X2Go dev team | 14 Jan 02:54 2013

pyhoca-gui.git - master (branch) updated: 0.2.1.1-42-g9f6c08f

The branch, master has been updated
       via  9f6c08f94d52c5c662fcfae91c2da524521ace4c (commit)
      from  1f9b6304ae56a69d46c6748f221ed326f48065aa (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 -----------------------------------------------------------------
commit 9f6c08f94d52c5c662fcfae91c2da524521ace4c
Author: Mike Gabriel <mike.gabriel@...>
Date:   Mon Jan 14 02:56:13 2013 +0100

    make unique aliases code always available.

-----------------------------------------------------------------------

Summary of changes:
 pyhoca/wxgui/profilemanager.py |   42 ++++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

The diff of changes is:
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index 504e33e..c0f7b32 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
 <at>  <at>  -261,12 +261,12  <at>  <at>  class PyHocaGUI_ProfileManager(wx.Dialog):
         self.SSHAutoLogin = wx.CheckBox(self.tab_Connection, -1, _(u"Discover SSH keys or use SSH agent for
X2Go authentication"))
         if PARAMIKO_FEATURE['forward-ssh-agent']:
             self.SSHForwardAuthAgent = wx.CheckBox(self.tab_Connection, -1, _(u"Enable forwarding of SSH
authentication agent connections"))
+        self.UniqueHostKeyAliases = wx.CheckBox(self.tab_Connection, -1, _(u"Store SSH host keys under
(unique) X2Go session profile ID"))
         self.UseSSHProxy = wx.CheckBox(self.tab_Connection, -1, _(u"Server behind SSH proxy"))
         self.SSHProxyUserLabel = wx.StaticText(self.tab_Connection, -1, _(u"User")+": ")
         self.SSHProxyUser = wx.TextCtrl(self.tab_Connection, -1, "", size=wx.Size(80,20))
         self.SSHProxySameUser = wx.CheckBox(self.tab_Connection, -1, _(u"Use same username for X2Go and
proxy host"))
         self.SSHProxySamePassword = wx.CheckBox(self.tab_Connection, -1, _(u"Use same authentication for
X2Go and proxy host"))
-        self.SSHProxyUniqueHostKeyAliases = wx.CheckBox(self.tab_Connection, -1, _(u"Store SSH host keys
under (unique) X2Go session profile ID"))
         self.SSHProxyKeyFileLabel = wx.StaticText(self.tab_Connection, -1, _(u"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),
size=wx.Size(self._textfield_height,self._textfield_height), )
 <at>  <at>  -569,7 +569,7  <at>  <at>  class PyHocaGUI_ProfileManager(wx.Dialog):
         ## CONNECTION TAB
         sizer_3 = wx.BoxSizer(wx.VERTICAL)
         sizer_3_1 = wx.StaticBoxSizer(self.staticbox_Server, wx.VERTICAL)
-        sizer_3_1_1 = wx.GridBagSizer(hgap=5,vgap=6)
+        sizer_3_1_1 = wx.GridBagSizer(hgap=6,vgap=6)
         sizer_3_1_1.Add(self.UserNameLabel, pos=(0,0), flag=wx.ALIGN_CENTRE_VERTICAL)
         sizer_3_1_1.Add(self.UserName, pos=(0,1))
         sizer_3_1_1.Add((16,0), pos=(0,2))
 <at>  <at>  -583,25 +583,25  <at>  <at>  class PyHocaGUI_ProfileManager(wx.Dialog):
         sizer_3_1_1.Add(self.SSHAutoLogin, pos=(2,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL)
         if PARAMIKO_FEATURE['forward-ssh-agent']:
             sizer_3_1_1.Add(self.SSHForwardAuthAgent, pos=(3,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_1_1.Add(self.UseSSHProxy, pos=(4,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_3_1_1.Add(self.UniqueHostKeyAliases, pos=(4,0), span=(1,6))
+        sizer_3_1_1.Add(self.UseSSHProxy, pos=(5,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL)
         sizer_3_1.Add(sizer_3_1_1, flag=wx.EXPAND|wx.ALL, border=7)

         sizer_3_2 = wx.StaticBoxSizer(self.staticbox_Proxy, wx.VERTICAL)
         sizer_3_2_1 = wx.GridBagSizer(hgap=6,vgap=6)
-        sizer_3_2_1.Add(self.SSHProxyUniqueHostKeyAliases, pos=(0,0), span=(1,6))
-        sizer_3_2_1.Add(self.SSHProxySameUser, pos=(1,0), span=(1,6))
-        sizer_3_2_1.Add(self.SSHProxySamePassword, pos=(2,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_2_1.Add(self.SSHProxyUserLabel, pos=(3,0), flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_2_1.Add(self.SSHProxyUser, pos=(3,1), flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_2_1.Add((16,0), pos=(3,2))
-        sizer_3_2_1.Add(self.SSHProxyKeyFileLabel, pos=(3,3),  flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_2_1.Add(self.SSHProxyKeyFile, pos=(3,4), flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_2_1.Add(self.SSHProxyKeyFileBrowseButton, pos=(3,5),
flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=2)
-        sizer_3_2_1.Add(self.SSHProxyHostLabel, pos=(4,0), flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_2_1.Add(self.SSHProxyHost, pos=(4,1), flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_2_1.Add(self.SSHProxyPortLabel, pos=(4,3), flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_2_1.Add(self.SSHProxyPort, pos=(4,4), span=(1,2), flag=wx.ALIGN_CENTRE_VERTICAL)
-        sizer_3_2_1.Add(self.SSHProxyAutoLogin, pos=(5,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_3_2_1.Add(self.SSHProxySameUser, pos=(0,0), span=(1,6))
+        sizer_3_2_1.Add(self.SSHProxySamePassword, pos=(1,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_3_2_1.Add(self.SSHProxyUserLabel, pos=(2,0), flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_3_2_1.Add(self.SSHProxyUser, pos=(2,1), flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_3_2_1.Add((16,0), pos=(2,2))
+        sizer_3_2_1.Add(self.SSHProxyKeyFileLabel, pos=(2,3),  flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_3_2_1.Add(self.SSHProxyKeyFile, pos=(2,4), flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_3_2_1.Add(self.SSHProxyKeyFileBrowseButton, pos=(2,5),
flag=wx.ALIGN_CENTRE_VERTICAL|wx.LEFT, border=2)
+        sizer_3_2_1.Add(self.SSHProxyHostLabel, pos=(3,0), flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_3_2_1.Add(self.SSHProxyHost, pos=(3,1), flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_3_2_1.Add(self.SSHProxyPortLabel, pos=(3,3), flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_3_2_1.Add(self.SSHProxyPort, pos=(3,4), span=(1,2), flag=wx.ALIGN_CENTRE_VERTICAL)
+        sizer_3_2_1.Add(self.SSHProxyAutoLogin, pos=(4,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL)
         sizer_3_2.Add(sizer_3_2_1, flag=wx.EXPAND|wx.ALL, border=7)

         sizer_3.Add(sizer_3_1, flag=wx.EXPAND|wx.ALL, border=5)
 <at>  <at>  -846,7 +846,7  <at>  <at>  class PyHocaGUI_ProfileManager(wx.Dialog):
             self.SSHKeyFile.Enable(False)
             self.SSHKeyFileBrowseButton.Enable(False)
         self.UseSSHProxy.SetValue(self.profile_config['usesshproxy'])
-        self.SSHProxyUniqueHostKeyAliases.SetValue(self.profile_config['uniquehostkeyaliases'])
+        self.UniqueHostKeyAliases.SetValue(self.profile_config['uniquehostkeyaliases'])
         self.SSHProxyAutoLogin.SetValue(self.profile_config['sshproxyautologin'])

         _ssh_proxy = self.profile_config['usesshproxy']
 <at>  <at>  -1224,7 +1224,6  <at>  <at>  class PyHocaGUI_ProfileManager(wx.Dialog):
             self.SSHProxyPortLabel.Enable(False)
             self.SSHProxyPort.Enable(False)
             self.SSHProxyAutoLogin.Enable(False)
-            self.SSHProxyUniqueHostKeyAliases.Enable(False)

 
     def __update_from_screen(self):
 <at>  <at>  -1268,7 +1267,7  <at>  <at>  class PyHocaGUI_ProfileManager(wx.Dialog):
         if self.profile_config.has_key('sshproxytunnel'):
             self.profile_config['sshproxytunnel'] = 'DEPRECATED_CAN_BE_REMOVED'
         self.profile_config['sshproxyautologin'] = self.SSHProxyAutoLogin.GetValue()
-        self.profile_config['uniquehostkeyaliases'] = self.SSHProxyUniqueHostKeyAliases.GetValue()
+        self.profile_config['uniquehostkeyaliases'] = self.UniqueHostKeyAliases.GetValue()
         if self.profile_config['sshproxysameuser']:
             self.profile_config['sshproxyuser'] = ''
         else:
 <at>  <at>  -1490,7 +1489,6  <at>  <at>  class PyHocaGUI_ProfileManager(wx.Dialog):
         self.SSHProxyPortLabel.Enable(False)
         self.SSHProxyPort.Enable(False)
         self.SSHProxyAutoLogin.Enable(False)
-        self.SSHProxyUniqueHostKeyAliases.Enable(False)
         self.LinkSpeed.Enable(False)
         self.ModemLabel.Enable(False)
         self.ISDNLabel.Enable(False)
 <at>  <at>  -1916,7 +1914,6  <at>  <at>  class PyHocaGUI_ProfileManager(wx.Dialog):
             if self.SSHProxyAutoLogin.GetValue():
                 self.SSHProxyKeyFileLabel.Enable(False)
             self.SSHProxyAutoLogin.Enable(True)
-            self.SSHProxyUniqueHostKeyAliases.Enable(True)
         else:
             self.staticbox_Proxy.Enable(False)
             self.SSHProxySameUser.Enable(False)
 <at>  <at>  -1931,7 +1928,6  <at>  <at>  class PyHocaGUI_ProfileManager(wx.Dialog):
             self.SSHProxyKeyFile.Enable(False)
             self.SSHProxyKeyFileBrowseButton.Enable(False)
             self.SSHProxyAutoLogin.Enable(False)
-            self.SSHProxyUniqueHostKeyAliases.Enable(False)

     def OnSetKeyboard(self, event):
         """\

hooks/post-receive

Gmane