[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: 438ea566bd710f84c3adfb50b0977e417f9742e6

X2Go dev team git-admin at x2go.org
Tue Aug 27 13:20:43 CEST 2013


The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
       via  438ea566bd710f84c3adfb50b0977e417f9742e6 (commit)
      from  3dbab0e0600a6ffe489b231581a4ce513329e33d (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:
 pyhoca-gui                    |    2 +-
 pyhoca/wxgui/frontend.py      |   13 +++++++------
 pyhoca/wxgui/menus_taskbar.py |    9 ++++++---
 3 files changed, 14 insertions(+), 10 deletions(-)

The diff of changes is:
diff --git a/pyhoca-gui b/pyhoca-gui
index 6d47364..a7248f3 100755
--- a/pyhoca-gui
+++ b/pyhoca-gui
@@ -73,10 +73,10 @@ debug_options =  [
                    {'args':['-V', '--version'], 'default': False, 'action': 'store_true', 'help': 'print version number and exit', },
                  ]
 x2go_gui_options = [
-                   #{'args':['-m','--minimized'], 'default':False, 'action': 'store_true', 'help': 'start x2go gui minimized on the taskbar',} ,
                    {'args':['-u','--username'], 'default': None, 'help': 'username for the session (default: current user)', },
                    {'args':['-P','--session-profile'], 'default': None, 'help': 'directly connect to a session profile', },
                    {'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':['--start-on-connect'], 'default': False, 'action': 'store_true', 'help': 'start a session directly after authentication', },
                    {'args':['--resume-newest-on-connect', '--resume-on-connect'], 'default': False, 'action': 'store_true', 'help': ' on connect auto-resume the newest suspended session', },
                    {'args':['--resume-oldest-on-connect'], 'default': False, 'action': 'store_true', 'help': ' on connect auto-resume the oldest suspended session', },
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index 714cfd6..fed9fab 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -158,9 +158,10 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
 
         # prepare start/resume options
         self.start_on_connect = self.args.start_on_connect
-        self.resume_newest_on_connect =self.args.resume_newest_on_connect
-        self.resume_oldest_on_connect =self.args.resume_oldest_on_connect
-        self.resume_all_on_connect =self.args.resume_all_on_connect
+        self.resume_newest_on_connect = self.args.resume_newest_on_connect
+        self.resume_oldest_on_connect = self.args.resume_oldest_on_connect
+        self.resume_all_on_connect = self.args.resume_all_on_connect
+        self.show_profile_metatypes = self.args.show_profile_metatypes
 
         ###
         ### disable functionality for release versions
@@ -289,9 +290,9 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
         except gevent.socket.error, e:
             self.notifier.send('%s - connect error' % profile_name, '%s!' % e.strerror, icon='auth_error', timeout=4000)
             self._temp_disabled_profile_names.remove(profile_name)
-        except:
-            self.notifier.send('%s - connect error' % profile_name, 'An unknown error occurred during authentication!', icon='auth_error', timeout=4000)
-            self._temp_disabled_profile_names.remove(profile_name)
+#        except:
+#            self.notifier.send('%s - connect error' % profile_name, 'An unknown error occurred during authentication!', icon='auth_error', timeout=4000)
+#            self._temp_disabled_profile_names.remove(profile_name)
         self.taskbar.SetIconIdle()
 
 
diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py
index b6655ad..8742f53 100644
--- a/pyhoca/wxgui/menus_taskbar.py
+++ b/pyhoca/wxgui/menus_taskbar.py
@@ -230,10 +230,11 @@ class PyHocaGUI_Menu_TaskbarProfileNames(wx.Menu):
         for profile_name in _profile_names:
             _this_id = wx.NewId()
             self._PyHocaGUI._eventid_profilenames_map[_this_id] = profile_name
+            _menu_profile_name = self._PyHocaGUI.show_profile_metatypes and '%s (%s)' % (profile_name, self._PyHocaGUI.get_profile_metatype(profile_name)) or profile_name
             if submenu is not None:
-                self.AppendMenu(text=profile_name, id=_this_id, submenu=submenu(self._PyHocaGUI, caller=self, profile_name=profile_name))
+                self.AppendMenu(text=_menu_profile_name, id=_this_id, submenu=submenu(self._PyHocaGUI, caller=self, profile_name=profile_name))
             else:
-                self.Append(text=profile_name, id=_this_id)
+                self.Append(text=_menu_profile_name, id=_this_id)
                 if bind_method is not None:
                     self.Bind(wx.EVT_MENU, bind_method, id=_this_id)
                     self._PyHocaGUI.Bind(wx.EVT_UPDATE_UI, self.OnUpdateUI, id=_this_id)
@@ -280,7 +281,9 @@ class PyHocaGUI_Menu_TaskbarSessionManager(wx.Menu):
             if profile_name in self._PyHocaGUI._X2goClient__client_connected_sessions(return_profile_names=True):
                 _connected_sessions = True
                 _this_id = wx.NewId()
-                self.AppendMenu(text=profile_name, 
+
+                _menu_profile_name = self._PyHocaGUI.show_profile_metatypes and '%s (%s)' % (profile_name, self._PyHocaGUI.get_profile_metatype(profile_name)) or profile_name
+                self.AppendMenu(text=_menu_profile_name, 
                                 id=_this_id, 
                                 submenu=PyHocaGUI_Menu_TaskbarSessionProfile(self._PyHocaGUI, caller=self, profile_name=profile_name))
 


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




More information about the x2go-commits mailing list