[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: 0.1.0.10-236-ge3d22dd

[X2Go dev team]

The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
       via  e3d22dd947f9424598314f589c03ad4284fe3a6d (commit)
      from  d3be56fe6794a891488320343db3cd34b8236b7e (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog         |    2 ++
 pyhoca-gui               |    2 ++
 pyhoca/wxgui/frontend.py |    2 ++
 pyhoca/wxgui/taskbar.py  |   12 ++++++++----
 4 files changed, 14 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index fa0216b..f737d38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -124,6 +124,8 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
     - Windows packaging: remove dist directory before calling py2exe.
     - For empty menu maps create a dummy menu.
     - Python gevent will drop gevent.dns in v1.0. Not using it anymore.
+    - Add options --tray-icon and --tray-icon-connecting to customize the
+      system tray icon (e.g. for branding).
   * Depend on Python X2Go 0.1.2.0.
   * Install GNOME icons via dh_links.
   * Install X2Go icons with explicit install paths.
diff --git a/pyhoca-gui b/pyhoca-gui
index 901fe24..ae66833 100755
--- a/pyhoca-gui
+++ b/pyhoca-gui
@@ -203,6 +203,8 @@ x2go_gui_options = [
                    {'args':['--auto-connect'], 'default': False, 'action': 'store_true', 'help': 'connect sessions via SSH pubkey authentication if possible', },
                    {'args':['--show-profile-metatypes'], 'default': False, 'action': 'store_true', 'help': 'show descriptive meta information on session profiles in menus (NOTE: this makes menus appear a bit more sluggish, use it mostly for debugging)', },
                    {'args':['--single-session-profile'], 'default': False, 'action': 'store_true', 'help': 'disable support of handling multiple session profiles', },
+                   {'args':['--tray-icon'], 'default': None, 'metavar': '<your-logo>', 'help': 'define an alternative system tray icon file (PNG files only, leave out file extension here, size 22x22 on Linux, 16x16 on Windows)', },
+                   {'args':['--tray-icon-connecting'], 'default': None, 'metavar': '<your-logo-while-connecting>', 'help': 'define an alternative system tray icon file while connecting to a server (PNG files only, leave out file extension here, size 22x22 on Linux, 16x16 on Windows)', },
                    {'args':['--restricted-trayicon'], 'default': False, 'action': 'store_true', 'help': 'restricts session manager\'s main icon functionality to information window and application exit', },
                    {'args':['--start-on-connect'], 'default': False, 'action': 'store_true', 'help': 'start a session directly after authentication if no session is currently running/suspended', },
                    {'args':['--exit-on-disconnect'], 'default': False, 'action': 'store_true', 'help': 'exit the session manager after a server connection has died', },
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index bff85d4..972c03f 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -234,6 +234,8 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
         self.disconnect_on_terminate = self.args.disconnect_on_terminate
         self.show_profile_metatypes = self.args.show_profile_metatypes
         self.restricted_trayicon = self.args.restricted_trayicon
+        self.tray_icon = self.args.tray_icon
+        self.tray_icon_connecting = self.args.tray_icon_connecting
         self.disable_notifications = self.args.disable_notifications
         self.remember_username = self.args.remember_username
 
diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py
index 089b84d..5aa0a4f 100644
--- a/pyhoca/wxgui/taskbar.py
+++ b/pyhoca/wxgui/taskbar.py
@@ -75,18 +75,22 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon):
     def SetIconConnecting(self, profile_name):
         self.icon = self.MakeIcon(icon_name='pyhoca-trayicon')
         if x2go.X2GOCLIENT_OS == 'Windows':
-            self.icon = self.MakeIcon(icon_name='x2go-logo-ubuntu')
+            icon_name = self._PyHocaGUI.tray_icon_connecting or self._PyHocaGUI.tray_icon or 'x2go-logo-ubuntu'
+            self.icon = self.MakeIcon(icon_name=icon_name)
             self.SetIcon(self.icon, _(u"PyHoca-GUI\nConnecting you to ,,%s\'\'") % profile_name)
         else:
-            self.icon = self.MakeIcon(icon_name='pyhoca-trayicon')
+            icon_name = self._PyHocaGUI.tray_icon_connecting or self._PyHocaGUI.tray_icon or 'pyhoca-trayicon'
+            self.icon = self.MakeIcon(icon_name=icon_name)
             self.SetIcon(self.icon, _(u"PyHoca-GUI (Python X2goClient)\nCurrently connecting you to remote X2Go server ,,%s\'\'") % profile_name)
 
     def SetIconIdle(self):
         if x2go.X2GOCLIENT_OS == 'Windows':
-            self.icon = self.MakeIcon(icon_name='x2go-logo-ubuntu')
+            icon_name = self._PyHocaGUI.tray_icon or 'x2go-logo-ubuntu'
+            self.icon = self.MakeIcon(icon_name=icon_name)
             self.SetIcon(self.icon, _(u"PyHoca-GUI\nConnecting you to X2Go..."))
         else:
-            self.icon = self.MakeIcon(icon_name='pyhoca-trayicon')
+            icon_name = self._PyHocaGUI.tray_icon or 'pyhoca-trayicon'
+            self.icon = self.MakeIcon(icon_name=icon_name)
             self.SetIcon(self.icon, _(u"PyHoca-GUI (Python X2goClient)\nClient for connecting you to a remote X2Go server"))
 
     def CreateSessionManagerPopupMenu(self, evt):


hooks/post-receive
-- 
pyhoca-gui.git (Python X2Go Client (wxPython GUI))

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 "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).