]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Don't assign twice the same key to the action New Tab
authorJaime Torres Amate <jtamate@gmail.com>
Mon, 10 Sep 2018 14:45:45 +0000 (16:45 +0200)
committerJaime Torres Amate <jtamate@gmail.com>
Mon, 10 Sep 2018 14:47:31 +0000 (16:47 +0200)
Summary:
QKeySequence::AddTab = Qt::CTRL + Qt::Key_T.
Leaving only the first avoids the warning window "There are two actions (New Tab, New Tab) that want to use the same shortcut (Ctrl+T)"

BUG: 398324

Test Plan:
su - test
unset KDE_FULL_SESSION
dolphin
After: No more the warning window.

Reviewers: #dolphin, elvisangelaccio

Reviewed By: #dolphin, elvisangelaccio

Subscribers: elvisangelaccio, kfm-devel

Tags: #dolphin

Differential Revision: https://phabricator.kde.org/D15371

src/dolphinmainwindow.cpp

index f8b35d4a70f845bb32ed2c07b4872ac7d94ccf35..a862ae80359f1eaf742b1ba1ea8ded13ff55b712 100644 (file)
@@ -1079,7 +1079,7 @@ void DolphinMainWindow::setupActions()
     QAction* newTab = actionCollection()->addAction(QStringLiteral("new_tab"));
     newTab->setIcon(QIcon::fromTheme(QStringLiteral("tab-new")));
     newTab->setText(i18nc("@action:inmenu File", "New Tab"));
-    actionCollection()->setDefaultShortcuts(newTab, {Qt::CTRL + Qt::Key_T, QKeySequence::AddTab});
+    actionCollection()->setDefaultShortcuts(newTab, {QKeySequence::AddTab});
     connect(newTab, &QAction::triggered, this, static_cast<void(DolphinMainWindow::*)()>(&DolphinMainWindow::openNewActivatedTab));
 
     QAction* closeTab = KStandardAction::close(