Merge pull request #40 from namecheap/feature/RND-600-flameshot-custo…

…m-hotkeys-for-tools

Add configurable shortcuts for drawing tools

flameshot.pro

@@ -85,7 +85,10 @@ DEFINES += QAPPLICATION_CLASS=QApplication
 
 SOURCES += src/main.cpp \
     src/config/filepathconfiguration.cpp \
+    src/config/setshortcutwidget.cpp \
+    src/config/shortcutswidget.cpp \
     src/tools/imgs3/imgs3settings.cpp \
+    src/utils/configshortcuts.cpp \
     src/widgets/historywidget.cpp \
     src/utils/configenterprise.cpp \
     src/utils/history.cpp \
@@ -165,7 +168,10 @@ SOURCES += src/main.cpp \
 
 HEADERS  += src/widgets/capture/buttonhandler.h \
     src/config/filepathconfiguration.h \
+    src/config/setshortcutwidget.h \
+    src/config/shortcutswidget.h \
     src/tools/imgs3/imgs3settings.h \
+    src/utils/configshortcuts.h \
     src/widgets/historywidget.h \
     src/utils/configenterprise.h \
     src/utils/history.h \

graphics.qrc

@@ -65,5 +65,10 @@
         <file>img/material/white/circle-outline.svg</file>
         <file>img/material/white/blur.svg</file>
         <file>img/material/white/arrow-bottom-left.svg</file>
+        <file>img/app/keyboard.svg</file>
+        <file>img/material/black/shortcut.svg</file>
+        <file>img/material/white/shortcut.svg</file>
+        <file>img/material/black/filepath.svg</file>
+        <file>img/material/white/filepath.svg</file>
     </qresource>
 </RCC>

src/config/configwindow.cpp

@@ -23,6 +23,7 @@
 #include "src/config/geneneralconf.h"
 #include "src/config/filenameeditor.h"
 #include "src/config/filepathconfiguration.h"
+#include "src/config/shortcutswidget.h"
 #include "src/config/strftimechooserwidget.h"
 #include "src/config/visualseditor.h"
 #include "src/utils/globalvalues.h"
@@ -67,16 +68,21 @@ ConfigWindow::ConfigWindow(QWidget *parent) : QTabWidget(parent) {
     addTab(m_filenameEditor, QIcon(modifier + "name_edition.svg"),
            tr("Filename Editor"));
 
-    // filepath
-    m_filePathConfiguration = new FilePathConfiguration();
-    addTab(m_filePathConfiguration, QIcon(modifier + "name_edition.svg"),
-           tr("Path Default"));
-
     // general
     m_generalConfig = new GeneneralConf();
     addTab(m_generalConfig, QIcon(modifier + "config.svg"),
            tr("General"));
 
+    // shortcuts
+    m_shortcuts = new ShortcutsWidget();
+    addTab(m_shortcuts, QIcon(modifier + "shortcut.svg"),
+           tr("Shortcuts"));
+
+    // filepath
+    m_filePathConfiguration = new FilePathConfiguration();
+    addTab(m_filePathConfiguration, QIcon(modifier + "filepath.svg"),
+           tr("Path Default"));
+
     // connect update sigslots
     connect(this, &ConfigWindow::updateChildren,
             m_filenameEditor, &FileNameEditor::updateComponents);

src/config/configwindow.h

@@ -21,6 +21,7 @@
 
 class FileNameEditor;
 class FilePathConfiguration;
+class ShortcutsWidget;
 class GeneneralConf;
 class QFileSystemWatcher;
 class VisualsEditor;
@@ -39,6 +40,7 @@ class ConfigWindow : public QTabWidget {
 private:
     FileNameEditor *m_filenameEditor;
     FilePathConfiguration *m_filePathConfiguration;
+    ShortcutsWidget *m_shortcuts;
     GeneneralConf *m_generalConfig;
     VisualsEditor *m_visuals;
     QFileSystemWatcher *m_configWatcher;

src/config/setshortcutwidget.cpp

@@ -0,0 +1,59 @@
+#include "setshortcutwidget.h"
+#include <QKeyEvent>
+#include <QLayout>
+#include <QLabel>
+#include <QIcon>
+#include <QPixmap>
+
+SetShortcutDialog::SetShortcutDialog(QDialog *parent) : QDialog(parent)
+{
+    setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+    setWindowIcon(QIcon(":img/app/flameshot.svg"));
+    setWindowTitle(tr("Set Shortcut"));
+    m_ks = QKeySequence();
+
+    m_layout = new QVBoxLayout(this);
+    m_layout->setAlignment(Qt::AlignHCenter);
+
+    QLabel *infoTop = new QLabel(tr("Enter new shortcut to change "));
+    infoTop->setMargin(10);
+    infoTop->setAlignment(Qt::AlignCenter);
+    m_layout->addWidget(infoTop);
+
+    QLabel *infoIcon = new QLabel();
+    infoIcon->setAlignment(Qt::AlignCenter);
+    infoIcon->setPixmap(QPixmap(":/img/app/keyboard.svg"));
+    m_layout->addWidget(infoIcon);
+
+    m_layout->addWidget(infoIcon);
+
+    QLabel *infoBottom = new QLabel(tr("Press Esc to cancel or Backspace to disable the keyboard shortcut."));
+    infoBottom->setMargin(10);
+    infoBottom->setAlignment(Qt::AlignCenter);
+    m_layout->addWidget(infoBottom);
+}
+
+const QKeySequence& SetShortcutDialog::shortcut() {
+    return m_ks;
+}
+
+void SetShortcutDialog::keyPressEvent(QKeyEvent *ke) {
+    if (ke->modifiers() & Qt::ShiftModifier)
+        m_modifier += "Shift+";
+    if (ke->modifiers() & Qt::ControlModifier)
+        m_modifier += "Ctrl+";
+    if (ke->modifiers() & Qt::AltModifier)
+        m_modifier += "Alt+";
+    if (ke->modifiers() & Qt::MetaModifier)
+        m_modifier += "Meta+";
+
+    QString key = QKeySequence(ke->key()).toString();
+    m_ks = QKeySequence(m_modifier + key);
+}
+
+void SetShortcutDialog::keyReleaseEvent(QKeyEvent *event) {
+    if (m_ks == QKeySequence(Qt::Key_Escape)) {
+        reject();
+    }
+    accept();
+}

src/config/setshortcutwidget.h

@@ -0,0 +1,30 @@
+#ifndef SETSHORTCUTWIDGET_H
+#define SETSHORTCUTWIDGET_H
+
+#include <QObject>
+#include <QDialog>
+#include <QKeySequence>
+
+class QVBoxLayout;
+
+
+class SetShortcutDialog : public QDialog
+{
+    Q_OBJECT
+public:
+    explicit SetShortcutDialog(QDialog *parent = nullptr);
+    const QKeySequence& shortcut();
+
+public:
+    void keyPressEvent(QKeyEvent *);
+    void keyReleaseEvent(QKeyEvent *event);
+
+signals:
+
+private:
+    QVBoxLayout *m_layout;
+    QString m_modifier;
+    QKeySequence m_ks;
+};
+
+#endif // SETSHORTCUTWIDGET_H