[X2Go-Commits] [x2goclient] 02/02: src/sessionbutton.cpp: replace drop down menu button on session buttons again with the custom-created hamburger icon.

git-admin at x2go.org git-admin at x2go.org
Tue Jan 17 16:42:24 CET 2017


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goclient.

commit 585fb93b539fb1d3522f5c63b91be4f3e33b18d7
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Jan 17 16:40:55 2017 +0100

    src/sessionbutton.cpp: replace drop down menu button on session buttons again with the custom-created hamburger icon.
    
    Also fix positioning issues in mini mode.
---
 debian/changelog      |    3 +++
 src/sessionbutton.cpp |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ad2c986..a97d64a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,9 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
       URIs in wrap_legacy_resource_URIs (). Fixes: #910.
     - {res/img/svg/,res/resources.qrc}: add new file hamburger.svg, a
       custom-created hamburger icon.
+    - src/sessionbutton.cpp: replace drop down menu button on session buttons
+      again with the custom-created hamburger icon. Also fix positioning
+      issues in mini mode.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.0.5.3):
diff --git a/src/sessionbutton.cpp b/src/sessionbutton.cpp
index 34cd0d5..a8cb919 100644
--- a/src/sessionbutton.cpp
+++ b/src/sessionbutton.cpp
@@ -121,7 +121,7 @@ SessionButton::SessionButton ( ONMainWindow* mw,QWidget *parent, QString id )
     editBut=new QPushButton ( this );
     editBut->setMouseTracking ( true );
     connect ( editBut,SIGNAL ( pressed() ),this,SLOT ( slotShowMenu() ) );
-    editBut->setIcon ( QIcon ( par->iconsPath ( "/32x32/preferences.png" ) ) );
+    editBut->setIcon ( QIcon ( par->iconsPath ( "/../svg/hamburger.svg" ) ) );
     editBut->setIconSize ( QSize ( 32,32 ) );
     editBut->setFixedSize ( 48,48 );
     editBut->setFlat ( true );
@@ -181,7 +181,7 @@ SessionButton::SessionButton ( ONMainWindow* mw,QWidget *parent, QString id )
     }
     else
     {
-        editBut->move ( 218,113 );
+        editBut->move ( 194,89 );
         sessName->move ( 64,11 );
         sessStatus->hide();
         serverIcon->move ( 66,44 );

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