[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: 8ab4c956fac14dfcce14666e2298beeec5fe316e
X2Go dev team
git-admin at x2go.org
Tue Aug 27 13:21:00 CEST 2013
The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
via 8ab4c956fac14dfcce14666e2298beeec5fe316e (commit)
from fc0ef55857b75d70d12faa3d65e48f40d4735e6e (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 | 57 ++++++++++++++++++++++++----------------
1 file changed, 34 insertions(+), 23 deletions(-)
The diff of changes is:
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index ce30c0a..47e0afc 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -49,6 +49,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self._pyhoca_logger('starting profile manager, action is: %s' % action, loglevel=log.loglevel_INFO)
+ wx.Dialog.__init__(self, None, -1, style=wx.DEFAULT_DIALOG_STYLE, size=wx.Size(550,450))
+
self.profileManagerDefaults = defaults.X2GO_SESSIONPROFILE_DEFAULTS
self.success = False
@@ -102,9 +104,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
# we create a backup dict of our profile_config immediately (for being able to reset erroneously made changes)
self.profile_config_bak = copy.deepcopy(self.profile_config)
- wx.Dialog.__init__(self, None, -1, style=wx.DEFAULT_DIALOG_STYLE, size=wx.Size(550,450))
- self.CentreOnScreen()
-
self.X2goTabs = wx.Notebook(self, -1, style=0)
self.tab_Session = wx.Panel(self.X2goTabs, -1)
self.tab_Connection = wx.Panel(self.X2goTabs, -1)
@@ -181,11 +180,11 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.SSHProxyTunnelToPort = wx.SpinCtrl(self.tab_Connection, -1, "0", min=22, max=64000)
self.LinkSpeed = wx.Slider(self.tab_Connection, -1, 0, 0, 4)
- self.ModemLabel = wx.StaticText(self.tab_Connection, -1, " |\n "+_(u"Modem"), style=wx.ALIGN_CENTRE)
- self.ISDNLabel = wx.StaticText(self.tab_Connection, -1, " |\n "+_(u"ISDN"), style=wx.ALIGN_CENTRE)
- self.ADSLLabel = wx.StaticText(self.tab_Connection, -1, " |\n "+_(u"ADSL"), style=wx.ALIGN_CENTRE)
- self.WANLabel = wx.StaticText(self.tab_Connection, -1, " |\n "+_(u"WAN"), style=wx.ALIGN_CENTRE)
- self.LANLabel = wx.StaticText(self.tab_Connection, -1, " |\n "+_(u"LAN"), style=wx.ALIGN_CENTRE)
+ self.ModemLabel = wx.StaticText(self.tab_Connection, -1, "|\n "+_(u"Modem"), style=wx.ALIGN_CENTRE)
+ self.ISDNLabel = wx.StaticText(self.tab_Connection, -1, "|\n "+_(u"ISDN"), style=wx.ALIGN_CENTRE)
+ self.ADSLLabel = wx.StaticText(self.tab_Connection, -1, "|\n"+_(u"ADSL"), style=wx.ALIGN_CENTRE)
+ self.WANLabel = wx.StaticText(self.tab_Connection, -1, "|\n"+_(u"WAN"), style=wx.ALIGN_CENTRE)
+ self.LANLabel = wx.StaticText(self.tab_Connection, -1, "|\n"+_(u"LAN"), style=wx.ALIGN_CENTRE)
self.CompressionLabel = wx.StaticText(self.tab_Connection, -1, _(u"Method")+':')
self.Compression = wx.ComboBox(self.tab_Connection, -1, choices=self.compressionChoices.values(), style=wx.CB_DROPDOWN)
@@ -274,8 +273,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.Bind(wx.EVT_BUTTON, self.OnOKButton, self.OKButton)
self.Bind(wx.EVT_BUTTON, self.OnCancel, self.CancelButton)
self.Bind(wx.EVT_BUTTON, self.OnDefault, self.DefaultButton)
- self.SetSize(self.GetBestSize())
- self.Show(True)
def __set_properties(self):
if self.action == 'ADD':
@@ -324,7 +321,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.SSHProxyTunnelToPort.SetMinSize((60, _textfield_height))
self.SSHProxyTunnelFromHost.SetMinSize((120, _textfield_height))
self.SSHProxyTunnelToHost.SetMinSize((120, _textfield_height))
- self.LinkSpeed.SetMinSize((454, _textfield_height))
+ self.LinkSpeed.SetMinSize((440, _textfield_height))
self.ModemLabel.SetFont(wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, ""))
self.ISDNLabel.SetFont(wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, ""))
self.ADSLLabel.SetFont(wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, ""))
@@ -401,7 +398,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
sizer_1.Add(sizer_1_1, 1, wx.EXPAND, 0)
sizer_1.Add(sizer_1_2, 1, wx.EXPAND, 0)
- self.tab_Session.SetSizer(sizer_1)
+ self.tab_Session.SetSizerAndFit(sizer_1)
+ self.tab_Session.Layout()
## CONNECTION TAB
sizer_2 = wx.BoxSizer(wx.VERTICAL)
@@ -462,13 +460,14 @@ 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.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)
sizer_2_2_2.Add(self.WANLabel, 0, wx.ALIGN_CENTRE_HORIZONTAL, 0)
sizer_2_2_2.Add(self.LANLabel, 0, wx.ALIGN_CENTRE_HORIZONTAL, 0)
sizer_2_2.Add(sizer_2_2_1, 0, wx.ALIGN_CENTRE_HORIZONTAL, 0)
- sizer_2_2.Add(sizer_2_2_2, 0, wx.EXPAND|wx.ALIGN_CENTRE_HORIZONTAL, 0)
+ sizer_2_2.Add(sizer_2_2_2, 0, wx.ALIGN_CENTRE_HORIZONTAL, 0)
sizer_2_3 = wx.StaticBoxSizer(self.staticbox_Compression, wx.VERTICAL)
sizer_2_3_1 = wx.BoxSizer(wx.HORIZONTAL)
@@ -484,20 +483,22 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
sizer_2.Add(sizer_2_1, 0, wx.EXPAND, 0)
sizer_2.Add(sizer_2_2, 1, wx.EXPAND, 0)
sizer_2.Add(sizer_2_3, 0, wx.EXPAND, 0)
- self.tab_Connection.SetSizer(sizer_2)
+ self.tab_Connection.SetSizerAndFit(sizer_2)
+ self.tab_Connection.Layout()
## SETTINGS TAB
sizer_3 = wx.BoxSizer(wx.VERTICAL)
sizer_3_1 = wx.StaticBoxSizer(self.staticbox_Display, wx.VERTICAL)
sizer_3_1_1 = wx.BoxSizer(wx.HORIZONTAL)
sizer_3_1_1.Add(self.DisplayTypeFullscreen, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
+ sizer_3_1_1.Add((16, 0))
sizer_3_1_1.Add(self.DisplayTypeCustom, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
sizer_3_1_1.Add(self.ScreenWidthLabel, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_3_1_1.Add((16,0))
+ sizer_3_1_1.Add((8,0))
sizer_3_1_1.Add(self.ScreenWidth, 0, 0, 0)
- sizer_3_1_1.Add((16,0))
+ sizer_3_1_1.Add((8,0))
sizer_3_1_1.Add(self.ScreenHeightLabel, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
- sizer_3_1_1.Add((16,0))
+ 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))
@@ -552,7 +553,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
sizer_3.Add(sizer_3_2, 1, wx.EXPAND, 0)
sizer_3.Add(sizer_3_3, 1, wx.EXPAND, 0)
sizer_3.Add(sizer_3_4, 0, wx.EXPAND, 0)
- self.tab_Settings.SetSizer(sizer_3)
+ self.tab_Settings.SetSizerAndFit(sizer_3)
+ self.tab_Settings.Layout()
# FOLDERSHARING TAB
sizer_4 = wx.BoxSizer(wx.VERTICAL)
@@ -599,7 +601,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
sizer_4.Add(sizer_4_1, 0, wx.EXPAND, 0)
sizer_4.Add(sizer_4_2, 1, wx.EXPAND, 0)
- self.tab_SharedFilesAndFolders.SetSizer(sizer_4)
+ self.tab_SharedFilesAndFolders.SetSizerAndFit(sizer_4)
+ self.tab_SharedFilesAndFolders.Layout()
self.X2goTabs.AddPage(self.tab_Session, _(u"Session Profile"))
self.X2goTabs.AddPage(self.tab_Connection, _(u"Connection"))
@@ -618,12 +621,20 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
MainSizer = wx.BoxSizer(wx.VERTICAL)
MainSizer.Add(self.X2goTabs, 1, wx.EXPAND|wx.FIXED_MINSIZE, 0)
MainSizer.Add(sizer_B, 0, wx.ALIGN_RIGHT, 0)
- self.SetSizer(MainSizer)
- self.Fit()
- self.SetSizeHints(550,450)
+ self.SetSizerAndFit(MainSizer)
+
+ max1_x, max1_y = self.tab_Session.GetBestSize()
+ max2_x, max2_y = self.tab_Connection.GetBestSize()
+ max3_x, max3_y = self.tab_Settings.GetBestSize()
+ max4_x, max4_y = self.tab_SharedFilesAndFolders.GetBestSize()
+ sizer_B_x, sizer_B_y = sizer_B.GetSize()
+
+ self.SetSize(((max(max1_x, max2_x, max3_x, max4_x) + sizer_B_x) * 1.05, (max(max1_y, max2_y, max3_y, max4_y) + sizer_B_y) * 1.2))
+
self.SetAutoLayout(True)
self.Layout()
- self.ShowFullScreen(True)
+ self.CentreOnScreen()
+ self.Show(True)
def __update_fields(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)).
More information about the x2go-commits
mailing list