summaryrefslogtreecommitdiff
path: root/muse2/muse/master
diff options
context:
space:
mode:
authorRobert Jonsson <spamatica@gmail.com>2011-08-27 20:17:59 +0000
committerRobert Jonsson <spamatica@gmail.com>2011-08-27 20:17:59 +0000
commitcb4ae0b104084e9c054d2a1b28ce531d104e9d76 (patch)
tree28fd952bf2e1ab34826b8162e4980833c546e747 /muse2/muse/master
parent543dbb22e201208aee602a1c56ab92d8b9adb53f (diff)
full screen + part edit focus
Diffstat (limited to 'muse2/muse/master')
-rw-r--r--muse2/muse/master/lmaster.cpp1
-rw-r--r--muse2/muse/master/masteredit.cpp2
2 files changed, 3 insertions, 0 deletions
diff --git a/muse2/muse/master/lmaster.cpp b/muse2/muse/master/lmaster.cpp
index 5370a493..ab392497 100644
--- a/muse2/muse/master/lmaster.cpp
+++ b/muse2/muse/master/lmaster.cpp
@@ -158,6 +158,7 @@ LMaster::LMaster()
settingsMenu->addAction(subwinAction);
settingsMenu->addAction(shareAction);
settingsMenu->addAction(fullscreenAction);
+ fullscreenAction->setShortcut(shortcuts[SHRT_FULLSCREEN].key);
connect(tempoAction, SIGNAL(triggered()), signalMapper, SLOT(map()));
diff --git a/muse2/muse/master/masteredit.cpp b/muse2/muse/master/masteredit.cpp
index 1eb2d071..9f5c45e5 100644
--- a/muse2/muse/master/masteredit.cpp
+++ b/muse2/muse/master/masteredit.cpp
@@ -20,6 +20,7 @@
#include "xml.h"
#include "lcombo.h"
#include "doublelabel.h"
+#include "shortcuts.h"
///#include "sigedit.h"
#include "globals.h"
@@ -92,6 +93,7 @@ MasterEdit::MasterEdit()
settingsMenu->addAction(subwinAction);
settingsMenu->addAction(shareAction);
settingsMenu->addAction(fullscreenAction);
+ fullscreenAction->setShortcut(shortcuts[SHRT_FULLSCREEN].key);
// Toolbars ---------------------------------------------------------
QToolBar* undo_tools=addToolBar(tr("Undo/Redo tools"));