[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: 86d083d5f05ac00df9259f2162f910512baa4a31
X2Go dev team
git-admin at x2go.org
Tue Aug 27 13:20:44 CEST 2013
The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
via 86d083d5f05ac00df9259f2162f910512baa4a31 (commit)
from bb2d7102be5842d5f4c5ebf41bffb0e46a442a98 (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/wxgui/menus_taskbar.py | 32 ++++++++++++++++----------------
pyhoca/wxgui/taskbar.py | 2 +-
2 files changed, 17 insertions(+), 17 deletions(-)
The diff of changes is:
diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py
index 2d51b86..7e3c346 100644
--- a/pyhoca/wxgui/menus_taskbar.py
+++ b/pyhoca/wxgui/menus_taskbar.py
@@ -47,12 +47,12 @@ class PyHocaGUI_Menu_TaskbarManageProfile(wx.Menu):
self._PyHocaGUI._eventid_profilenames_map[ID_EDITPROFILE] = \
self._PyHocaGUI._eventid_profilenames_map[ID_DELETEPROFILE] = profile_name
- _edit_profile = self.Append(text="Edit Profile", id=ID_EDITPROFILE)
+ self.Append(text="Edit Profile", id=ID_EDITPROFILE)
self.AppendSeparator()
- _delete_profile = self.Append(text="Delete Profile", id=ID_DELETEPROFILE)
+ self.Append(text="Delete Profile", id=ID_DELETEPROFILE)
- self.Bind(wx.EVT_MENU, self._PyHocaGUI.OnProfileEdit, _edit_profile)
- self.Bind(wx.EVT_MENU, self._PyHocaGUI.OnProfileDelete, _delete_profile)
+ self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnProfileEdit, id=ID_EDITPROFILE)
+ self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnProfileDelete, id=ID_DELETEPROFILE)
class PyHocaGUI_Menu_TaskbarOptionsManager(wx.Menu):
@@ -72,7 +72,7 @@ class PyHocaGUI_Menu_TaskbarOptionsManager(wx.Menu):
ID_ABOUT = wx.NewId()
self.Append(id=ID_ABOUT, text="About %s ..." % self._PyHocaGUI.appname)
- self.Bind(wx.EVT_MENU, self._PyHocaGUI.OnAbout, id=ID_ABOUT)
+ self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnAbout, id=ID_ABOUT)
self.AppendSeparator()
@@ -89,7 +89,7 @@ class PyHocaGUI_Menu_TaskbarOptionsManager(wx.Menu):
ID_OPTIONS = wx.NewId()
_options_item = self.Append(id=ID_OPTIONS, text="Client Options")
- self.Bind(wx.EVT_MENU, self._PyHocaGUI.OnOptions, id=ID_OPTIONS)
+ self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnOptions, id=ID_OPTIONS)
if self._PyHocaGUI.options_disabled:
_options_item.Enable(False)
@@ -97,7 +97,7 @@ class PyHocaGUI_Menu_TaskbarOptionsManager(wx.Menu):
ID_EXIT = wx.NewId()
self.Append(id=ID_EXIT, text="E&xit")
- self.Bind(wx.EVT_MENU, self._PyHocaGUI.OnTaskbarExit, id=ID_EXIT)
+ self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnTaskbarExit, id=ID_EXIT)
class PyHocaGUI_Menu_TaskbarSessionActions(wx.Menu):
@@ -136,9 +136,9 @@ class PyHocaGUI_Menu_TaskbarSessionActions(wx.Menu):
self.Append(text="Terminate Session", id=ID_TERMINATESESSION)
- self.Bind(wx.EVT_MENU, self._PyHocaGUI.OnSessionResume, id=ID_RESUMESESSION)
- self.Bind(wx.EVT_MENU, self._PyHocaGUI.OnSessionSuspend, id=ID_SUSPENDSESSION)
- self.Bind(wx.EVT_MENU, self._PyHocaGUI.OnSessionTerminate, id=ID_TERMINATESESSION)
+ self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnSessionResume, id=ID_RESUMESESSION)
+ self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnSessionSuspend, id=ID_SUSPENDSESSION)
+ self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnSessionTerminate, id=ID_TERMINATESESSION)
class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu):
@@ -195,9 +195,9 @@ class PyHocaGUI_Menu_TaskbarSessionProfile(wx.Menu):
self.Append(id=ID_DISCONNECT, text="&Disconnect from Server")
self._PyHocaGUI.current_profile_name = profile_name
- self.Bind(wx.EVT_MENU, self._PyHocaGUI.OnSessionStart, id=ID_SESSIONSTART)
- self.Bind(wx.EVT_MENU, self._PyHocaGUI.OnCleanSessions, id=ID_CLEANSESSIONS)
- self.Bind(wx.EVT_MENU, self._PyHocaGUI.OnSessionDisconnect, id=ID_DISCONNECT)
+ self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnSessionStart, id=ID_SESSIONSTART)
+ self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnCleanSessions, id=ID_CLEANSESSIONS)
+ self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnSessionDisconnect, id=ID_DISCONNECT)
class PyHocaGUI_Menu_TaskbarProfileNames(wx.Menu):
@@ -219,7 +219,7 @@ class PyHocaGUI_Menu_TaskbarProfileNames(wx.Menu):
if type(caller) == PyHocaGUI_Menu_TaskbarOptionsManager:
ID_ADDPROFILE = wx.NewId()
self.Append(id=ID_ADDPROFILE, text="Add Profile")
- self.Bind(wx.EVT_MENU, self._PyHocaGUI.OnProfileAdd, id=ID_ADDPROFILE)
+ self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnProfileAdd, id=ID_ADDPROFILE)
self.AppendSeparator()
@@ -236,7 +236,7 @@ class PyHocaGUI_Menu_TaskbarProfileNames(wx.Menu):
else:
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_MENU, bind_method, id=_this_id)
self._PyHocaGUI.Bind(wx.EVT_UPDATE_UI, self.OnUpdateUI, id=_this_id)
def OnUpdateUI(self, evt):
@@ -291,6 +291,6 @@ class PyHocaGUI_Menu_TaskbarSessionManager(wx.Menu):
self.AppendSeparator()
self.Append(id=ID_EXIT, text="E&xit")
- self.Bind(wx.EVT_MENU, self._PyHocaGUI.OnTaskbarExit, id=ID_EXIT)
+ self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnTaskbarExit, id=ID_EXIT)
diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py
index 20d86e3..f8324d1 100644
--- a/pyhoca/wxgui/taskbar.py
+++ b/pyhoca/wxgui/taskbar.py
@@ -114,7 +114,7 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon):
return self.CreateProfileManagerPopupMenu()
def CreateProfileManagerPopupMenu(self):
- self.menu_optionsmanager = menus_taskbar.PyHocaGUI_Menu_TaskbarOptionsManager(self._PyHocaGUI, caller=self)
+ self.menu_optionsmanager = self.PopupMenu(menus_taskbar.PyHocaGUI_Menu_TaskbarOptionsManager(self._PyHocaGUI, caller=self))
return self.menu_optionsmanager
def MakeIcon(self, icon_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