[X2Go-Commits] x2goclient.git - master (branch) updated: 4.0.1.1-65-gc0e8c20

[X2Go dev team]

The branch, master has been updated
       via  c0e8c20c773b36e33094ddc0c867bd098e49a11c (commit)
      from  ac14ad24e7a2d3d3fd08e61098769b5391f4ea8b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c0e8c20c773b36e33094ddc0c867bd098e49a11c
Author: Oleksandr Shneyder <o.shneyder at phoca-gmbh.de>
Date:   Thu Dec 12 10:58:47 2013 +0100

    Setting main window focus on mac (Fixes: #139).

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    1 +
 onmainwindow.cpp |   15 +++++++++++++++
 2 files changed, 16 insertions(+)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 582891f..d3b9b79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -61,6 +61,7 @@ x2goclient (4.0.1.2-0x2go2) UNRELEASED; urgency=low
     - Support for GSSApi(Kerberos 5) authentication. Using ssh/scp commands
       on Linux and Mac and plink/pscp on Windows.   
     - Support for ChallengeResponseAuthentication (Google Authenticator)
+    - Setting main window focus on mac (Fixes: #139).
 
   [ Heinrich Schuchardt ]
   * New upstream version (4.0.1.2):
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index 946e6ae..4377e99 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -5464,6 +5464,10 @@ void ONMainWindow::slotProxyError ( QProcess::ProcessError )
 void ONMainWindow::slotProxyFinished ( int,QProcess::ExitStatus )
 {
 
+#ifdef Q_OS_DARWIN
+//fixes bug, when mainwindow inputs not accepting focus under mac
+    setFocus();
+#endif
     //set tray icon to default
     if (trayIcon)
         trayIcon->setIcon(QIcon ( ":icons/128x128/x2go.png") );
@@ -5625,6 +5629,11 @@ void ONMainWindow::slotProxyFinished ( int,QProcess::ExitStatus )
     }
     x2goDebug<<"Finished Proxy.";
     setStatStatus ( tr ( "Finished" ) );
+#ifdef Q_OS_DARWIN
+//fixes bug, when mainwindow inputs not accepting focus under mac
+    setFocus();
+#endif
+
 }
 
 
@@ -5744,6 +5753,12 @@ void ONMainWindow::slotProxyStdout()
 
 void ONMainWindow::slotShowPassForm()
 {
+#ifdef Q_OS_DARWIN
+//fixes bug, when mainwindow inputs not accepting focus under mac
+    x2goDebug<<"set focus"<<endl;
+    QTimer::singleShot(500, this, SLOT(setFocus()));
+    setFocus();
+#endif
     if ( !useLdap )
     {
         loginPrompt->show();


hooks/post-receive
-- 
x2goclient.git (X2Go Client)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goclient.git" (X2Go Client).