Commit 32af61fb authored by Kurt Hindenburg's avatar Kurt Hindenburg
Browse files

Leave the bookmark shortcut set to what user changed it to

Only reset the bookmark shortcut to Ctrl+Shift+B if the user didn't
change it to something else.

BUG: 303747
FIXED-IN: 4.10
parent 69b53c00
...@@ -165,10 +165,14 @@ void MainWindow::correctStandardShortcuts() ...@@ -165,10 +165,14 @@ void MainWindow::correctStandardShortcuts()
Q_ASSERT(helpAction); Q_ASSERT(helpAction);
helpAction->setShortcut(QKeySequence()); helpAction->setShortcut(QKeySequence());
// replace Ctrl+B shortcut for bookmarks // replace Ctrl+B shortcut for bookmarks only if user hasn't already
// changed the shortcut; however, if the user changed it to Ctrl+B
// this will still get changed to Ctrl+Shift+B
QAction* bookmarkAction = actionCollection()->action("add_bookmark"); QAction* bookmarkAction = actionCollection()->action("add_bookmark");
Q_ASSERT(bookmarkAction); Q_ASSERT(bookmarkAction);
bookmarkAction->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_B)); if (bookmarkAction->shortcut() == QKeySequence(Qt::CTRL + Qt::Key_B)) {
bookmarkAction->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_B));
}
} }
ViewManager* MainWindow::viewManager() const ViewManager* MainWindow::viewManager() const
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment