Show keyboard shortcut in the tray icon menu (flameshot-org#4258)

* Show keyboard shortcut in the tray icon menu

* add the guard for macOS-specific shortcut

Author: artptr

src/widgets/trayicon.cpp

@@ -85,7 +85,7 @@ TrayIcon::TrayIcon(QObject* parent)
     connect(ConfigHandler::getInstance(),
             &ConfigHandler::fileChanged,
             this,
-            [this]() {});
+            [this]() { updateCaptureActionShortcut(); });
 }
 
 TrayIcon::~TrayIcon()
@@ -104,8 +104,11 @@ void TrayIcon::initMenu()
 {
     m_menu = new QMenu();
 
-    auto* captureAction = new QAction(tr("&Take Screenshot"), this);
-    connect(captureAction, &QAction::triggered, this, [this]() {
+    m_captureAction = new QAction(tr("&Take Screenshot"), this);
+
+    updateCaptureActionShortcut();
+
+    connect(m_captureAction, &QAction::triggered, this, [this]() {
 #if defined(Q_OS_MACOS)
         auto currentMacOsVersion = QOperatingSystemVersion::current();
         if (currentMacOsVersion >= QOperatingSystemVersion::MacOSBigSur) {
@@ -170,7 +173,7 @@ void TrayIcon::initMenu()
             Flameshot::instance(),
             &Flameshot::openSavePath);
 
-    m_menu->addAction(captureAction);
+    m_menu->addAction(m_captureAction);
     m_menu->addAction(launcherAction);
     m_menu->addSeparator();
 #ifdef ENABLE_IMGUR
@@ -188,6 +191,18 @@ void TrayIcon::initMenu()
     m_menu->addAction(quitAction);
 }
 
+void TrayIcon::updateCaptureActionShortcut()
+{
+#if defined(Q_OS_MACOS)
+    if (!m_captureAction) {
+        return;
+    }
+
+    QString shortcut = ConfigHandler().shortcut("TAKE_SCREENSHOT");
+    m_captureAction->setShortcut(QKeySequence(shortcut));
+#endif
+}
+
 #if !defined(DISABLE_UPDATE_CHECKER)
 void TrayIcon::enableCheckUpdatesAction(bool enable)
 {

src/widgets/trayicon.h

@@ -18,13 +18,15 @@ class TrayIcon : public QSystemTrayIcon
 private:
     void initTrayIcon();
     void initMenu();
+    void updateCaptureActionShortcut();
 #if !defined(DISABLE_UPDATE_CHECKER)
     void enableCheckUpdatesAction(bool enable);
 #endif
 
     void startGuiCapture();
 
     QMenu* m_menu;
+    QAction* m_captureAction;
 #if !defined(DISABLE_UPDATE_CHECKER)
     QAction* m_appUpdates;
 #endif