[X2Go-Commits] [x2goclient] 05/05: onmainwindow.cpp: also make the message about a non-running sshd non-modal.
git-admin at x2go.org
git-admin at x2go.org
Mon Mar 9 23:26:57 CET 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/general
in repository x2goclient.
commit a4196bff3262b5bb8b9afb141ace5bd8b9e192b8
Author: Mihai Moldovan <ionic at ionic.de>
Date: Mon Mar 9 23:12:35 2015 +0100
onmainwindow.cpp: also make the message about a non-running sshd non-modal.
---
debian/changelog | 2 ++
src/onmainwindow.cpp | 18 +++++++++++-------
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3c1740e..a2b3ba1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -190,6 +190,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low
non-modal message boxes.
- onmainwindow.cpp: use Non_Modal_MessageBox::critical function to display
errors relating to missing sshd host keys. Fixes: #794.
+ - onmainwindow.cpp: also make the message about a non-running sshd
+ non-modal.
-- X2Go Release Manager <git-admin at x2go.org> Thu, 19 Feb 2015 13:25:28 +0100
diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
index 07707b9..fad2cb7 100644
--- a/src/onmainwindow.cpp
+++ b/src/onmainwindow.cpp
@@ -11376,15 +11376,19 @@ void ONMainWindow::printSshDError_startupFailure()
#else
if ( closeEventSent )
return;
- QMessageBox::critical ( 0l,tr ( "SSH Error" ),
- tr ( "SSH daemon is not running.\n\n"
+ Non_Modal_MessageBox::critical (0l, tr ("SSH Error"),
+ tr ("SSH daemon is not running.\n\n"
- "You'll need SSH daemon for printing and file sharing\n\n"
+ "You have enabled Remote Printing or File Sharing.\n"
+ "These features require a running and functioning SSH server on your computer.\n\n"
- "Please ask your system administrator to provide the SSH\n"
- "service on your computer."
- ),
- QMessageBox::Ok,QMessageBox::NoButton );
+ "The Server is currently not started.\n\n"
+
+ "Please ask your system administrator to provide the SSH\n"
+ "service on your computer.\n\n"
+
+ "Disabling Remote Printing or File Sharing support will get rid of this message."),
+ QMessageBox::Ok, QMessageBox::NoButton);
#endif
}
--
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