[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: 0.1.0.4-12-g4d83c15

[X2Go dev team]

The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
       via  4d83c15b83a20c8ed9195ab43e28ddc096624694 (commit)
      from  5f3ee229ba537bd12f6565cca17d5bf92e9e9af6 (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:
 debian/changelog      |    1 +
 pyhoca/wxgui/logon.py |   20 +++++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 317a47f..05fd943 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ pyhoca-gui (0.1.0.5-0~x2go1) UNRELEASED; urgency=low
       started (PyHoca-GUI is already running...)
     - Fix for permanently disabled session profile when Cancel button has been
       hit in logon window.
+    - Make tab traversal work in logon window.
   * React to bug #627990, prefer man2html-base over man2html.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 24 Jun 2011 16:39:24 +0200
diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py
index 17bc0e0..7938ed0 100644
--- a/pyhoca/wxgui/logon.py
+++ b/pyhoca/wxgui/logon.py
@@ -58,7 +58,7 @@ if os.environ.has_key('DESKTOP_SESSION'):
 else:
     WINDOW_MANAGER = 'generic'
 
-class PyHocaGUI_DialogBoxPassword(wx.Frame):
+class PyHocaGUI_DialogBoxPassword(wx.Dialog):
     """\
     STILL UNDOCUMENTED
 
@@ -74,7 +74,8 @@ class PyHocaGUI_DialogBoxPassword(wx.Frame):
         self.current_profile_name = profile_name
         self.current_profile_config = self._PyHocaGUI.session_profiles.get_profile_config(profile_name)
 
-        wx.Frame.__init__(self, None, -1, profile_name)
+        wx.Dialog.__init__(self, None, id=-1, title=profile_name, style=wx.DEFAULT_FRAME_STYLE, )
+        self.panel = self
         self._PyHocaGUI._sub_windows.append(self)
 
         if self.sshproxy_auth:
@@ -89,9 +90,11 @@ class PyHocaGUI_DialogBoxPassword(wx.Frame):
         self.passwordLbl = wx.StaticText(self, wx.ID_ANY, _(u'Password')+':', size=(-1, -1)) 
         self.passwordTxt = wx.TextCtrl(self, wx.ID_ANY, '', style=wx.TE_PROCESS_ENTER|wx.TE_PASSWORD, size=(120, -1)) 
         self.passwordTxt.SetFocus()
-        self.loginBtn = wx.Button(self, wx.ID_OK, _(u'Authenticate'))
+        self.loginBtn = wx.Button(self, wx.ID_OK, _(u'Authenticate'), )
         self.loginBtn.SetDefault()
 
+        _tab_order = []
+
         # widgets 
         if self.sshproxy_auth:
             self.sshProxyUserLbl = wx.StaticText(self, wx.ID_ANY, _(u'Username')+':', size=(-1, -1)) 
@@ -102,6 +105,8 @@ class PyHocaGUI_DialogBoxPassword(wx.Frame):
             self.sshProxyLoginBtn = wx.Button(self, wx.ID_OK, _(u'  Start SSH tunnel  '))
             self.sshProxyLoginBtn.SetDefault()
 
+            _tab_order.extend([self.sshProxyUserTxt, self.sshProxyPasswordTxt, self.sshProxyLoginBtn, ])
+
             headerWidth = max(self.userLbl.GetSize().GetWidth(), self.passwordLbl.GetSize().GetWidth()) + 150
             sshProxyHeaderWidth = max(self.sshProxyUserLbl.GetSize().GetWidth(), self.sshProxyPasswordLbl.GetSize().GetWidth()) + 150
 
@@ -117,7 +122,9 @@ class PyHocaGUI_DialogBoxPassword(wx.Frame):
             self.passwordTxt.Enable(False)
             self.loginBtn.Enable(False)
 
-        self.cancelBtn = wx.Button(self, wx.ID_CANCEL, _(u'Cancel'))
+        self.cancelBtn = wx.Button(self, wx.ID_CANCEL, _(u'Cancel'), )
+
+        _tab_order.extend([self.userTxt, self.passwordTxt, self.loginBtn, self.cancelBtn, ])
 
         if self.sshproxy_auth:
             self.Bind(wx.EVT_BUTTON, self.OnLogin, self.sshProxyLoginBtn)
@@ -188,6 +195,9 @@ class PyHocaGUI_DialogBoxPassword(wx.Frame):
         self.SetSizerAndFit(mainSizer) 
         self.Layout()
 
+        for i in xrange(len(_tab_order) - 1):
+            _tab_order[i+1].MoveAfterInTabOrder(_tab_order[i])
+
         maxX, maxY = wx.GetDisplaySize()
 
         if self._PyHocaGUI.logon_window_position_x and self._PyHocaGUI.logon_window_position_y:
@@ -388,4 +398,4 @@ class PyHocaGUI_DialogBoxPassword(wx.Frame):
             self._PyHocaGUI._temp_disabled_profile_names.remove(self.current_profile_name)
         except ValueError:
             pass
-        wx.Frame.Destroy(self)
+        wx.Dialog.Destroy(self)


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