diff options
| author | Luboš Doležel <lubos@dolezel.info> | 2020-02-23 09:45:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-23 09:45:13 +0100 |
| commit | a25b22bd43997726a911c69d1d82e08250a3a8b4 (patch) | |
| tree | 8a139c4791ea60ef7c3875d940e053650f71f639 /src/gui/mphoneform.cpp | |
| parent | 0b4252721a1767d1c891b51e68c30b2eb4a22920 (diff) | |
| parent | 3377008db04ac8d7e4928b7abfbe84a4c694d6b8 (diff) | |
| download | twinkle-a25b22bd43997726a911c69d1d82e08250a3a8b4.tar twinkle-a25b22bd43997726a911c69d1d82e08250a3a8b4.tar.gz twinkle-a25b22bd43997726a911c69d1d82e08250a3a8b4.tar.lz twinkle-a25b22bd43997726a911c69d1d82e08250a3a8b4.tar.xz twinkle-a25b22bd43997726a911c69d1d82e08250a3a8b4.zip | |
Merge pull request #149 from fbriere/issue/121-toggle-window-menu-entry
Systray icon: Always toggle visibility when clicking & Add "Show/Hide" menu entry
Diffstat (limited to 'src/gui/mphoneform.cpp')
| -rw-r--r-- | src/gui/mphoneform.cpp | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/src/gui/mphoneform.cpp b/src/gui/mphoneform.cpp index 2d4f10f..9f90b29 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,12 +3245,20 @@ void MphoneForm::whatsThis() void MphoneForm::sysTrayIconClicked(QSystemTrayIcon::ActivationReason reason) { if (reason == QSystemTrayIcon::Trigger || reason == QSystemTrayIcon::DoubleClick) - { - if (sys_config->get_gui_hide_on_close()) - setVisible(!isVisible()); - else - activateWindow(); - } + 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) |