diff --git a/ChangeLog b/ChangeLog index 3b805fe786..e07ff6ea91 100644 --- a/ChangeLog +++ b/ChangeLog @@ -90,6 +90,21 @@ * plugins/spectrum_analyzer/log_y_axis.png: Update plugin artwork + * plugins/live_tool/live_tool.cpp: + * src/gui/plugin_browser.cpp: + * src/gui/main_window.cpp: + * src/gui/automation_editor.cpp: + * src/gui/bb_editor.cpp: + * src/tracks/bb_track.cpp: + * src/core/mmp.cpp: + * data/locale/nl.ts: + * data/locale/it.ts: + * data/locale/ca.ts: + * data/locale/ru.ts: + * data/locale/de.ts: + * data/locale/sv.ts: + Rename Baseline to Bassline + 2008-06-28 Tobias Doerffel * plugins/Makefile.am: diff --git a/data/locale/ca.ts b/data/locale/ca.ts index 55732172b2..074d234734 100644 --- a/data/locale/ca.ts +++ b/data/locale/ca.ts @@ -892,7 +892,7 @@ http://lmms.sourceforge.net - Beat+Baseline Editor + Beat+Bassline Editor Editor de Ritme Base @@ -905,7 +905,7 @@ http://lmms.sourceforge.net bbTCOView - Open in Beat+Baseline-Editor + Open in Beat+Bassline-Editor Obre a l'Editor de Ritme Base @@ -928,7 +928,7 @@ http://lmms.sourceforge.net bbTrack - Beat/Baseline %1 + Beat/Bassline %1 Ritme base %1 @@ -3173,7 +3173,7 @@ Fent doble clic a qualsevol connector mostrarà informació sobre els ports.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. -F1-F10 keys mute the first 10 instruments in the Beat+Baseline Editor. +F1-F10 keys mute the first 10 instruments in the Beat+Bassline Editor. Aquesta eina està pensada per a ser usada en actuacions en directe, encara que també pots usar-la per a producció musical. Les tecles següents només funcionaran si aquesta finestra està activa. La barra d'espai canvia entre reproducció i pausa a l'Editor de Cançó. @@ -3304,12 +3304,12 @@ Les tecles F1-F10 apaguen els 10 primers instruments a l'Editor de Ritme Ba - Show/hide Beat+Baseline Editor + Show/hide Beat+Bassline 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. + By pressing this button, you can show or hide the Beat+Bassline Editor. The Beat+Bassline Editor is needed for creating beats, opening, adding and removing channels, cutting, copying and pasting beat- and bassline-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. @@ -4412,7 +4412,7 @@ usa la roda del ratolí per a ajustar el volum d'un pas - You can drag an instrument-plugin into either the Song-Editor, the Beat+Baseline Editor or just into a channel-window or on the corresponding channel-button. + You can drag an instrument-plugin into either the Song-Editor, the Beat+Bassline Editor or just into a channel-window or on the corresponding channel-button. Pots arrossegar un connector d'instrument a l'Editor de Cançó, a l'Editor de Ritme Base o simplement a una finestra de canal o al botó de canal corresponent. diff --git a/data/locale/de.ts b/data/locale/de.ts index 8973ac4037..4b594933c5 100644 --- a/data/locale/de.ts +++ b/data/locale/de.ts @@ -1533,8 +1533,8 @@ http://lmms.sourceforge.net - Beat+Baseline Editor - Beat+Baseline Editor + Beat+Bassline Editor + Beat+Bassline Editor @@ -1561,16 +1561,16 @@ http://lmms.sourceforge.net - Open in Beat+Baseline-Editor - Im Beat+Baseline-Editor öffnen + Open in Beat+Bassline-Editor + Im Beat+Bassline-Editor öffnen bbTCOView - Open in Beat+Baseline-Editor - Im Beat+Baseline-Editor öffnen + Open in Beat+Bassline-Editor + Im Beat+Bassline-Editor öffnen @@ -1592,8 +1592,8 @@ http://lmms.sourceforge.net bbTrack - Beat/Baseline %1 - Beat/Baseline %1 + Beat/Bassline %1 + Beat/Bassline %1 @@ -5537,7 +5537,7 @@ Double clicking any of the plugins will bring up information on the ports.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. -F1-F10 keys mute the first 10 instruments in the Beat+Baseline Editor. +F1-F10 keys mute the first 10 instruments in the Beat+Bassline Editor. Dieses Werkzeug ist für die Verwendung in Live-Auftritten gedacht, allerdings können Sie es natürlich auch für die Musikproduktion verwenden. Die folgenden Tasten funktionieren nur, wenn dieses Fenster im Vordergrund ist. Leertaste wechselt zwischen Abspielen und Pause im Song-Editor. @@ -5551,7 +5551,7 @@ F1-F10 schalten die ersten 10 Instrumente im Beat+Bassline-Editor stumm bzw. wie 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. -F1-F10 keys mute the first 10 instruments in the Beat+Baseline Editor. +F1-F10 keys mute the first 10 instruments in the Beat+Bassline Editor. Dieses Werkzeug ist für die Verwendung in Live-Auftritten gedacht, allerdings können Sie es natürlich auch für die Musikproduktion verwenden. Die folgenden Tasten funktionieren nur, wenn dieses Fenster im Vordergrund ist. Leertaste wechselt zwischen Abspielen und Pause im Song-Editor. @@ -5769,13 +5769,13 @@ Bitte besuchen Sie http://wiki.mindrules.net für Dokumentationen über LMMS. - Show/hide Beat+Baseline Editor - Zeige/verstecke Beat+Baseline Editor + Show/hide Beat+Bassline Editor + Zeige/verstecke Beat+Bassline Editor - 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. - Durch das Drücken dieses Knopfes wird der Beat+Baseline Editor ein- oder ausgeblendet. Der Beat+Baseline Editor ist nötig, um Beats zu erstellen, Kanale zu öffnen, hinzuzufügen und zu entfernen sowie um Baseline-Patterns auszuschneiden, zu kopieren und einzufügen usw. + By pressing this button, you can show or hide the Beat+Bassline Editor. The Beat+Bassline Editor is needed for creating beats, opening, adding and removing channels, cutting, copying and pasting beat- and bassline-patterns and other things like that. + Durch das Drücken dieses Knopfes wird der Beat+Bassline Editor ein- oder ausgeblendet. Der Beat+Bassline Editor ist nötig, um Beats zu erstellen, Kanale zu öffnen, hinzuzufügen und zu entfernen sowie um Bassline-Patterns auszuschneiden, zu kopieren und einzufügen usw. @@ -7383,8 +7383,8 @@ Lautstärke eines Steps kann mit Mausrad geändert werden - You can drag an instrument-plugin into either the Song-Editor, the Beat+Baseline Editor or just into a channel-window or on the corresponding channel-button. - Sie können ein Instrument-Plugin entweder in den Song-Editor, den Beat+Baseline-Editor oder einfach in ein Kanal-Fenster oder auf den zugehörigen Kanal-Button ziehen. + You can drag an instrument-plugin into either the Song-Editor, the Beat+Bassline Editor or just into a channel-window or on the corresponding channel-button. + Sie können ein Instrument-Plugin entweder in den Song-Editor, den Beat+Bassline-Editor oder einfach in ein Kanal-Fenster oder auf den zugehörigen Kanal-Button ziehen. diff --git a/data/locale/it.ts b/data/locale/it.ts index 743bc2fb81..450b45d829 100644 --- a/data/locale/it.ts +++ b/data/locale/it.ts @@ -777,10 +777,6 @@ http://lmms.sourceforge.net bbEditor - - Beat+Bassline Editor - Beat+Bassline Editor - Play/pause current beat/bassline (Space) Riproduci/pausa il beat/bassline corrente (Spazio) @@ -798,8 +794,8 @@ http://lmms.sourceforge.net Clicca qui per fermare la riproduzione del beat/bassline corrente. - Beat+Baseline Editor - Beat+Baseline Editor + Beat+Bassline Editor + Beat+Bassline Editor Add beat/bassline @@ -808,10 +804,6 @@ http://lmms.sourceforge.net bbTCO - - Open in Beat+Bassline-Editor - Apri nel Beat+Bassline-Editor - Reset name Reimposta nome @@ -825,19 +817,15 @@ http://lmms.sourceforge.net Cambia colore - Open in Beat+Baseline-Editor - Apri nel Beat+Baseline Editor + Open in Beat+Bassline-Editor + Apri nel Beat+Bassline Editor bbTrack Beat/Bassline %1 - Beat/Bassline %1 - - - Beat/Baseline %1 - Beat/Baseline %1 + Beat/Bassline %1 @@ -2057,12 +2045,12 @@ Si prega di visitare http://wiki.mindrules.net per la documentazione su LMMS.Esporta il progetto corrente - Show/hide Beat+Baseline Editor - Mostra/nascondi il Beat+Baseline Editor + Show/hide Beat+Bassline Editor + Mostra/nascondi il Beat+Bassline Editor - 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. - Premendo questo pulsante puoi mostrare o nascondere il Beat+Baseline Editor. Il Beat+Baseline Editor serve per creare beats, aprire, aggiungere e togliere canale, tagliare, copiare e incollare beat- e baseline- pattern. + By pressing this button, you can show or hide the Beat+Bassline Editor. The Beat+Bassline Editor is needed for creating beats, opening, adding and removing channels, cutting, copying and pasting beat- and bassline-patterns and other things like that. + Premendo questo pulsante puoi mostrare o nascondere il Beat+Bassline Editor. Il Beat+Bassline Editor serve per creare beats, aprire, aggiungere e togliere canale, tagliare, copiare e incollare beat- e bassline- pattern. Show/hide Piano-Roll @@ -2624,8 +2612,8 @@ usa la rotellina del mouse per impostare il volume di una nota Host VST per usare i plugin VST con LMMS - You can drag an instrument-plugin into either the Song-Editor, the Beat+Baseline Editor or just into a channel-window or on the corresponding channel-button. - Puoi trascinare uno strumento plugin nel Song-Editor, nel Beat+Baseline Editor o direttamente in un canale o sul pulsante di canale corrispondente. + You can drag an instrument-plugin into either the Song-Editor, the Beat+Bassline Editor or just into a channel-window or on the corresponding channel-button. + Puoi trascinare uno strumento plugin nel Song-Editor, nel Beat+Bassline Editor o direttamente in un canale o sul pulsante di canale corrispondente. Rough & Dirty Wavetable Synthesizer. diff --git a/data/locale/nl.ts b/data/locale/nl.ts index 7f7ac223c5..eaf34b835e 100644 --- a/data/locale/nl.ts +++ b/data/locale/nl.ts @@ -810,8 +810,8 @@ http://lmms.sourceforge.net Klik hier, wanneer je het afspelen van de huidige beat/bassline wilt stoppen. - Beat+Baseline Editor - Beat+Baseline Editor + Beat+Bassline Editor + Beat+Bassline Editor Add beat/bassline @@ -833,15 +833,15 @@ http://lmms.sourceforge.net Kleur veranderen - Open in Beat+Baseline-Editor - In Beat+Baseline-Editor openen + Open in Beat+Bassline-Editor + In Beat+Bassline-Editor openen bbTrack - Beat/Baseline %1 - Beat/Baseline %1 + Beat/Bassline %1 + Beat/Bassline %1 @@ -1991,11 +1991,11 @@ Bezoek http://wiki.mindrules.net voor documentatie over LMMS. Hoofdscherm en werkplek instellen... - Show/hide Beat+Baseline Editor + Show/hide Beat+Bassline Editor Toon/Verberg Beat+Bassline Bewerker - 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. + By pressing this button, you can show or hide the Beat+Bassline Editor. The Beat+Bassline Editor is needed for creating beats, opening, adding and removing channels, cutting, copying and pasting beat- and bassline-patterns and other things like that. Met deze knop kun je de Beat+Bassline-Bewerker tonen/verbergen. De Beat+Bassline bewerker is nodig voor beats, het openen, toevoegen en verwijderen van kanalen, het knippen, plakken en kopieren van beat- en bassline-patterns en meer van dat soort dingen. @@ -2460,8 +2460,8 @@ volume van de steps is met het muiswiel te veranderen Ruige & Smerige Wavetable Synthesizer. - You can drag an instrument-plugin into either the Song-Editor, the Beat+Baseline Editor or just into a channel-window or on the corresponding channel-button. - Je kunt een instrument-plugin slepen naar zowel de Song-Bewerker, de Beat+Baseline-Bewerker of gewoon in een kanaal-venster of naar de corresponderende kanal-knop. + You can drag an instrument-plugin into either the Song-Editor, the Beat+Bassline Editor or just into a channel-window or on the corresponding channel-button. + Je kunt een instrument-plugin slepen naar zowel de Song-Bewerker, de Beat+Bassline-Bewerker of gewoon in een kanaal-venster of naar de corresponderende kanal-knop. Additive Synthesizer for organ-like sounds diff --git a/data/locale/ru.ts b/data/locale/ru.ts index a1d912d497..f9a2975407 100644 --- a/data/locale/ru.ts +++ b/data/locale/ru.ts @@ -837,7 +837,7 @@ http://lmms.sourceforge.net Нажмите чтобы остановить воспроизведение. - Beat+Baseline Editor + Beat+Bassline Editor Редактор ритма/лейтмотива @@ -860,14 +860,14 @@ http://lmms.sourceforge.net Изменить цвет - Open in Beat+Baseline-Editor + Open in Beat+Bassline-Editor Открыть в редакторе ритма/лейтмотива bbTrack - Beat/Baseline %1 + Beat/Bassline %1 Лейтмотив %1 @@ -2443,11 +2443,11 @@ Please visit http://wiki.mindrules.net for documentation on LMMS. Создаю рабочее пространство... - Show/hide Beat+Baseline Editor + Show/hide Beat+Bassline Editor Показать/скрыть редактор ритма/лейтмотива - 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. + By pressing this button, you can show or hide the Beat+Bassline Editor. The Beat+Bassline Editor is needed for creating beats, opening, adding and removing channels, cutting, copying and pasting beat- and bassline-patterns and other things like that. По нажатию этой кнопки запускается редактор ритма/лейтмотива произведения. Он необходим для установки ритма, добавления и удаления каналов, вырезания, копирования и вставки шаблонов и т. п. @@ -3138,7 +3138,7 @@ use mouse wheel to set volume of a step Тяп-ляп синтезатор сигнала. - You can drag an instrument-plugin into either the Song-Editor, the Beat+Baseline Editor or just into a channel-window or on the corresponding channel-button. + You can drag an instrument-plugin into either the Song-Editor, the Beat+Bassline Editor or just into a channel-window or on the corresponding channel-button. Вы можете переносить нужные вам инструменты из этой панели в редактор мелодии или в редактор лейтмотива. Отпускайте кнопку мыши прямо в окне, чтобы создать новый канал, или на кнопке нужного канала для замены типа канала на выбранный инструмент. diff --git a/data/locale/sv.ts b/data/locale/sv.ts index 9ce2c57e70..2d6e8f160d 100644 --- a/data/locale/sv.ts +++ b/data/locale/sv.ts @@ -758,7 +758,7 @@ Om du vill hjälpa till med översättningen av lmms eller vill förbättra exit bbEditor - Beat+Baseline Editor + Beat+Bassline Editor @@ -785,7 +785,7 @@ Om du vill hjälpa till med översättningen av lmms eller vill förbättra exit bbTCO - Open in Beat+Baseline-Editor + Open in Beat+Bassline-Editor @@ -804,7 +804,7 @@ Om du vill hjälpa till med översättningen av lmms eller vill förbättra exit bbTrack - Beat/Baseline %1 + Beat/Bassline %1 @@ -1850,11 +1850,11 @@ Double clicking any of the plugins will bring up information on the ports.Exportera aktuellt projekt - Show/hide Beat+Baseline Editor + Show/hide Beat+Bassline Editor - 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. + By pressing this button, you can show or hide the Beat+Bassline Editor. The Beat+Bassline Editor is needed for creating beats, opening, adding and removing channels, cutting, copying and pasting beat- and bassline-patterns and other things like that. @@ -2391,7 +2391,7 @@ use mouse wheel to set volume of a step - You can drag an instrument-plugin into either the Song-Editor, the Beat+Baseline Editor or just into a channel-window or on the corresponding channel-button. + You can drag an instrument-plugin into either the Song-Editor, the Beat+Bassline Editor or just into a channel-window or on the corresponding channel-button. diff --git a/plugins/live_tool/live_tool.cpp b/plugins/live_tool/live_tool.cpp index c217398ee3..e46fc0801d 100644 --- a/plugins/live_tool/live_tool.cpp +++ b/plugins/live_tool/live_tool.cpp @@ -114,7 +114,7 @@ liveToolView::liveToolView( tool * _tool ) : "The following keys will work only if this window is active.\n" "The spacebar toggles play and pause in the Song Editor.\n" "F1-F10 keys mute the first 10 instruments in the " - "Beat+Baseline Editor." ) ); + "Beat+Bassline Editor." ) ); parentWidget()->hide(); parentWidget()->layout()->setSizeConstraint( QLayout::SetFixedSize ); diff --git a/src/core/mmp.cpp b/src/core/mmp.cpp index b267b4be8e..89e805cbd3 100644 --- a/src/core/mmp.cpp +++ b/src/core/mmp.cpp @@ -649,6 +649,15 @@ void multimediaProject::upgrade( void ) QDomElement el = list.item( i ).toElement(); el.setTagName( "automationpattern" ); } + + list = elementsByTagName( "bbtrack" ); + for( int i = 0; !list.item( i ).isNull(); ++i ) + { + QDomElement el = list.item( i ).toElement(); + QString s = el.attribute( "name" ); + s.replace( QRegExp("^Beat/Baseline "), "Beat/Bassline " ); + el.setAttribute( "name", s ); + } } diff --git a/src/gui/automation_editor.cpp b/src/gui/automation_editor.cpp index 66da59d499..5c373e74a6 100644 --- a/src/gui/automation_editor.cpp +++ b/src/gui/automation_editor.cpp @@ -677,12 +677,14 @@ void automationEditor::drawLine( int _x0, float _y0, int _x1, float _y1 ) while( i < deltax ) { y = _y0 + ( ystep * yscale * i ); + m_pattern->removeValue( midiTime( x ) ); + m_pattern->putValue( midiTime( x ), y ); x += xstep; i += 1; - m_pattern->removeValue( midiTime( x ) ); - m_pattern->putValue( midiTime( x ), y ); } + m_pattern->removeValue( midiTime( _x1 ) ); + m_pattern->putValue( midiTime( _x1 ), _y1 ); }; diff --git a/src/gui/bb_editor.cpp b/src/gui/bb_editor.cpp index 35e05c5911..81f15f287b 100644 --- a/src/gui/bb_editor.cpp +++ b/src/gui/bb_editor.cpp @@ -57,7 +57,7 @@ bbEditor::bbEditor( bbTrackContainer * _tc ) : setWindowIcon( embed::getIconPixmap( "bb_track" ) ); - setWindowTitle( tr( "Beat+Baseline Editor" ) ); + setWindowTitle( tr( "Beat+Bassline Editor" ) ); // TODO: Use style sheet setMinimumWidth( TRACK_OP_WIDTH + DEFAULT_SETTINGS_WIDGET_WIDTH + 2 * TCO_BORDER_WIDTH + 192 ); diff --git a/src/gui/main_window.cpp b/src/gui/main_window.cpp index 44e1672a25..44400cf105 100644 --- a/src/gui/main_window.cpp +++ b/src/gui/main_window.cpp @@ -361,17 +361,17 @@ void mainWindow::finalize( void ) toolButton * bb_editor_window = new toolButton( embed::getIconPixmap( "bb_track" ), - tr( "Show/hide Beat+Baseline Editor" ) + + tr( "Show/hide Beat+Bassline Editor" ) + " (F6)", this, SLOT( toggleBBEditorWin() ), m_toolBar ); bb_editor_window->setShortcut( Qt::Key_F6 ); bb_editor_window->setWhatsThis( tr( "By pressing this button, you can show or hide the " - "Beat+Baseline Editor. The Beat+Baseline Editor is " + "Beat+Bassline Editor. The Beat+Bassline Editor is " "needed for creating beats, opening, adding and " "removing channels, cutting, copying and pasting " - "beat- and baseline-patterns and other things like " + "beat- and bassline-patterns and other things like " "that." ) ); diff --git a/src/gui/plugin_browser.cpp b/src/gui/plugin_browser.cpp index e1aeb04a38..4d01ffbefc 100644 --- a/src/gui/plugin_browser.cpp +++ b/src/gui/plugin_browser.cpp @@ -57,7 +57,7 @@ pluginBrowser::pluginBrowser( QWidget * _parent ) : QLabel * hint = new QLabel( tr( "You can drag an instrument-plugin " "into either the Song-Editor, the " - "Beat+Baseline Editor or just into a " + "Beat+Bassline Editor or just into a " "channel-window or on the " "corresponding channel-button." ), m_view ); diff --git a/src/tracks/bb_track.cpp b/src/tracks/bb_track.cpp index 2778247e3e..4eea761398 100644 --- a/src/tracks/bb_track.cpp +++ b/src/tracks/bb_track.cpp @@ -147,7 +147,7 @@ bbTCOView::~bbTCOView() void bbTCOView::constructContextMenu( QMenu * _cm ) { QAction * a = new QAction( embed::getIconPixmap( "bb_track" ), - tr( "Open in Beat+Baseline-Editor" ), + tr( "Open in Beat+Bassline-Editor" ), _cm ); _cm->insertAction( _cm->actions()[0], a ); connect( a, SIGNAL( triggered( bool ) ), @@ -313,7 +313,7 @@ bbTrack::bbTrack( trackContainer * _tc ) : int bbNum = s_infoMap.size(); s_infoMap[this] = bbNum; - setName( tr( "Beat/Baseline %1" ).arg( bbNum ) ); + setName( tr( "Beat/Bassline %1" ).arg( bbNum ) ); engine::getBBTrackContainer()->setCurrentBB( bbNum ); engine::getBBTrackContainer()->updateComboBox(); }