[X2go-Commits] x2goclient.git - master (branch) updated: 3.99.1.1-11-g8e54131

[X2Go dev team]

The branch, master has been updated
       via  8e54131c45359c54d8241dda25ffaa2f69e8e249 (commit)
      from  342bb695167c1808bbf969e56a3d23c136df70cb (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 8e54131c45359c54d8241dda25ffaa2f69e8e249
Author: Oleksandr Shneyder <oleksandr.shneyder at treuchtlingen.de>
Date:   Fri Mar 16 14:14:42 2012 +0100

    Set "nofocus" policy for tool buttons.

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

Summary of changes:
 debian/changelog       |    1 +
 onmainwindow.cpp       |   27 +++++++++++++--------------
 onmainwindow_part4.cpp |    6 ++++++
 3 files changed, 20 insertions(+), 14 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index f69b2bb..c840c86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ x2goclient (3.99.2.0-0~x2go1) UNRELEASED; urgency=low
     - Replace text on buttons "Application", "Share folder", "Suspend",
       "Terminate" with icons to fit in dialog window.
     - Support for SVG icons for published applications
+    - Set "nofocus" policy for tool buttons.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 07 Mar 2012 21:02:15 +0100
 
diff --git a/onmainwindow.cpp b/onmainwindow.cpp
index 18db8b9..3f2a860 100644
--- a/onmainwindow.cpp
+++ b/onmainwindow.cpp
@@ -169,16 +169,6 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent )
     widgetExtraStyle =new QPlastiqueStyle();
 #endif
 
-    QDesktopWidget wd;
-// 	x2goDebug<<"Desktop geometry:"<<wd.screenGeometry();
-    if ( wd.screenGeometry().width() <1024 ||
-            wd.screenGeometry().height() <768 )
-    {
-        miniMode=true;
-        x2goDebug<<"Switching to \"mini\" mode";
-    }
-
-
     agentCheckTimer=new QTimer ( this );
     connect ( agentCheckTimer,SIGNAL ( timeout() ),this,
               SLOT ( slotCheckAgentProcess() ) );
@@ -265,6 +255,19 @@ ONMainWindow::ONMainWindow ( QWidget *parent ) :QMainWindow ( parent )
         QTimer::singleShot ( 10, this, SLOT ( slotResize() ) );
     }
 
+
+    QDesktopWidget wd;
+
+    x2goDebug<<"primary screen geometry: "<<wd.screenGeometry(wd.screenNumber(this));
+
+    if ( wd.screenGeometry(wd.screenNumber(this)).width() <1024 ||
+            wd.screenGeometry(wd.screenNumber(this)).height() <768 )
+    {
+        miniMode=true;
+        x2goDebug<<"Switching to \"mini\" mode";
+    }
+
+
     if ( usePGPCard )
     {
         QTimer::singleShot ( 10, this, SLOT ( slotStartPGPAuth() ) );
@@ -1439,16 +1442,12 @@ void ONMainWindow::loadSettings()
 {
 
     X2goSettings st ( "sizes" );
-
     mwSize=st.setting()->value ( "mainwindow/size",
                                  ( QVariant ) QSize ( 800,600 ) ).toSize();
     mwPos=st.setting()->value ( "mainwindow/pos",
                                 ( QVariant ) QPoint ( 20,20 ) ).toPoint();
     mwMax=st.setting()->value ( "mainwindow/maximized",
                                 ( QVariant ) false ).toBool();
-    // tray stuff
-// 	trayQuitInfoShown = st1.value( "trayQuitInfoShown", false ).toBool();
-
 
 
     X2goSettings st1 ( "settings" );
diff --git a/onmainwindow_part4.cpp b/onmainwindow_part4.cpp
index cdb5ac8..1e55628 100644
--- a/onmainwindow_part4.cpp
+++ b/onmainwindow_part4.cpp
@@ -1863,21 +1863,27 @@ void ONMainWindow::initStatusDlg()
     sbApps->setToolTip(tr ( "Applications..." ));
     sbApps->setIcon(QPixmap(":/icons/32x32/apps.png"));
     sbApps->setAutoRaise(true);
+    sbApps->setFocusPolicy(Qt::NoFocus);
 
     sbExp=new QToolButton (sessionStatusDlg );
     sbExp->setIcon(QPixmap(":/icons/32x32/open_dir.png"));
     sbExp->setToolTip (tr ("Share folder..." ));
     sbExp->setAutoRaise(true);
+    sbExp->setFocusPolicy(Qt::NoFocus);
 
     sbSusp=new QToolButton (sessionStatusDlg );
     sbSusp->setIcon(QPixmap(":/icons/32x32/suspend_session.png"));
     sbSusp->setToolTip(tr ( "Abort" ));
     sbSusp->setAutoRaise(true);
+    sbSusp->setFocusPolicy(Qt::NoFocus);
+
 
     sbTerm=new QToolButton (sessionStatusDlg );
     sbTerm->setIcon(QPixmap(":/icons/32x32/stop_session.png"));
     sbTerm->setToolTip(tr ( "Terminate" ));
     sbTerm->setAutoRaise(true);
+    sbTerm->setFocusPolicy(Qt::NoFocus);
+
 
     sbAdv=new QCheckBox ( tr ( "Show details" ),sessionStatusDlg );
     setWidgetStyle ( sbTerm );


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).