[X2Go-Commits] [x2goclient] 03/04: configdialog.cpp: use new helper function show_RichText_WarningMsgBox to show proper errors.
git-admin at x2go.org
git-admin at x2go.org
Thu Mar 12 06:01:25 CET 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit bd06b934d935cbefd0de1aa5cbb323e7f64633d5
Author: Mihai Moldovan <ionic at ionic.de>
Date: Thu Mar 12 05:59:02 2015 +0100
configdialog.cpp: use new helper function show_RichText_WarningMsgBox to show proper errors.
- Format as HTML.
- Use hyperlinks.
- Rephrase XQuartz warning messages.
---
debian/changelog | 3 ++
src/configdialog.cpp | 77 +++++++++++++++++++++++++-------------------------
2 files changed, 42 insertions(+), 38 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b1226e0..3ef34b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -212,6 +212,9 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low
when no XQuartz server is installed. Fixes: #792.
- x2goutils.{h,cpp}: use QString references.
- x2goutils.{h,cpp}: add new helper function show_RichText_WarningMsgBox.
+ - configdialog.cpp: use new helper function show_RichText_WarningMsgBox to
+ show proper errors. Format as HTML. Use hyperlinks. Rephrase XQuartz
+ warning messages.
-- X2Go Release Manager <git-admin at x2go.org> Thu, 19 Feb 2015 13:25:28 +0100
diff --git a/src/configdialog.cpp b/src/configdialog.cpp
index b23b6d4..de348a9 100644
--- a/src/configdialog.cpp
+++ b/src/configdialog.cpp
@@ -37,6 +37,7 @@
#include "connectionwidget.h"
#include "settingswidget.h"
#include "mediawidget.h"
+#include "x2goutils.h"
#if defined ( Q_OS_WIN) && defined (CFGCLIENT )
@@ -506,24 +507,24 @@ void ConfigDialog::slot_findXDarwin ()
QString version;
QString path = findXDarwin (version);
if (path.isEmpty ()) {
- QMessageBox::warning (this, tr ("Warning"),
- tr ("x2goclient could not find any suitable X11 Server.\n\n"
-
- "MacPorts users, please install either the port <b>xorg-server</b>\n"
- "or the port <b>xorg-server-devel</b>.\n"
- "Upon successful installation, please follow the instructions printed\n"
- "by the port utility to autostart/load the server.\n\n"
-
- "All other users, please obtain and install XQuartz from\n\n"
-
- "\t<a href=\"https://xquartz.macosforge.org/\">"
- "https://xquartz.macosforge.org/"
- "</a>\n\n"
-
- "Afterwards, restart x2goclient and\n"
- "select the correct path to the X11 application.\n"
- "This will most likely be <b>/Applications/MacPorts/X11.app</b> or\n"
- "<b>/Applications/Utilities/XQuartz.app</b>."));
+ show_RichText_WarningMsgBox (tr ("x2goclient could not find any suitable X11 Server."),
+ tr ("MacPorts users, please install either the port <b>xorg-server</b>\n"
+ "or the port <b>xorg-server-devel</b>.\n"
+ "Upon successful installation, please follow the instructions printed\n"
+ "by the port utility to autostart/load the server.\n\n"
+
+ "All other users, please obtain and install XQuartz from:\n"
+
+ "<center><a href=\"https://xquartz.macosforge.org/\">"
+ "https://xquartz.macosforge.org/"
+ "</a></center>\n\n"
+
+ "Afterwards, restart x2goclient and\n"
+ "select the correct path to the X11 application.\n"
+ "This will most likely be\n"
+ "<center><b>/Applications/MacPorts/X11.app</b></center>\n"
+ "or\n"
+ "<center><b>/Applications/Utilities/XQuartz.app</b></center>"));
}
else {
QString minVer = "2.1.0";
@@ -538,26 +539,26 @@ void ConfigDialog::slot_findXDarwin ()
void ConfigDialog::printXDarwinVersionWarning (QString version)
{
- QMessageBox::warning (this, tr ("Warning"),
- tr ("Your are using XQuartz (X-Window Server for OS X) version ")
- + version +
- tr (".\n"
- "This version causes problems with X application in 24bit "
- "color mode.\n"
- "You should update your X11 environment.\n\n"
-
- "MacPorts users please follow the steps outlined on\n\n"
-
- "\t<a href=\"https://guide.macports.org/chunked/using.common-tasks.html\">"
- "https://guide.macports.org/chunked/using.common-tasks.html"
- "</a>\n\n"
-
- "Users who have installed XQuartz via the installer package\n"
- "can find updated versions on\n\n"
-
- "\t<a href=\"https://xquartz.macosforge.org/\">"
- "https://xquartz.macosforge.org/"
- "</a>"));
+ show_RichText_WarningMsgBox (tr ("Your XQuartz version is too old."),
+ tr ("Your are using XQuartz (X Window System Server for OS X) version ")
+ + version +
+ tr (".\n\n"
+ "This version causes problems with X applications in 24bit "
+ "color mode.\n"
+ "You should update your X11 environment.\n\n"
+
+ "MacPorts users please follow the steps outlined on:\n"
+
+ "<center><a href=\"https://guide.macports.org/chunked/using.common-tasks.html\">"
+ "https://guide.macports.org/chunked/using.common-tasks.html"
+ "</a></center>\n\n"
+
+ "Users who have installed XQuartz via the installer package\n"
+ "can find updated versions on:\n"
+
+ "<center><a href=\"https://xquartz.macosforge.org/\">"
+ "https://xquartz.macosforge.org/"
+ "</a></center>"));
}
--
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