fix(ui): make Ctrl+W the default for closing tabs

QKeySequence::Close can resolve to Ctrl+F4.
somaliz · Apr 3, 2019 · 40807fc · 40807fc
1 parent 680a1ba
commit 40807fc
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/src/libs/ui/mainwindow.cpp b/src/libs/ui/mainwindow.cpp
@@ -217,24 +217,21 @@ MainWindow::MainWindow(Core::Application *app, QWidget *parent) :
             createTab();
     });
 
-#ifdef Q_OS_WIN32
-    ui->actionCloseTab->setShortcut(QKeySequence(Qt::Key_W + Qt::CTRL));
-#else
-    ui->actionCloseTab->setShortcut(QKeySequence::Close);
-#endif
+    ui->actionCloseTab->setShortcuts({QKeySequence(Qt::ControlModifier | Qt::Key_W),
+                                      QKeySequence::Close});
     addAction(ui->actionCloseTab);
     connect(ui->actionCloseTab, &QAction::triggered, this, [this]() { closeTab(); });
 
     ui->actionNextTab->setShortcuts({QKeySequence::NextChild,
-                                     QKeySequence(Qt::ControlModifier| Qt::Key_PageDown)});
+                                     QKeySequence(Qt::ControlModifier | Qt::Key_PageDown)});
     addAction(ui->actionNextTab);
     connect(ui->actionNextTab, &QAction::triggered, this, [this]() {
         m_tabBar->setCurrentIndex((m_tabBar->currentIndex() + 1) % m_tabBar->count());
     });
 
     // TODO: Use QKeySequence::PreviousChild, when QTBUG-15746 is fixed.
     ui->actionPreviousTab->setShortcuts({QKeySequence(Qt::ControlModifier | Qt::ShiftModifier | Qt::Key_Tab),
-                                         QKeySequence(Qt::ControlModifier| Qt::Key_PageUp)});
+                                         QKeySequence(Qt::ControlModifier | Qt::Key_PageUp)});
     addAction(ui->actionPreviousTab);
     connect(ui->actionPreviousTab, &QAction::triggered, this, [this]() {
         m_tabBar->setCurrentIndex((m_tabBar->currentIndex() - 1 + m_tabBar->count()) % m_tabBar->count());