[X2Go-Commits] [x2goclient] 01/01: configdialog.cpp: rephrase another error message, use the new helper and reformat code.
git-admin at x2go.org
git-admin at x2go.org
Thu Mar 12 06:10:35 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 bcf498fd236ef8f5698ba608380e939fc6f5d65f
Author: Mihai Moldovan <ionic at ionic.de>
Date: Thu Mar 12 06:10:07 2015 +0100
configdialog.cpp: rephrase another error message, use the new helper and reformat code.
---
debian/changelog | 2 ++
src/configdialog.cpp | 39 +++++++++++++++++++++------------------
2 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c562c68..64e545f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -218,6 +218,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low
- configdialog.cpp: return empty strings as paths to the XQuartz
application if no valid one could be found in order to show the proper
error message.
+ - configdialog.cpp: rephrase another error message, use the new helper and
+ reformat code.
-- 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 6311dfb..e0c7861 100644
--- a/src/configdialog.cpp
+++ b/src/configdialog.cpp
@@ -569,30 +569,33 @@ void ConfigDialog::printXDarwinVersionWarning (QString version)
}
-void ConfigDialog::slot_selectXDarwin()
+void ConfigDialog::slot_selectXDarwin ()
{
- QString newDir=QFileDialog::getOpenFileName ( this,QString(),leXexec->text() +"/.." );
+ QString newDir = QFileDialog::getOpenFileName (this, QString (), leXexec->text () + "/..");
QString version;
- if ( newDir.length() >0 )
- {
- findXDarwin ( version,newDir );
- if ( version=="0.0.0" )
- {
- QMessageBox::warning (
- this, tr ( "Warning" ),
- tr ( "No suitable X11 application found "
- "in selected path" ) );
- return;
+ if (newDir.length () > 0) {
+ findXDarwin (version, newDir);
+ if (version.compare (QString ("0.0.0")) == 0) {
+ show_RichText_WarningMsgBox (tr ("No valid XQuartz application selected."),
+ tr ("You did not select a valid XQuartz application.\n"
+ "Please try again.\n\n"
+
+ "Some standard installation locations may be:\n"
+ "<center><b>/Applications/Utilities/X11.app</b></center>\n"
+ "<center><b>/Applications/Utilities/XQuartz.app</b></center>\n"
+ "<center><b>/Applications/MacPorts/X11.app</b></center>"));
}
- QString minVer="2.1.0";
- if ( retMaxXDarwinVersion ( minVer,version ) ==minVer )
- {
- printXDarwinVersionWarning ( version );
+ else {
+ QString minVer = "2.1.0";
+ if (retMaxXDarwinVersion (minVer, version) == minVer) {
+ printXDarwinVersionWarning (version);
+ }
+ leXexec->setText (newDir);
+ leCmdOpt->setText (version);
}
- leXexec->setText ( newDir );
- leCmdOpt->setText ( version );
}
}
+
QString ConfigDialog::getXDarwinDirectory()
{
X2goSettings st ("settings");
--
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