[X2go-Commits] pyhoca-gui.git - master (branch) updated: 0.1.0.10-54-g19ece35

X2go dev team git-admin at x2go.org
Fri Feb 10 00:25:24 CET 2012


The branch, master has been updated
       via  19ece3551adb36c82ee6c93eff3aef0f3e102203 (commit)
       via  f77d4e74480b8e21513dac98b8822d4925c11f62 (commit)
      from  73297d0b799254f887a920f00214869aadb2edb1 (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 -----------------------------------------------------------------
commit 19ece3551adb36c82ee6c93eff3aef0f3e102203
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Feb 10 00:25:12 2012 +0100

    Mark master sessions with a marker ,,(*)'',

commit f77d4e74480b8e21513dac98b8822d4925c11f62
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Feb 10 00:24:20 2012 +0100

    Remove pointed brackets from new/derived session profile names.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog               |    2 ++
 pyhoca/wxgui/menus_taskbar.py  |   30 ++++++++++++++++++------------
 pyhoca/wxgui/profilemanager.py |    4 ++--
 3 files changed, 22 insertions(+), 14 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index d961496..a753683 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,8 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
       Reintroduce window icon in profile manager.
     - Use x2golistmounts to detect server-side unsharing of client-side
       folders.
+    - Remove pointed brackets from new/derived session profile names.
+    - Mark master sessions with a marker ,,(*)'',
   * 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/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py
index 571bd7c..01c4488 100644
--- a/pyhoca/wxgui/menus_taskbar.py
+++ b/pyhoca/wxgui/menus_taskbar.py
@@ -373,26 +373,32 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu):
                     state = _(u'Running')
                 elif _session_list[session_name].status == 'S':
                     state = _(u'Suspended')
-                session_submenu = self.AppendMenu(id=_s_id, text=u'%s: »%s«' % (state, session_name), 
-                                                  submenu=PyHocaGUI_Menu_TaskbarSessionActions(self._PyHocaGUI, caller=self,
-                                                                                               profile_name=profile_name,
-                                                                                               session_name=session_name,
-                                                                                               status=_session_list[session_name].status,
-                                                                                              )
-                                                 )
-                if self._PyHocaGUI._temp_disabled_session_names.has_key(profile_name) and session_name in self._PyHocaGUI._temp_disabled_session_names[profile_name]:
-                    session_submenu.Enable(False)
+                session = self._PyHocaGUI.get_session_of_session_name(session_name, return_object=True)
+                _marker = ''
+                if session and session.is_master_session():
+                    _marker = '(*)'
+                if session:
+                    session_submenu = self.AppendMenu(id=_s_id, text=u'%s: »%s« %s' % (state, session_name, _marker),
+                                                      submenu=PyHocaGUI_Menu_TaskbarSessionActions(self._PyHocaGUI, caller=self,
+                                                                                                   profile_name=profile_name,
+                                                                                                   session_name=session_name,
+                                                                                                   status=_session_list[session_name].status,
+                                                                                                  )
+                                                     )
+                    if self._PyHocaGUI._temp_disabled_session_names.has_key(profile_name) and session_name in self._PyHocaGUI._temp_disabled_session_names[profile_name]:
+                        session_submenu.Enable(False)
 
             if _session_list.keys():
                 self.Append(id=ID_CLEANSESSIONS, text=_(u"&Clean all sessions"))
                 self.AppendSeparator()
+
         self.Append(id=ID_EDITPROFILEWHILECONNECTED, text=_(u"Customize &profile"))
         if current_profile_config['useexports'] and self._PyHocaGUI._X2goClient__profile_is_folder_sharing_available(profile_name=profile_name):
 
             _shared_folders = self.AppendMenu(id=ID_SHARELOCALFOLDER, text=_(u"Shared &folders"),
-                                            submenu=PyHocaGUI_Menu_TaskbarProfileSharedFolders(self._PyHocaGUI, caller=self,
-                                                                                        profile_name=profile_name)
-                                           )
+                                              submenu=PyHocaGUI_Menu_TaskbarProfileSharedFolders(self._PyHocaGUI, caller=self,
+                                              profile_name=profile_name)
+                                             )
             if not self._PyHocaGUI._X2goClient__client_associated_sessions_of_profile_name(profile_name=profile_name, return_objects=False):
                 _shared_folders.Enable(False)
 
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index 0172b7d..a183876 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -126,11 +126,11 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         elif self.action == 'COPY' and self.profile_id:
             self.profile_name = self.session_profiles.to_profile_name(self.profile_id)
             self.profile_config = self.session_profiles.get_profile_config(self.profile_id)
-            self.profile_name = self.profile_config['name'] = '<%s %s>' % (_('settings derived from '), self.profile_name)
+            self.profile_name = self.profile_config['name'] = '%s %s' % (_('settings derived from '), self.profile_name)
         else:
             # if self.action == 'ADD' ...
             self.profile_config = self.session_profiles.default_profile_config()
-            self.profile_name = self.profile_config['name'] = '<%s>' %_('new session profile')
+            self.profile_name = self.profile_config['name'] = '%s' %_('new session profile')
 
         # we create a backup dict of our profile_config immediately (for being able to reset erroneously made changes)
         self.profile_config_bak = copy.deepcopy(self.profile_config)


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