[X2Go-Commits] [x2goclient] 01/02: configdialog.cpp: update XQuartz outdated version info message and links. Add MacPorts reference.

[git-admin at x2go.org]

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

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

commit cdf4cbeb210148dd7d558dc832568eca9eaa5bbd
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Mar 12 03:05:07 2015 +0100

    configdialog.cpp: update XQuartz outdated version info message and links. Add MacPorts reference.
---
 debian/changelog     |    2 ++
 src/configdialog.cpp |   29 +++++++++++++++++++++--------
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9e558ec..778c7a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -205,6 +205,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low
       sshd error.
     - onmainwindow.cpp: fix session icon not being displayed as tray icon
       (missed legacy resource URI wrapper call.)
+    - configdialog.cpp: update XQuartz outdated version info message and
+      links. Add MacPorts reference.
 
  -- 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 1491f18..ca6277d 100644
--- a/src/configdialog.cpp
+++ b/src/configdialog.cpp
@@ -526,15 +526,28 @@ void ConfigDialog::slot_findXDarwin()
 
 }
 
-void ConfigDialog::printXDarwinVersionWarning ( QString version )
+void ConfigDialog::printXDarwinVersionWarning (QString version)
 {
-    QMessageBox::warning (
-        this,tr ( "Warning" ),
-        tr ( "Your are using X11 (Apple X-Window Server) version " )
-        +version+
-        tr ( ". This version causes problems with X-application in 24bit "
-             "color mode. You should update your X11 environment "
-             "(http://trac.macosforge.org/projects/xquartz)." ) );
+    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>"));
 }
 
 

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