diff options
| author | Frédéric Brière <fbriere@fbriere.net> | 2019-06-30 17:00:34 -0400 |
|---|---|---|
| committer | Frédéric Brière <fbriere@fbriere.net> | 2019-06-30 21:49:56 -0400 |
| commit | 3377008db04ac8d7e4928b7abfbe84a4c694d6b8 (patch) | |
| tree | 27ee081313b1ba5f169403c6136cd4e39f1a8f52 | |
| parent | d358a52e6124b528fb0bc09eaf4d28c8215e07e7 (diff) | |
| download | twinkle-3377008db04ac8d7e4928b7abfbe84a4c694d6b8.tar twinkle-3377008db04ac8d7e4928b7abfbe84a4c694d6b8.tar.gz twinkle-3377008db04ac8d7e4928b7abfbe84a4c694d6b8.tar.lz twinkle-3377008db04ac8d7e4928b7abfbe84a4c694d6b8.tar.xz twinkle-3377008db04ac8d7e4928b7abfbe84a4c694d6b8.zip | |
Add a "Show/Hide window" entry to the systray icon menu
It's customary for applications embedding themselves in the system tray
to offer a "Show/Hide window" menu entry on right-click, even for those
applications which offer the same functionality via a single left-click.
(Thanks to qBittorrent for the idea of using QMenu::aboutToShow to
update the label of this menu entry.)
| -rw-r--r-- | src/gui/mphoneform.cpp | 21 | ||||
| -rw-r--r-- | src/gui/mphoneform.h | 2 | ||||
| -rw-r--r-- | src/gui/mphoneform.ui | 11 |
3 files changed, 33 insertions, 1 deletions
diff --git a/src/gui/mphoneform.cpp b/src/gui/mphoneform.cpp index b829be8..a724eb0 100644 --- a/src/gui/mphoneform.cpp +++ b/src/gui/mphoneform.cpp @@ -200,6 +200,12 @@ void MphoneForm::init() connect(sysTray, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(sysTrayIconClicked(QSystemTrayIcon::ActivationReason))); + connect(menu, &QMenu::aboutToShow, this, &MphoneForm::updateTrayIconMenu); + + // Toggle window visibility + menu->addAction(toggleWindowAction); + + menu->addSeparator(); // Call menu menu->addAction(callInvite); @@ -3239,7 +3245,20 @@ void MphoneForm::whatsThis() void MphoneForm::sysTrayIconClicked(QSystemTrayIcon::ActivationReason reason) { if (reason == QSystemTrayIcon::Trigger || reason == QSystemTrayIcon::DoubleClick) - setVisible(!isVisible()); + toggleWindow(); +} + +void MphoneForm::toggleWindow() +{ + setVisible(!isVisible()); +} + +void MphoneForm::updateTrayIconMenu() +{ + if (isVisible()) + toggleWindowAction->setText(tr("Hide window")); + else + toggleWindowAction->setText(tr("Show window")); } bool MphoneForm::event(QEvent * event) diff --git a/src/gui/mphoneform.h b/src/gui/mphoneform.h index 1527e8d..508072d 100644 --- a/src/gui/mphoneform.h +++ b/src/gui/mphoneform.h @@ -172,6 +172,8 @@ public slots: void DiamondcardAdminCenter(); void whatsThis(); void sysTrayIconClicked(QSystemTrayIcon::ActivationReason); + void toggleWindow(); + void updateTrayIconMenu(); void osdMuteClicked(); diff --git a/src/gui/mphoneform.ui b/src/gui/mphoneform.ui index 196b098..8857394 100644 --- a/src/gui/mphoneform.ui +++ b/src/gui/mphoneform.ui @@ -1822,6 +1822,11 @@ <cstring>actgrActivateLine</cstring> </property> </actiongroup> + <action name="toggleWindowAction"> + <property name="text"> + <string>Toggle window visibility</string> + </property> + </action> </widget> <layoutdefault spacing="6" margin="11"/> <tabstops> @@ -2503,6 +2508,12 @@ </hint> </hints> </connection> + <connection> + <sender>toggleWindowAction</sender> + <signal>triggered()</signal> + <receiver>MphoneForm</receiver> + <slot>toggleWindow()</slot> + </connection> </connections> <slots> <slot>doMessageBuddy(QTreeWidgetItem*)</slot> |