[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: 0.2.1.1-26-g15f0c51
X2Go dev team
git-admin at x2go.org
Tue Aug 27 13:22:50 CEST 2013
The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
via 15f0c51a56f92d212c81b5d73b4b53239e351dc6 (commit)
from c2e233584ebfc0d361028c68f2d54fdbb7844372 (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:
debian/changelog | 2 ++
pyhoca/wxgui/profilemanager.py | 32 ++++++++++++++++++++------------
2 files changed, 22 insertions(+), 12 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 90c676e..564a988 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ pyhoca-gui (0.2.2.0-0~x2go1) UNRELEASED; urgency=low
way X2GoClient configures the SSH proxy settings.
- Add cmdline option --add-to-known-hosts. Add SSH host keys automatically
to the client's known_hosts file.
+ - Add checkbox for unique host key aliases feature to session profile
+ manager.
* /debian/control:
+ Thanks to Orion's patch in bug #91 we can drop many build dependencies.
+ Versioned Depend: on python-x2go (>= 0.2.2.0-0~).
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index c8c9de8..9fa7754 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -266,6 +266,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
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), )
@@ -587,19 +588,20 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
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.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(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=(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_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_1 = wx.BoxSizer(wx.HORIZONTAL)
sizer_3_2.Add(sizer_3_2_1, flag=wx.EXPAND|wx.ALL, border=7)
@@ -845,6 +847,7 @@ 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.SSHProxyAutoLogin.SetValue(self.profile_config['sshproxyautologin'])
_ssh_proxy = self.profile_config['usesshproxy']
@@ -1222,6 +1225,7 @@ 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):
@@ -1265,6 +1269,7 @@ 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()
if self.profile_config['sshproxysameuser']:
self.profile_config['sshproxyuser'] = ''
else:
@@ -1486,6 +1491,7 @@ 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)
@@ -1911,6 +1917,7 @@ 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)
@@ -1925,6 +1932,7 @@ 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
--
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