Grab color shortcut rebase (flameshot-org#4164)

* Add shortcut for Grab Color

* Update README.md

* Improve description

* Add shortcut to flameshot.example.ini

---------

Co-authored-by: Alex P <[email protected]>

Author: borgmanJeremy

README.md

@@ -225,6 +225,7 @@ These shortcuts are available in GUI mode:
 | <kbd>Ctrl</kbd> + <kbd>Backspace</kbd>                                    | Cancel current selection                                       | 
 | <kbd>Return</kbd>                                             | Upload the selection to Imgur                                      |
 | <kbd>Spacebar</kbd>                                                       | Toggle visibility of sidebar with options of the selected tool, color picker for the drawing color and history menu |
+| <kbd>G</kbd>                                                       | Starts the color picker |
 | Right Click                                                               | Show the color wheel                                              |
 | Mouse Wheel                                                               | Change the tool's thickness                                    |
 | <kbd>Print screen</kbd>                                          | Capture Screen |

flameshot.example.ini

@@ -153,4 +153,5 @@
 ;TYPE_SELECT_ALL=Ctrl+A
 ;TYPE_TEXT=T
 ;TYPE_TOGGLE_PANEL=Space
+;TYPE_GRAB_COLOR=G
 ;TYPE_UNDO=Ctrl+Z

src/config/shortcutswidget.cpp

@@ -167,6 +167,7 @@ void ShortcutsWidget::loadShortcuts()
 
     // additional tools that don't have their own buttons
     appendShortcut("TYPE_TOGGLE_PANEL", tr("Toggle side panel"));
+    appendShortcut("TYPE_GRAB_COLOR", tr("Grab a color from the screen"));
     appendShortcut("TYPE_RESIZE_LEFT", tr("Resize selection left 1px"));
     appendShortcut("TYPE_RESIZE_RIGHT", tr("Resize selection right 1px"));
     appendShortcut("TYPE_RESIZE_UP", tr("Resize selection up 1px"));

src/utils/confighandler.cpp

@@ -166,6 +166,7 @@ static QMap<QString, QSharedPointer<KeySequence>> recognizedShortcuts = {
     SHORTCUT("TYPE_REDO"                ,   "Ctrl+Shift+Z"          ),
     SHORTCUT("TYPE_TEXT"                ,   "T"                     ),
     SHORTCUT("TYPE_TOGGLE_PANEL"        ,   "Space"                 ),
+    SHORTCUT("TYPE_GRAB_COLOR"          ,   "G"                     ),
     SHORTCUT("TYPE_RESIZE_LEFT"         ,   "Shift+Left"            ),
     SHORTCUT("TYPE_RESIZE_RIGHT"        ,   "Shift+Right"           ),
     SHORTCUT("TYPE_RESIZE_UP"           ,   "Shift+Up"              ),

src/widgets/capture/capturewidget.cpp

@@ -417,6 +417,13 @@ void CaptureWidget::onGridSizeChanged(int size)
     repaint();
 }
 
+void CaptureWidget::startColorGrab()
+{
+    if (m_sidePanel) {
+        m_sidePanel->startColorGrab();
+    }
+}
+
 void CaptureWidget::showxywh()
 {
     m_xywhDisplay = true;
@@ -1210,6 +1217,10 @@ void CaptureWidget::initPanel()
             &SidePanelWidget::togglePanel,
             m_panel,
             &UtilityPanel::toggle);
+    connect(
+      m_sidePanel, &SidePanelWidget::showPanel, m_panel, &UtilityPanel::show);
+    connect(
+      m_sidePanel, &SidePanelWidget::hidePanel, m_panel, &UtilityPanel::hide);
     connect(m_sidePanel,
             &SidePanelWidget::displayGridChanged,
             this,
@@ -1577,6 +1588,9 @@ void CaptureWidget::initShortcuts()
     newShortcut(QKeySequence(ConfigHandler().shortcut("TYPE_TOGGLE_PANEL")),
                 this,
                 SLOT(togglePanel()));
+    newShortcut(QKeySequence(ConfigHandler().shortcut("TYPE_GRAB_COLOR")),
+                this,
+                SLOT(startColorGrab()));
 
     newShortcut(QKeySequence(ConfigHandler().shortcut("TYPE_RESIZE_LEFT")),
                 m_selection,

src/widgets/capture/capturewidget.h

@@ -92,6 +92,8 @@ private slots:
     void onDisplayGridChanged(bool display);
     void onGridSizeChanged(int size);
 
+    void startColorGrab();
+
 public:
     void removeToolObject(int index = -1);
     void showxywh();

src/widgets/panel/sidepanelwidget.cpp

@@ -171,7 +171,7 @@ void SidePanelWidget::startColorGrab()
             this,
             &SidePanelWidget::onColorGrabAborted);
 
-    emit togglePanel();
+    emit hidePanel();
     m_colorGrabber->startGrabbing();
 }
 
@@ -196,7 +196,7 @@ void SidePanelWidget::onTemporaryColorUpdated(const QColor& color)
 
 void SidePanelWidget::finalizeGrab()
 {
-    emit togglePanel();
+    emit showPanel();
 }
 
 void SidePanelWidget::updateColorNoWheel(const QColor& c)

src/widgets/panel/sidepanelwidget.h

@@ -32,15 +32,17 @@ class SidePanelWidget : public QWidget
     void colorChanged(const QColor& color);
     void toolSizeChanged(int size);
     void togglePanel();
+    void showPanel();
+    void hidePanel();
     void displayGridChanged(bool display);
     void gridSizeChanged(int size);
 
 public slots:
     void onToolSizeChanged(int tool);
     void onColorChanged(const QColor& color);
+    void startColorGrab();
 
 private slots:
-    void startColorGrab();
     void onColorGrabFinished();
     void onColorGrabAborted();
     void onTemporaryColorUpdated(const QColor& color);

src/widgets/panel/utilitypanel.cpp

@@ -82,6 +82,9 @@ void UtilityPanel::pushWidget(QWidget* widget)
 
 void UtilityPanel::show()
 {
+    if (!m_internalPanel->isHidden()) {
+        return;
+    }
     setAttribute(Qt::WA_TransparentForMouseEvents, false);
     m_showAnimation->setStartValue(QRect(-width(), 0, 0, height()));
     m_showAnimation->setEndValue(QRect(0, 0, width(), height()));
@@ -95,6 +98,9 @@ void UtilityPanel::show()
 
 void UtilityPanel::hide()
 {
+    if (m_internalPanel->isHidden()) {
+        return;
+    }
     setAttribute(Qt::WA_TransparentForMouseEvents);
     m_hideAnimation->setStartValue(QRect(0, 0, width(), height()));
     m_hideAnimation->setEndValue(QRect(-width(), 0, 0, height()));

src/widgets/panel/utilitypanel.h

@@ -25,8 +25,6 @@ class UtilityPanel : public QWidget
     void setToolWidget(QWidget* weight);
     void clearToolWidget();
     void pushWidget(QWidget* widget);
-    void hide();
-    void show();
     void fillCaptureTools(
       const QList<QPointer<CaptureTool>>& captureToolObjectsHistory);
     void setActiveLayer(int index);
@@ -40,6 +38,8 @@ class UtilityPanel : public QWidget
 
 public slots:
     void toggle();
+    void hide();
+    void show();
     void slotButtonDelete(bool clicked);
     void onCurrentRowChanged(int currentRow);