This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 585fb93 src/sessionbutton.cpp: replace drop down menu button on session buttons again with the custom-created hamburger icon. new c092262 src/onmainwindow.{cpp,h}: add new function images_resource_path (), similar to iconsPath () but without explicitly referring to icons. new 707f990 src/sessionbutton.cpp: we cannot use ".." in resource paths to move up one level, so use images_resource_path () instead and hope that we finally get a yummy hamburger. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 5 +++++ src/onmainwindow.cpp | 4 ++++ src/onmainwindow.h | 1 + src/sessionbutton.cpp | 2 +- 4 files changed, 11 insertions(+), 1 deletion(-) -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit c0922627bde7bb5985aac0ff75d75c4ab036e085 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Jan 17 17:34:57 2017 +0100 src/onmainwindow.{cpp,h}: add new function images_resource_path (), similar to iconsPath () but without explicitly referring to icons. --- debian/changelog | 2 ++ src/onmainwindow.cpp | 4 ++++ src/onmainwindow.h | 1 + 3 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index a97d64a..6e0f478 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium - 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. + - src/onmainwindow.{cpp,h}: add new function images_resource_path (), + similar to iconsPath () but without explicitly referring to icons. [ Bernard Cafarelli ] * New upstream version (4.0.5.3): diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp index 4cb9c56..806f9f2 100644 --- a/src/onmainwindow.cpp +++ b/src/onmainwindow.cpp @@ -1670,6 +1670,10 @@ QString ONMainWindow::iconsPath ( QString fname ) return ( QString ) ":/img/icons"+fname; } +QString ONMainWindow::images_resource_path (const QString &filename) const { + return (QString (":/img/" + filename)); +} + void ONMainWindow::displayUsers() { diff --git a/src/onmainwindow.h b/src/onmainwindow.h index e0e4d26..c8af781 100644 --- a/src/onmainwindow.h +++ b/src/onmainwindow.h @@ -352,6 +352,7 @@ public: ~ONMainWindow(); static void installTranslator(); QString iconsPath ( QString fname ); + QString images_resource_path (const QString &filename) const; static bool isServerRunning ( int port ); void startNewSession(); void suspendSession ( QString sessId ); -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 707f99075d7a3011016aac13322419b7acb1fa6d Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Jan 17 17:37:25 2017 +0100 src/sessionbutton.cpp: we cannot use ".." in resource paths to move up one level, so use images_resource_path () instead and hope that we finally get a yummy hamburger. --- debian/changelog | 3 +++ src/sessionbutton.cpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6e0f478..b84b2f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,9 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium issues in mini mode. - src/onmainwindow.{cpp,h}: add new function images_resource_path (), similar to iconsPath () but without explicitly referring to icons. + - src/sessionbutton.cpp: we cannot use ".." in resource paths to move up + one level, so use images_resource_path () instead and hope that we + finally get a yummy hamburger. [ Bernard Cafarelli ] * New upstream version (4.0.5.3): diff --git a/src/sessionbutton.cpp b/src/sessionbutton.cpp index a8cb919..49f0ae3 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 ( "/../svg/hamburger.svg" ) ) ); + editBut->setIcon ( QIcon ( par->images_resource_path ( "/svg/hamburger.svg" ) ) ); editBut->setIconSize ( QSize ( 32,32 ) ); editBut->setFixedSize ( 48,48 ); editBut->setFlat ( true ); -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org