[X2Go-Commits] pyhoca-gui.git - twofactorauth (branch) updated: 58a99cdf1803f08fc0a90370945779a20060cf24

X2Go dev team git-admin at x2go.org
Sat Sep 14 15:54:15 CEST 2013


The branch, twofactorauth has been updated
       via  58a99cdf1803f08fc0a90370945779a20060cf24 (commit)
      from  f668b6cd2e3a7b54aa4528abeb99ba26c5e3db12 (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      |   33 ---------------------------------
 pyhoca/wxgui/logon.py         |    1 +
 pyhoca/wxgui/menus_taskbar.py |    9 +++------
 3 files changed, 4 insertions(+), 39 deletions(-)

The diff of changes is:
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index 904a332..43113a9 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -142,39 +142,6 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
         #    import x2go.X2goXServer as _xserver
         #    _xserver.startXserver(parent)
 
-        #default_session = None
-        #_defaults = _session_profiles.get_default_profiles()
-        #if _defaultProfiles and len(_defaultProfiles) == 1:
-        #    self.current_profile = defaultProfile = _defaultProfiles[0]
-
-
-        # auto-resume suspended sessions
-        #_suspended_sessions = self.suspended_sessions
-        #if _suspended_sessions and len(_suspended_sessions) > 0:
-        #    if _client_settings.autoresume:
-        #
-        #        self._pyhoca_logger('autoresuming suspended sessions: %s' % _suspended_sessions, loglevel=x2go.loglevel_INFO, )
-        #        ChoiceScrn = X2GoChooseSessionScrn(self, Iconize=True)
-        #        for suspended in _suspended_sessions:
-        #            suspended.resume()
-        #    else:
-        #
-        #        self._pyhoca_logger('select sessions to be resumed from suspended sessions: %s' % _suspended_sessions, loglevel=x2go.loglevel_INFO, )
-        #        X2GoResumeSessions(self, _suspended_sessions)
-        #
-        #elif defaultProfile:
-        #
-        #    # start minimized and immediately connect to the default sessions
-        #    ChoiceScrn = X2GoChooseSessionScrn(self, Iconize=self.args.minimized)
-
-        #elif len(_session_profiles.profile_ids) > 0:
-        #
-        #    self._pyhoca_logger('starting profile selection window', loglevel=x2go.loglevel_INFO, )
-        #else:
-        #
-        #    self._pyhoca_logger('starting profile manager with new/empty session profile', loglevel=x2go.loglevel_INFO, )
-        #    defScrn = X2GoSessionDefScrn(self, directCall=True)
-
         self._pyhoca_logger('PyHoca GUI is starting up', loglevel=x2go.loglevel_INFO, )
         self._pyhoca_logger('registering PyHocaGUI control sessions', loglevel=x2go.loglevel_INFO, )
 
diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py
index 71a4c30..e4088e4 100644
--- a/pyhoca/wxgui/logon.py
+++ b/pyhoca/wxgui/logon.py
@@ -110,6 +110,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
         self.userTxt = wx.TextCtrl(self, wx.ID_ANY, '') 
         passwordLbl = wx.StaticText(self, wx.ID_ANY, 'Password:', size=(80, -1)) 
         self.passwordTxt = wx.TextCtrl(self, wx.ID_ANY, '', style=wx.TE_PROCESS_ENTER|wx.TE_PASSWORD) 
+        self.passwordTxt.SetFocus()
         loginBtn = wx.Button(self, wx.ID_YES, 'Authenticate')
         loginBtn.SetDefault()
         cancelBtn = wx.Button(self, wx.ID_ANY, 'Cancel')
diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py
index 843e24d..93a7ce1 100644
--- a/pyhoca/wxgui/menus_taskbar.py
+++ b/pyhoca/wxgui/menus_taskbar.py
@@ -177,12 +177,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)
-        wx.EVT_MENU(self, ID_SESSIONSTART, self._PyHocaGUI.OnSessionStart)
-        wx.EVT_MENU(self, ID_CLEANSESSIONS, self._PyHocaGUI.OnCleanSessions)
-        wx.EVT_MENU(self, ID_DISCONNECT, self._PyHocaGUI.OnSessionDisconnect)
+        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)
 
 
 class PyHocaGUI_Menu_TaskbarProfileNames(wx.Menu):


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