This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/osx in repository x2goclient. commit c99b74160a8af8db1a7ebcf765f9db8b8a43d371 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Mar 12 23:04:29 2015 +0100 onmainwindow.cpp: prettify non-available host key error message. --- debian/changelog | 1 + src/onmainwindow.cpp | 50 +++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 42 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index bd56f84..edc1053 100644 --- a/debian/changelog +++ b/debian/changelog @@ -228,6 +228,7 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low overloaded functions to be able to use informative text and a (forceful, if requested) conversion to rich text. - onmainwindow.cpp: prettify non-running sshd error message. + - onmainwindow.cpp: prettify non-available host key error message. -- X2Go Release Manager <git-admin@x2go.org> Thu, 19 Feb 2015 13:25:28 +0100 diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 5e9dae9..16c6d80 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -11422,20 +11422,52 @@ void ONMainWindow::printSshDError_noHostPubKey() { if ( closeEventSent ) return; - Non_Modal_MessageBox::critical (0l, "X2Go Client", - tr ("SSH daemon failed to open its public host key.\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" + X2goSettings st ("settings"); + + int port = st.setting ()->value ("clientport", (QVariant) 22).toInt (); - "The Server is currently not configured correctly.\n\n" + Non_Modal_MessageBox::critical (0l, "X2Go Client", + tr ("SSH daemon failed to open its public host key."), + tr ("You have enabled Remote Printing or File Sharing.\n" + "These features require a running and functioning SSH server on your computer.\n" + "<b>Printing and File Sharing will be disabled for this session.</b>\n\n" - "Please ensure that the server's public exists.\n" - "Host keys can be generated by running:\n\n" + "The SSH server is currently not configured correctly.\n\n" + + "Please ensure that the server's public exists.\n\n" +#ifdef Q_OS_WIN + "Normally, this should not happen as X2Go Client for Windows " + "ships its own internal SSH server and automatically " + "generates the required keys.\n\n" + + "If you see this message, please report a bug on:\n" + "<center><a href=\"https://wiki.x2go.org/doku.php/wiki:bugs\">" + "https://wiki.x2go.org/doku.php/wiki:bugs" + "</a></center>\n" +#else // defined (Q_OS_WIN) +#ifdef Q_OS_DARWIN + "On OS X, please follow these steps to generate the " + "required keys:" + + "<ul>" + "<li>Open a <b>Terminal Window</b> (Applications -> Utilities -> Terminal)</li>" + "<li>Run this command: <b>ssh -p " + QString::number (port).toAscii () + + " localhost</b></li>" + "<li>You do not need to login. Just quit the Terminal application " + "via Cmd + Q</li>" + "</ul>" +#else // defined (Q_OS_DARWIN) + "Please ask your system administrator to generate the required host keys.\n\n" - "\tsudo ssh-keygen -A\n\n" + "If you are administrating this system yourself, please run:\n" - "Disabling Remote Printing or File Sharing support will get rid of this message."), + "<center><b>sudo ssh-keygen -A</b></center>\n\n" +#endif // defined (Q_OS_DARWIN) +#endif // defined (Q_OS_WIN) + "Disabling Remote Printing or File Sharing support " + "in the session settings will get rid of this message."), + true, QMessageBox::Ok, QMessageBox::NoButton); } -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git