[X2Go-Commits] [x2goclient] 187/280: src/x2goutils.{cpp, h}: add application modality parameter to show_RichText_Generic_MsgBox () and its wrappers.

git-admin at x2go.org git-admin at x2go.org
Wed Jan 18 12:25:46 CET 2017


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 5f0e2cbc115bdc0ce1cf9e05c5c201abe4493377
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Jun 22 02:45:45 2016 +0200

    src/x2goutils.{cpp,h}: add application modality parameter to show_RichText_Generic_MsgBox () and its wrappers.
---
 debian/changelog  |    2 ++
 src/x2goutils.cpp |   19 +++++++++++++------
 src/x2goutils.h   |    6 +++---
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 153aacb..87aa20c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -344,6 +344,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
       a system PA binary shall be used.
     - src/pulsemanager.cpp: correctly initialize and set system_pulse_ when
       required.
+    - src/x2goutils.{cpp,h}: add application modality parameter to
+      show_RichText_Generic_MsgBox () and its wrappers.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.0.5.3):
diff --git a/src/x2goutils.cpp b/src/x2goutils.cpp
index 1861443..f58a436 100644
--- a/src/x2goutils.cpp
+++ b/src/x2goutils.cpp
@@ -99,7 +99,7 @@ QString convert_to_rich_text (const QString &text, bool force) {
   return (fixup_text);
 }
 
-void show_RichText_Generic_MsgBox (QMessageBox::Icon icon, const QString &main_text, const QString &informative_text) {
+void show_RichText_Generic_MsgBox (QMessageBox::Icon icon, const QString &main_text, const QString &informative_text, bool app_modal) {
   QString fixup_main_text (convert_to_rich_text (main_text));
   QString fixup_informative_text (convert_to_rich_text (informative_text, true));
 
@@ -107,16 +107,23 @@ void show_RichText_Generic_MsgBox (QMessageBox::Icon icon, const QString &main_t
 
   msg_box.setTextFormat (Qt::RichText);
   msg_box.setInformativeText (fixup_informative_text);
-  msg_box.setWindowModality (Qt::WindowModal);
+
+  if (app_modal) {
+    msg_box.setWindowModality (Qt::ApplicationModal);
+  }
+  else {
+    msg_box.setWindowModality (Qt::WindowModal);
+  }
+
   msg_box.exec ();
 }
 
-void show_RichText_WarningMsgBox (const QString &main_text, const QString &informative_text) {
-  show_RichText_Generic_MsgBox (QMessageBox::Warning, main_text, informative_text);
+void show_RichText_WarningMsgBox (const QString &main_text, const QString &informative_text bool app_modal) {
+  show_RichText_Generic_MsgBox (QMessageBox::Warning, main_text, informative_text, app_modal);
 }
 
-void show_RichText_ErrorMsgBox (const QString &main_text, const QString &informative_text) {
-  show_RichText_Generic_MsgBox (QMessageBox::Critical, main_text, informative_text);
+void show_RichText_ErrorMsgBox (const QString &main_text, const QString &informative_text, bool app_modal) {
+  show_RichText_Generic_MsgBox (QMessageBox::Critical, main_text, informative_text, app_modal);
 }
 
 QString git_changelog_extract_commit_sha (const QString &gitlog) {
diff --git a/src/x2goutils.h b/src/x2goutils.h
index 4159d39..dd7613c 100644
--- a/src/x2goutils.h
+++ b/src/x2goutils.h
@@ -33,9 +33,9 @@ QString wrap_legacy_resource_URIs (const QString &res_path);
 
 QString convert_to_rich_text (const QString &text, bool force = false);
 
-void show_RichText_Generic_MsgBox (QMessageBox::Icon icon, const QString &main_text, const QString &informative_text);
-void show_RichText_WarningMsgBox (const QString &main_text, const QString &informative_text = "");
-void show_RichText_ErrorMsgBox (const QString &main_text, const QString &informative_text = "");
+void show_RichText_Generic_MsgBox (QMessageBox::Icon icon, const QString &main_text, const QString &informative_text, bool app_modal = false);
+void show_RichText_WarningMsgBox (const QString &main_text, const QString &informative_text = "", bool app_modal = false);
+void show_RichText_ErrorMsgBox (const QString &main_text, const QString &informative_text = "", bool app_modal = false);
 
 QString git_changelog_extract_commit_sha (const QString &gitlog);
 

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git


More information about the x2go-commits mailing list