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

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


The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
       via  c4497cad1e82697f62c8524bc5b3a855042ef45c (commit)
      from  7b0c22aaa9423277139aa51c0a5ef865bea522d1 (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          |    1 +
 pyhoca/wxgui/profilemanager.py |   24 +++++++++++++-----------
 2 files changed, 14 insertions(+), 11 deletions(-)

The diff of changes is:
diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py
index 7e3a97f..d590f71 100644
--- a/pyhoca/wxgui/logon.py
+++ b/pyhoca/wxgui/logon.py
@@ -227,6 +227,7 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog):
                                                          username=username, 
                                                          password=password, 
                                                          force_password_auth=force_password_auth, 
+                                                         add_to_known_hosts=True,
                                                          sshproxy_user=sshproxy_user, 
                                                          sshproxy_password=sshproxy_password)
             if not self._PyHocaGUI._X2goClient__server_valid_x2gouser(session_uuid):
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index 54e2fdd..74fc795 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -123,11 +123,13 @@ 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(':', os.path.normpath('%s/' % _share_location))
+            path_to_icon = self.profile_config['icon']
+            path_to_icon = path_to_icon.lstrip(':')
+            path_to_icon = os.path.join(os.path.normpath(_share_location), os.path.normpath(path_to_icon))
         else:
             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(os.path.normpath('icons/128x128/x2gosession.png'), os.path.normpath('icons/PyHoca/128x128/pyhoca-session.png'))
+        path_to_icon = path_to_icon.replace('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:")
@@ -172,11 +174,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, "     |\nModem", style=wx.ALIGN_LEFT)
-        self.ISDNLabel = wx.StaticText(self.tab_Connection, -1, " |\nISDN", style=wx.ALIGN_LEFT)
-        self.ADSLLabel = wx.StaticText(self.tab_Connection, -1, "  |\nADSL", style=wx.ALIGN_LEFT)
-        self.WANLabel = wx.StaticText(self.tab_Connection, -1, "  |\nWAN", style=wx.ALIGN_LEFT)
-        self.LANLabel = wx.StaticText(self.tab_Connection, -1, "|  \nLAN", style=wx.ALIGN_RIGHT)
+        self.ModemLabel = wx.StaticText(self.tab_Connection, -1, " |\n Modem", style=wx.ALIGN_CENTRE)
+        self.ISDNLabel = wx.StaticText(self.tab_Connection, -1, " |\n ISDN", style=wx.ALIGN_CENTRE)
+        self.ADSLLabel = wx.StaticText(self.tab_Connection, -1, "  |\n  ADSL", style=wx.ALIGN_CENTRE)
+        self.WANLabel = wx.StaticText(self.tab_Connection, -1, "  |\n  WAN", style=wx.ALIGN_CENTRE)
+        self.LANLabel = wx.StaticText(self.tab_Connection, -1, "   |\n   LAN", style=wx.ALIGN_CENTRE)
 
         self.CompressionLabel = wx.StaticText(self.tab_Connection, -1, "Method:")
         self.Compression = wx.ComboBox(self.tab_Connection, -1, choices=self.compressionChoices.values(), style=wx.CB_DROPDOWN)
@@ -268,7 +270,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
         self.Application.SetSelection(0)
         self.Command.SetMinSize((230, _textfield_height))
         self.XDMCPServerLabel.SetMinSize((120, 16))
-        self.XDMCPServer.SetMinSize((160, _textfield_height))
+        self.XDMCPServer.SetMinSize((120, _textfield_height))
         self.RDPSettingsLabel.SetMinSize((120, 16))
         self.RDPServerLabel.SetMinSize((120, 16))
         self.RDPServer.SetMinSize((160, _textfield_height))
@@ -337,7 +339,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.GridSizer(2, 2, 7, 9)
+        sizer_1_1_1 = wx.FlexGridSizer(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 +347,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.GridSizer(4, 2, 7, 9)
+        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)
@@ -354,7 +356,7 @@ 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.GridSizer(2, 3, 2, 9)
+        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)


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