[Pkg-owncloud-commits] [owncloud-client] 15/38: OS X: Finally(?) fix stay-on-top behaviour of settings dialog
Sandro Knauß
hefee-guest at moszumanska.debian.org
Fri Sep 5 20:20:55 UTC 2014
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch sid
in repository owncloud-client.
commit 69dffc8882df64d453f6b52a11052d832d92ae9f
Author: Markus Goetz <markus at woboq.com>
Date: Tue Aug 12 14:47:43 2014 +0200
OS X: Finally(?) fix stay-on-top behaviour of settings dialog
Fixes #1795
Conflicts:
.gitmodules
src/mirall/owncloudgui.cpp
---
.gitmodules | 2 +-
src/3rdparty/qtmacgoodies | 2 +-
src/CMakeLists.txt | 1 +
src/mirall/owncloudgui.cpp | 8 ++++++++
src/mirall/utility.cpp | 5 +++++
5 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index ebcd8db..01bfac6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,4 +3,4 @@
url = https://github.com/owncloud/documentation
[submodule "src/3rdparty/qtmacgoodies"]
path = src/3rdparty/qtmacgoodies
- url = git://github.com/shadone/qtmacgoodies.git
+ url = git://github.com/guruz/qtmacgoodies.git
diff --git a/src/3rdparty/qtmacgoodies b/src/3rdparty/qtmacgoodies
index cf09d34..fa06775 160000
--- a/src/3rdparty/qtmacgoodies
+++ b/src/3rdparty/qtmacgoodies
@@ -1 +1 @@
-Subproject commit cf09d34dc7199538727e3d32a9b937ee73890027
+Subproject commit fa067757146e768f31103160eb97991cd0186cf6
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 669854f..fbfd037 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -45,6 +45,7 @@ if (APPLE)
list(APPEND 3rdparty_SRC
3rdparty/qtmacgoodies/src/macpreferenceswindow.mm
3rdparty/qtmacgoodies/src/macstandardicon.mm
+ 3rdparty/qtmacgoodies/src/macwindow.mm
)
endif()
diff --git a/src/mirall/owncloudgui.cpp b/src/mirall/owncloudgui.cpp
index cadb5a8..816ca62 100644
--- a/src/mirall/owncloudgui.cpp
+++ b/src/mirall/owncloudgui.cpp
@@ -111,6 +111,14 @@ void ownCloudGui::slotTrayClicked( QSystemTrayIcon::ActivationReason reason )
if( reason == QSystemTrayIcon::Trigger ) {
slotOpenSettingsDialog(true); // start settings if config is existing.
}
+#else
+ // On Mac, if the settings dialog is already visible but hidden
+ // by other applications, this will bring it to the front.
+ if( reason == QSystemTrayIcon::Trigger ) {
+ if (!_settingsDialog.isNull() && _settingsDialog->isVisible()) {
+ slotShowSettings();
+ }
+ }
#endif
}
diff --git a/src/mirall/utility.cpp b/src/mirall/utility.cpp
index 696d148..6638f78 100644
--- a/src/mirall/utility.cpp
+++ b/src/mirall/utility.cpp
@@ -50,6 +50,7 @@
#include "mirall/utility_win.cpp"
#elif defined(Q_OS_MAC)
#include "mirall/utility_mac.cpp"
+#include "macwindow.h" // qtmacgoodies
#else
#include "mirall/utility_unix.cpp"
#endif
@@ -173,6 +174,10 @@ void Utility::raiseDialog( QWidget *raiseWidget )
raiseWidget->raise();
raiseWidget->activateWindow();
}
+#if defined(Q_OS_MAC)
+ // viel hilft viel ;-)
+ MacWindow::bringToFront(raiseWidget);
+#endif
#endif
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list