[X2Go-Commits] [x2goclient] 01/02: src/onmainwindow.{cpp, h}: add new function images_resource_path (), similar to iconsPath () but without explicitly referring to icons.

[git-admin at x2go.org]

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