diff options
author | Camila <hello@camila.codes> | 2020-06-29 20:41:51 +0300 |
---|---|---|
committer | Kevin Ottens <ervin@ipsquad.net> | 2020-07-02 20:21:10 +0300 |
commit | fdc160460b81be45ef1ad4361bc20f69187f6f99 (patch) | |
tree | 8fbe3995c6c5e0b86295ae8ccffc1c5c7e83b09a /src/gui/owncloudgui.cpp | |
parent | 6081ef636d1edd82897377a5d1b7e8f2f593b548 (diff) |
Fix #2085 new tray menu.
Update systray behavior and context menu:
- left click brings up the new QtQuick based dialogs on all latforms
- right click brings up the new QtQuick based dialog on Mac OS only
- right click brings up a context menu on all other platforms than Mac OS
- "Quit Nextcloud" => "Exit Nextcloud"
- Add "Open main dialog" option.
Signed-off-by: Camila <hello@camila.codes>
Diffstat (limited to 'src/gui/owncloudgui.cpp')
-rw-r--r-- | src/gui/owncloudgui.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp index 5dc280bdc..c6f3aa66e 100644 --- a/src/gui/owncloudgui.cpp +++ b/src/gui/owncloudgui.cpp @@ -85,6 +85,9 @@ ownCloudGui::ownCloudGui(Application *parent) connect(_tray.data(), &Systray::openHelp, this, &ownCloudGui::slotHelp); + connect(_tray.data(), &Systray::openMainDialog, + this, &ownCloudGui::slotOpenMainDialog); + connect(_tray.data(), &Systray::openSettings, this, &ownCloudGui::slotShowSettings); @@ -164,7 +167,7 @@ void ownCloudGui::slotOpenMainDialog() void ownCloudGui::slotTrayClicked(QSystemTrayIcon::ActivationReason reason) { - if (reason == QSystemTrayIcon::Trigger || reason == QSystemTrayIcon::Context) { + if (reason == QSystemTrayIcon::Trigger) { if (OwncloudSetupWizard::bringWizardToFrontIfVisible()) { // brought wizard to front } else if (_shareDialogs.size() > 0) { |