diff --git a/ChangeLog b/ChangeLog index 02dd1577b..e16cc09bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,55 @@ +2007-11-23 Javier Serrano Polo + + * Makefile.am: + * plugins/ladspa_browser/ladspa_browser.cpp: + * plugins/ladspa_browser/ladspa_browser.h: + * plugins/ladspa_browser/ladspa_description.cpp: + * plugins/ladspa_browser/ladspa_description.h: + * plugins/ladspa_browser/ladspa_port_dialog.cpp: + * plugins/ladspa_browser/ladspa_port_dialog.h: + * plugins/ladspa_browser/logo.png: + * plugins/ladspa_browser/Makefile.am: + * plugins/Makefile.am: + resurrected LADSPA browser + + * plugins/ladspa_effect/ladspa_subplugin_features.cpp: + minor simplification + + * src/core/song_editor.cpp: + * src/widgets/automatable_slider.cpp: + upgraded automatable sliders to Qt4 + + * configure.in: + * include/engine.h: + * plugins/Makefile.am: + * src/core/config_mgr.cpp: + * src/core/engine.cpp: + removed references to optional LADSPA support + + * data/themes/default/style.css: + * src/core/main_window.cpp: + moved workspace background to style sheet + + * src/core/main_window.cpp: + added workspace scroll bars + + * include/track_container.h: + * src/core/song_editor.cpp: + removed obsolete centralWiget() + + * plugins/live_tool/live_tool.cpp: + * plugins/live_tool/live_tool.h: + fixed i18n + + * plugins/live_tool/live_tool.cpp: + cosmetic changes + + * data/locale/ca.ts: + updated translation + + * resources/*: + removed unused images + 2007-11-22 Paul Giblock * src/widgets/text_float.cpp: diff --git a/Makefile.am b/Makefile.am index fc0165bab..39af1179d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -73,7 +73,6 @@ lmms_MOC = \ ./kmultitabbar.moc \ ./knob.moc \ ./ladspa_control.moc \ - ./ladspa_port_dialog.moc \ ./lcd_spinbox.moc \ ./led_checkbox.moc \ ./main_window.moc \ @@ -169,7 +168,6 @@ lmms_SOURCES = \ $(srcdir)/src/core/file_browser.cpp \ $(srcdir)/src/core/import_filter.cpp \ $(srcdir)/src/core/instrument.cpp \ - $(srcdir)/src/core/ladspa_port_dialog.cpp \ $(srcdir)/src/core/ladspa_2_lmms.cpp \ $(srcdir)/src/core/ladspa_manager.cpp \ $(srcdir)/src/core/ladspa_control.cpp \ @@ -384,7 +382,6 @@ lmms_SOURCES = \ $(srcdir)/include/ladspa_manager.h \ $(srcdir)/include/ladspa_2_lmms.h \ $(srcdir)/include/ladspa_control.h \ - $(srcdir)/include/ladspa_port_dialog.h \ $(srcdir)/include/ladspa_base.h \ $(THIRD_PARTY_CODE) diff --git a/configure.in b/configure.in index 5c99ff636..82b03e9ed 100644 --- a/configure.in +++ b/configure.in @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.50) -AC_INIT(lmms, 0.4.0-svn20071120, lmms-devel/at/lists/dot/sf/dot/net) -AM_INIT_AUTOMAKE(lmms, 0.4.0-svn20071120) +AC_INIT(lmms, 0.4.0-svn20071123, lmms-devel/at/lists/dot/sf/dot/net) +AM_INIT_AUTOMAKE(lmms, 0.4.0-svn20071123) AM_CONFIG_HEADER(config.h) @@ -253,22 +253,12 @@ AM_CONDITIONAL(AMD64_BUILD, test "x$AMD64_BUILD" = "xyes") # check for LADSPA-SDK -AC_ARG_WITH(ladspa, - AS_HELP_STRING([--without-ladspa], [disable support for LADSPA]), , [ with_ladspa=yes ] ) AH_TEMPLATE(HAVE_LADSPA_H, [Define to 1 if you have the header file.]) -AH_TEMPLATE(LADSPA_SUPPORT, [Define to 1 if you have the header file.]) -if test "x$with_ladspa" = "xyes" ; then - AC_CHECK_HEADER(ladspa.h, HAVE_LADSPA_H="true") -fi +AC_CHECK_HEADER(ladspa.h, HAVE_LADSPA_H="true") if test ! -z "$HAVE_LADSPA_H" ; then AC_DEFINE(HAVE_LADSPA_H) fi -#if [ "$build_linux" = "true" ] ; then - AC_DEFINE(LADSPA_SUPPORT) -#fi #AM_CONDITIONAL(HAVE_LADSPA_H, test ! -z "$HAVE_LADSPA_H") -#AM_CONDITIONAL(LADSPA_SUPPORT, test "$build_linux" = "true" ) -AM_CONDITIONAL(LADSPA_SUPPORT, test true ) # check for STK @@ -650,6 +640,7 @@ AC_CONFIG_FILES([Makefile plugins/bit_invader/Makefile plugins/flp_import/Makefile plugins/kicker/Makefile + plugins/ladspa_browser/Makefile plugins/ladspa_effect/Makefile plugins/ladspa_effect/caps/Makefile plugins/lb302/Makefile @@ -820,32 +811,21 @@ fi -#if test "$build_linux" = "true" ; then - PLUGINS_TO_BUILD="$PLUGINS_TO_BUILD\n\t\* LADSPA-plugins" - if test -z "$HAVE_LADSPA_H" ; then - echo " ========================" - echo " === LMMS - WARNING =======================================================" - echo " ========================" - echo " =" - echo " = As the header file ladspa.h could not be found on your system, a version" - echo " = shipped with LMMS will be used. This is no problem at all but generally" - echo " = it's better to use files being customized to your system/distribution." - echo " = If you encounter problems related to LADSPA-support, try to install" - echo " = LADSPA-SDK-package (ladspa-sdk, ladspa-dev or similiar) and run configure" - echo " = again." - echo " =" - with_warnings="true" - fi -#else -# echo " ========================" -# echo " === LMMS - WARNING =======================================================" -# echo " ========================" -# echo " =" -# echo " = You're building LMMS for a platform other than Linux which will prevent" -# echo " = configure from enabling LADSPA-support." -# echo " =" -# with_warnings="true" -#fi +PLUGINS_TO_BUILD="$PLUGINS_TO_BUILD\n\t\* LADSPA-plugins" +if test -z "$HAVE_LADSPA_H" ; then + echo " ========================" + echo " === LMMS - WARNING =======================================================" + echo " ========================" + echo " =" + echo " = As the header file ladspa.h could not be found on your system, a version" + echo " = shipped with LMMS will be used. This is no problem at all but generally" + echo " = it's better to use files being customized to your system/distribution." + echo " = If you encounter problems related to LADSPA-support, try to install" + echo " = LADSPA-SDK-package (ladspa-sdk, ladspa-dev or similiar) and run configure" + echo " = again." + echo " =" + with_warnings="true" +fi diff --git a/data/locale/ca.qm b/data/locale/ca.qm index b757e4914..93b198f92 100644 Binary files a/data/locale/ca.qm and b/data/locale/ca.qm differ diff --git a/data/locale/ca.ts b/data/locale/ca.ts index a92381d57..d9daf3527 100644 --- a/data/locale/ca.ts +++ b/data/locale/ca.ts @@ -1,55 +1,54 @@ - QWidget - + Name: Nom: - + Maker: Fabricant: - + Copyright: Copyright: - + Requires Real Time: Requereix Temps Real: - + Yes Sí - + No No - + Real Time Capable: Capaç de Temps Real: - + In Place Broken: Trencat En Lloc: - + Channels In: Canals d'Entrada: - + Channels Out: Canals de Sortida: @@ -456,102 +455,102 @@ http://lmms.sourceforge.net m-Maj13 - + Chord range: Rang d'acord: - + octave(s) octava(es) - + Use this knob for setting the chord range in octaves. The selected chord will be played within specified amount of octaves. Usa aquesta roda per a ajustar el rang d'acord en octaves. L'acord seleccionat serà reproduït amb la quantitat especificada d'octaves. - + An arpeggio is a type of playing (especially plucked) instruments, which makes the music much livelier. The strings of such instruments (e.g. harps) are plucked like chords, the only difference is, that this is done in a sequential order, so the notes are not played at the same time. Typical arpeggios are major or minor triads. But there're a lot of other possible chords, you can select. Un arpegi és una forma de tocar (especialment puntejada) els instruments, que fa la música més animada. Les cordes d'aquests instruments (p.e. l'arpa) són puntejades com els acords, l'única diferència és que això es fa en un ordre seqüencial, així les notes no sonen a la vegada. Arpegis típics són les tríades majors o menors. Però hi ha molts més acords que pots seleccionar. - + Arpeggio range: Rang d'arpegi: - + Use this knob for setting the arpeggio range in octaves. The selected arpeggio will be played within specified amount of octaves. Usa aquesta roda per a ajustar el rang d'arpegi en octaves. L'arpegi seleccionat serà reproduït amb la quantitat especificada d'octaves. - + Arpeggio time: Temps d'arpegi: - + ms ms - + Use this knob for setting the arpeggio time in milliseconds. The arpeggio time specifies how long each arpeggio-tone should be played. Usa aquesta roda per a ajustar el temps d'arpegi en mil·lisegons. El temps d'arpegi especifica la durada de cada nota de l'arpegi. - + Arpeggio gate: Porta d'arpegi: - + % % - + Use this knob for setting the arpeggio gate. The arpeggio gate specifies the percent of a whole arpeggio-tone that should be played. With this you can make cool staccato-arpeggios. Usa aquesta roda per a ajustar la porta d'arpegi. La porta d'arpegi especifica el percentatge de la nota de l'arpegi que serà reproduït. Amb això pots fer arpegis amb staccato genials. - + arpeggio direction = up direcció d'arpegi = amunt - + arpeggio direction = down direcció d'arpegi = abaix - + arpeggio direction = up and down direcció d'arpegi = amunt i abaix - + arpeggio direction = random direcció d'arpegi = aleatori - + Chord range Rang d'acord - + Arpeggio range Rang d'arpegi - + Arpeggio time Temps d'arpegi - + Arpeggio gate Porta d'arpegi @@ -666,47 +665,47 @@ http://lmms.sourceforge.net ACORDS - + RANGE RANG - + ARPEGGIO ARPEGI - + TIME TEMPS - + GATE PORTA - + Direction: Direcció: - + Mode: Mode: - + Free Lliure - + Sort Ordena - + Sync Sinc @@ -716,17 +715,17 @@ http://lmms.sourceforge.net Tipus d'acord - + Arpeggio type Tipus d'arpegi - + Arpeggio direction Direcció d'arpegi - + Arpeggio mode Mode d'arpegi @@ -850,7 +849,7 @@ http://lmms.sourceforge.net automatableButton - + &Open in automation editor &Obre a l'editor d'automatització @@ -866,117 +865,117 @@ http://lmms.sourceforge.net automationEditor - + Play/pause current pattern (Space) Reprodueix/pausa el patró actual (Espai) - + Stop playing of current pattern (Space) Atura la reproducció del patró actual (Espai) - + Click here, if you want to play the current pattern. This is useful while editing it. The pattern is automatically looped when its end is reached. Pica aquí si vols reproduir el patró actual. Això és útil mentre s'edita. El patró es repeteix automàticament quan arriba al final. - + Click here, if you want to stop playing of current pattern. Pica aquí si vols aturar la reproducció del patró actual. - + Cut selected values (Ctrl+X) Talla els valors seleccionats (Ctrl+X) - + Copy selected values (Ctrl+C) Copia els valors seleccionats (Ctrl+C) - + Paste values from clipboard (Ctrl+V) Enganxa valors des del portapapers (Ctrl+V) - + If you click here, selected values will be cut into the clipboard. You can paste them anywhere in any pattern by clicking on the paste-button. Si piques aquí, els valors seleccionats seran tallats cap al portapapers. Pots enganxar-los a qualsevol banda de qualsevol patró picant el botó enganxar. - + If you click here, selected values will be copied into the clipboard. You can paste them anywhere in any pattern by clicking on the paste-button. Si piques aquí, els valors seleccionats seran copiats al portapapers. Pots enganxar-los a qualsevol banda de qualsevol patró picant el botó enganxar. - + If you click here, the values from the clipboard will be pasted at the first visible tact. Si piques aquí, els valors del portapapers seran enganxats al primer compàs visible. - + Automation Editor - no pattern Editor d'Automatització - sense patró - + Automation Editor - %1 Editor d'Automatització - %1 - + Please open an automation pattern with the context menu of a control! Per favor, obre un patró d'automatització amb el menú contextual d'un control! - + Values copied Valors copiats - + All selected values were copied to the clipboard. Tots els valors seleccionats s'han copiat al portapapers. - + Draw mode (Shift+D) Mode dibuixar (Maj+D) - + Erase mode (Shift+E) Mode esborrar (Maj+E) - + Select mode (Shift+S) Mode seleccionar (Maj+S) - + Move selection mode (Shift+M) Mode moure selecció (Maj+M) - + If you click here, draw-mode will be activated. In this mode you can add and move single values. This is the default-mode which is used most of the time. You can also press 'Shift+D' on your keyboard to activate this mode. Si piques aquí, el mode dibuixar serà activat. En aquest mode pots afegir i moure valors solts. Aquest és el mode per defecte que s'utilitza més temps. També pots pitjar 'Maj+D' al teclat per a activar aquest mode. - + If you click here, erase-mode will be activated. In this mode you can erase single values. You can also press 'Shift+E' on your keyboard to activate this mode. Si piques aquí, s'activarà el mode esborrar. En aquest mode pots esborrar valors solts. També pots pitjar 'Maj+E' al teclat per a activar aquest mode. - + If you click here, select-mode will be activated. In this mode you can select values. This is neccessary if you want to cut, copy, paste, delete or move values. You can also press 'Shift+S' on your keyboard to activate this mode. Si piques aquí, el mode seleccionar serà activat. En aquest mode pots seleccionar valors. Això és necessari si vols tallar, copiar, enganxar, esborrar o moure valors. També pots pitjar 'Maj+S' al teclat per a activar aquest mode. - + If you click here, move-mode will be activated. In this mode you can move the values you selected in select-mode. You can also press 'Shift+M' on your keyboard to activate this mode. Si piques aquí, el mode moure serà activat. En aquest mode pots moure els valors que has seleccionat en el mode seleccionar. També pots pitjar 'Maj+M' al teclat per a activar aquest mode. @@ -1037,32 +1036,32 @@ http://lmms.sourceforge.net bbEditor - + Play/pause current beat/bassline (Space) Reprodueix/pausa el ritme base actual (Espai) - + Stop playing of current beat/bassline (Space) Atura el ritme base actual (Espai) - + Click here, if you want to play the current beat/bassline. The beat/bassline is automatically looped when its end is reached. Pica aquí si vols reproduir el ritme base actual. El ritme base és repetit automàticament quan arriba al final. - + Click here, if you want to stop playing of current beat/bassline. Pica aquí si vols aturar el ritme base actual. - + Beat+Baseline Editor Editor de Ritme Base - + Add beat/bassline Afegeix ritme de base @@ -1249,24 +1248,24 @@ Per favor, selecciona un directori: Selecciona directori de treball - + Directory not existing El directori no existeix - + Error in configuration-file Error al fitxer de configuració - + Error while parsing configuration-file %1. The setup-wizard will be shown for reconfiguring LMMS. Error analitzant el fitxer de configuració %1. Es mostrarà l'assistent per a reconfigurar LMMS. - + The directory you specified does not exist. Create it? El directori especificat no existeix. Crear-lo? @@ -1281,19 +1280,19 @@ Es mostrarà l'assistent per a reconfigurar LMMS. &Finalitza - + Could not save config-file No s'ha pogut desar el fitxer de configuració - + Could not save configuration file %1. You probably are not permitted to write to this file. Please make sure you have write-access to the file and try again. No s'ha pogut desar el fitxer de configuració %1. Per favor, comprova que tens permís d'escriptura per a aquest fitxer i torna-ho a provar. - + Version mismatches La versió no coincideix @@ -1313,7 +1312,7 @@ Per favor, comprova que tens permís d'escriptura per a aquest fitxer i tor Escull el directori de treball de LMMS - + Accordingly to the information in your LMMS-configuration-file you seem to have run a different (probably older) version of LMMS before. It is recommended to run the setup-wizard again to ensure that the latest samples, presets, demo-projects etc. are installed in your LMMS-working-directory. Run the setup-wizard now? @@ -1852,12 +1851,12 @@ Assegura't que tens permís d'escriptura per al fitxer/dispositiu sele fileBrowser - + Browser Navegador - + Reload (F5) Recarrega (F5) @@ -1968,62 +1967,62 @@ Assegura't que tens permís d'escriptura per al fitxer/dispositiu sele instrumentTrack - + With this knob you can set the volume of the opened channel. Amb aquesta roda pots ajustar el volum del canal obert. - + Within this rectangle you can set the position where the channel should be audible. You should have a soundcard supporting at least surround 4.0 for enjoying this feature. Amb aquest rectangle pots ajustar la posició on el canal ha de ser audible. Necessites una targeta de so que suporti almenys l'envoltant 4.0 per a gaudir d'aquesta característica. - + unnamed_channel canal_sense_nom - + Channel volume Volum del canal - + Channel volume: Volum del canal: - + VOL VOL - + MIDI input/output Entrada/sortida MIDI - + GENERAL SETTINGS CONFIGURACIÓ GENERAL - + VOLUME VOLUM - + FX CHNL CANAL FX - + Save current channel settings in a preset-file Desa la configuració del canal actual en una plantilla - + Click here, if you want to save current channel settings in a preset-file. Later you can load this preset by double-clicking it in the preset-browser. Pica aquí si vols desar la configuració del canal actual en una plantilla. Més tard podràs carregar aquesta plantilla picant-la dos cops al navegador de plantilles. @@ -2033,57 +2032,57 @@ Assegura't que tens permís d'escriptura per al fitxer/dispositiu sele Defecte - + ENV/LFO/FILTER ENV/OBF/FILTRE - + ARP/CHORD ARP/ACORD - + MIDI MIDI - + MIDI input Entrada MIDI - + MIDI output Sortida MIDI - + Save channel-settings in file Desa configuració de canal en fitxer - + Channel-Settings-File (*.cs.xml) Fitxer de Configuració de Canal (*.cs.xml) - + PLUGIN CONN - + Surround area Àrea envoltant - + FX channel Canal FX - + FX FX @@ -2169,41 +2168,98 @@ Assegura't que tens permís d'escriptura per al fitxer/dispositiu sele knob - + &Help &Ajuda - + &Reset (%1%2) &Restaura (%1%2) - + &Copy value (%1%2) &Copia valor (%1%2) - + &Paste value (%1%2) &Enganxa valor (%1%2) - + Connect to MIDI-device Connecta a dispositiu MIDI - + Please enter a new value between %1 and %2: Per favor, introdueix un nou valor entre %1 i %2: - + &Open in automation editor &Obre a l'editor d'automatització + + ladspaBrowser + + + Available Effects + Efectes Disponibles + + + + Unavailable Effects + Efectes No Disponibles + + + + Instruments + Instruments + + + + Analysis Tools + Eines d'Anàlisi + + + + Don't know + Desconeguts + + + + This dialog displays information on all of the LADSPA plugins LMMS was able to locate. The plugins are divided into five categories based upon an interpretation of the port types and names. + +Available Effects are those that can be used by LMMS. In order for LMMS to be able to use an effect, it must, first and foremost, be an effect, which is to say, it has to have both input channels and output channels. LMMS identifies an input channel as an audio rate port containing 'in' in the name. Output channels are identified by the letters 'out'. Furthermore, the effect must have the same number of inputs and outputs and be real time capable. + +Unavailable Effects are those that were identified as effects, but either didn't have the same number of input and output channels or weren't real time capable. + +Instruments are plugins for which only output channels were identified. + +Analysis Tools are plugins for which only input channels were identified. + +Don't Knows are plugins for which no input or output channels were identified. + +Double clicking any of the plugins will bring up information on the ports. + Aquest diàleg mostra informació de tots els connectors LADSPA que LMMS ha pogut trobar. Els connectors estan dividits en cinc categories basades en la interpretació dels tipus i noms dels ports. + +Efectes Disponibles són aquells que LMMS pot usar. Per a que LMMS pugui usar un efecte, primerament, ha de ser un efecte, és a dir, ha de tenir canals d'entrada i de sortida. LMMS identifica un canal d'entrada com a un port d'àudio que conté 'in' al nom. Els canals de sortida són identificats amb les lletres 'out'. A més, l'efecte ha de tenir el mateix nombre d'entrades que de sortides i ser capaç de temps real. + +Efectes No Disponibles són aquells que han estat identificats com a efectes, però no tenen el mateix nombre d'entrades que de sortides o no són capaços de temps real. + +Instruments són connectors on només s'han identificat canals de sortida. + +Eines d'Anàlisi són connectors on només s'han identificat canals d'entrada. + +Desconeguts són connectors on no s'han identificat canals d'entrada o sortida. + +Fent doble clic a qualsevol connector mostrarà informació sobre els ports. + + ladspaControl @@ -2235,83 +2291,101 @@ Assegura't que tens permís d'escriptura per al fitxer/dispositiu sele Enllaça Canals + + ladspaDescription + + + Plugins + Connectors + + + + Description + Descripció + + ladspaPortDialog - + Name Nom - + Rate Taxa - + Direction Direcció - + Type Tipus - + Min < Default < Max Mín < Defecte < Màx - + Logarithmic Logarítmic - + SR Dependent Depenent SR - + Audio Àudio - + Control Control - + Input Entrada - + Output Sortida - + Toggled Commutat - + Integer Enter - + Float Flotant - + Yes Sí + + + Ports + Ports + lb302Synth @@ -2497,37 +2571,37 @@ Assegura't que tens permís d'escriptura per al fitxer/dispositiu sele listView - + Files Fitxers - + Loading sample Carregant mostra - + Please wait, loading sample for preview... Per favor espera, carregant mostra per a previsualitzar... - + --- Factory files --- --- Fitxers de fàbrica --- - + Send to active instrument-track Envia a la pista d'instrument activa - + Open in new instrument-track/Song-Editor Obre en una nova pista d'instrument/Editor de Cançó - + Open in new instrument-track/B+B Editor Obre en una nova pista d'instrument/Editor R+B @@ -2535,7 +2609,7 @@ Assegura't que tens permís d'escriptura per al fitxer/dispositiu sele liveTool - + This tool is intended to be used in live performances, though you can use it for music production as well. The following keys will work only if this window is active. The spacebar toggles play and pause in the Song Editor. @@ -2549,62 +2623,62 @@ Les tecles F1-F10 apaguen els 10 primers instruments a l'Editor de Ritme Ba mainWindow - + Setting up main-window and workspace... Preparant finestra principal i espai de treball... - + Creating new song... Creant nova cançó... - + Creating GUI... Creant interfície... - + &New &Nou - + &Open... &Obre... - + &Save &Desa - + Save &As... &Anomena i desa... - + &Quit &Surt - + Help Ajuda - + About Quant a - + &Help &Ajuda - + What's this? Què és això? @@ -2624,67 +2698,67 @@ Les tecles F1-F10 apaguen els 10 primers instruments a l'Editor de Ritme Ba Els meus projectes - + Loading song... Carregant cançó... - + &Settings &Configuració - + Show setup wizard Mostra l'assistent de configuració - + By pressing this button, you can show or hide the project notes window. In this window you can put down your project notes. Pitjant aquest botó, pots mostrar o amagar la finestra de notes del projecte. En aquesta finestra pots escriure les teves notes del projecte. - + LMMS %1 LMMS %1 - + Create new project Crea nou projecte - + Open existing project Obre projecte existent - + Save current project Desa projecte actual - + Export current project Exporta projecte actual - + By pressing this button, you can show or hide the Piano-Roll. With the help of the Piano-Roll you can edit melody-patterns in an easy way. Pitjant aquest botó pots mostrar o amagar el Rotlle de Piano. Amb l'ajuda del Rotlle de Piano pots editar patrons de melodia fàcilment. - + &Project &Projecte - + Open project Obre projecte - + Save project Desa projecte @@ -2699,109 +2773,109 @@ Les tecles F1-F10 apaguen els 10 primers instruments a l'Editor de Ritme Ba Directori arrel - + Show/hide Beat+Baseline Editor Mostra/amaga Editor de Ritme Base - + By pressing this button, you can show or hide the Beat+Baseline Editor. The Beat+Baseline Editor is needed for creating beats, opening, adding and removing channels, cutting, copying and pasting beat- and baseline-patterns and other things like that. Pitjant aquest botó pots mostrar o amagar l'Editor de Ritme Base. L'Editor de Ritme Base és necessari per a crear ritmes; obrir, afegir i eliminar canals; tallar, copiar i enganxar patrons de ritme; i altres funcions similars. - + Show/hide Piano-Roll Mostra/amaga Rotlle de Piano - + Show/hide Song-Editor Mostra/amaga Editor de Cançó - + By pressing this button, you can show or hide the Song-Editor. With the help of the Song-Editor you can edit song-playlist and specify when which track should be played. You can also insert and move samples (e.g. rap-samples) directly into the playlist. Pitjant aquest botó pots mostrar o amagar l'Editor de Cançó. Amb l'ajuda de l'Editor de Cançó pots editar la llista de reproducció de la cançó i especificar quan ha de tocar-se cada pista. També pots inserir i moure mostres (p.e. mostres de rap) directament a la llista de reproducció. - + Show/hide project notes Mostra/amaga les notes del projecte - + &Edit &Edita - + Undo Desfés - + Redo Refés - + Show settings dialog Mostra el diàleg de configuració - + Help not available Ajuda no disponible - + Show/hide Automation Editor Mostra/amaga Editor d'Automatització - + By pressing this button, you can show or hide the Automation Editor. With the help of the Automation Editor you can edit dynamic values in an easy way. Pitjant aquest botó pots mostrar o amagar l'Editor d'Automatització. Amb l'ajuda de l'Editor d'Automatització pots editar valors dinàmics fàcilment. - + &Tools E&ines - + MultiMedia Project (*.mmp *.mmpz *.xml) Projecte MultiMèdia (*.mmp *.mmpz *.xml) - + MultiMedia Project (*.mmp *.mmpz);;MultiMedia Project Template (*.mpt) Projecte MultiMèdia (*.mmp *.mmpz);;Plantilla de Projecte MultiMèdia (*.mpt) - + Online help Ajuda en línia - + Import... Importa... - + E&xport... E&xporta... - + Currently there's no help available in LMMS. Please visit http://lmms.sf.net/wiki for documentation on LMMS. Actualment no hi ha ajuda disponible a LMMS. Per favor, visita http://lmms.sf.net/wiki per a documentació sobre LMMS. - + Recently opened projects Projectes oberts recentment @@ -3402,132 +3476,132 @@ usa la roda del ratolí per a ajustar el volum d'un pas pianoRoll - + Cut selected notes (Ctrl+X) Talla les notes seleccionades (Ctrl+X) - + Copy selected notes (Ctrl+C) Copia les notes seleccionades (Ctrl+C) - + If you click here, selected notes will be cut into the clipboard. You can paste them anywhere in any pattern by clicking on the paste-button. Si piques aquí, les notes seleccionades seran tallades cap al portapapers. Pots enganxar-les a qualsevol banda de qualsevol patró picant el botó enganxar. - + If you click here, selected notes will be copied into the clipboard. You can paste them anywhere in any pattern by clicking on the paste-button. Si piques aquí, les notes seleccionades seran copiades al portapapers. Pots enganxar-les a qualsevol banda de qualsevol patró picant el botó enganxar. - + If you click here, the notes from the clipboard will be pasted at the first visible tact. Si piques aquí, les notes del portapapers seran enganxades al primer compàs visible. - + Paste notes from clipboard (Ctrl+V) Enganxa notes des del portapapers (Ctrl+V) - + Play/pause current pattern (Space) Reprodueix/pausa el patró actual (Espai) - + Stop playing of current pattern (Space) Atura la reproducció del patró actual (Espai) - + Click here, if you want to play the current pattern. This is useful while editing it. The pattern is automatically looped when its end is reached. Pica aquí si vols reproduir el patró actual. Això és útil mentre s'edita. El patró es repeteix automàticament quan arriba al final. - + Click here, if you want to stop playing of current pattern. Pica aquí si vols aturar la reproducció del patró actual. - + Piano-Roll - no pattern Rotlle de Piano - sense patró - + Please open a pattern by double-clicking on it! Per favor, obre un patró picant-lo dos cops! - + Piano-Roll - %1 Rotlle de Piano - %1 - + Record notes from MIDI-device/channel-piano Enregistra notes des d'un dispositiu MIDI o piano de canal - + Click here, if you want to record notes from a MIDI-device or the virtual test-piano of the according channel-window to the current pattern. When recording all notes you play will be written to this pattern and you can play and edit them afterwards. Pica aquí si vols enregistrar notes des d'un dispositiu MIDI o el piano virtual de prova de la finestra de canal corresponent al patró actual. Mentre s'enregistra, totes les notes que toquis seran escrites en aquest patró i les podràs reproduir i editar després. - + Last note Darrera nota - + Notes copied Notes copiades - + All selected notes were copied to the clipboard. Totes les notes seleccionades s'han copiat al portapapers. - + Draw mode (Shift+D) Mode dibuixar (Maj+D) - + Erase mode (Shift+E) Mode esborrar (Maj+E) - + Select mode (Shift+S) Mode seleccionar (Maj+S) - + Move selection mode (Shift+M) Mode moure selecció (Maj+M) - + If you click here, draw-mode will be activated. In this mode you can add, resize and move single notes. This is the default-mode which is used most of the time. You can also press 'Shift+D' on your keyboard to activate this mode. Si piques aquí, el mode dibuixar serà activat. En aquest mode pots afegir, redimensionar i moure notes soltes. Aquest és el mode per defecte que s'utilitza més temps. També pots pitjar 'Maj+D' al teclat per a activar aquest mode. - + If you click here, erase-mode will be activated. In this mode you can erase single notes. You can also press 'Shift+E' on your keyboard to activate this mode. Si piques aquí, s'activarà el mode esborrar. En aquest mode pots esborrar notes soltes. També pots pitjar 'Maj+E' al teclat per a activar aquest mode. - + If you click here, select-mode will be activated. In this mode you can select notes. This is neccessary if you want to cut, copy, paste, delete or move notes. You can also press 'Shift+S' on your keyboard to activate this mode. Si piques aquí, el mode seleccionar serà activat. En aquest mode pots seleccionar notes. Això és necessari si vols tallar, copiar, enganxar, esborrar o moure notes. També pots pitjar 'Maj+S' al teclat per a activar aquest mode. - + If you click here, move-mode will be activated. In this mode you can move the notes you selected in select-mode. You can also press 'Shift+M' on your keyboard to activate this mode. Si piques aquí, el mode moure serà activat. En aquest mode pots moure les notes que has seleccionat en el mode seleccionar. També pots pitjar 'Maj+M' al teclat per a activar aquest mode. @@ -3666,7 +3740,7 @@ usa la roda del ratolí per a ajustar el volum d'un pas Bot cantant per a afegir veus bàsiques - + Tool for live performance Eina per a actuació en directe @@ -3685,6 +3759,11 @@ usa la roda del ratolí per a ajustar el volum d'un pas Plugin for enhancing stereo separation of a stereo input file Connector per a millorar la separació estèreo + + + List installed LADSPA plugins + Llista connectors LADSPA instal·lats + polyb302Synth @@ -3847,147 +3926,147 @@ usa la roda del ratolí per a ajustar el volum d'un pas projectNotes - + Put down your project notes here. Escriu aquí les teves notes del projecte. - + Project notes Notes del projecte - + Edit Actions Accions d'Editar - + &Undo &Desfés - + Ctrl+Z Ctrl+Z - + &Redo &Refés - + Ctrl+Y Ctrl+Y - + &Copy &Copia - + Ctrl+C Ctrl+C - + Cu&t &Talla - + Ctrl+X Ctrl+X - + &Paste &Enganxa - + Ctrl+V Ctrl+V - + Format Actions Accions de Format - + &Bold &Negreta - + Ctrl+B Ctrl+B - + &Italic Curs&iva - + Ctrl+I Ctrl+I - + &Underline &Subratllat - + Ctrl+U Ctrl+U - + &Left &Esquerra - + Ctrl+L Ctrl+L - + C&enter Cen&tre - + Ctrl+E Ctrl+E - + &Right &Dreta - + Ctrl+R Ctrl+R - + &Justify &Justifica - + Ctrl+J Ctrl+J - + &Color... &Color... @@ -3995,77 +4074,77 @@ usa la roda del ratolí per a ajustar el volum d'un pas rackPlugin - + Turn the effect off Apaga l'efecte - + On/Off Encès/Apagat - + Toggles the effect on or off. Encén o apaga l'efecte. - + Wet/Dry mix Mescla Moll/Sec - + W/D M/S - + Wet Level: Nivell de Moll: - + The Wet/Dry knob sets the ratio between the input signal and the effect that shows up in the output. La roda Moll/Sec indica la proporció entre el senyal d'entrada i l'efecte que es mostra a la sortida. - + Decay Decaïment - + Time: Temps: - + The Decay knob controls how many buffers of silence must pass before the plugin stops processing. Smaller values will reduce the CPU overhead but run the risk of clipping the tail on delay effects. La roda Decaïment controla quants períodes de silenci han de passar abans de que el connector aturi el processament. Valors més petits reduiran la càrrega de CPU, però augmenten el risc de tallar la cua als efectes de retard. - + Gate Porta - + Gate: Porta: - + The Gate knob controls the signal level that is considered to be 'silence' while deciding when to stop processing signals. La roda Porta controla el nivell de senyal que és considerat 'silenci' mentre decideix quan aturar de processar senyals. - + Controls Controls - + Effect plugins function as a chained series of effects where the signal will be processed from top to bottom. The On/Off switch allows you to bypass a given plugin at any point in time. @@ -4088,22 +4167,22 @@ El botó Controls obre un diàleg per a editar els paràmetres de l'efecte. Un clic dret mostrarà un menú contextual on podràs canviar l'ordre en el qual els efectes són processats o esborrar un efecte. - + Move &up Mou a&munt - + Move &down Mou a&vall - + &Remove this plugin &Treu aquest connector - + &Help &Ajuda @@ -4144,57 +4223,57 @@ Si funciona amb altre programari VST sota Linux, per favor contacta amb un desen sampleBuffer - + Wave-Files (*.wav) Fitxers WAV (*.wav) - + OGG-Files (*.ogg) Fitxers OGG (*.ogg) - + VOC-Files (*.voc) Fitxers VOC (*.voc) - + AIFF-Files (*.aif *.aiff) Fitxers AIFF (*.aif *.aiff) - + AU-Files (*.au) Fitxers AU (*.au) - + RAW-Files (*.raw) Fitxers RAW (*.raw) - + Open audio file Obre fitxer d'àudio - + FLAC-Files (*.flac) Fitxers FLAC (*.flac) - + SPEEX-Files (*.spx) Fitxers SPEEX (*.spx) - + All Audio-Files (*.wav *.ogg *.ds *.flac *.spx *.voc *.aif *.aiff *.au *.raw) Tots els Fitxers d'Àudio (*.wav *.ogg *.ds *.flac *.spx *.voc *.aif *.aiff *.au *.raw) - + DrumSynth-Files (*.ds) Fitxers DrumSynth (*.ds) @@ -4210,27 +4289,27 @@ Si funciona amb altre programari VST sota Linux, per favor contacta amb un desen sampleTrack - + Sample track Pista de mostra - + Channel volume Volum del canal - + Channel volume: Volum del canal: - + VOL VOL - + With this knob you can set the volume of the opened channel. Amb aquesta roda pots ajustar el volum del canal obert. @@ -4513,12 +4592,12 @@ Fixa't que en alguns casos la paral·lelització no funcionarà amb memòri songEditor - + Click here, if you want to stop playing of your song. The song-position-marker will be set to the start of your song. Pica aquí si vols aturar la reproducció de la cançó. El marcador de posició de cançó serà col·locat a l'inici de la cançó. - + untitled sense títol @@ -4548,57 +4627,57 @@ Fixa't que en alguns casos la paral·lelització no funcionarà amb memòri No es pot escriure el fitxer - + Song-Editor Editor de Cançó - + The file "%1" already exists. Do you want to overwrite it? El fitxer "%1" ja existeix. Vols sobreescriure'l? - + Click here, if you want to play your whole song. Playing will be started at the song-position-marker (green). You can also move it while playing. Pica aquí si vols reproduir la cançó sencera. La reproducció començarà al marcador de posició de cançó (verd). També pots moure'l mentre es reprodueix. - + Play song (Space) Reprodueix cançó (Espai) - + Stop song (Space) Atura cançó (Espai) - + The tempo of a song is specified in beats per minute (BPM). If you want to change the tempo of your song, change this value. Every tact has four beats, so the tempo in BPM specifies, how many tacts / 4 should be played within a minute (or how many tacts should be played within four minutes). El tempo d'una cançó s'especifica en batecs per minut (BPM). Si vols canviar el tempo de la cançó, canvia aquest valor. Cada compàs té quatre batecs, llavors el tempo en BPM especifica quants compassos / 4 s'han de tocar en un minut (o quants compassos s'han de tocar en quatre minuts). - + master pitch to mestre - + tempo of song tempo de cançó - + Add beat/bassline Afegeix ritme base - + Add sample-track Afegeix pista de mostra - + Project NOT saved. Projecte NO desat. @@ -4610,27 +4689,27 @@ Do you want to overwrite it? Vols sobreescriure'l? - + Select file for project-export... Selecciona fitxer per a exportar projecte... - + Project not saved Projecte no desat - + The current project was modified since last saving. Do you want to save it now? El projecte actual ha estat modificat des del darrer desament. Vols desar-lo ara? - + Import file Importa fitxer - + TEMPO/BPM TEMPO/BPM @@ -4642,62 +4721,62 @@ Please make sure you have at least read-access to the file and try again. - + High quality mode Mode alta qualitat - + Auto limiter Autolimitador - + master volume volum mestre - + Master volume Volum mestre - + Master pitch To mestre - + Draw mode Mode dibuixar - + Edit mode (select and move) Mode editar (selecciona i mou) - + Value: %1% Valor: %1% - + Value: %1 semitones Valor: %1 semitons - + Project saved Projecte desat - + The project %1 is now saved. El projecte %1 està desat. - + The project %1 was not saved! El projecte %1 no està desat! @@ -4709,7 +4788,7 @@ Please make sure you have write-access to the file and try again. Per favor, assegura't que tens permís d'escriptura per a aquest fitxer i torna-ho a provar. - + Tempo Tempo @@ -4717,17 +4796,17 @@ Per favor, assegura't que tens permís d'escriptura per a aquest fitxe stereoEnhancerControlDialog - + Width Amplada - + WIDE AMPLE - + Width: Amplada: @@ -4932,7 +5011,7 @@ Per favor, assegura't que tens permís d'escriptura per a aquest fitxe trackContainer - + Loading project... Carregant projecte... @@ -5042,27 +5121,27 @@ Per favor, assegura't que tens permís de lectura per al fitxer i el direct trackOperationsWidget - + Press <Ctrl> while clicking on move-grip to begin a new drag'n'drop-action. Pitja <Ctrl> quan piquis el control de moviment per a iniciar una nova acció d'arrossegar i amollar. - + Clone this track Clona aquesta pista - + Remove this track Elimina aquesta pista - + Actions for this track Accions per a aquesta pista - + With this switch you can either mute this track or mute all other tracks. By clicking left, this track is muted. This is useful, if you only want to listen to the other tracks without changing this track and loosing information. When you click right on this switch, all other tracks will be muted. This is useful, if you only want to listen to this track. @@ -5071,24 +5150,24 @@ Amb un clic esquerre, aquesta pista s'apaga. Això és útil si només vols Amb un clic dret a l'interruptor, totes les altres pistes s'apagaran. Això és útil si només vols escoltar aquesta pista. - + left click = mute this track right click = mute all other tracks (solo) clic esquerre = apaga aquesta pista clic dret = apaga totes les altres pistes (solo) - + Mute Apaga - + Enable automation Habilita automatització - + Disable automation Inhabilita automatització diff --git a/data/themes/default/style.css b/data/themes/default/style.css index 2f57a6419..d66f10438 100644 --- a/data/themes/default/style.css +++ b/data/themes/default/style.css @@ -1,5 +1,9 @@ /* LMMS style sheet */ +QMdiArea { + background-image: url(resources:background_artwork.png); +} + captionMenu::item:disabled { color: white; background-color: rgb(0, 0, 192); diff --git a/include/engine.h b/include/engine.h index 12b910c22..ab9decf3d 100644 --- a/include/engine.h +++ b/include/engine.h @@ -40,9 +40,8 @@ class mixer; class pianoRoll; class projectNotes; class songEditor; -#ifdef LADSPA_SUPPORT class ladspa2LMMS; -#endif + class engine { @@ -95,12 +94,10 @@ public: return( s_automationEditor ); } -#ifdef LADSPA_SUPPORT static ladspa2LMMS * getLADSPAManager( void ) { return( s_ladspaManager ); } -#endif static float framesPerTact64th( void ) { @@ -126,10 +123,7 @@ private: static pianoRoll * s_pianoRoll; static projectNotes * s_projectNotes; static projectJournal * s_projectJournal; - -#ifdef LADSPA_SUPPORT static ladspa2LMMS * s_ladspaManager; -#endif static QMap s_sample_extensions; diff --git a/include/ladspa_browser.h b/include/ladspa_browser.h deleted file mode 100644 index 79b36cb9f..000000000 --- a/include/ladspa_browser.h +++ /dev/null @@ -1,79 +0,0 @@ -#if 0 -/* - * ladspa_browser.h - dialog to display information about installed LADSPA - * plugins - * - * Copyright (c) 2006 Danny McRae - * - * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program (see COPYING); if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA. - * - */ - - -#ifndef _LADSPA_BROWSER_H -#define _LADSPA_BROWSER_H - -#include "ladspa_manager.h" -#ifdef LADSPA_SUPPORT - -#include "qt3support.h" - -#ifdef QT4 - -#include - -#else - -#include - -#endif - -#include "engine.h" - -class QComboBox; -class QLabel; -class QLineEdit; -class QSlider; - -class tabBar; - - -class ladspaBrowser : public QDialog, public engineObject -{ - Q_OBJECT -public: - ladspaBrowser( engine * _engine ); - virtual ~ladspaBrowser(); - - inline void labelWidget( QWidget * _w, const QString & _txt ); - -public slots: - void showPorts( const ladspa_key_t & _key ); - void displayHelp( void ); - -private: - tabBar * m_tabBar; - -} ; - -#endif - -#endif - -#endif - diff --git a/include/ladspa_port_dialog.h b/include/ladspa_port_dialog.h deleted file mode 100644 index 86a2f0508..000000000 --- a/include/ladspa_port_dialog.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * ladspa_port_dialog.h - dialog to test a LADSPA plugin - * - * Copyright (c) 2006-2007 Danny McRae - * - * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program (see COPYING); if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA. - * - */ - -#ifndef _LADSPA_PORT_DIALOG_H -#define _LADSPA_PORT_DIALOG_H - -#include - -#include "ladspa_2_lmms.h" - - -class ladspaPortDialog : public QDialog -{ - Q_OBJECT -public: - ladspaPortDialog( const ladspa_key_t & _key ); - virtual ~ladspaPortDialog(); - -private: - ladspa_key_t m_key; - ladspa2LMMS * m_ladspa; - -}; - -#endif - diff --git a/include/track_container.h b/include/track_container.h index c46e7d61f..fd468d4b7 100644 --- a/include/track_container.h +++ b/include/track_container.h @@ -54,12 +54,6 @@ public: return( m_scrollArea ); } -#warning centralWidget is obsolete - QWidget * centralWidget( void ) const - { - return( (QWidget *) this ); - } - virtual void FASTCALL saveSettings( QDomDocument & _doc, QDomElement & _parent ); diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 6c9fd34ad..d1613a503 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -2,10 +2,6 @@ if VST_SUPPORT VST_DIRS=vst_base vst_effect vestige endif -if LADSPA_SUPPORT -LADSPA_DIRS=ladspa_effect -endif - if STK_SUPPORT STK_DIR=stk endif @@ -20,7 +16,8 @@ SUBDIRS = \ bit_invader \ flp_import \ kicker \ - $(LADSPA_DIRS) \ + ladspa_browser \ + ladspa_effect \ lb302 \ live_tool \ midi_import \ diff --git a/plugins/ladspa_effect/ladspa_subplugin_features.cpp b/plugins/ladspa_effect/ladspa_subplugin_features.cpp index a856d6e26..18ee4975b 100644 --- a/plugins/ladspa_effect/ladspa_subplugin_features.cpp +++ b/plugins/ladspa_effect/ladspa_subplugin_features.cpp @@ -67,8 +67,7 @@ void ladspaSubPluginFeatures::fillDescriptionWidget( QWidget * _parent, maker_content->setText( lm->getMaker( lkey ) ); maker_content->setWordWrap( TRUE ); l->addWidget( maker_label ); - l->addWidget( maker_content ); - l->setStretchFactor( maker_content, 100 ); + l->addWidget( maker_content, 1 ); QWidget * copyright = new QWidget( _parent ); l = new QHBoxLayout( copyright ); @@ -84,8 +83,7 @@ void ladspaSubPluginFeatures::fillDescriptionWidget( QWidget * _parent, copyright_content->setText( lm->getCopyright( lkey ) ); copyright_content->setWordWrap( TRUE ); l->addWidget( copyright_label ); - l->addWidget( copyright_content ); - l->setStretchFactor( copyright_content, 100 ); + l->addWidget( copyright_content, 1 ); QLabel * requiresRealTime = new QLabel( _parent ); requiresRealTime->setText( QWidget::tr( "Requires Real Time: " ) + diff --git a/plugins/live_tool/live_tool.cpp b/plugins/live_tool/live_tool.cpp index 75c291ebf..23118948d 100644 --- a/plugins/live_tool/live_tool.cpp +++ b/plugins/live_tool/live_tool.cpp @@ -60,6 +60,13 @@ plugin::descriptor live_tool_plugin_descriptor = NULL } ; + +// neccessary for getting instance out of shared lib +plugin * lmms_plugin_main( void * _data ) +{ + return( new liveTool ); +} + } @@ -76,7 +83,7 @@ liveTool::liveTool( void ) : setPalette( pal ); setFixedSize( background.size() ); - setWhatsThis( tr( + setWhatsThis( tr( "This tool is intended to be used in live performances, though " "you can use it for music production as well.\n" "The following keys will work only if this window is active.\n" @@ -183,13 +190,4 @@ void liveTool::toggleInstrument( int _n ) -extern "C" -{ - -// neccessary for getting instance out of shared lib -plugin * lmms_plugin_main( void * _data ) -{ - return( new liveTool() ); -} - -} +#include "live_tool.moc" diff --git a/plugins/live_tool/live_tool.h b/plugins/live_tool/live_tool.h index 876378ce6..2331c9983 100644 --- a/plugins/live_tool/live_tool.h +++ b/plugins/live_tool/live_tool.h @@ -34,6 +34,7 @@ class liveTool : public tool { + Q_OBJECT public: liveTool( void ); virtual ~liveTool(); diff --git a/resources/add_bb_track.png b/resources/add_bb_track.png deleted file mode 100644 index 5097f0422..000000000 Binary files a/resources/add_bb_track.png and /dev/null differ diff --git a/resources/add_sample_track.png b/resources/add_sample_track.png deleted file mode 100644 index 5b27a2725..000000000 Binary files a/resources/add_sample_track.png and /dev/null differ diff --git a/resources/apply.png b/resources/apply.png deleted file mode 100644 index 8d8e7eafc..000000000 Binary files a/resources/apply.png and /dev/null differ diff --git a/resources/arp_down_off.png b/resources/arp_down_off.png deleted file mode 100644 index 435a4db25..000000000 Binary files a/resources/arp_down_off.png and /dev/null differ diff --git a/resources/arp_down_on.png b/resources/arp_down_on.png deleted file mode 100644 index ad5c19b9d..000000000 Binary files a/resources/arp_down_on.png and /dev/null differ diff --git a/resources/arp_free.png b/resources/arp_free.png deleted file mode 100644 index 86bef17c1..000000000 Binary files a/resources/arp_free.png and /dev/null differ diff --git a/resources/arp_random_off.png b/resources/arp_random_off.png deleted file mode 100644 index 74391a256..000000000 Binary files a/resources/arp_random_off.png and /dev/null differ diff --git a/resources/arp_random_on.png b/resources/arp_random_on.png deleted file mode 100644 index 9d8e503b1..000000000 Binary files a/resources/arp_random_on.png and /dev/null differ diff --git a/resources/arp_sort.png b/resources/arp_sort.png deleted file mode 100644 index d55133cbd..000000000 Binary files a/resources/arp_sort.png and /dev/null differ diff --git a/resources/arp_sync.png b/resources/arp_sync.png deleted file mode 100644 index c2c52bd56..000000000 Binary files a/resources/arp_sync.png and /dev/null differ diff --git a/resources/arp_up_and_down_off.png b/resources/arp_up_and_down_off.png deleted file mode 100644 index 1909a94aa..000000000 Binary files a/resources/arp_up_and_down_off.png and /dev/null differ diff --git a/resources/arp_up_and_down_on.png b/resources/arp_up_and_down_on.png deleted file mode 100644 index 2170b84bd..000000000 Binary files a/resources/arp_up_and_down_on.png and /dev/null differ diff --git a/resources/arp_up_off.png b/resources/arp_up_off.png deleted file mode 100644 index ae8ecd653..000000000 Binary files a/resources/arp_up_off.png and /dev/null differ diff --git a/resources/arp_up_on.png b/resources/arp_up_on.png deleted file mode 100644 index 5b4d2d77d..000000000 Binary files a/resources/arp_up_on.png and /dev/null differ diff --git a/resources/automation.png b/resources/automation.png deleted file mode 100644 index b5346bb88..000000000 Binary files a/resources/automation.png and /dev/null differ diff --git a/resources/autoscroll_off.png b/resources/autoscroll_off.png deleted file mode 100644 index 715d68fd4..000000000 Binary files a/resources/autoscroll_off.png and /dev/null differ diff --git a/resources/autoscroll_on.png b/resources/autoscroll_on.png deleted file mode 100644 index e5853f74f..000000000 Binary files a/resources/autoscroll_on.png and /dev/null differ diff --git a/resources/back_to_start.png b/resources/back_to_start.png deleted file mode 100644 index b8d672f91..000000000 Binary files a/resources/back_to_start.png and /dev/null differ diff --git a/resources/back_to_zero.png b/resources/back_to_zero.png deleted file mode 100644 index 8ae5ef7f2..000000000 Binary files a/resources/back_to_zero.png and /dev/null differ diff --git a/resources/background_artwork.png b/resources/background_artwork.png deleted file mode 100644 index 2aa3a7d12..000000000 Binary files a/resources/background_artwork.png and /dev/null differ diff --git a/resources/bb_track.png b/resources/bb_track.png deleted file mode 100644 index db6a8c913..000000000 Binary files a/resources/bb_track.png and /dev/null differ diff --git a/resources/black_key.png b/resources/black_key.png deleted file mode 100644 index 8576bf1fc..000000000 Binary files a/resources/black_key.png and /dev/null differ diff --git a/resources/black_key_pressed.png b/resources/black_key_pressed.png deleted file mode 100644 index 52e3fdf55..000000000 Binary files a/resources/black_key_pressed.png and /dev/null differ diff --git a/resources/cancel.png b/resources/cancel.png deleted file mode 100644 index 36cbdeb29..000000000 Binary files a/resources/cancel.png and /dev/null differ diff --git a/resources/clock.png b/resources/clock.png deleted file mode 100644 index 9060065ca..000000000 Binary files a/resources/clock.png and /dev/null differ diff --git a/resources/colorize.png b/resources/colorize.png deleted file mode 100644 index 7c070d4f1..000000000 Binary files a/resources/colorize.png and /dev/null differ diff --git a/resources/combobox_arrow.png b/resources/combobox_arrow.png deleted file mode 100644 index c918b0e19..000000000 Binary files a/resources/combobox_arrow.png and /dev/null differ diff --git a/resources/combobox_bg.png b/resources/combobox_bg.png deleted file mode 100644 index 1faeca007..000000000 Binary files a/resources/combobox_bg.png and /dev/null differ diff --git a/resources/cpuload_bg.png b/resources/cpuload_bg.png deleted file mode 100644 index fafb19320..000000000 Binary files a/resources/cpuload_bg.png and /dev/null differ diff --git a/resources/cpuload_leds.png b/resources/cpuload_leds.png deleted file mode 100644 index 232080a61..000000000 Binary files a/resources/cpuload_leds.png and /dev/null differ diff --git a/resources/drum.png b/resources/drum.png deleted file mode 100644 index 472d05b9a..000000000 Binary files a/resources/drum.png and /dev/null differ diff --git a/resources/edit_arrow.png b/resources/edit_arrow.png deleted file mode 100644 index 316ce4c10..000000000 Binary files a/resources/edit_arrow.png and /dev/null differ diff --git a/resources/edit_copy.png b/resources/edit_copy.png deleted file mode 100644 index 9a4b2581f..000000000 Binary files a/resources/edit_copy.png and /dev/null differ diff --git a/resources/edit_cut.png b/resources/edit_cut.png deleted file mode 100644 index 1aeb397a1..000000000 Binary files a/resources/edit_cut.png and /dev/null differ diff --git a/resources/edit_draw.png b/resources/edit_draw.png deleted file mode 100644 index 87b3aa3b1..000000000 Binary files a/resources/edit_draw.png and /dev/null differ diff --git a/resources/edit_erase.png b/resources/edit_erase.png deleted file mode 100644 index a5d7044e8..000000000 Binary files a/resources/edit_erase.png and /dev/null differ diff --git a/resources/edit_move.png b/resources/edit_move.png deleted file mode 100644 index 6905033db..000000000 Binary files a/resources/edit_move.png and /dev/null differ diff --git a/resources/edit_paste.png b/resources/edit_paste.png deleted file mode 100644 index 06efcc969..000000000 Binary files a/resources/edit_paste.png and /dev/null differ diff --git a/resources/edit_redo.png b/resources/edit_redo.png deleted file mode 100644 index 02408e2b1..000000000 Binary files a/resources/edit_redo.png and /dev/null differ diff --git a/resources/edit_select.png b/resources/edit_select.png deleted file mode 100644 index b09759a89..000000000 Binary files a/resources/edit_select.png and /dev/null differ diff --git a/resources/edit_undo.png b/resources/edit_undo.png deleted file mode 100644 index 56c4688f9..000000000 Binary files a/resources/edit_undo.png and /dev/null differ diff --git a/resources/effect_board.png b/resources/effect_board.png deleted file mode 100644 index 01f1993ce..000000000 Binary files a/resources/effect_board.png and /dev/null differ diff --git a/resources/empty.png b/resources/empty.png deleted file mode 100644 index 859ba35d5..000000000 Binary files a/resources/empty.png and /dev/null differ diff --git a/resources/envelope_graph.png b/resources/envelope_graph.png deleted file mode 100644 index dfe7d6cfa..000000000 Binary files a/resources/envelope_graph.png and /dev/null differ diff --git a/resources/error.png b/resources/error.png deleted file mode 100644 index 6dc97df2f..000000000 Binary files a/resources/error.png and /dev/null differ diff --git a/resources/exit.png b/resources/exit.png deleted file mode 100644 index 7cc7d4de9..000000000 Binary files a/resources/exit.png and /dev/null differ diff --git a/resources/exp_wave_active.png b/resources/exp_wave_active.png deleted file mode 100644 index fa4b20993..000000000 Binary files a/resources/exp_wave_active.png and /dev/null differ diff --git a/resources/exp_wave_inactive.png b/resources/exp_wave_inactive.png deleted file mode 100644 index d59dfd120..000000000 Binary files a/resources/exp_wave_inactive.png and /dev/null differ diff --git a/resources/filter_2lp.png b/resources/filter_2lp.png deleted file mode 100644 index 0304786d4..000000000 Binary files a/resources/filter_2lp.png and /dev/null differ diff --git a/resources/filter_ap.png b/resources/filter_ap.png deleted file mode 100644 index ddfcb1842..000000000 Binary files a/resources/filter_ap.png and /dev/null differ diff --git a/resources/filter_bp.png b/resources/filter_bp.png deleted file mode 100644 index 36f4dddf2..000000000 Binary files a/resources/filter_bp.png and /dev/null differ diff --git a/resources/filter_hp.png b/resources/filter_hp.png deleted file mode 100644 index 1a7d1720d..000000000 Binary files a/resources/filter_hp.png and /dev/null differ diff --git a/resources/filter_lp.png b/resources/filter_lp.png deleted file mode 100644 index f25e8580e..000000000 Binary files a/resources/filter_lp.png and /dev/null differ diff --git a/resources/filter_notch.png b/resources/filter_notch.png deleted file mode 100644 index 4a77543e5..000000000 Binary files a/resources/filter_notch.png and /dev/null differ diff --git a/resources/folder.png b/resources/folder.png deleted file mode 100644 index 05731b1a7..000000000 Binary files a/resources/folder.png and /dev/null differ diff --git a/resources/folder_locked.png b/resources/folder_locked.png deleted file mode 100644 index 307684747..000000000 Binary files a/resources/folder_locked.png and /dev/null differ diff --git a/resources/folder_opened.png b/resources/folder_opened.png deleted file mode 100644 index ab67758d7..000000000 Binary files a/resources/folder_opened.png and /dev/null differ diff --git a/resources/freeze.png b/resources/freeze.png deleted file mode 100644 index 130c9e809..000000000 Binary files a/resources/freeze.png and /dev/null differ diff --git a/resources/frozen.png b/resources/frozen.png deleted file mode 100644 index ce4049472..000000000 Binary files a/resources/frozen.png and /dev/null differ diff --git a/resources/groupbox_led_bg.png b/resources/groupbox_led_bg.png deleted file mode 100644 index 6266b8011..000000000 Binary files a/resources/groupbox_led_bg.png and /dev/null differ diff --git a/resources/help.png b/resources/help.png deleted file mode 100644 index 8bd601edf..000000000 Binary files a/resources/help.png and /dev/null differ diff --git a/resources/hint.png b/resources/hint.png deleted file mode 100644 index bd673cf1f..000000000 Binary files a/resources/hint.png and /dev/null differ diff --git a/resources/home.png b/resources/home.png deleted file mode 100644 index 896c78f1f..000000000 Binary files a/resources/home.png and /dev/null differ diff --git a/resources/hourglass.png b/resources/hourglass.png deleted file mode 100644 index ff50c1e47..000000000 Binary files a/resources/hourglass.png and /dev/null differ diff --git a/resources/hq_mode.png b/resources/hq_mode.png deleted file mode 100644 index fe1a92860..000000000 Binary files a/resources/hq_mode.png and /dev/null differ diff --git a/resources/keep_stop_position.png b/resources/keep_stop_position.png deleted file mode 100644 index ef7589b8c..000000000 Binary files a/resources/keep_stop_position.png and /dev/null differ diff --git a/resources/knob01.png b/resources/knob01.png deleted file mode 100644 index d16a87f6c..000000000 Binary files a/resources/knob01.png and /dev/null differ diff --git a/resources/knob02.png b/resources/knob02.png deleted file mode 100644 index 99f8bc714..000000000 Binary files a/resources/knob02.png and /dev/null differ diff --git a/resources/knob03.png b/resources/knob03.png deleted file mode 100644 index 5d2f06808..000000000 Binary files a/resources/knob03.png and /dev/null differ diff --git a/resources/knob04.png b/resources/knob04.png deleted file mode 100644 index 0e3af11c8..000000000 Binary files a/resources/knob04.png and /dev/null differ diff --git a/resources/led_green.png b/resources/led_green.png deleted file mode 100644 index ac978151e..000000000 Binary files a/resources/led_green.png and /dev/null differ diff --git a/resources/led_off.png b/resources/led_off.png deleted file mode 100644 index ef8b75b5d..000000000 Binary files a/resources/led_off.png and /dev/null differ diff --git a/resources/led_yellow.png b/resources/led_yellow.png deleted file mode 100644 index 5b50506d2..000000000 Binary files a/resources/led_yellow.png and /dev/null differ diff --git a/resources/lfo_graph.png b/resources/lfo_graph.png deleted file mode 100644 index 67fb82939..000000000 Binary files a/resources/lfo_graph.png and /dev/null differ diff --git a/resources/loop_point.png b/resources/loop_point.png deleted file mode 100644 index 2a5e586b8..000000000 Binary files a/resources/loop_point.png and /dev/null differ diff --git a/resources/loop_point_disabled.png b/resources/loop_point_disabled.png deleted file mode 100644 index cd0efae22..000000000 Binary files a/resources/loop_point_disabled.png and /dev/null differ diff --git a/resources/loop_points_off.png b/resources/loop_points_off.png deleted file mode 100644 index 3bc544c85..000000000 Binary files a/resources/loop_points_off.png and /dev/null differ diff --git a/resources/loop_points_on.png b/resources/loop_points_on.png deleted file mode 100644 index fda03729f..000000000 Binary files a/resources/loop_points_on.png and /dev/null differ diff --git a/resources/main_toolbar_bg.png b/resources/main_toolbar_bg.png deleted file mode 100644 index 070f0bcd6..000000000 Binary files a/resources/main_toolbar_bg.png and /dev/null differ diff --git a/resources/master_pitch.png b/resources/master_pitch.png deleted file mode 100644 index 6143a84c9..000000000 Binary files a/resources/master_pitch.png and /dev/null differ diff --git a/resources/master_volume.png b/resources/master_volume.png deleted file mode 100644 index 3f2f97c68..000000000 Binary files a/resources/master_volume.png and /dev/null differ diff --git a/resources/midi_file.png b/resources/midi_file.png deleted file mode 100644 index d57fb6c51..000000000 Binary files a/resources/midi_file.png and /dev/null differ diff --git a/resources/midi_in.png b/resources/midi_in.png deleted file mode 100644 index c56a85b73..000000000 Binary files a/resources/midi_in.png and /dev/null differ diff --git a/resources/midi_out.png b/resources/midi_out.png deleted file mode 100644 index c933f5f71..000000000 Binary files a/resources/midi_out.png and /dev/null differ diff --git a/resources/moog_saw_wave_active.png b/resources/moog_saw_wave_active.png deleted file mode 100644 index 8c57878eb..000000000 Binary files a/resources/moog_saw_wave_active.png and /dev/null differ diff --git a/resources/moog_saw_wave_inactive.png b/resources/moog_saw_wave_inactive.png deleted file mode 100644 index b4d1cd616..000000000 Binary files a/resources/moog_saw_wave_inactive.png and /dev/null differ diff --git a/resources/mute_off.png b/resources/mute_off.png deleted file mode 100644 index 9f4bd9c83..000000000 Binary files a/resources/mute_off.png and /dev/null differ diff --git a/resources/mute_off_disabled.png b/resources/mute_off_disabled.png deleted file mode 100644 index 66439607a..000000000 Binary files a/resources/mute_off_disabled.png and /dev/null differ diff --git a/resources/mute_on.png b/resources/mute_on.png deleted file mode 100644 index a08705915..000000000 Binary files a/resources/mute_on.png and /dev/null differ diff --git a/resources/mute_on_disabled.png b/resources/mute_on_disabled.png deleted file mode 100644 index 7f0318277..000000000 Binary files a/resources/mute_on_disabled.png and /dev/null differ diff --git a/resources/note.png b/resources/note.png deleted file mode 100644 index c0fc91255..000000000 Binary files a/resources/note.png and /dev/null differ diff --git a/resources/note_double_whole.png b/resources/note_double_whole.png deleted file mode 100644 index 5fd0aa51e..000000000 Binary files a/resources/note_double_whole.png and /dev/null differ diff --git a/resources/note_eighth.png b/resources/note_eighth.png deleted file mode 100644 index f9d416b19..000000000 Binary files a/resources/note_eighth.png and /dev/null differ diff --git a/resources/note_half.png b/resources/note_half.png deleted file mode 100644 index 38648cc4f..000000000 Binary files a/resources/note_half.png and /dev/null differ diff --git a/resources/note_none.png b/resources/note_none.png deleted file mode 100644 index bca2ee331..000000000 Binary files a/resources/note_none.png and /dev/null differ diff --git a/resources/note_quarter.png b/resources/note_quarter.png deleted file mode 100644 index 9e10c2313..000000000 Binary files a/resources/note_quarter.png and /dev/null differ diff --git a/resources/note_sixteenth.png b/resources/note_sixteenth.png deleted file mode 100644 index 693679bbf..000000000 Binary files a/resources/note_sixteenth.png and /dev/null differ diff --git a/resources/note_thirtysecond.png b/resources/note_thirtysecond.png deleted file mode 100644 index 50ee3133c..000000000 Binary files a/resources/note_thirtysecond.png and /dev/null differ diff --git a/resources/note_whole.png b/resources/note_whole.png deleted file mode 100644 index 7bc997866..000000000 Binary files a/resources/note_whole.png and /dev/null differ diff --git a/resources/output_graph.png b/resources/output_graph.png deleted file mode 100644 index 67e0efbfb..000000000 Binary files a/resources/output_graph.png and /dev/null differ diff --git a/resources/pause.png b/resources/pause.png deleted file mode 100644 index 9449cabce..000000000 Binary files a/resources/pause.png and /dev/null differ diff --git a/resources/piano.png b/resources/piano.png deleted file mode 100644 index 276fe28aa..000000000 Binary files a/resources/piano.png and /dev/null differ diff --git a/resources/play.png b/resources/play.png deleted file mode 100644 index 9e5c25739..000000000 Binary files a/resources/play.png and /dev/null differ diff --git a/resources/playpos_marker.png b/resources/playpos_marker.png deleted file mode 100644 index 3985567e9..000000000 Binary files a/resources/playpos_marker.png and /dev/null differ diff --git a/resources/plugins.png b/resources/plugins.png deleted file mode 100644 index 7a1d86892..000000000 Binary files a/resources/plugins.png and /dev/null differ diff --git a/resources/pr_black_key.png b/resources/pr_black_key.png deleted file mode 100644 index 86930716e..000000000 Binary files a/resources/pr_black_key.png and /dev/null differ diff --git a/resources/pr_white_key_big.png b/resources/pr_white_key_big.png deleted file mode 100644 index 5bb282477..000000000 Binary files a/resources/pr_white_key_big.png and /dev/null differ diff --git a/resources/pr_white_key_small.png b/resources/pr_white_key_small.png deleted file mode 100644 index 8e9de995c..000000000 Binary files a/resources/pr_white_key_small.png and /dev/null differ diff --git a/resources/preset_file.png b/resources/preset_file.png deleted file mode 100644 index ad4cdfacb..000000000 Binary files a/resources/preset_file.png and /dev/null differ diff --git a/resources/project_export.png b/resources/project_export.png deleted file mode 100644 index 3fc6f401c..000000000 Binary files a/resources/project_export.png and /dev/null differ diff --git a/resources/project_file.png b/resources/project_file.png deleted file mode 100644 index 9c43e578d..000000000 Binary files a/resources/project_file.png and /dev/null differ diff --git a/resources/project_new.png b/resources/project_new.png deleted file mode 100644 index 20f7423e0..000000000 Binary files a/resources/project_new.png and /dev/null differ diff --git a/resources/project_notes.png b/resources/project_notes.png deleted file mode 100644 index 32414af8e..000000000 Binary files a/resources/project_notes.png and /dev/null differ diff --git a/resources/project_open.png b/resources/project_open.png deleted file mode 100644 index 5bae07f5e..000000000 Binary files a/resources/project_open.png and /dev/null differ diff --git a/resources/project_open_down.png b/resources/project_open_down.png deleted file mode 100644 index 14c799927..000000000 Binary files a/resources/project_open_down.png and /dev/null differ diff --git a/resources/project_save.png b/resources/project_save.png deleted file mode 100644 index d92724ea8..000000000 Binary files a/resources/project_save.png and /dev/null differ diff --git a/resources/project_saveas.png b/resources/project_saveas.png deleted file mode 100644 index 1741664c4..000000000 Binary files a/resources/project_saveas.png and /dev/null differ diff --git a/resources/quantize.png b/resources/quantize.png deleted file mode 100644 index 2ee28ca5d..000000000 Binary files a/resources/quantize.png and /dev/null differ diff --git a/resources/record.png b/resources/record.png deleted file mode 100644 index 1ca61af4c..000000000 Binary files a/resources/record.png and /dev/null differ diff --git a/resources/reload.png b/resources/reload.png deleted file mode 100644 index ee2ab0f4e..000000000 Binary files a/resources/reload.png and /dev/null differ diff --git a/resources/rename.png b/resources/rename.png deleted file mode 100644 index 5aa3e8feb..000000000 Binary files a/resources/rename.png and /dev/null differ diff --git a/resources/root.png b/resources/root.png deleted file mode 100644 index 327167707..000000000 Binary files a/resources/root.png and /dev/null differ diff --git a/resources/sample_track.png b/resources/sample_track.png deleted file mode 100644 index 0f3837c26..000000000 Binary files a/resources/sample_track.png and /dev/null differ diff --git a/resources/saw_wave_active.png b/resources/saw_wave_active.png deleted file mode 100644 index a48c35f6e..000000000 Binary files a/resources/saw_wave_active.png and /dev/null differ diff --git a/resources/saw_wave_inactive.png b/resources/saw_wave_inactive.png deleted file mode 100644 index 9421664b1..000000000 Binary files a/resources/saw_wave_inactive.png and /dev/null differ diff --git a/resources/setup_audio.png b/resources/setup_audio.png deleted file mode 100644 index 5b3a7676a..000000000 Binary files a/resources/setup_audio.png and /dev/null differ diff --git a/resources/setup_directories.png b/resources/setup_directories.png deleted file mode 100644 index 1a9dfee76..000000000 Binary files a/resources/setup_directories.png and /dev/null differ diff --git a/resources/setup_general.png b/resources/setup_general.png deleted file mode 100644 index 660f04864..000000000 Binary files a/resources/setup_general.png and /dev/null differ diff --git a/resources/setup_midi.png b/resources/setup_midi.png deleted file mode 100644 index dc5d50ca3..000000000 Binary files a/resources/setup_midi.png and /dev/null differ diff --git a/resources/setup_performance.png b/resources/setup_performance.png deleted file mode 100644 index f93b7ff2e..000000000 Binary files a/resources/setup_performance.png and /dev/null differ diff --git a/resources/sin_wave_active.png b/resources/sin_wave_active.png deleted file mode 100644 index 81794ee6c..000000000 Binary files a/resources/sin_wave_active.png and /dev/null differ diff --git a/resources/sin_wave_inactive.png b/resources/sin_wave_inactive.png deleted file mode 100644 index abccbbcfb..000000000 Binary files a/resources/sin_wave_inactive.png and /dev/null differ diff --git a/resources/songeditor.png b/resources/songeditor.png deleted file mode 100644 index 27d79fb4a..000000000 Binary files a/resources/songeditor.png and /dev/null differ diff --git a/resources/sound_file.png b/resources/sound_file.png deleted file mode 100644 index 01a273867..000000000 Binary files a/resources/sound_file.png and /dev/null differ diff --git a/resources/square_wave_active.png b/resources/square_wave_active.png deleted file mode 100644 index e30f98ec1..000000000 Binary files a/resources/square_wave_active.png and /dev/null differ diff --git a/resources/square_wave_inactive.png b/resources/square_wave_inactive.png deleted file mode 100644 index c429abff6..000000000 Binary files a/resources/square_wave_inactive.png and /dev/null differ diff --git a/resources/step_btn_add.png b/resources/step_btn_add.png deleted file mode 100644 index dc9d634d5..000000000 Binary files a/resources/step_btn_add.png and /dev/null differ diff --git a/resources/step_btn_off.png b/resources/step_btn_off.png deleted file mode 100644 index ef91a2c4e..000000000 Binary files a/resources/step_btn_off.png and /dev/null differ diff --git a/resources/step_btn_off_light.png b/resources/step_btn_off_light.png deleted file mode 100644 index d360521cb..000000000 Binary files a/resources/step_btn_off_light.png and /dev/null differ diff --git a/resources/step_btn_on.png b/resources/step_btn_on.png deleted file mode 100644 index f0101d053..000000000 Binary files a/resources/step_btn_on.png and /dev/null differ diff --git a/resources/step_btn_on_100.png b/resources/step_btn_on_100.png deleted file mode 100644 index 1e75b6091..000000000 Binary files a/resources/step_btn_on_100.png and /dev/null differ diff --git a/resources/step_btn_on_yellow.png b/resources/step_btn_on_yellow.png deleted file mode 100644 index 38a971a77..000000000 Binary files a/resources/step_btn_on_yellow.png and /dev/null differ diff --git a/resources/step_btn_remove.png b/resources/step_btn_remove.png deleted file mode 100644 index 248e9bc3a..000000000 Binary files a/resources/step_btn_remove.png and /dev/null differ diff --git a/resources/stop.png b/resources/stop.png deleted file mode 100644 index c7c6e13ae..000000000 Binary files a/resources/stop.png and /dev/null differ diff --git a/resources/surround_area.png b/resources/surround_area.png deleted file mode 100644 index ded56ebff..000000000 Binary files a/resources/surround_area.png and /dev/null differ diff --git a/resources/text_block.png b/resources/text_block.png deleted file mode 100644 index 9413dbe1d..000000000 Binary files a/resources/text_block.png and /dev/null differ diff --git a/resources/text_bold.png b/resources/text_bold.png deleted file mode 100644 index 1fb59dec3..000000000 Binary files a/resources/text_bold.png and /dev/null differ diff --git a/resources/text_center.png b/resources/text_center.png deleted file mode 100644 index cce408072..000000000 Binary files a/resources/text_center.png and /dev/null differ diff --git a/resources/text_italic.png b/resources/text_italic.png deleted file mode 100644 index c748276fc..000000000 Binary files a/resources/text_italic.png and /dev/null differ diff --git a/resources/text_left.png b/resources/text_left.png deleted file mode 100644 index 89788e76e..000000000 Binary files a/resources/text_left.png and /dev/null differ diff --git a/resources/text_right.png b/resources/text_right.png deleted file mode 100644 index 2f3c6752b..000000000 Binary files a/resources/text_right.png and /dev/null differ diff --git a/resources/text_under.png b/resources/text_under.png deleted file mode 100644 index 58ac92a5b..000000000 Binary files a/resources/text_under.png and /dev/null differ diff --git a/resources/timeline.png b/resources/timeline.png deleted file mode 100644 index 6093f28d6..000000000 Binary files a/resources/timeline.png and /dev/null differ diff --git a/resources/toolbar_bg.png b/resources/toolbar_bg.png deleted file mode 100644 index dc9476bd7..000000000 Binary files a/resources/toolbar_bg.png and /dev/null differ diff --git a/resources/track_op_grip.png b/resources/track_op_grip.png deleted file mode 100644 index 6542a83f7..000000000 Binary files a/resources/track_op_grip.png and /dev/null differ diff --git a/resources/track_op_menu.png b/resources/track_op_menu.png deleted file mode 100644 index ddf5f9699..000000000 Binary files a/resources/track_op_menu.png and /dev/null differ diff --git a/resources/track_op_menu_disabled.png b/resources/track_op_menu_disabled.png deleted file mode 100644 index 7a50a2399..000000000 Binary files a/resources/track_op_menu_disabled.png and /dev/null differ diff --git a/resources/triangle_wave_active.png b/resources/triangle_wave_active.png deleted file mode 100644 index d2b23e7f9..000000000 Binary files a/resources/triangle_wave_active.png and /dev/null differ diff --git a/resources/triangle_wave_inactive.png b/resources/triangle_wave_inactive.png deleted file mode 100644 index c84f8b2d6..000000000 Binary files a/resources/triangle_wave_inactive.png and /dev/null differ diff --git a/resources/unfreeze.png b/resources/unfreeze.png deleted file mode 100644 index 017d99ac9..000000000 Binary files a/resources/unfreeze.png and /dev/null differ diff --git a/resources/unknown_file.png b/resources/unknown_file.png deleted file mode 100644 index 0c1594812..000000000 Binary files a/resources/unknown_file.png and /dev/null differ diff --git a/resources/usr_wave_active.png b/resources/usr_wave_active.png deleted file mode 100644 index 1c574e5f5..000000000 Binary files a/resources/usr_wave_active.png and /dev/null differ diff --git a/resources/usr_wave_inactive.png b/resources/usr_wave_inactive.png deleted file mode 100644 index 20890771c..000000000 Binary files a/resources/usr_wave_inactive.png and /dev/null differ diff --git a/resources/whatsthis.png b/resources/whatsthis.png deleted file mode 100644 index f77572efb..000000000 Binary files a/resources/whatsthis.png and /dev/null differ diff --git a/resources/white_key.png b/resources/white_key.png deleted file mode 100644 index 73b0c9e32..000000000 Binary files a/resources/white_key.png and /dev/null differ diff --git a/resources/white_key_pressed.png b/resources/white_key_pressed.png deleted file mode 100644 index 05b8927b7..000000000 Binary files a/resources/white_key_pressed.png and /dev/null differ diff --git a/resources/white_noise_wave_active.png b/resources/white_noise_wave_active.png deleted file mode 100644 index 253513564..000000000 Binary files a/resources/white_noise_wave_active.png and /dev/null differ diff --git a/resources/white_noise_wave_inactive.png b/resources/white_noise_wave_inactive.png deleted file mode 100644 index ba5739c65..000000000 Binary files a/resources/white_noise_wave_inactive.png and /dev/null differ diff --git a/resources/wizard.png b/resources/wizard.png deleted file mode 100644 index 6a3becd1c..000000000 Binary files a/resources/wizard.png and /dev/null differ diff --git a/resources/xclock.png b/resources/xclock.png deleted file mode 100644 index f0c544ec8..000000000 Binary files a/resources/xclock.png and /dev/null differ diff --git a/resources/zoom.png b/resources/zoom.png deleted file mode 100644 index 8fe517919..000000000 Binary files a/resources/zoom.png and /dev/null differ diff --git a/resources/zoom_x.png b/resources/zoom_x.png deleted file mode 100644 index 9f9d745ad..000000000 Binary files a/resources/zoom_x.png and /dev/null differ diff --git a/resources/zoom_y.png b/resources/zoom_y.png deleted file mode 100644 index 9a6a72e0c..000000000 Binary files a/resources/zoom_y.png and /dev/null differ diff --git a/src/core/config_mgr.cpp b/src/core/config_mgr.cpp index 9029c641a..3d4bb34f8 100644 --- a/src/core/config_mgr.cpp +++ b/src/core/config_mgr.cpp @@ -482,9 +482,7 @@ void configManager::setFLDir( const QString & _fd ) void configManager::setLADSPADir( const QString & _fd ) { -#ifdef LADSPA_SUPPORT m_ladDir = _fd; -#endif } @@ -780,9 +778,7 @@ bool configManager::loadConfigFile( void ) m_workingDir = value( "paths", "workingdir" ); m_vstDir = value( "paths", "vstdir" ); m_flDir = value( "paths", "fldir" ); -#ifdef LADSPA_SUPPORT m_ladDir = value( "paths", "laddir" ); -#endif #ifdef HAVE_STK_H m_stkDir = value( "paths", "stkdir" ); #endif @@ -797,12 +793,10 @@ bool configManager::loadConfigFile( void ) m_flDir = QDir::home().absolutePath(); } -#ifdef LADSPA_SUPPORT if( m_ladDir == "" ) -{ - m_ladDir = "/usr/lib/ladspa/:/usr/local/lib/ladspa/"; -} -#endif + { + m_ladDir = "/usr/lib/ladspa/:/usr/local/lib/ladspa/"; + } #ifdef HAVE_STK_H if( m_stkDir == "" ) @@ -857,9 +851,7 @@ void configManager::saveConfigFile( void ) setValue( "paths", "workingdir", m_workingDir ); setValue( "paths", "vstdir", m_vstDir ); setValue( "paths", "fldir", m_flDir ); -#ifdef LADSPA_SUPPORT setValue( "paths", "laddir", m_ladDir ); -#endif #ifdef HAVE_STK_H setValue( "paths", "stkdir", m_stkDir ); #endif diff --git a/src/core/engine.cpp b/src/core/engine.cpp index 011f6d500..419ddf295 100644 --- a/src/core/engine.cpp +++ b/src/core/engine.cpp @@ -25,23 +25,20 @@ */ +#include "engine.h" #include "automation_editor.h" #include "bb_editor.h" #include "config_mgr.h" -#include "project_journal.h" -#include "engine.h" +#include "ladspa_2_lmms.h" #include "main_window.h" #include "mixer.h" #include "pattern.h" #include "piano_roll.h" #include "preset_preview_play_handle.h" +#include "project_journal.h" #include "project_notes.h" #include "song_editor.h" -#ifdef LADSPA_SUPPORT -#include "ladspa_2_lmms.h" -#endif - bool engine::s_hasGUI = TRUE; float engine::s_frames_per_tact64th; @@ -53,9 +50,7 @@ bbEditor * engine::s_bbEditor; pianoRoll * engine::s_pianoRoll; projectNotes * engine::s_projectNotes; projectJournal * engine::s_projectJournal; -#ifdef LADSPA_SUPPORT ladspa2LMMS * engine::s_ladspaManager; -#endif QMap engine::s_sample_extensions; @@ -75,11 +70,8 @@ void engine::init( const bool _has_gui ) s_bbEditor = new bbEditor; s_pianoRoll = new pianoRoll; s_automationEditor = new automationEditor; - -#ifdef LADSPA_SUPPORT s_ladspaManager = new ladspa2LMMS; -#endif - + s_mixer->initDevices(); s_mainWindow->finalize(); @@ -106,10 +98,7 @@ void engine::destroy( void ) s_pianoRoll = NULL; delete s_automationEditor; s_automationEditor = NULL; - -#ifdef LADSPA_SUPPORT delete s_ladspaManager; -#endif presetPreviewPlayHandle::cleanUp(); diff --git a/src/core/ladspa_browser.cpp b/src/core/ladspa_browser.cpp deleted file mode 100644 index acd0ff02b..000000000 --- a/src/core/ladspa_browser.cpp +++ /dev/null @@ -1,307 +0,0 @@ -#if 0 - -/* - * ladspa_browser.h - dialog to display information about installed LADSPA - * plugins - * - * Copyright (c) 2006 Danny McRae - * - * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program (see COPYING); if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA. - * - */ - -#include "ladspa_manager.h" -#ifdef LADSPA_SUPPORT - -#include "qt3support.h" - -#ifdef QT4 - -#include -#include - -#else - -#include -#include - -#endif - -#include "ladspa_browser.h" - -#include "tab_bar.h" -#include "tab_button.h" -#include "tab_widget.h" -#include "gui_templates.h" -#include "config_mgr.h" -#include "embed.h" -#include "debug.h" -#include "tooltip.h" -#include "ladspa_description.h" -#include "ladspa_port_dialog.h" -#include "audio_device.h" -#include "buffer_allocator.h" -#include "effect_chain.h" - -inline void ladspaBrowser::labelWidget( QWidget * _w, const QString & _txt ) -{ - QLabel * title = new QLabel( _txt, _w ); - QFont f = title->font(); - f.setBold( TRUE ); - title->setFont( pointSize<12>( f ) ); - -#ifdef LMMS_DEBUG - assert( dynamic_cast( _w->layout() ) != NULL ); -#endif - dynamic_cast( _w->layout() )->addSpacing( 5 ); - dynamic_cast( _w->layout() )->addWidget( title ); - dynamic_cast( _w->layout() )->addSpacing( 10 ); -} - - - - -ladspaBrowser::ladspaBrowser( engine * _engine ) : - QDialog(), - engineObject( _engine ) -{ - setWindowIcon( embed::getIconPixmap( "setup_general" ) ); - setWindowTitle( tr( "LADSPA Plugin Browser" ) ); - setModal( TRUE ); - - QVBoxLayout * vlayout = new QVBoxLayout( this ); - vlayout->setSpacing( 0 ); - vlayout->setMargin( 0 ); - QWidget * settings = new QWidget( this ); - QHBoxLayout * hlayout = new QHBoxLayout( settings ); - hlayout->setSpacing( 0 ); - hlayout->setMargin( 0 ); - - m_tabBar = new tabBar( settings, QBoxLayout::TopToBottom ); - m_tabBar->setExclusive( TRUE ); - m_tabBar->setFixedWidth( 72 ); - - QWidget * ws = new QWidget( settings ); - ws->setFixedSize( 500, 400 ); - - QWidget * available = new QWidget( ws ); - available->setFixedSize( 500, 340 ); - QVBoxLayout * avl_layout = new QVBoxLayout( available ); - avl_layout->setSpacing( 0 ); - avl_layout->setMargin( 0 ); - labelWidget( available, tr( "Available Effects" ) ); - - ladspaDescription * available_list = new ladspaDescription(available, - _engine, VALID ); - connect( available_list, SIGNAL( doubleClicked( const ladspa_key_t & ) ), - this, SLOT( showPorts( const ladspa_key_t & ) ) ); - avl_layout->addWidget( available_list ); - - - QWidget * unavailable = new QWidget( ws ); - unavailable->setFixedSize( 500, 340 ); - QVBoxLayout * unavl_layout = new QVBoxLayout( unavailable ); - unavl_layout->setSpacing( 0 ); - unavl_layout->setMargin( 0 ); - labelWidget( unavailable, tr( "Unavailable Effects" ) ); - - ladspaDescription * unavailable_list = new ladspaDescription(unavailable, - _engine, INVALID ); - connect( unavailable_list, - SIGNAL( doubleClicked( const ladspa_key_t & ) ), - this, SLOT( showPorts( const ladspa_key_t & ) ) ); - unavl_layout->addWidget( unavailable_list ); - - - QWidget * instruments = new QWidget( ws ); - instruments->setFixedSize( 500, 340 ); - QVBoxLayout * inst_layout = new QVBoxLayout( instruments ); - inst_layout->setSpacing( 0 ); - inst_layout->setMargin( 0 ); - labelWidget( instruments, tr( "Instruments" ) ); - - ladspaDescription * instruments_list = - new ladspaDescription(instruments, _engine, SOURCE ); - connect( instruments_list, - SIGNAL( doubleClicked( const ladspa_key_t & ) ), - this, SLOT( showPorts( const ladspa_key_t & ) ) ); - inst_layout->addWidget( instruments_list ); - - - QWidget * analysis = new QWidget( ws ); - analysis->setFixedSize( 500, 340 ); - QVBoxLayout * anal_layout = new QVBoxLayout( analysis ); - anal_layout->setSpacing( 0 ); - anal_layout->setMargin( 0 ); - labelWidget( analysis, tr( "Analysis Tools" ) ); - - ladspaDescription * analysis_list = - new ladspaDescription(analysis, _engine, SINK ); - connect( analysis_list, - SIGNAL( doubleClicked( const ladspa_key_t & ) ), - this, SLOT( showPorts( const ladspa_key_t & ) ) ); - anal_layout->addWidget( analysis_list ); - - - QWidget * other = new QWidget( ws ); - other->setFixedSize( 500, 340 ); - QVBoxLayout * other_layout = new QVBoxLayout( other ); - other_layout->setSpacing( 0 ); - other_layout->setMargin( 0 ); - labelWidget( other, tr( "Don't know" ) ); - - ladspaDescription * other_list = - new ladspaDescription(other, _engine, OTHER ); - connect( other_list, - SIGNAL( doubleClicked( const ladspa_key_t & ) ), - this, SLOT( showPorts( const ladspa_key_t & ) ) ); - other_layout->addWidget( other_list ); - -#ifndef QT4 -#define setIcon setPixmap -#endif - - m_tabBar->addTab( available, tr( "Available Effects" ), - 0, FALSE, TRUE - )->setIcon( embed::getIconPixmap( "setup_audio" ) ); - m_tabBar->addTab( unavailable, tr( "Unavailable Effects" ), - 1, FALSE, TRUE - )->setIcon( embed::getIconPixmap( - "unavailable_sound" ) ); - m_tabBar->addTab( instruments, tr( "Instruments" ), - 2, FALSE, TRUE - )->setIcon( embed::getIconPixmap( - "setup_midi" ) ); - m_tabBar->addTab( analysis, tr( "Analysis Tools" ), - 3, FALSE, TRUE - )->setIcon( embed::getIconPixmap( "analysis" ) ); - m_tabBar->addTab( other, tr( "Don't know" ), - 4, TRUE, TRUE - )->setIcon( embed::getIconPixmap( "uhoh" ) ); - -#undef setIcon - - m_tabBar->setActiveTab( 0 ); - - hlayout->addWidget( m_tabBar ); - hlayout->addSpacing( 10 ); - hlayout->addWidget( ws ); - hlayout->addSpacing( 10 ); - hlayout->addStretch(); - - QWidget * buttons = new QWidget( this ); - QHBoxLayout * btn_layout = new QHBoxLayout( buttons ); - btn_layout->setSpacing( 0 ); - btn_layout->setMargin( 0 ); - - QPushButton * help_btn = new QPushButton( - embed::getIconPixmap( "help" ), "", buttons ); - connect( help_btn, SIGNAL( clicked() ), - this, SLOT( displayHelp() ) ); - - QPushButton * cancel_btn = new QPushButton( - embed::getIconPixmap( "cancel" ), tr( "Close" ), buttons ); - connect( cancel_btn, SIGNAL( clicked() ), - this, SLOT( reject() ) ); - - btn_layout->addStretch(); - btn_layout->addSpacing( 10 ); - btn_layout->addWidget( help_btn ); - btn_layout->addSpacing( 10 ); - btn_layout->addWidget( cancel_btn ); - btn_layout->addSpacing( 10 ); - - vlayout->addWidget( settings ); - vlayout->addSpacing( 10 ); - vlayout->addWidget( buttons ); - vlayout->addSpacing( 10 ); - vlayout->addStretch(); - - show(); - -#ifdef QT4 - this->setWhatsThis( -#else - QWhatsThis::add( this, -#endif - tr( -"This dialog displays information on all of the LADSPA plugins LMMS was " -"able to locate. The plugins are divided into five categories based " -"upon an interpretation of the port types and names.\n\n" - -"Available Effects are those that can be used by LMMS. In order for LMMS " -"to be able to use an effect, it must, first and foremost, be an effect, " -"which is to say, it has to have both input channels and output channels. " -"LMMS identifies an input channel as an audio rate port containing 'in' in " -"the name. Output channels are identified by the letters 'out'. Furthermore, " -"the effect must have the same number of inputs and outputs and be real time " -"capable.\n\n" - -"Unavailable Effects are those that were identified as effects, but either " -"didn't have the same number of input and output channels or weren't real " -"time capable.\n\n" - -"Instruments are plugins for which only output channels were identified.\n\n" - -"Analysis Tools are plugins for which only input channels were identified.\n\n" - -"Don't Knows are plugins for which no input or output channels were " -"identified.\n\n" - -"Double clicking any of the plugins will bring up information on the " -"ports." ) ); - -} - - - - -ladspaBrowser::~ladspaBrowser() -{ -} - - - - -void ladspaBrowser::showPorts( const ladspa_key_t & _key ) -{ - ladspaPortDialog ports( _key, eng() ); - ports.exec(); -} - - - - -void ladspaBrowser::displayHelp( void ) -{ -#ifdef QT4 - QWhatsThis::showText( mapToGlobal( rect().bottomRight() ), - whatsThis() ); -#else - QWhatsThis::display( QWhatsThis::textFor( this ), - mapToGlobal( rect().bottomRight() ) ); -#endif -} - - - -#include "ladspa_browser.moc" - -#endif - -#endif diff --git a/src/core/ladspa_port_dialog.cpp b/src/core/ladspa_port_dialog.cpp deleted file mode 100644 index 059062e81..000000000 --- a/src/core/ladspa_port_dialog.cpp +++ /dev/null @@ -1,201 +0,0 @@ -/* - * ladspa_port_dialog.cpp - dialog to test a LADSPA plugin - * - * Copyright (c) 2006-2007 Danny McRae - * - * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program (see COPYING); if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA. - * - */ - - -#include -#include - -#include "ladspa_port_dialog.h" - -#include "embed.h" -#include "engine.h" -#include "mixer.h" - - -ladspaPortDialog::ladspaPortDialog( const ladspa_key_t & _key ) : - m_key( _key ), - m_ladspa( engine::getLADSPAManager() ) -{ - setWindowIcon( embed::getIconPixmap( "ports" ) ); - setWindowTitle( "Ports" ); - setModal( TRUE ); - - QVBoxLayout * vlayout = new QVBoxLayout( this ); - vlayout->setSpacing( 0 ); - vlayout->setMargin( 0 ); - QWidget * settings = new QWidget( this ); - - Uint16 pc = m_ladspa->getPortCount( m_key ); - - QTableWidget * display = new QTableWidget( pc, 7, settings ); - - QStringList ports; - ports.append( tr( "Name" ) ); - ports.append( tr( "Rate" ) ); - ports.append( tr( "Direction" ) ); - ports.append( tr( "Type" ) ); - ports.append( tr( "Min < Default < Max" ) ); - ports.append( tr( "Logarithmic" ) ); - ports.append( tr( "SR Dependent" ) ); - - QStringList port_nums; - for(Uint16 row = 0; row < pc; row++) - { - port_nums.append( QString::number( row ) ); - Uint8 col = 0; - display->item( row, col )->setText( m_ladspa->getPortName( - m_key, row ) ); - col++; - - if( m_ladspa->isPortAudio( m_key, row ) ) - { - display->item( row, col )->setText( tr( "Audio" ) ); - } - else - { - display->item( row, col )->setText( tr( "Control" ) ); - } - col++; - - if( m_ladspa->isPortInput( m_key, row ) ) - { - display->item( row, col )->setText( tr( "Input" ) ); - } - else - { - display->item( row, col )->setText( tr( "Output" ) ); - } - col++; - - if( m_ladspa->isPortToggled( m_key, row ) ) - { - display->item( row, col )->setText( tr( "Toggled" ) ); - } - else if( m_ladspa->isInteger( m_key, row ) ) - { - display->item( row, col )->setText( tr( "Integer" ) ); - } - else - { - display->item( row, col )->setText( tr( "Float" ) ); - } - col++; - - float min = m_ladspa->getLowerBound( m_key, row ); - float max = m_ladspa->getUpperBound( m_key, row ); - float def = m_ladspa->getDefaultSetting( m_key, row ); - QString range = ""; - - if( m_ladspa->areHintsSampleRateDependent( m_key, row ) ) - { - if( min != NOHINT ) - { - min *= engine::getMixer()->sampleRate(); - } - if( max != NOHINT ) - { - max *= engine::getMixer()->sampleRate(); - } - } - - if( min == NOHINT ) - { - range += "-Inf < "; - } - else if( m_ladspa->isInteger( m_key, row ) ) - { - range += QString::number( static_cast( min ) ) + - " < "; - } - else - { - range += QString::number( min ) + " < "; - } - - if( def == NOHINT ) - { - range += "None < "; - } - else if( m_ladspa->isInteger( m_key, row ) ) - { - range += QString::number( static_cast( def ) ) + - " < "; - } - else - { - range += QString::number( def ) + " < "; - } - - if( max == NOHINT ) - { - range += "Inf"; - } - else if( m_ladspa->isInteger( m_key, row ) ) - { - range += QString::number( static_cast( max ) ); - } - else - { - range += QString::number( max ); - } - - if( m_ladspa->isPortOutput( m_key, row ) || - m_ladspa->isPortToggled( m_key, row ) ) - { - range = ""; - } - display->item( row, col )->setText( range ); - col++; - - if( m_ladspa->isLogarithmic( m_key, row ) ) - { - display->item( row, col )->setText( tr( "Yes" ) ); - } - col++; - - if( m_ladspa->areHintsSampleRateDependent( m_key, row ) ) - { - display->item( row, col )->setText( tr( "Yes" ) ); - } - col++; - } - - - vlayout->addWidget( settings ); - - setFixedSize( display->width(), display->height() ); - - show(); -} - - - -ladspaPortDialog::~ ladspaPortDialog() -{ -} - - - -#include "ladspa_port_dialog.moc" - diff --git a/src/core/main_window.cpp b/src/core/main_window.cpp index bc2cd093a..db0a4a68a 100644 --- a/src/core/main_window.cpp +++ b/src/core/main_window.cpp @@ -143,9 +143,11 @@ mainWindow::mainWindow( void ) : if( no_mdi == FALSE ) { m_workspace = new QMdiArea( splitter ); - m_workspace->setBackground( embed::getIconPixmap( - "background_artwork" ) ); - // m_workspace->setBackgroundMode (QWidget::NoBackground); + m_workspace->setBackground( Qt::NoBrush ); + m_workspace->setHorizontalScrollBarPolicy( + Qt::ScrollBarAsNeeded ); + m_workspace->setVerticalScrollBarPolicy( + Qt::ScrollBarAsNeeded ); } hbox->addWidget( side_bar ); diff --git a/src/core/song_editor.cpp b/src/core/song_editor.cpp index 0b2a81edf..743650681 100644 --- a/src/core/song_editor.cpp +++ b/src/core/song_editor.cpp @@ -182,7 +182,6 @@ songEditor::songEditor( void ) : m_masterVolumeSlider->setTickPosition( QSlider::TicksLeft ); m_masterVolumeSlider->setFixedSize( 26, 60 ); m_masterVolumeSlider->setTickInterval( 50 ); - m_masterVolumeSlider->setInvertedAppearance( true ); toolTip::add( m_masterVolumeSlider, tr( "master volume" ) ); connect( m_masterVolumeSlider, SIGNAL( logicValueChanged( int ) ), this, @@ -217,7 +216,6 @@ songEditor::songEditor( void ) : m_masterPitchSlider->setTickPosition( QSlider::TicksLeft ); m_masterPitchSlider->setFixedSize( 26, 60 ); m_masterPitchSlider->setTickInterval( 12 ); - m_masterPitchSlider->setInvertedAppearance( true ); toolTip::add( m_masterPitchSlider, tr( "master pitch" ) ); connect( m_masterPitchSlider, SIGNAL( logicValueChanged( int ) ), this, SLOT( masterPitchChanged( int ) ) ); @@ -438,14 +436,9 @@ void songEditor::paintEvent( QPaintEvent * _pe ) QRect songEditor::scrollAreaRect( void ) const { - if( centralWidget() == NULL ) - { - return( rect() ); - } - return( QRect( 0, 0, centralWidget()->width(), - centralWidget()->height() - m_toolBar->height() - - m_playPos[PLAY_SONG].m_timeLine->height() - - DEFAULT_SCROLLBAR_SIZE ) ); + return( QRect( 0, 0, width(), height() - m_toolBar->height() - + m_playPos[PLAY_SONG].m_timeLine->height() - + DEFAULT_SCROLLBAR_SIZE ) ); } @@ -454,18 +447,10 @@ QRect songEditor::scrollAreaRect( void ) const // responsible for moving scrollbars after resizing void songEditor::resizeEvent( QResizeEvent * _re ) { - if( centralWidget() != NULL ) - { - m_leftRightScroll->setGeometry( 0, - centralWidget()->height() - - DEFAULT_SCROLLBAR_SIZE, - centralWidget()->width(), - DEFAULT_SCROLLBAR_SIZE ); - - m_playPos[PLAY_SONG].m_timeLine->setFixedWidth( - centralWidget()->width() ); - m_toolBar->setFixedWidth( centralWidget()->width() ); - } + m_leftRightScroll->setGeometry( 0, height() - DEFAULT_SCROLLBAR_SIZE, + width(), DEFAULT_SCROLLBAR_SIZE ); + m_playPos[PLAY_SONG].m_timeLine->setFixedWidth( width() ); + m_toolBar->setFixedWidth( width() ); trackContainer::resizeEvent( _re ); } @@ -682,8 +667,8 @@ void songEditor::updatePosition( const midiTime & _t ) { if( ( m_playing && m_playMode == PLAY_SONG ) || m_scrollBack == TRUE ) { - const int w = centralWidget()->width() - - DEFAULT_SETTINGS_WIDGET_WIDTH - TRACK_OP_WIDTH; + const int w = width() - DEFAULT_SETTINGS_WIDGET_WIDTH + - TRACK_OP_WIDTH; if( _t > m_currentPosition + w * 64 / pixelsPerTact() ) { m_leftRightScroll->setValue( _t.getTact() ); diff --git a/src/widgets/automatable_slider.cpp b/src/widgets/automatable_slider.cpp index 4aa804679..660b9ee6d 100644 --- a/src/widgets/automatable_slider.cpp +++ b/src/widgets/automatable_slider.cpp @@ -78,7 +78,7 @@ void automatableSlider::setRange( int _min, int _max ) void automatableSlider::setValue( int _value ) { QSlider::setValue( _value ); - m_knob->setValue( minimum() + maximum() - _value ); + m_knob->setValue( _value ); } @@ -87,7 +87,7 @@ void automatableSlider::setValue( int _value ) void automatableSlider::setInitValue( int _value ) { m_knob->setInitValue( _value ); - QSlider::setValue( minimum() + maximum() - _value ); + QSlider::setValue( _value ); } @@ -155,7 +155,7 @@ void automatableSlider::moveSlider( int _value ) void automatableSlider::updateSlider( void ) { - QSlider::setValue( minimum() + maximum() - logicValue() ); + QSlider::setValue( logicValue() ); }