Implement CTRL+1 to CTRL+9 hotkeys for switching tabs

Progress on #21
Chatterino · Jan 6, 2018 · b8e268f · b8e268f
1 parent 8aa459d
commit b8e268f
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 9 deletions.
diff --git a/src/widgets/notebook.cpp b/src/widgets/notebook.cpp
@@ -117,6 +117,15 @@ void Notebook::select(SplitContainer *page)
     this->performLayout();
 }
 
+void Notebook::selectIndex(unsigned index)
+{
+    if (index >= this->pages.size()) {
+        return;
+    }
+
+    this->select(this->pages.at(index));
+}
+
 int Notebook::tabCount()
 {
     return this->pages.size();

diff --git a/src/widgets/notebook.hpp b/src/widgets/notebook.hpp
@@ -29,6 +29,7 @@ class Notebook : public BaseWidget
 
     void removePage(SplitContainer *page);
     void select(SplitContainer *page);
+    void selectIndex(unsigned index);
 
     SplitContainer *getSelectedPage() const
     {

diff --git a/src/widgets/window.cpp b/src/widgets/window.cpp
@@ -3,6 +3,7 @@
 #include "singletons/channelmanager.hpp"
 #include "singletons/settingsmanager.hpp"
 #include "singletons/thememanager.hpp"
+#include "widgets/helper/shortcut.hpp"
 #include "widgets/notebook.hpp"
 #include "widgets/settingsdialog.hpp"
 #include "widgets/split.hpp"
@@ -55,14 +56,22 @@ Window::Window(const QString &windowName, singletons::ThemeManager &_themeManage
 
     this->loadGeometry();
 
-    // Initialize program-wide hotkeys
-    {
-        // CTRL+P: Open Settings Dialog
-        auto shortcut = new QShortcut(QKeySequence("CTRL+P"), this);
-        connect(shortcut, &QShortcut::activated, []() {
-            SettingsDialog::showDialog();  //
-        });
-    }
+    /// Initialize program-wide hotkeys
+    // CTRL+P: Open Settings Dialog
+    CreateShortcut(this, "CTRL+P", [] {
+        SettingsDialog::showDialog();  //
+    });
+
+    // CTRL+Number: Switch to n'th tab
+    CreateShortcut(this, "CTRL+1", [this] { this->notebook.selectIndex(0); });
+    CreateShortcut(this, "CTRL+2", [this] { this->notebook.selectIndex(1); });
+    CreateShortcut(this, "CTRL+3", [this] { this->notebook.selectIndex(2); });
+    CreateShortcut(this, "CTRL+4", [this] { this->notebook.selectIndex(3); });
+    CreateShortcut(this, "CTRL+5", [this] { this->notebook.selectIndex(4); });
+    CreateShortcut(this, "CTRL+6", [this] { this->notebook.selectIndex(5); });
+    CreateShortcut(this, "CTRL+7", [this] { this->notebook.selectIndex(6); });
+    CreateShortcut(this, "CTRL+8", [this] { this->notebook.selectIndex(7); });
+    CreateShortcut(this, "CTRL+9", [this] { this->notebook.selectIndex(8); });
 }
 
 void Window::repaintVisibleChatWidgets(Channel *channel)

diff --git a/src/widgets/window.hpp b/src/widgets/window.hpp
@@ -44,7 +44,8 @@ class Window : public BaseWidget
     WindowGeometry windowGeometry;
 
 public:
-    explicit Window(const QString &windowName, singletons::ThemeManager &_themeManager, bool isMainWindow);
+    explicit Window(const QString &windowName, singletons::ThemeManager &_themeManager,
+                    bool isMainWindow);
 
     void repaintVisibleChatWidgets(Channel *channel = nullptr);