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

[X2Go dev team]

The branch, twofactorauth has been updated
       via  ddad2838615d2d634959184265d849b9dc09fd09 (commit)
      from  3d39160a4070a4fc380a88afef199f4b4992f024 (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:
 dist/library.zip      |  Bin 5860311 -> 5860442 bytes
 pyhoca/wxgui/logon.py |   17 +++++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

The diff of changes is:
diff --git a/dist/library.zip b/dist/library.zip
index ab1256b..a765224 100644
Binary files a/dist/library.zip and b/dist/library.zip differ
diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py
index 622aca0..5b2b5b9 100644
--- a/pyhoca/wxgui/logon.py
+++ b/pyhoca/wxgui/logon.py
@@ -111,16 +111,17 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
         wx.Dialog.__init__(self, None, -1, profile_name, size=(210,150))
         # widgets 
         userLbl = wx.StaticText(self, wx.ID_ANY, 'Username:', size=(80, -1)) 
-        self.userTxt = wx.TextCtrl(self, wx.ID_ANY, '') 
+        self.userTxt = wx.TextCtrl(self, wx.ID_ANY, '', style=wx.TE_PROCESS_ENTER) 
         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')
+        loginBtn = wx.Button(self, wx.ID_OK, 'Authenticate')
+        cancelBtn = wx.Button(self, wx.ID_CANCEL, 'Cancel')
         self.Bind(wx.EVT_BUTTON, self.OnLogin, loginBtn)
+        self.Bind(wx.EVT_TEXT_ENTER, self.OnLogin, self.userTxt)
+        self.Bind(wx.EVT_TEXT_ENTER, self.OnLogin, self.passwordTxt)
         self.Bind(wx.EVT_BUTTON, self.OnCancel, cancelBtn)
-
+        
         # sizer / layout 
         userSizer = wx.BoxSizer(wx.HORIZONTAL) 
         passwordSizer = wx.BoxSizer(wx.HORIZONTAL) 
@@ -155,6 +156,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
         elif x2go.X2GOCLIENT_OS == 'Windows':
             self.Move((maxX-225,maxY-160))
 
+        loginBtn.SetDefault()
         self.Show()
 
     def OnLogin(self, evt):
@@ -221,7 +223,10 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
         self.Destroy()
 
     def Destroy(self):
-        self._PyHocaGUI._sub_windows.remove(self)
+        try:
+            self._PyHocaGUI._sub_windows.remove(self)
+        except ValueError:
+            pass
         try:
             self._PyHocaGUI._temp_disabled_profile_names.remove(self.current_profile_name)
         except ValueError:


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)).