summaryrefslogtreecommitdiff
path: root/muse2/muse/master
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2011-08-29 16:28:08 +0000
committerFlorian Jung <flo@windfisch.org>2011-08-29 16:28:08 +0000
commit6ea4a4959526136957b7e0d8ae1ebb29e48993ce (patch)
treefecb6a7b1a9a0372cfcf9a2c04a0f4636c9cb72c /muse2/muse/master
parentcb4ae0b104084e9c054d2a1b28ce531d104e9d76 (diff)
fixed robert's fixes
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, 0 insertions, 3 deletions
diff --git a/muse2/muse/master/lmaster.cpp b/muse2/muse/master/lmaster.cpp
index ab392497..5370a493 100644
--- a/muse2/muse/master/lmaster.cpp
+++ b/muse2/muse/master/lmaster.cpp
@@ -158,7 +158,6 @@ 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 9f5c45e5..1eb2d071 100644
--- a/muse2/muse/master/masteredit.cpp
+++ b/muse2/muse/master/masteredit.cpp
@@ -20,7 +20,6 @@
#include "xml.h"
#include "lcombo.h"
#include "doublelabel.h"
-#include "shortcuts.h"
///#include "sigedit.h"
#include "globals.h"
@@ -93,7 +92,6 @@ 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"));