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

List:       kde-commits
Subject:    [calligra] libs/main: [shortcuts] Undo, Redo, Fullscreen standard shortkeys
From:       Anthony Fieroni <bvbfan () abv ! bg>
Date:       2016-11-23 5:36:21
Message-ID: E1c9QEH-0005ED-MG () code ! kde ! org
[Download RAW message or body]

Git commit 4fb2711afc1125efdcc009d9e20ca05a4405b735 by Anthony Fieroni.
Committed on 23/11/2016 at 05:35.
Pushed by anthonyfieroni into branch 'master'.

[shortcuts] Undo, Redo, Fullscreen standard shortkeys

REVIEW: 129532

Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>

M  +1    -1    libs/main/KoMainWindow.cpp
M  +4    -2    libs/main/KoView.cpp

http://commits.kde.org/calligra/4fb2711afc1125efdcc009d9e20ca05a4405b735

diff --git a/libs/main/KoMainWindow.cpp b/libs/main/KoMainWindow.cpp
index 828d789..64b7e3f 100644
--- a/libs/main/KoMainWindow.cpp
+++ b/libs/main/KoMainWindow.cpp
@@ -344,7 +344,7 @@ KoMainWindow::KoMainWindow(const QByteArray &nativeMimeType, \
const KoComponentDa  
     KToggleAction *fullscreenAction  = new KToggleAction(koIcon("view-fullscreen"), \
i18n("Full Screen Mode"), this);  actionCollection()->addAction("view_fullscreen", \
                fullscreenAction);
-    fullscreenAction->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_F));
+    actionCollection()->setDefaultShortcut(fullscreenAction, \
                QKeySequence::FullScreen);
     connect(fullscreenAction, SIGNAL(toggled(bool)), this, \
SLOT(viewFullscreen(bool)));  
     d->toggleDockers = new KToggleAction(i18n("Show Dockers"), this);
diff --git a/libs/main/KoView.cpp b/libs/main/KoView.cpp
index f3b6fd9..f72766d 100644
--- a/libs/main/KoView.cpp
+++ b/libs/main/KoView.cpp
@@ -335,9 +335,11 @@ QPrintDialog *KoView::createPrintDialog(KoPrintJob *printJob, \
QWidget *parent)  
 void KoView::setupGlobalActions()
 {
-    actionCollection()->addAction("edit_undo", new \
                KoUndoStackAction(d->document->undoStack(), \
                KoUndoStackAction::UNDO));
-    actionCollection()->addAction("edit_redo", new \
KoUndoStackAction(d->document->undoStack(), KoUndoStackAction::RED0)); +    QAction \
*undo = actionCollection()->addAction("edit_undo", new \
KoUndoStackAction(d->document->undoStack(), KoUndoStackAction::UNDO)); +    QAction \
*redo = actionCollection()->addAction("edit_redo", new \
KoUndoStackAction(d->document->undoStack(), KoUndoStackAction::RED0));  
+    actionCollection()->setDefaultShortcut(undo, QKeySequence::Undo);
+    actionCollection()->setDefaultShortcut(redo, QKeySequence::Redo);
     d->actionAuthor  = new KSelectAction(koIcon("user-identity"), i18n("Active \
                Author Profile"), this);
     connect(d->actionAuthor, SIGNAL(triggered(QString)), this, \
                SLOT(changeAuthorProfile(QString)));
     actionCollection()->addAction("settings_active_author", d->actionAuthor);


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