This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch bugfix/osx in repository x2goclient. from 7b18f20 onmainwindow.cpp: fix session icon not being displayed as tray icon (missed legacy resource URI wrapper call.) new cdf4cbe configdialog.cpp: update XQuartz outdated version info message and links. Add MacPorts reference. new 551078c configdialog.cpp: The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 5 ++ src/configdialog.cpp | 135 +++++++++++++++++++++++++++++--------------------- 2 files changed, 84 insertions(+), 56 deletions(-) -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/osx in repository x2goclient. commit 551078ce72b56157539830978348c06415cb30eb Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Mar 12 03:34:38 2015 +0100 configdialog.cpp: - Reformat code. - Add MacPorts and XQuartz references URL's and installation instructions - Don't show outdated version warning when no XQuartz server is installed. Fixes: #792. --- debian/changelog | 3 ++ src/configdialog.cpp | 106 +++++++++++++++++++++++++++----------------------- 2 files changed, 61 insertions(+), 48 deletions(-) diff --git a/debian/changelog b/debian/changelog index 778c7a8..ea8e563 100644 --- a/debian/changelog +++ b/debian/changelog @@ -207,6 +207,9 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low (missed legacy resource URI wrapper call.) - configdialog.cpp: update XQuartz outdated version info message and links. Add MacPorts reference. + - configdialog.cpp: reformat code, add MacPorts and XQuartz references, + URL's and installation instructions, don't show outdated version warning + when no XQuartz server is installed. Fixes: #792. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 13:25:28 +0100 diff --git a/src/configdialog.cpp b/src/configdialog.cpp index ca6277d..b23b6d4 100644 --- a/src/configdialog.cpp +++ b/src/configdialog.cpp @@ -461,69 +461,79 @@ QString ConfigDialog::retMaxXDarwinVersion ( QString v1, QString v2 ) QString ConfigDialog::findXDarwin ( QString& version, QString path ) { - if ( path=="" ) - { - QString dir1="/Applications/Utilities/XQuartz.app"; - QString ver1="0.0.0"; - if ( QFile::exists ( dir1+"/Contents/Info.plist" ) ) - { - QSettings vst ( dir1+"/Contents/Info.plist", - QSettings::NativeFormat ); - ver1=vst.value ( "CFBundleShortVersionString", - ( QVariant ) "0.0.0" ).toString(); + if (path.isEmpty ()) { + QString dir1 = "/Applications/Utilities/XQuartz.app"; + QString ver1 = "0.0.0"; + if (QFile::exists (dir1 + "/Contents/Info.plist")) { + QSettings vst (dir1 + "/Contents/Info.plist", + QSettings::NativeFormat); + ver1 = vst.value ("CFBundleShortVersionString", + (QVariant) "0.0.0").toString (); } - QString dir2="/usr/X11/X11.app"; - QString ver2="0.0.0";; - if ( QFile::exists ( dir2+"/Contents/Info.plist" ) ) - { - QSettings vst ( dir2+"/Contents/Info.plist", - QSettings::NativeFormat ); - ver2=vst.value ( "CFBundleShortVersionString", - ( QVariant ) "0.0.0" ).toString(); + + QString dir2 = "/usr/X11/X11.app"; + QString ver2 = "0.0.0";; + if (QFile::exists (dir2 + "/Contents/Info.plist")) { + QSettings vst (dir2 + "/Contents/Info.plist", + QSettings::NativeFormat); + ver2 = vst.value ("CFBundleShortVersionString", + (QVariant) "0.0.0").toString (); } - if ( retMaxXDarwinVersion ( ver1,ver2 ) ==ver1 ) - { - version=ver1; + if (retMaxXDarwinVersion (ver1, ver2) == ver1) { + version = ver1; return dir1; } - else - { - version=ver2; + else { + version = ver2; return dir2; } } - version="0.0.0"; - if ( QFile::exists ( path+"/Contents/Info.plist" ) ) - { - QSettings vst ( path+"/Contents/Info.plist", - QSettings::NativeFormat ); - version=vst.value ( "CFBundleShortVersionString", - ( QVariant ) "0.0.0" ).toString(); + else { + version = "0.0.0"; + if (QFile::exists (path + "/Contents/Info.plist")) { + QSettings vst (path + "/Contents/Info.plist", + QSettings::NativeFormat); + version=vst.value ("CFBundleShortVersionString", + (QVariant) "0.0.0").toString (); + } + return path; } - return path; } -void ConfigDialog::slot_findXDarwin() +void ConfigDialog::slot_findXDarwin () { QString version; - QString path=findXDarwin ( version ); - if ( path=="" ) - { - QMessageBox::warning ( - this,tr ( "Warning" ), - tr ( "x2goclient could not find any suitable X11 " - "Application. Please install Apple X11 " - "or select the path to the application" ) ); - } - QString minVer="2.1.0"; - if ( retMaxXDarwinVersion ( minVer,version ) ==minVer ) - { - printXDarwinVersionWarning ( 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>.")); } - leXexec->setText ( path ); - leCmdOpt->setText ( version ); + else { + QString minVer = "2.1.0"; + if (retMaxXDarwinVersion (minVer, version) == minVer) { + printXDarwinVersionWarning (version); + } + leXexec->setText (path); + leCmdOpt->setText (version); + } } void ConfigDialog::printXDarwinVersionWarning (QString version) -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
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@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@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
-
git-admin＠x2go.org