[X2Go-Commits] pyhoca-gui.git - twofactorauth (branch) updated: 0.1.0.10-91-g87fd34c

[X2Go dev team]

The branch, twofactorauth has been updated
       via  87fd34c75e2764f3776a285d6422437684ff901f (commit)
      from  8af9e69cfc2ab18dd3c302363751d929e8c92ade (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/profilemanager.py |   22 +++++++++++-----------
 2 files changed, 12 insertions(+), 11 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index e2d147e..24dfea8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -50,6 +50,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
       to the running PyHoca-GUI client.
     - Fix icon and button sizes in profile manager.
     - Use different textfield sizes for wxMSWin and wxGTK.
+    - Beautify MIME box configuration block in profile manager.
   * Depend on Python X2Go 0.1.2.0.
   * Install GNOME icons via dh_links.
   * Install X2Go icons with explicit install paths.
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index 3ef65ab..3186d4c 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -429,8 +429,9 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.ClientEncoding.SetMinSize((140, self._textfield_height))
         self.ServerEncoding.SetMinSize((140, self._textfield_height))
 
-        self.FileMIMEboxExtensions.SetMinSize((140, self._textfield_height))
-        self.FileMIMEboxAction.SetMinSize((180, self._textfield_height))
+        self.FileMIMEboxAction.SetMinSize((-1, self._textfield_height))
+        _field_width = self.FileMIMEboxAction.GetBestSize().GetWidth()
+        self.FileMIMEboxExtensions.SetMinSize((_field_width, self._textfield_height))
 
         self.OKButton.SetMinSize((-1, 30))
         self.CancelButton.SetMinSize((-1, 30))
@@ -657,7 +658,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         sizer_5_1_1_2_2 = wx.BoxSizer(wx.HORIZONTAL)
         sizer_5_1_1_2_3 = wx.BoxSizer(wx.HORIZONTAL)
         sizer_5_1_1_2_3.Add(self.AddSharedFolderPathButton, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_5_1_1_2_3.Add(self.DeleteSharedFolderPathButton, flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_5_1_1_2_3.Add(self.DeleteSharedFolderPathButton, flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=2)
         sizer_5_1_1_2.Add(sizer_5_1_1_2_1, flag=wx.EXPAND|wx.ALIGN_LEFT)
         sizer_5_1_1_2.Add(sizer_5_1_1_2_2, proportion=1, flag=wx.EXPAND|wx.ALIGN_LEFT)
         sizer_5_1_1_2.Add(sizer_5_1_1_2_3, flag=wx.EXPAND|wx.ALIGN_RIGHT)
@@ -686,14 +687,13 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         sizer_5_2_1 = wx.BoxSizer(wx.VERTICAL)
         sizer_5_2_1_1 = wx.BoxSizer(wx.HORIZONTAL)
         sizer_5_2_1_1.Add(self.UseFileMIMEbox, flag=wx.BOTTOM, border=5)
-        sizer_5_2_1_2 = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_5_2_1_2.Add(self.FileMIMEboxExtensionsLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_5_2_1_2.Add((8,0))
-        sizer_5_2_1_2.Add(self.FileMIMEboxExtensions)
-        sizer_5_2_1_2.Add((16,0))
-        sizer_5_2_1_2.Add(self.FileMIMEboxActionLabel, flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_5_2_1_2.Add((8,0))
-        sizer_5_2_1_2.Add(self.FileMIMEboxAction)
+        sizer_5_2_1_2 = wx.GridBagSizer(vgap=2, hgap=3)
+        sizer_5_2_1_2.Add(self.FileMIMEboxActionLabel, pos=(0,0), flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_5_2_1_2.Add(self.FileMIMEboxAction, pos=(0,2))
+        sizer_5_2_1_2.Add((8,0), pos=(0,1))
+        sizer_5_2_1_2.Add((8,0), pos=(1,1))
+        sizer_5_2_1_2.Add(self.FileMIMEboxExtensionsLabel, pos=(1,0), flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_5_2_1_2.Add(self.FileMIMEboxExtensions, pos=(1,2))
         sizer_5_2_1.Add(sizer_5_2_1_1, flag=wx.EXPAND)
         sizer_5_2_1.Add(sizer_5_2_1_2, flag=wx.EXPAND)
         sizer_5_2.Add(sizer_5_2_1, flag=wx.EXPAND|wx.ALL, border=7)


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