diff options
author | Florian Jung <flo@windfisch.org> | 2011-05-16 12:16:44 +0000 |
---|---|---|
committer | Florian Jung <flo@windfisch.org> | 2011-05-16 12:16:44 +0000 |
commit | 2cf9d99932d8f45d5508c45729bea7af4e6ec8fd (patch) | |
tree | ea423f965efa83e841e267778f537af8de28a953 /muse2/muse/app.cpp | |
parent | 4e1ca61b03bab50d5e71e6da433503ac3b4470c0 (diff) | |
parent | 38988a37365c8772da11f3f41d49e5c1fd083084 (diff) |
set focus policy to strong in all editors
merged with trunk
Diffstat (limited to 'muse2/muse/app.cpp')
-rw-r--r-- | muse2/muse/app.cpp | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp index 4ec64edf..adac840a 100644 --- a/muse2/muse/app.cpp +++ b/muse2/muse/app.cpp @@ -53,6 +53,7 @@ #include "widgets/menutitleitem.h" #include "tools.h" #include "visibletracks.h" +#include "widgets/unusedwavefiles.h" #ifdef DSSI_SUPPORT #include "dssihost.h" @@ -964,6 +965,7 @@ MusE::MusE(int argc, char** argv) : QMainWindow() fileImportPartAction = new QAction(tr("Import Part"), this); fileImportWaveAction = new QAction(tr("Import Wave File"), this); + fileMoveWaveFiles = new QAction(tr("Find unused wave files"), this); quitAction = new QAction(tr("&Quit"), this); @@ -998,10 +1000,9 @@ MusE::MusE(int argc, char** argv) : QMainWindow() scoreAllInOneSubsubmenu = new QMenu(tr("all parts in one staff"), this); scoreOneStaffPerTrackSubsubmenu = new QMenu(tr("one staff per part"), this); - scoreSubmenu->addMenu(scoreAllInOneSubsubmenu); - scoreSubmenu->addMenu(scoreOneStaffPerTrackSubsubmenu); - - updateScoreMenus(); + scoreSubmenu->addMenu(scoreAllInOneSubsubmenu); + scoreSubmenu->addMenu(scoreOneStaffPerTrackSubsubmenu); + updateScoreMenus(); startScoreEditAction = new QAction(*scoreIconSet, tr("New score window"), this); startPianoEditAction = new QAction(*pianoIconSet, tr("Pianoroll"), this); @@ -1072,6 +1073,7 @@ MusE::MusE(int argc, char** argv) : QMainWindow() autoClearAction = new QAction(QIcon(*automation_clear_dataIcon), tr("Clear Automation Data"), this); autoClearAction->setEnabled(false); + //-------- Settings Actions settingsGlobalAction = new QAction(QIcon(*settings_globalsettingsIcon), tr("Global Settings"), this); settingsShortcutsAction = new QAction(QIcon(*settings_configureshortcutsIcon), tr("Configure Shortcuts"), this); @@ -1113,6 +1115,7 @@ MusE::MusE(int argc, char** argv) : QMainWindow() connect(fileImportPartAction, SIGNAL(activated()), SLOT(importPart())); connect(fileImportWaveAction, SIGNAL(activated()), SLOT(importWave())); + connect(fileMoveWaveFiles, SIGNAL(activated()), SLOT(findUnusedWaveFiles())); connect(quitAction, SIGNAL(activated()), SLOT(quitDoc())); //-------- Edit connections @@ -1338,6 +1341,8 @@ MusE::MusE(int argc, char** argv) : QMainWindow() menu_file->addSeparator(); menu_file->addAction(fileImportWaveAction); menu_file->addSeparator(); + menu_file->addAction(fileMoveWaveFiles); + menu_file->addSeparator(); menu_file->addAction(quitAction); menu_file->addSeparator(); @@ -5081,6 +5086,7 @@ void MusE::execDeliveredScript(int id) //QString scriptfile = QString(INSTPREFIX) + SCRIPTSSUFFIX + deliveredScriptNames[id]; song->executeScript(song->getScriptPath(id, true).toLatin1().constData(), song->getSelectedMidiParts(), 0, false); // TODO: get quant from arranger } + //--------------------------------------------------------- // execUserScript //--------------------------------------------------------- @@ -5088,3 +5094,12 @@ void MusE::execUserScript(int id) { song->executeScript(song->getScriptPath(id, false).toLatin1().constData(), song->getSelectedMidiParts(), 0, false); // TODO: get quant from arranger } + +//--------------------------------------------------------- +// findUnusedWaveFiles +//--------------------------------------------------------- +void MusE::findUnusedWaveFiles() +{ + UnusedWaveFiles unused(muse); + unused.exec(); +} |