The branch, twofactorauth has been updated via e8e6d2f60de431980a3b9a2ac8153dfe7c12c5c7 (commit) from 8fd894f6a7c5c51e98750e01c1defd9c9f302822 (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/frontend.py | 3 +-- pyhoca/wxgui/menus_taskbar.py | 12 +++++------- pyhoca/wxgui/profilemanager.py | 15 +++++++++++---- 3 files changed, 17 insertions(+), 13 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index ca59a30..866ac84 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -360,9 +360,8 @@ class PyHocaGUI(wx.App, x2go.X2goClient): STILL UNDOCUMENTED """ - self.current_profile_name = self._eventid_profilenames_map[evt.GetId()] self._pyhoca_logger('adding new X2go session profile', x2go.loglevel_INFO, ) - profilemanager.PyHocaGUI_ProfileManager(self._PyHocaGUI, 'ADD') + profilemanager.PyHocaGUI_ProfileManager(self, 'ADD') # def OnProfileEdit(self, evt): # """\ diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py index 2aff5fb..947f08d 100644 --- a/pyhoca/wxgui/menus_taskbar.py +++ b/pyhoca/wxgui/menus_taskbar.py @@ -30,7 +30,7 @@ class PyHocaGUI_Menu_TaskbarManageProfile(wx.Menu): STILL UNDOCUMENTED """ - def __init__(self, _PyHocaGUI, caller=None): + def __init__(self, _PyHocaGUI, caller=None, profile_name=None): """\ STILL UNDOCUMENTED @@ -40,17 +40,13 @@ class PyHocaGUI_Menu_TaskbarManageProfile(wx.Menu): wx.Menu.__init__(self) - ID_ADDPROFILE = wx.NewId() ID_DELPROFILE = wx.NewId() - ID_RENPROFILE = wx.NewId() ID_EDITPROFILE = wx.NewId() - self.Append(text="Add Profile", id=ID_ADDPROFILE) self.Append(text="Edit Profile", id=ID_EDITPROFILE) self.AppendSeparator() self.Append(text="Delete Profile", id=ID_DELPROFILE) - self.Bind(wx.EVT_MENU, self._PyHocaGUI.OnProfileAdd, id=ID_ADDPROFILE) #self.Bind(wx.EVT_MENU, self._PyHocaGUI.OnProfileEdit, id=ID_EDITPROFILE) #self.Bind(wx.EVT_MENU, self._PyHocaGUI.OnProfileDelete, id=ID_DELPROFILE) @@ -70,12 +66,14 @@ class PyHocaGUI_Menu_TaskbarOptionsManager(wx.Menu): wx.Menu.__init__(self) - ID_NEWPROFILE = wx.NewId() + ID_ADDPROFILE = wx.NewId() ID_PROFILEMANAGER = wx.NewId() ID_OPTIONS = wx.NewId() ID_EXIT = wx.NewId() - self.Append(id=ID_NEWPROFILE, text="Add new X2go Session Profile") + self.Append(id=ID_ADDPROFILE, text="Add new X2go Session Profile") + self.Bind(wx.EVT_MENU, self._PyHocaGUI.OnProfileAdd, id=ID_ADDPROFILE) + self.AppendMenu(id=ID_PROFILEMANAGER, text="Maintain X2go Session Profiles", submenu=PyHocaGUI_Menu_TaskbarProfileNames(self._PyHocaGUI, diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index e0f3bb9..36fd8eb 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -21,6 +21,8 @@ import wx import platform +import x2go.log as log + # begin wxGlade: extracode # end wxGlade @@ -34,25 +36,30 @@ class PyHocaGUI_ProfileManager(wx.Frame): STILL UNDOCUMENTED """ - self.PyHocaGUI = _PyHocaGUI + self._PyHocaGUI = _PyHocaGUI self._pyhoca_logger = self._PyHocaGUI._pyhoca_logger self._pyhoca_logger('starting profile manager, action is: %s' % action, loglevel=log.loglevel_INFO) + self.sessionChoicesText = ["KDE", "GNOME", "LXDE", "Connect to Windows Terminal server", "Custom desktop", "Single application"] self.sessionChoices = ["KDE", "GNOME", "LXDE", "TerminalServer", "Custom", "application"] self.applicationListText = ["Internet browser", "Email client", "Openoffice.org", "Terminal", "xterm", "Server side programlist"] self.applicationList = ['WWWBROWSER', 'MAILCLIENT', 'OFFICE', 'TERMINAL','TERMINAL','x2go-auth'] + self.linkText = ['MODEM','ISDN','ADSL','WAN','LAN'] self.compText = ["4k-jpeg", "32k-jpeg", "64k-jpeg", "256k-jpeg", "2m-jpeg", "16m-jpeg"] self.session_profiles = self._PyHocaGUI.session_profiles self.action = action + + self.profile_id = profile_id if self.action == 'ADD': # this will create a default session profile - self.profile_id = self.session_profiles.add_profile() - self.profile_config = self.session_profiles.get_profile_config(profile_id) + self.profile_id = self.session_profiles.add_profile(self.profile_id) + + self.profile_config = self.session_profiles.get_profile_config(self.profile_id) - wx.Frame.__init__(self, self._PyHocaGUI, -1, style=wx.DEFAULT_FRAME_STYLE, size=wx.Size(400,400)) + wx.Frame.__init__(self, None, -1, style=wx.DEFAULT_FRAME_STYLE, size=wx.Size(400,400)) self.CentreOnScreen() self.X2goTabs = wx.Notebook(self, -1, style=0) self.X2goTabs_pane_4 = wx.Panel(self.X2goTabs, -1) 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)).