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

[X2Go dev team]

The branch, twofactorauth has been updated
       via  f571e24d5b002e6a466ecfb77fc8fc75398fef77 (commit)
      from  a4ab34330af41254fdb447f330c1bab09433cfe7 (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              |    1 +
 pyhoca/wxgui/menus_taskbar.py |    5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 7a5dd2b..5c429b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ pyhoca-gui (0.1.0.11-0~x2go1) UNRELEASED; urgency=low
     - 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.
+    - Enable session profile submenus functionality to profile manager.
   * 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 e8b3697..502f998 100644
--- a/pyhoca/wxgui/menus_taskbar.py
+++ b/pyhoca/wxgui/menus_taskbar.py
@@ -94,7 +94,7 @@ class PyHocaGUI_Menu_TaskbarOptionsManager(wx.Menu):
                                                                                                  filter_profiles=[],
                                                                                                  disabled_profiles=self._PyHocaGUI.client_connected_profiles(return_profile_names=True),
                                                                                                  submenu=PyHocaGUI_Menu_TaskbarManageProfile,
-                                                                                                 group_menus=False,
+                                                                                                 group_menus=True,
                                                                                                 )
                                                      )
             if self._PyHocaGUI.profilemanager_disabled:
@@ -403,6 +403,7 @@ class PyHocaGUI_Menu_TaskbarProfileNames(wx.Menu):
                                                                                     sub_profile_items=_sub_profile_items,
                                                                                     filter_profiles=[],
                                                                                     disabled_profiles=disabled_profiles,
+                                                                                    submenu=submenu,
                                                                                     bind_method=bind_method,
                                                                                     group_name=profile_group,
                                                                                     parent_group=_parent_group,
@@ -426,7 +427,7 @@ class PyHocaGUI_Menu_TaskbarProfileNames(wx.Menu):
             self._PyHocaGUI._eventid_profilenames_map[_this_id] = _real_profile_name
             _menu_profile_name = self._PyHocaGUI.show_profile_metatypes and '%s (%s)' % (_show_profile_name, self._PyHocaGUI.get_profile_metatype(_real_profile_name)) or _show_profile_name
             if submenu is not None:
-                _sub = self.AppendMenu(text=_menu_profile_name, id=_this_id, submenu=submenu(self._PyHocaGUI, caller=self, profile_name=_show_profile_name))
+                _sub = self.AppendMenu(text=_menu_profile_name, id=_this_id, submenu=submenu(self._PyHocaGUI, caller=self, profile_name=_real_profile_name))
                 if disabled_profiles and _real_profile_name in disabled_profiles:
                     _sub.Enable(False)
             else:


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