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

X2Go dev team git-admin at x2go.org
Wed Apr 11 02:23:22 CEST 2012


The branch, master has been updated
       via  edf44b3f4db29102e1c91a88dfba4780bb2020f4 (commit)
      from  796ee27daaba8c7e7fe31a07742acf2234b200b1 (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 edf44b3f4db29102e1c91a88dfba4780bb2020f4
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Apr 11 02:23:18 2012 +0200

    Fix cmdline option --restricted-trayicon.

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

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

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 5fa27b9..937a05c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -92,6 +92,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
       the last log file, stderr will append to the very same file.
     - Allow TCP ports higher than 64000 for SSH and sound server connections.
     - Be more precise on error causes during SSH authentication.
+    - Fix cmdline option --restricted-trayicon.
   * 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/frontend.py b/pyhoca/wxgui/frontend.py
index 28257da..659476d 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -243,9 +243,7 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
 
         self.taskbar = taskbar.PyHocaGUI_TaskBarIcon(self.about)
         self.taskbar.Bind(wx.EVT_TASKBAR_LEFT_DCLICK, lambda _Show: self.about.Show(True))
-
-        if not self.restricted_trayicon:
-            self.taskbar.Bind(wx.EVT_TASKBAR_LEFT_DOWN, self.taskbar.CreateSessionManagerPopupMenu)
+        self.taskbar.Bind(wx.EVT_TASKBAR_LEFT_DOWN, self.taskbar.CreateSessionManagerPopupMenu)
 
         if x2go.X2GOCLIENT_OS in ('Linux', 'Mac'):
             self.notifier = notify.libnotify_NotifierPopup(self)
diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py
index 403997d..6cbb500 100644
--- a/pyhoca/wxgui/menus_taskbar.py
+++ b/pyhoca/wxgui/menus_taskbar.py
@@ -138,7 +138,7 @@ class PyHocaGUI_Menu_TaskbarOptionsManager(wx.Menu):
             if self._PyHocaGUI.options_disabled:
                 _options_item.Enable(False)
 
-            self.AppendSeparator()
+        self.AppendSeparator()
 
         ID_EXIT = wx.NewId()
         self.Append(id=ID_EXIT, text=_("E&xit"))
@@ -482,7 +482,8 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu):
 
                 if current_profile_config['command'] == '' and current_profile_config['published']:
 
-                    self.AppendSeparator()
+                    if not self._PyHocaGUI.restricted_trayicon:
+                        self.AppendSeparator()
                     _pubapp_sessions = [ _pas for _pas in self._PyHocaGUI.client_pubapp_sessions_of_profile_name(profile_name, return_objects=True) if _pas.is_running() ]
                     if _pubapp_sessions:
                         _pubapp_session = _pubapp_sessions[0]
@@ -545,7 +546,8 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu):
 
                     if current_profile_config['published']:
 
-                        self.AppendSeparator()
+                        if not self._PyHocaGUI.restricted_trayicon:
+                            self.AppendSeparator()
 
                         _pubapp_session = None
                         _pubapp_sessions = [ _pas for _pas in self._PyHocaGUI.client_pubapp_sessions_of_profile_name(profile_name, return_objects=True) if _pas.is_running() ]
@@ -642,22 +644,21 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu):
                         if _session_list_names:
                             self.Append(id=ID_CLEANSESSIONS, text=_(u"&Clean all sessions"))
                             self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnCleanSessions, id=ID_CLEANSESSIONS)
-
-                        if _session_list_names:
-
                             self.AppendSeparator()
 
-                    if not _session_list_names:
+                    else:
 
                         self.AppendSeparator()
 
+                if not self._PyHocaGUI.restricted_trayicon:
+
+                    self.Append(id=ID_EDITPROFILEWHILECONNECTED, text=_(u"Customize &profile"))
+                    self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnProfileEditWhileConnected, id=ID_EDITPROFILEWHILECONNECTED)
+
                 self._PyHocaGUI._eventid_profilenames_map[ID_EDITPROFILEWHILECONNECTED] = \
                     self._PyHocaGUI._eventid_profilenames_map[ID_SHARELOCALFOLDER] = \
                     self._PyHocaGUI._eventid_profilenames_map[ID_UNSHAREFOLDERS] = profile_name
 
-                self.Append(id=ID_EDITPROFILEWHILECONNECTED, text=_(u"Customize &profile"))
-                self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnProfileEditWhileConnected, id=ID_EDITPROFILEWHILECONNECTED)
-
                 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"),
@@ -667,6 +668,7 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu):
                     if not self._PyHocaGUI._X2goClient__client_associated_sessions_of_profile_name(profile_name=profile_name, return_objects=False) or _foldersharing_disabled:
                         _shared_folders.Enable(False)
 
+
         self.AppendSeparator()
 
         if profile_name in self._PyHocaGUI.client_connected_profiles(return_profile_names=True):


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