[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: 7b0c22aaa9423277139aa51c0a5ef865bea522d1

X2Go dev team git-admin at x2go.org
Tue Aug 27 13:20:57 CEST 2013


The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
       via  7b0c22aaa9423277139aa51c0a5ef865bea522d1 (commit)
      from  26a6dae65464f73fdeb39f8e38e3951f3893a9be (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 |   35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

The diff of changes is:
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index d8b9eed..54e2fdd 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -123,11 +123,11 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.ProfileName = wx.TextCtrl(self.tab_Session, -1, "", size=wx.Size(200,20))
         _share_location = os.path.split(_icons_location)[0]
         if 'icon' in self.profile_config:
-            path_to_icon = self.profile_config['icon'].replace(':','%s/' % _share_location)
+            path_to_icon = self.profile_config['icon'].replace(':', os.path.normpath('%s/' % _share_location))
         else:
-            path_to_icon = '%s/icons/PyHoca/128x128/pyhoca-session.png' % _share_location
+            path_to_icon = os.path.normpath('%s/icons/PyHoca/128x128/pyhoca-session.png' % _share_location)
         self.IconPath = path_to_icon
-        path_to_icon = path_to_icon.replace('icons/128x128/x2gosession.png', 'icons/PyHoca/128x128/pyhoca-session.png')
+        path_to_icon = path_to_icon.replace(os.path.normpath('icons/128x128/x2gosession.png'), os.path.normpath('icons/PyHoca/128x128/pyhoca-session.png'))
         self.IconButtonLabel = wx.StaticText(self.tab_Session, -1, "Profile icon:")
         self.IconButton = wx.BitmapButton(self.tab_Session, -1, wx.Bitmap(path_to_icon, wx.BITMAP_TYPE_ANY))
         self.SessionTypeLabel = wx.StaticText(self.tab_Session, -1, "Session type:")
@@ -155,7 +155,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.SSHPort = wx.SpinCtrl(self.tab_Connection, -1, "0", min=22, max=64000)
         self.SSHKeyFileLabel = wx.StaticText(self.tab_Connection, -1, "RSA/DSA private key:")
         self.SSHKeyFile = wx.TextCtrl(self.tab_Connection, -1, style=wx.TE_PROCESS_ENTER)
-        self.SSHKeyFileBrowseButton = wx.BitmapButton(self.tab_Connection, -1, wx.Bitmap('/%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY))
+        self.SSHKeyFileBrowseButton = wx.BitmapButton(self.tab_Connection, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY))
         self.UseSSHProxy = wx.CheckBox(self.tab_Connection, -1, "Server behind SSH proxy")
         self.SSHProxyHostLabel = wx.StaticText(self.tab_Connection, -1, "Host:")
         self.SSHProxyHost = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(80,20))
@@ -163,7 +163,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.SSHProxyUser = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(80,20))
         self.SSHProxyKeyFileLabel = wx.StaticText(self.tab_Connection, -1, "Key file:")
         self.SSHProxyKeyFile = wx.TextCtrl(self.tab_Connection, -1, style=wx.TE_PROCESS_ENTER)
-        self.SSHProxyKeyFileBrowseButton = wx.BitmapButton(self.tab_Connection, -1, wx.Bitmap('/%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY))
+        self.SSHProxyKeyFileBrowseButton = wx.BitmapButton(self.tab_Connection, -1, wx.Bitmap('%s/PyHoca/16x16/system-search.png' % _icons_location, wx.BITMAP_TYPE_ANY))
         self.SSHProxyTunnelLabel = wx.StaticText(self.tab_Connection, -1, "SSH Proxy Tunnel:")
         self.SSHProxyTunnelFromHost = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(200,20))
         self.SSHProxyTunnelFromPort = wx.SpinCtrl(self.tab_Connection, -1, "0", min=22, max=64000)
@@ -337,7 +337,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         # SESSION TAB
         sizer_1 = wx.BoxSizer(wx.VERTICAL)
         sizer_1_1 = wx.StaticBoxSizer(self.staticbox_Profile, wx.VERTICAL)
-        sizer_1_1_1 = wx.FlexGridSizer(1, 2, 7, 9)
+        sizer_1_1_1 = wx.GridSizer(2, 2, 7, 9)
         sizer_1_1_1.Add(self.ProfileNameLabel, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
         sizer_1_1_1.Add(self.ProfileName, 0, 0, 0)
         sizer_1_1_1.Add(self.IconButtonLabel, 0, wx.TOP, 0)
@@ -345,7 +345,7 @@ 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(1, 2, 7, 9)
+        sizer_1_2_1 = wx.GridSizer(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)
@@ -354,8 +354,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         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(1, 3, 2, 9)
-        sizer_1_2_2.Add((0,23))
+        sizer_1_2_2 = wx.GridSizer(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)
@@ -424,12 +424,12 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         sizer_2_2 = wx.StaticBoxSizer(self.staticbox_LinkSpeed, wx.VERTICAL)
         sizer_2_2_1 = wx.BoxSizer(wx.VERTICAL)
         sizer_2_2_1.Add(self.LinkSpeed, 0, 0, 0)
-        sizer_2_2_2 = wx.FlexGridSizer(1,5,0,0)
-        sizer_2_2_2.AddGrowableCol(0)
-        sizer_2_2_2.AddGrowableCol(1)
-        sizer_2_2_2.AddGrowableCol(2)
-        sizer_2_2_2.AddGrowableCol(3)
-        sizer_2_2_2.AddGrowableCol(4)
+        sizer_2_2_2 = wx.GridSizer(1,5,0,0)
+        #sizer_2_2_2.AddGrowableCol(0)
+        #sizer_2_2_2.AddGrowableCol(1)
+        #sizer_2_2_2.AddGrowableCol(2)
+        #sizer_2_2_2.AddGrowableCol(3)
+        #sizer_2_2_2.AddGrowableCol(4)
         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)
@@ -525,7 +525,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         # FOLDERSHARING TAB
         sizer_4 = wx.BoxSizer(wx.VERTICAL)
         sizer_4_1 = wx.StaticBoxSizer(self.staticbox_FolderSharing, wx.VERTICAL)
-        sizer_4_1_1 = wx.FlexGridSizer(1, 2, 0, 0)
+        sizer_4_1_1 = wx.GridSizer(2, 2, 0, 0)
         sizer_4_1_1_1 = wx.BoxSizer(wx.HORIZONTAL)
         sizer_4_1_1_1.Add(self.SharedFolderPathLabel, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
         sizer_4_1_1_1.Add(self.SharedFolderPath, 0, wx.ALIGN_CENTRE_VERTICAL, 0)
@@ -552,7 +552,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
 
         # the bottom area with OK, Defaults and Cancel buttons
         sizer_B = wx.BoxSizer(wx.HORIZONTAL)
-        sizer_B_1 = wx.FlexGridSizer(1, 0, 7, 14)
+        sizer_B_1 = wx.GridSizer(1, 3, 7, 14)
         sizer_B_1.Add(self.OKButton, 0, 0, 0)
         sizer_B_1.Add(self.DefaultButton, 0, 0, 0)
         sizer_B_1.Add(self.CancelButton, 0, 0, 0)
@@ -567,6 +567,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.SetSizeHints(550,450)
         self.SetAutoLayout(True)
         self.Layout()
+        self.ShowFullScreen(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