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

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


The branch, twofactorauth has been updated
       via  d1c98b3c61b8f8ea9d110a8f6f2b226e55d5ab2d (commit)
      from  8ab4c956fac14dfcce14666e2298beeec5fe316e (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/logon.py          |   33 +++++++++++++++++++--------------
 pyhoca/wxgui/profilemanager.py |    2 +-
 2 files changed, 20 insertions(+), 15 deletions(-)

The diff of changes is:
diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py
index 5504567..09db73f 100644
--- a/pyhoca/wxgui/logon.py
+++ b/pyhoca/wxgui/logon.py
@@ -126,33 +126,38 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
 
         btnSizer = wx.BoxSizer(wx.HORIZONTAL)
         if not self.sshproxy_auth:
-            credSizer = wx.GridSizer(2, 2, 0, 0)
+            credSizer = wx.GridBagSizer(hgap=2, vgap=2)
         mainSizer = wx.BoxSizer(wx.VERTICAL)
 
         # sizer / layout 
         if self.sshproxy_auth:
 
-            headerSizer = wx.BoxSizer(wx.HORIZONTAL)
-            headerSizer.Add(self.sshProxyHeaderLbl, 0, wx.ALL|wx.EXPAND, 5)
-            headerSizer.Add(self.headerLbl, 0, wx.ALL|wx.EXPAND, 5)
+            credSizer = wx.GridBagSizer(hgap=4, vgap=2)
 
-            mainSizer.Add(headerSizer, 0, 0, 0)
+            credSizer.Add(self.sshProxyHeaderLbl, pos=(0,0), span=(1,2), flag=wx.ALL|wx.EXPAND, border=5)
+            credSizer.Add(self.headerLbl, pos=(0,2), span=(1,2), flag=wx.ALL|wx.EXPAND, border=5)
 
-            credSizer = wx.GridSizer(2, 4, 0, 0)
+            credSizer.Add(self.sshProxyUserLbl, pos=(1,0), flag=wx.LEFT|wx.ALIGN_CENTER_VERTICAL, border=5)
+            credSizer.Add(self.sshProxyUserTxt, pos=(1,1), flag=wx.ALL, border=5)
 
-            credSizer.Add(self.sshProxyUserLbl, 0, wx.LEFT|wx.ALIGN_CENTER_VERTICAL, 5)
-            credSizer.Add(self.sshProxyUserTxt, 0, wx.ALL, 5)
+            credSizer.Add(self.userLbl, pos=(1,2), flag=wx.LEFT|wx.ALIGN_CENTER_VERTICAL, border=5) 
+            credSizer.Add(self.userTxt, pos=(1,3), flag=wx.ALL, border=5) 
 
-        credSizer.Add(self.userLbl, 0, wx.LEFT|wx.ALIGN_CENTER_VERTICAL, 5) 
-        credSizer.Add(self.userTxt, 0, wx.ALL, 5) 
+        else:
+            credSizer.Add(self.userLbl, pos=(0,0), flag=wx.LEFT|wx.ALIGN_CENTER_VERTICAL, border=5) 
+            credSizer.Add(self.userTxt, pos=(0,1), flag=wx.ALL, border=5) 
 
         if self.sshproxy_auth:
 
-            credSizer.Add(self.sshProxyPasswordLbl, 0, wx.LEFT|wx.ALIGN_CENTER_VERTICAL, 5)
-            credSizer.Add(self.sshProxyPasswordTxt, 0, wx.ALL, 5)
+            credSizer.Add(self.sshProxyPasswordLbl, pos=(2,0), flag=wx.LEFT|wx.ALIGN_CENTER_VERTICAL, border=5)
+            credSizer.Add(self.sshProxyPasswordTxt, pos=(2,1), flag=wx.ALL, border=5)
+
+            credSizer.Add(self.passwordLbl, pos=(2,2), flag=wx.LEFT|wx.ALIGN_CENTER_VERTICAL, border=5) 
+            credSizer.Add(self.passwordTxt, pos=(2,3), flag=wx.ALL, border=5)
 
-        credSizer.Add(self.passwordLbl, 0, wx.LEFT|wx.ALIGN_CENTER_VERTICAL, 5) 
-        credSizer.Add(self.passwordTxt, 0, wx.ALL, 5) 
+        else:
+            credSizer.Add(self.passwordLbl, pos=(1,0), flag=wx.LEFT|wx.ALIGN_CENTER_VERTICAL, border=5) 
+            credSizer.Add(self.passwordTxt, pos=(1,1), flag=wx.ALL, border=5)
 
         if self.sshproxy_auth:
             btnSizer.Add(self.sshProxyLoginBtn, 0, wx.ALL, 5)
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index 47e0afc..4bc8cd6 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -460,7 +460,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         sizer_2_2_1 = wx.BoxSizer(wx.VERTICAL)
         sizer_2_2_1.Add(self.LinkSpeed, 0, 0, 0)
         sizer_2_2_2 = wx.GridSizer(1,5,0,0)
-        sizer_2_2_2.SetMinSize((454/5*6 - 35, -1))
+        sizer_2_2_2.SetMinSize((454/5*6 - 30, -1))
         sizer_2_2_2.Add(self.ModemLabel, 0, wx.ALIGN_CENTRE_HORIZONTAL, 0)
         sizer_2_2_2.Add(self.ISDNLabel, 0, wx.ALIGN_CENTRE_HORIZONTAL, 0)
         sizer_2_2_2.Add(self.ADSLLabel, 0, wx.ALIGN_CENTRE_HORIZONTAL, 0)


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