added "As subwindow" menu entries and made them work

2 files changed, 9 insertions, 0 deletions

diff --git a/muse2/muse/master/lmaster.cpp b/muse2/muse/master/lmaster.cpp
index 9d61311e..79762673 100644
--- a/muse2/muse/master/lmaster.cpp
+++ b/muse2/muse/master/lmaster.cpp
@@ -140,6 +140,10 @@ LMaster::LMaster()
       delAction = menuEdit->addAction(tr("Delete Event"));
       delAction->setShortcut(Qt::Key_Delete);
 
+      QMenu* settingsMenu = menuBar()->addMenu(tr("&Settings"));
+      settingsMenu->addAction(subwinAction);
+
+      
       connect(tempoAction, SIGNAL(triggered()), signalMapper, SLOT(map()));
       connect(signAction, SIGNAL(triggered()), signalMapper, SLOT(map()));
       connect(keyAction, SIGNAL(triggered()), signalMapper, SLOT(map()));
diff --git a/muse2/muse/master/masteredit.cpp b/muse2/muse/master/masteredit.cpp
index 8d41e37a..edc1a702 100644
--- a/muse2/muse/master/masteredit.cpp
+++ b/muse2/muse/master/masteredit.cpp
@@ -31,6 +31,8 @@
 #include <QLabel>
 #include <QToolBar>
 #include <QToolButton>
+#include <QMenuBar>
+#include <QMenu>
 
 int MasterEdit::_rasterInit = 0;
 int MasterEdit::_widthInit = 600;
@@ -91,6 +93,9 @@ MasterEdit::MasterEdit()
 //      QPopupMenu* file = new QPopupMenu(this);
 //      menuBar()->insertItem("&File", file);
 
+      QMenu* settingsMenu = menuBar()->addMenu(tr("&Settings"));
+      settingsMenu->addAction(subwinAction);
+
       //---------ToolBar----------------------------------
       
       tools = addToolBar(tr("Master tools"));