diff options
| -rw-r--r-- | muse2/ChangeLog | 4 | ||||
| -rw-r--r-- | muse2/muse/app.cpp | 27 | ||||
| -rw-r--r-- | muse2/share/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | muse2/share/locale/muse_de.ts | 14 | ||||
| -rw-r--r-- | muse2/share/locale/muse_es.ts | 14 | ||||
| -rw-r--r-- | muse2/share/locale/muse_fr.ts | 14 | ||||
| -rw-r--r-- | muse2/share/locale/muse_pl.ts | 14 | ||||
| -rw-r--r-- | muse2/share/locale/muse_ru.ts | 14 | ||||
| -rw-r--r-- | muse2/share/locale/muse_sv_SE.ts | 14 |
9 files changed, 67 insertions, 51 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog index 03076767..b4deb554 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -1,3 +1,7 @@ +22.12.2010: + - Capitalizations in the menus thanks to Geoff King (gsking1->gmail. com) + - Added some comments in app.cpp that I've been willing to include for a while. (Orcan) + - Added a line to CMakeLists to install the splash image. Commented out for now. (Orcan) 21.12.2010: - Moved all the config files "~/.musePrj, ~/.MusE, ~/.deicsonze.dco" into ~/.config/MusE/ and renamed them as "projects, MusE.cfg, deicsonze.dco", respectively. (Orcan) diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp index d53ed033..6e356a18 100644 --- a/muse2/muse/app.cpp +++ b/muse2/muse/app.cpp @@ -1038,20 +1038,20 @@ MusE::MusE(int argc, char** argv) : QMainWindow() //-------- Settings Actions settingsGlobalAction = new QAction(QIcon(*settings_globalsettingsIcon), tr("Global Settings"), this); - settingsShortcutsAction = new QAction(QIcon(*settings_configureshortcutsIcon), tr("Configure shortcuts"), this); - follow = new QMenu(tr("follow song"), this); - dontFollowAction = new QAction(tr("dont follow Song"), this); + settingsShortcutsAction = new QAction(QIcon(*settings_configureshortcutsIcon), tr("Configure Shortcuts"), this); + follow = new QMenu(tr("Follow Song"), this); + dontFollowAction = new QAction(tr("Don't Follow Song"), this); dontFollowAction->setCheckable(true); - followPageAction = new QAction(tr("follow page"), this); + followPageAction = new QAction(tr("Follow Page"), this); followPageAction->setCheckable(true); followPageAction->setChecked(true); - followCtsAction = new QAction(tr("follow continuous"), this); + followCtsAction = new QAction(tr("Follow Continuous"), this); followCtsAction->setCheckable(true); settingsMetronomeAction = new QAction(QIcon(*settings_metronomeIcon), tr("Metronome"), this); settingsMidiSyncAction = new QAction(QIcon(*settings_midisyncIcon), tr("Midi Sync"), this); settingsMidiIOAction = new QAction(QIcon(*settings_midifileexportIcon), tr("Midi File Import/Export"), this); - settingsAppearanceAction = new QAction(QIcon(*settings_appearance_settingsIcon), tr("Appearance settings"), this); + settingsAppearanceAction = new QAction(QIcon(*settings_appearance_settingsIcon), tr("Appearance Settings"), this); settingsMidiPortAction = new QAction(QIcon(*settings_midiport_softsynthsIcon), tr("Midi Ports / Soft Synth"), this); //-------- Help Actions @@ -1061,7 +1061,8 @@ MusE::MusE(int argc, char** argv) : QMainWindow() helpAboutAction = new QAction(tr("&About MusE"), this); - // Connections + //---- Connections + //-------- File connections connect(fileNewAction, SIGNAL(activated()), SLOT(loadTemplate())); connect(fileOpenAction, SIGNAL(activated()), SLOT(loadProject())); @@ -1077,7 +1078,8 @@ MusE::MusE(int argc, char** argv) : QMainWindow() connect(fileImportWaveAction, SIGNAL(activated()), SLOT(importWave())); connect(quitAction, SIGNAL(activated()), SLOT(quitDoc())); - + + //-------- Edit connections connect(editCutAction, SIGNAL(triggered()), editSignalMapper, SLOT(map())); connect(editCopyAction, SIGNAL(triggered()), editSignalMapper, SLOT(map())); connect(editPasteAction, SIGNAL(triggered()), editSignalMapper, SLOT(map())); @@ -1087,7 +1089,7 @@ MusE::MusE(int argc, char** argv) : QMainWindow() connect(editPasteC2TAction, SIGNAL(triggered()), editSignalMapper, SLOT(map())); connect(editInsertEMAction, SIGNAL(triggered()), editSignalMapper, SLOT(map())); connect(editDeleteSelectedAction, SIGNAL(triggered()), editSignalMapper, SLOT(map())); - + connect(editSelectAllAction, SIGNAL(triggered()), editSignalMapper, SLOT(map())); connect(editDeselectAllAction, SIGNAL(triggered()), editSignalMapper, SLOT(map())); connect(editInvertSelectionAction, SIGNAL(triggered()), editSignalMapper, SLOT(map())); @@ -1126,6 +1128,7 @@ MusE::MusE(int argc, char** argv) : QMainWindow() connect(editSongInfoAction, SIGNAL(activated()), SLOT(startSongInfo())); + //-------- View connections connect(viewTransportAction, SIGNAL(toggled(bool)), SLOT(toggleTransport(bool))); connect(viewBigtimeAction, SIGNAL(toggled(bool)), SLOT(toggleBigTime(bool))); connect(viewMixerAAction, SIGNAL(toggled(bool)),SLOT(toggleMixer1(bool))); @@ -1133,12 +1136,14 @@ MusE::MusE(int argc, char** argv) : QMainWindow() connect(viewCliplistAction, SIGNAL(toggled(bool)), SLOT(startClipList(bool))); connect(viewMarkerAction, SIGNAL(toggled(bool)), SLOT(toggleMarker(bool))); + //-------- Structure connections connect(strGlobalCutAction, SIGNAL(activated()), SLOT(globalCut())); connect(strGlobalInsertAction, SIGNAL(activated()), SLOT(globalInsert())); connect(strGlobalSplitAction, SIGNAL(activated()), SLOT(globalSplit())); connect(strCopyRangeAction, SIGNAL(activated()), SLOT(copyRange())); connect(strCutEventsAction, SIGNAL(activated()), SLOT(cutEvents())); + //-------- Midi connections connect(midiEditInstAction, SIGNAL(activated()), SLOT(startEditInstrument())); connect(midiResetInstAction, SIGNAL(activated()), SLOT(resetMidiDevices())); connect(midiInitInstActions, SIGNAL(activated()), SLOT(initMidiDevices())); @@ -1161,14 +1166,17 @@ MusE::MusE(int argc, char** argv) : QMainWindow() connect(midiPluginSignalMapper, SIGNAL(mapped(int)), this, SLOT(startMidiInputPlugin(int))); + //-------- Audio connections connect(audioBounce2TrackAction, SIGNAL(activated()), SLOT(bounceToTrack())); connect(audioBounce2FileAction, SIGNAL(activated()), SLOT(bounceToFile())); connect(audioRestartAction, SIGNAL(activated()), SLOT(seqRestart())); + //-------- Automation connections connect(autoMixerAction, SIGNAL(activated()), SLOT(switchMixerAutomation())); connect(autoSnapshotAction, SIGNAL(activated()), SLOT(takeAutomationSnapshot())); connect(autoClearAction, SIGNAL(activated()), SLOT(clearAutomation())); + //-------- Settings connections connect(settingsGlobalAction, SIGNAL(activated()), SLOT(configGlobalSettings())); connect(settingsShortcutsAction, SIGNAL(activated()), SLOT(configShortCuts())); connect(settingsMetronomeAction, SIGNAL(activated()), SLOT(configMetronome())); @@ -1187,6 +1195,7 @@ MusE::MusE(int argc, char** argv) : QMainWindow() connect(followSignalMapper, SIGNAL(mapped(int)), this, SLOT(cmd(int))); + //-------- Help connections connect(helpManualAction, SIGNAL(activated()), SLOT(startHelpBrowser())); connect(helpHomepageAction, SIGNAL(activated()), SLOT(startHomepageBrowser())); connect(helpReportAction, SIGNAL(activated()), SLOT(startBugBrowser())); diff --git a/muse2/share/CMakeLists.txt b/muse2/share/CMakeLists.txt index c8d89cf9..aeb7e4a1 100644 --- a/muse2/share/CMakeLists.txt +++ b/muse2/share/CMakeLists.txt @@ -32,3 +32,6 @@ subdirs( locale ) +# We don't have a splash image for MusE2 yet. When we do, the +# following line can be uncommented: +#install (FILES splash.png DESTINATION ${MusE_SHARE_DIR} ) diff --git a/muse2/share/locale/muse_de.ts b/muse2/share/locale/muse_de.ts index 81567349..4e547b20 100644 --- a/muse2/share/locale/muse_de.ts +++ b/muse2/share/locale/muse_de.ts @@ -425,7 +425,7 @@ Word-breaking but only with spaces.</source> <context> <name>AppearanceDialogBase</name> <message> - <source>MusE: Appearance settings</source> + <source>MusE: Appearance Settings</source> <translation>MusE: Erscheinungsbild einstellen</translation> </message> <message> @@ -6951,15 +6951,15 @@ Zur Aufnahme können mehrere Kanäle gewählt werden: <translation>Zeitanzeige groß</translation> </message> <message> - <source>dont follow Song</source> + <source>Don't Follow Song</source> <translation>Fenster folgt nicht dem Lied</translation> </message> <message> - <source>follow page</source> + <source>Follow Page</source> <translation>Fenster folgt dem Lied seitenweise</translation> </message> <message> - <source>follow continuous</source> + <source>Follow Continuous</source> <translation>Fenster folgt dem Lied ständig</translation> </message> <message> @@ -6967,7 +6967,7 @@ Zur Aufnahme können mehrere Kanäle gewählt werden: <translation>Globale Einstellungen</translation> </message> <message> - <source>follow song</source> + <source>Follow Song</source> <translation>Folge dem Lied</translation> </message> <message> @@ -6979,7 +6979,7 @@ Zur Aufnahme können mehrere Kanäle gewählt werden: <translation>Midi Sync</translation> </message> <message> - <source>Appearance settings</source> + <source>Appearance Settings</source> <translation>Erscheinungsbild einstellen</translation> </message> <message> @@ -7331,7 +7331,7 @@ Wave Spur als Zielspur auswählen</translation> <translation>Einstellungen</translation> </message> <message> - <source>Configure shortcuts</source> + <source>Configure Shortcuts</source> <translation>Tastenkürzel einstellen</translation> </message> <message> diff --git a/muse2/share/locale/muse_es.ts b/muse2/share/locale/muse_es.ts index 3addbc56..350e2595 100644 --- a/muse2/share/locale/muse_es.ts +++ b/muse2/share/locale/muse_es.ts @@ -446,7 +446,7 @@ Word-breaking but only with spaces.</source> <context> <name>AppearanceDialogBase</name> <message> - <source>MusE: Appearance settings</source> + <source>MusE: Appearance Settings</source> <translation type="unfinished">MusE: Configuraci� de apariencia</translation> </message> <message> @@ -7386,15 +7386,15 @@ Puedes especificar m� de un canal para grabar: <translation type="unfinished">ventana BigTime</translation> </message> <message> - <source>dont follow Song</source> + <source>Don't Follow Song</source> <translation type="unfinished">no sigas la canci�</translation> </message> <message> - <source>follow page</source> + <source>Follow Page</source> <translation type="unfinished">sigue la p�ina</translation> </message> <message> - <source>follow continuous</source> + <source>Follow Continuous</source> <translation type="unfinished">sigue cont�uamente</translation> </message> <message> @@ -7406,7 +7406,7 @@ Puedes especificar m� de un canal para grabar: <translation type="unfinished">Selecciones Globales</translation> </message> <message> - <source>follow song</source> + <source>Follow Song</source> <translation type="unfinished">seguir canci�</translation> </message> <message> @@ -7422,7 +7422,7 @@ Puedes especificar m� de un canal para grabar: <translation type="obsolete">Configuraci� de archivos MIDI</translation> </message> <message> - <source>Appearance settings</source> + <source>Appearance Settings</source> <translation type="unfinished">Selecciones de apariencia</translation> </message> <message> @@ -7850,7 +7850,7 @@ selecciona una pista de audio como destino</translation> <translation type="unfinished"></translation> </message> <message> - <source>Configure shortcuts</source> + <source>Configure Shortcuts</source> <translation type="unfinished"></translation> </message> <message> diff --git a/muse2/share/locale/muse_fr.ts b/muse2/share/locale/muse_fr.ts index af64bc63..ac6e993c 100644 --- a/muse2/share/locale/muse_fr.ts +++ b/muse2/share/locale/muse_fr.ts @@ -474,7 +474,7 @@ Word-breaking but only with spaces.</source> <context> <name>AppearanceDialogBase</name> <message> - <source>MusE: Appearance settings</source> + <source>MusE: Appearance Settings</source> <translation>MusE: réglages de l'apparence</translation> </message> <message> @@ -7237,15 +7237,15 @@ pour l'enregistrement: <translation>Fenêtre GrandeHorloge</translation> </message> <message> - <source>dont follow Song</source> + <source>Don't Follow Song</source> <translation>Ne pas suivre la chanson</translation> </message> <message> - <source>follow page</source> + <source>Follow Page</source> <translation>Défilement par page</translation> </message> <message> - <source>follow continuous</source> + <source>Follow Continuous</source> <translation>Défilement fin</translation> </message> <message> @@ -7257,7 +7257,7 @@ pour l'enregistrement: <translation>Paramètres Généraux</translation> </message> <message> - <source>follow song</source> + <source>Follow Song</source> <translation>suivre la chanson</translation> </message> <message> @@ -7273,7 +7273,7 @@ pour l'enregistrement: <translation type="obsolete">Paramètres du fichier MIDI</translation> </message> <message> - <source>Appearance settings</source> + <source>Appearance Settings</source> <translation>Apparence</translation> </message> <message> @@ -7755,7 +7755,7 @@ destination</translation> <translation type="unfinished"></translation> </message> <message> - <source>Configure shortcuts</source> + <source>Configure Shortcuts</source> <translation type="unfinished"></translation> </message> <message> diff --git a/muse2/share/locale/muse_pl.ts b/muse2/share/locale/muse_pl.ts index 47038827..1cf5d7e2 100644 --- a/muse2/share/locale/muse_pl.ts +++ b/muse2/share/locale/muse_pl.ts @@ -439,7 +439,7 @@ Word-breaking but only with spaces.</source> <context> <name>AppearanceDialogBase</name> <message> - <source>MusE: Appearance settings</source> + <source>MusE: Appearance Settings</source> <translation type="unfinished">MuzA: Wygląd aplikacji.</translation> </message> <message> @@ -6959,15 +6959,15 @@ Możesz określić więcej niż jeden ślad do nagrywania: <translation>Duży Zegar</translation> </message> <message> - <source>dont follow Song</source> + <source>Don't Follow Song</source> <translation>nie podążaj za utworem</translation> </message> <message> - <source>follow page</source> + <source>Follow Page</source> <translation>kursor się przesuwa</translation> </message> <message> - <source>follow continuous</source> + <source>Follow Continuous</source> <translation>takty się przesuwają (kursor stoi)</translation> </message> <message> @@ -6975,7 +6975,7 @@ Możesz określić więcej niż jeden ślad do nagrywania: <translation>Globalne Ustawienia</translation> </message> <message> - <source>follow song</source> + <source>Follow Song</source> <translation>podążanie kursora za utworem</translation> </message> <message> @@ -6987,7 +6987,7 @@ Możesz określić więcej niż jeden ślad do nagrywania: <translation>Synchronizacja Midi</translation> </message> <message> - <source>Appearance settings</source> + <source>Appearance Settings</source> <translation>Ustawienia wyglądu</translation> </message> <message> @@ -7340,7 +7340,7 @@ zaznacz ślad audio jako docelowy</translation> <translation>&Ustawienia</translation> </message> <message> - <source>Configure shortcuts</source> + <source>Configure Shortcuts</source> <translation>Konfiguracja skrótów</translation> </message> <message> diff --git a/muse2/share/locale/muse_ru.ts b/muse2/share/locale/muse_ru.ts index 9264bb8e..a579fd65 100644 --- a/muse2/share/locale/muse_ru.ts +++ b/muse2/share/locale/muse_ru.ts @@ -449,7 +449,7 @@ Word-breaking but only with spaces.</source> <context> <name>AppearanceDialogBase</name> <message> - <source>MusE: Appearance settings</source> + <source>MusE: Appearance Settings</source> <translation>MusE: Настройки вида</translation> </message> <message> @@ -7351,15 +7351,15 @@ recording: <translation>Окно хронометра</translation> </message> <message> - <source>dont follow Song</source> + <source>Don't Follow Song</source> <translation>не следовать за проектом</translation> </message> <message> - <source>follow page</source> + <source>Follow Page</source> <translation>следовать постранично</translation> </message> <message> - <source>follow continuous</source> + <source>Follow Continuous</source> <translation>следовать плавно</translation> </message> <message> @@ -7367,7 +7367,7 @@ recording: <translation>Общие настройки</translation> </message> <message> - <source>follow song</source> + <source>Follow Song</source> <translation>следовать за проектом</translation> </message> <message> @@ -7379,7 +7379,7 @@ recording: <translation>MIDI-синхр</translation> </message> <message> - <source>Appearance settings</source> + <source>Appearance Settings</source> <translation>Настройки вида</translation> </message> <message> @@ -7574,7 +7574,7 @@ Save Current Project?</source> <translation>Настройки</translation> </message> <message> - <source>Configure shortcuts</source> + <source>Configure Shortcuts</source> <translation>Настроить горячие клавиши</translation> </message> <message> diff --git a/muse2/share/locale/muse_sv_SE.ts b/muse2/share/locale/muse_sv_SE.ts index 4ae7dfc0..29eab8e5 100644 --- a/muse2/share/locale/muse_sv_SE.ts +++ b/muse2/share/locale/muse_sv_SE.ts @@ -464,7 +464,7 @@ Word-breaking but only with spaces.</source> <context> <name>AppearanceDialogBase</name> <message> - <source>MusE: Appearance settings</source> + <source>MusE: Appearance Settings</source> <translation>MusE: Utseendeinställningar</translation> </message> <message> @@ -7373,15 +7373,15 @@ inspelning: <translation>Bigtime fönster</translation> </message> <message> - <source>dont follow Song</source> + <source>Don't Follow Song</source> <translation>följ inte Sång</translation> </message> <message> - <source>follow page</source> + <source>Follow Page</source> <translation>följ sida</translation> </message> <message> - <source>follow continuous</source> + <source>Follow Continuous</source> <translation>följ kontinuerligt</translation> </message> <message> @@ -7393,7 +7393,7 @@ inspelning: <translation>Globala Inställningar</translation> </message> <message> - <source>follow song</source> + <source>Follow Song</source> <translation>följ sång</translation> </message> <message> @@ -7409,7 +7409,7 @@ inspelning: <translation type="obsolete">Midi Filkonfigurering</translation> </message> <message> - <source>Appearance settings</source> + <source>Appearance Settings</source> <translation>Utseendeinställningar</translation> </message> <message> @@ -7651,7 +7651,7 @@ Spara nuvarande Projekt?</translation> <translation type="unfinished">Inställningar</translation> </message> <message> - <source>Configure shortcuts</source> + <source>Configure Shortcuts</source> <translation type="unfinished">Konfigurera kortkommandon</translation> </message> <message> |