[X2Go-Commits] pyhoca-gui.git - twofactorauth (branch) updated: 0.1.0.10-15-ga4ab343

[X2Go dev team]

The branch, twofactorauth has been updated
       via  a4ab34330af41254fdb447f330c1bab09433cfe7 (commit)
      from  a44f8cd2f53dabd95a02ee142ba0eefddeac5481 (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/wxgui/menus_taskbar.py |   16 +++++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index ca59836..7a5dd2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ pyhoca-gui (0.1.0.11-0~x2go1) UNRELEASED; urgency=low
     - Drop handling of session icon, not used in pyhoca-gui, anyway.
     - Fix profile manager window size (shrinking for usage on netbooks).
     - Existing profiles can be used as templates for new session profiles.
+    - Session profile menu: allow multi-depth submenu structures, use '/'
+      as submenu separator item in session profile name.
   * Depend on Python X2Go 0.1.1.9.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 09 Nov 2011 03:13:09 +0100
diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py
index 5278858..e8b3697 100644
--- a/pyhoca/wxgui/menus_taskbar.py
+++ b/pyhoca/wxgui/menus_taskbar.py
@@ -348,7 +348,11 @@ class PyHocaGUI_Menu_TaskbarProfileNames(wx.Menu):
     STILL UNDOCUMENTED
 
     """
-    def __init__(self, _PyHocaGUI, caller=None, group_name='', sub_profile_items=[], filter_profiles=[], disabled_profiles=[], bind_method=None, submenu=None, group_menus=True):
+    def __init__(self, _PyHocaGUI, caller=None, 
+                 sub_profile_items=[], filter_profiles=[], disabled_profiles=[],
+                 bind_method=None,
+                 submenu=None,
+                 group_menus=True, group_name='', parent_group=''):
         """\
         STILL UNDOCUMENTED
 
@@ -374,6 +378,8 @@ class PyHocaGUI_Menu_TaskbarProfileNames(wx.Menu):
         _profile_groups = []
         if group_menus:
 
+            _parent_group = group_name
+
             # grouping of session profile menus
             for profile_name in _profile_names:
                 if len(profile_name.split('/')) >= 2:
@@ -399,7 +405,8 @@ class PyHocaGUI_Menu_TaskbarProfileNames(wx.Menu):
                                                                                     disabled_profiles=disabled_profiles,
                                                                                     bind_method=bind_method,
                                                                                     group_name=profile_group,
-                                                                                    group_menus=False)
+                                                                                    parent_group=_parent_group,
+                                                                                    group_menus=True)
                                         )
 
         if filter_profiles:
@@ -407,7 +414,10 @@ class PyHocaGUI_Menu_TaskbarProfileNames(wx.Menu):
 
         for profile_name in _profile_names:
             if group_name:
-                _real_profile_name = '%s/%s' % (group_name, profile_name)
+                if parent_group:
+                    _real_profile_name = '%s/%s/%s' % (parent_group, group_name, profile_name)
+                else:
+                    _real_profile_name = '%s/%s' % (group_name, profile_name)
                 _show_profile_name = profile_name
             else:
                 _real_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)).