The branch, twofactorauth has been updated via ce2297f13fe33008c0b55cc40224f48c5271241d (commit) from cc26a8dfa5267883c21da7c46c536fde5b86f6c9 (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/profilemanager.py | 54 +++++++++++++++++++++------------------- 1 file changed, 28 insertions(+), 26 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index 4bc8cd6..1b1bde7 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -283,24 +283,29 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SetTitle(_(u"PyHoca-GUI Profile Manager - %s") % self.profile_config['name']) self.SetFont(wx.Font(9, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "")) _textfield_height = self.SSHKeyFileBrowseButton.GetBestSize().GetHeight()-2 + self.ProfileNameLabel.SetMinSize((120, 16)) self.ProfileName.SetMinSize((180, _textfield_height)) self.IconButton.SetSize(self.IconButton.GetBestSize()) self.SessionTypeLabel.SetMinSize((120, 16)) + #self.SessionType.SetMinSize((180, _textfield_height)) + self.SessionType.SetMinSize((-1, _textfield_height)) self.SessionType.SetSelection(5) self.ApplicationLabel.SetMinSize((120, 16)) - self.Application.SetMinSize((230, _textfield_height)) + #self.Application.SetMinSize((180, _textfield_height)) + self.Application.SetMinSize((-1, _textfield_height)) self.Application.SetSelection(0) - self.Command.SetMinSize((230, _textfield_height)) + #self.Command.SetMinSize((180, _textfield_height)) + self.Command.SetMinSize((-1, _textfield_height)) self.XDMCPServerLabel.SetMinSize((120, 16)) - self.XDMCPServer.SetMinSize((120, _textfield_height)) + #self.XDMCPServer.SetMinSize((180, _textfield_height)) + self.XDMCPServer.SetMinSize((-1, _textfield_height)) self.RDPSettingsLabel.SetMinSize((120, 16)) - self.RDPServerLabel.SetMinSize((120, 16)) - self.RDPServer.SetMinSize((160, _textfield_height)) - self.RDPServerLabel.SetMinSize((120, 16)) - self.RDPServer.SetMinSize((160, _textfield_height)) + self.RDPServerLabel.SetMinSize((180, 16)) + self.RDPServer.SetMinSize((180, _textfield_height)) self.RDPOptionsLabel.SetMinSize((120, 16)) - self.RDPOptions.SetMinSize((160, _textfield_height)) + self.RDPOptions.SetMinSize((120, _textfield_height)) + self.HostLabel.SetMinSize((110, 16)) self.Host.SetMinSize((180, _textfield_height)) self.UserNameLabel.SetMinSize((110, 16)) @@ -377,24 +382,21 @@ class PyHocaGUI_ProfileManager(wx.Dialog): sizer_1_1.Add(sizer_1_1_1, 0, wx.EXPAND, 0) sizer_1_2 = wx.StaticBoxSizer(self.staticbox_SessionType, wx.VERTICAL) - sizer_1_2_1 = wx.FlexGridSizer(4, 2, 7, 9) - sizer_1_2_1.Add(self.SessionTypeLabel, 0, wx.ALIGN_CENTRE_VERTICAL, 0) - sizer_1_2_1.Add(self.SessionType, 0, 0, 0) - sizer_1_2_1.Add(self.ApplicationLabel, 0, wx.ALIGN_CENTRE_VERTICAL, 0) - sizer_1_2_1.Add(self.Application, 0, 0, 0) - sizer_1_2_1.Add(self.CommandLabel, 0, wx.ALIGN_CENTRE_VERTICAL, 0) - sizer_1_2_1.Add(self.Command, 0, 0, 0) - sizer_1_2_1.Add(self.XDMCPServerLabel, 0, wx.ALIGN_CENTRE_VERTICAL, 0) - sizer_1_2_1.Add(self.XDMCPServer, 0, 0, 0) - sizer_1_2_2 = wx.FlexGridSizer(2, 3, 2, 9) - sizer_1_2_2.Add((-1,23)) - sizer_1_2_2.Add(self.RDPServerLabel, 0, wx.ALIGN_BOTTOM, 0) - sizer_1_2_2.Add(self.RDPOptionsLabel, 0, wx.ALIGN_BOTTOM, 0) - sizer_1_2_2.Add(self.RDPSettingsLabel, 0, wx.ALIGN_CENTRE_VERTICAL, 0) - sizer_1_2_2.Add(self.RDPServer, 0, 0, 0) - sizer_1_2_2.Add(self.RDPOptions, 0, 0, 0) + sizer_1_2_1 = wx.GridBagSizer(hgap=3,vgap=6) + sizer_1_2_1.Add(self.SessionTypeLabel, pos=(0,0), flag=wx.ALIGN_CENTRE_VERTICAL, ) + sizer_1_2_1.Add(self.SessionType, pos=(0,1), span=(1,2), flag=wx.EXPAND, ) + sizer_1_2_1.Add(self.ApplicationLabel, pos=(1,0), flag=wx.ALIGN_CENTRE_VERTICAL, ) + sizer_1_2_1.Add(self.Application, pos=(1,1), span=(1,2), flag=wx.EXPAND, ) + sizer_1_2_1.Add(self.CommandLabel, pos=(2,0), flag=wx.ALIGN_CENTRE_VERTICAL, ) + sizer_1_2_1.Add(self.Command, pos=(2, 1), span=(1,2), flag=wx.EXPAND, ) + sizer_1_2_1.Add(self.XDMCPServerLabel, (3,0), flag=wx.ALIGN_CENTRE_VERTICAL, ) + sizer_1_2_1.Add(self.XDMCPServer, pos=(3,1), span=(1,2), flag=wx.EXPAND, ) + sizer_1_2_1.Add(self.RDPServerLabel, pos=(4,1), flag=wx.ALIGN_BOTTOM, ) + sizer_1_2_1.Add(self.RDPOptionsLabel, pos=(4,2), flag=wx.ALIGN_BOTTOM, ) + sizer_1_2_1.Add(self.RDPSettingsLabel, pos=(5,0), flag=wx.ALIGN_CENTRE_VERTICAL, ) + sizer_1_2_1.Add(self.RDPServer, pos=(5, 1), ) + sizer_1_2_1.Add(self.RDPOptions, pos=(5,2), ) sizer_1_2.Add(sizer_1_2_1, 0, wx.EXPAND, 0) - sizer_1_2.Add(sizer_1_2_2, 0, wx.EXPAND, 0) sizer_1.Add(sizer_1_1, 1, wx.EXPAND, 0) sizer_1.Add(sizer_1_2, 1, wx.EXPAND, 0) @@ -501,7 +503,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): sizer_3_1_1.Add((8,0)) sizer_3_1_1.Add(self.ScreenHeight, 0, 0, 0) sizer_3_1_2 = wx.BoxSizer(wx.HORIZONTAL) - sizer_3_1_2.Add((0,24)) + sizer_3_1_2.Add((-1,48)) sizer_3_1_2.Add(self.SetDisplayDPI, 0, wx.ALIGN_CENTRE_VERTICAL, 0) sizer_3_1_2.Add((8,0)) sizer_3_1_2.Add(self.DisplayDPI, 0, wx.ALIGN_CENTRE_VERTICAL, 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)).