This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 7933badc3ac689c09c0763d57a5cf506ffd46bc4 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Dec 9 04:15:20 2019 +0100 src/onmainwindow.cpp: disable "left click" action on OS X/macOS. This platform always gets a left click event, even when right clicked. May sound weird first, but this behavior is consistent between all applications - tray icons can be clicked via either button and will always trigger a context menu. Let X2Go Client behave the same way. --- debian/changelog | 5 +++++ src/onmainwindow.cpp | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index c73a939..504d6ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -130,6 +130,11 @@ x2goclient (4.1.2.2-0x2go1) UNRELEASED; urgency=medium time. Fixes: #1418. - macbuild.sh: switch to bundling PulseAudio 13.0 since it's now available in MacPorts. + - src/onmainwindow.cpp: disable "left click" action on OS X/macOS. This + platform always gets a left click event, even when right clicked. May + sound weird first, but this behavior is consistent between all + applications - tray icons can be clicked via either button and will + always trigger a context menu. Let X2Go Client behave the same way. * debian/control: + Add build-depend on pkg-config. * x2goclient.spec: diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index b226c62..3263221 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -1164,13 +1164,19 @@ void ONMainWindow::trayIconInit() // setup the tray icon itself trayIcon = new QSystemTrayIcon(this); +#ifndef Q_OS_DARWIN connect(trayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(trayIconActivated(QSystemTrayIcon::ActivationReason))); +#endif connect(trayIcon, SIGNAL(messageClicked()), this, SLOT(trayMessageClicked())); trayIcon->setContextMenu(trayIconMenu); trayIcon->setIcon(QIcon ( ":/img/icons/128x128/x2go.png") ); +#ifdef Q_OS_DARWIN + trayIcon->setToolTip(tr("A click displays the context menu.")); +#else trayIcon->setToolTip(tr("A left click hides or restores the window. A right click displays the context menu.")); +#endif } if (!startHidden | forceToShowTrayicon) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git