[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra/calligra/2.9] krita/ui: Remove resetting the shortcut for the toggledockers action
From:       Boudewijn Rempt <boud () valdyas ! org>
Date:       2014-12-28 12:15:08
Message-ID: E1Y5CkW-000626-S7 () scm ! kde ! org
[Download RAW message or body]

Git commit 6746c26a76c11824579f4490164dfa25e9405310 by Boudewijn Rempt.
Committed on 24/12/2014 at 12:53.
Pushed by rempt into branch 'calligra/2.9'.

Remove resetting the shortcut for the toggledockers action

Resetting the the shortcut is no longer necessary since we don't set
the shortcut in KisMainWindow anyway.

M  +0    -5    krita/ui/KisViewManager.cpp

http://commits.kde.org/calligra/6746c26a76c11824579f4490164dfa25e9405310

diff --git a/krita/ui/KisViewManager.cpp b/krita/ui/KisViewManager.cpp
index b859cca..9aaeec0 100644
--- a/krita/ui/KisViewManager.cpp
+++ b/krita/ui/KisViewManager.cpp
@@ -316,11 +316,6 @@ KisViewManager::KisViewManager(QWidget * parent, \
                KActionCollection *_actionColle
         actionCollection()->addAction(KStandardAction::KeyBindings, "keybindings", \
mainWindow()->guiFactory(), SLOT(configureShortcuts()));  
         connect(mainWindow(), SIGNAL(documentSaved()), this, \
                SLOT(slotDocumentSaved()));
-        KAction *action = \
dynamic_cast<KAction*>(mainWindow()->actionCollection()->action("view_toggledockers"));
                
-        if (action) {
-            action->setShortcut(QKeySequence(), KAction::DefaultShortcut);
-            action->setShortcut(QKeySequence(), KAction::ActiveShortcut);
-        }
 
         KoCanvasController *dummy = new KoDummyCanvasController(actionCollection());
         KoToolManager::instance()->registerTools(actionCollection(), dummy);


[prev in list] [next in list] [prev in thread] [next in thread]