The branch, twofactorauth has been updated via 2a68b11349f8888ceaef7767c1ea7adc1fb08876 (commit) from 9e175015d04d7fd9beb55c02cab34fe8ffe27dad (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: man/pyhoca-gui.1 | 3 --- pyhoca-gui | 1 - pyhoca/wxgui/chooser.py | 13 ++++++++++--- pyhoca/wxgui/frontend.py | 9 +++++++-- 4 files changed, 17 insertions(+), 9 deletions(-) The diff of changes is: diff --git a/man/pyhoca-gui.1 b/man/pyhoca-gui.1 index a33f04e..597b8ef 100644 --- a/man/pyhoca-gui.1 +++ b/man/pyhoca-gui.1 @@ -55,9 +55,6 @@ Enable debugging code of Python X2go's sFTP server code (very verbose, and it ma \*(T<\fB\-u, \-\-username\fR \fI<USERNAME>\fR\*(T> Username for the session (default: currently logged in user). .TP -\*(T<\fB\-p, \-\-password\fR \fI<secret>\fR\*(T> -User password, usage not recommended directly from the command line, useful for scripting, though (default: not set). -.TP \*(T<\fB\-m, \-\-minimized\fR\*(T> Start x2go gui minimized on the taskbar. .TP diff --git a/pyhoca-gui b/pyhoca-gui index 0a36941..aaa3793 100755 --- a/pyhoca-gui +++ b/pyhoca-gui @@ -69,7 +69,6 @@ debug_options = [ x2go_gui_options = [ {'args':['-m','--minimized'], 'default':False, 'action': 'store_true', 'help': 'start x2go gui minimized on the taskbar',} , {'args':['-u','--username'], 'default': None, 'help': 'username for the session (default: current user)', }, - {'args':['-p','--password'], 'default': None, 'help': 'user password (not recommended from the command line, default: not set)', }, {'args':['-s','--profile'], 'default': None, 'help': 'The name of the sessionprofile to be used to make the connection', } ] diff --git a/pyhoca/wxgui/chooser.py b/pyhoca/wxgui/chooser.py index b9f6178..4873507 100644 --- a/pyhoca/wxgui/chooser.py +++ b/pyhoca/wxgui/chooser.py @@ -18,6 +18,13 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +### +### The CHOOSER code is currently virtually disabled, we will keep it +### for future use!!! +### + + modules ={} try: @@ -100,9 +107,9 @@ class PyHocaGUI_SessionChooser(wx.Frame): # #self.list.SetImageList(self.il, wx.IMAGE_LIST_SMALL) - self.TaskBarIcon = taskbar.PyHocaGUI_TaskBarIcon(self._PyHocaGUI) - self.TaskBarIcon.Bind(wx.EVT_TASKBAR_LEFT_DCLICK, lambda _Show: self.Show(True)) - self.TaskBarIcon.Bind(wx.EVT_TASKBAR_LEFT_DOWN, self.TaskBarIcon.CreateSessionManagerPopupMenu) + #self.TaskBarIcon = taskbar.PyHocaGUI_TaskBarIcon(self._PyHocaGUI) + #self.TaskBarIcon.Bind(wx.EVT_TASKBAR_LEFT_DCLICK, lambda _Show: self.Show(True)) + #self.TaskBarIcon.Bind(wx.EVT_TASKBAR_LEFT_DOWN, self.TaskBarIcon.CreateSessionManagerPopupMenu) self.Main_MenuBar = wx.MenuBar() self.SetMenuBar(self.Main_MenuBar) diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index feea654..f73af9d 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -179,8 +179,13 @@ class PyHocaGUI(wx.App, x2go.X2goClient): # # self._pyhoca_logger('starting profile selection window', loglevel=x2go.loglevel_INFO, ) self._chooser_selected_profile_name = None - self.chooser = chooser.PyHocaGUI_SessionChooser(self) - self.taskbar = self.chooser.TaskBarIcon + #self.chooser = chooser.PyHocaGUI_SessionChooser(self) + + self.taskbar = taskbar.PyHocaGUI_TaskBarIcon(self) + #self.taskbar.Bind(wx.EVT_TASKBAR_LEFT_DCLICK, lambda _Show: self.Show(True)) + self.taskbar.Bind(wx.EVT_TASKBAR_LEFT_DOWN, self.taskbar.CreateSessionManagerPopupMenu) + #self.taskbar = self.chooser.TaskBarIcon + self._eventid_profilenames_map = {} self._eventid_sessionnames_map = {} 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)).