[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: 0.2.0.4-90-g4354726
X2Go dev team
git-admin at x2go.org
Tue Aug 27 13:22:42 CEST 2013
The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
via 4354726c3a3acf92604a55f0ea1f607881450dc5 (commit)
from ec4e5f5ddf1e7a35bdb310d99db2947aa9eb2ae9 (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 | 30 ++++++++++++++----------------
1 file changed, 14 insertions(+), 16 deletions(-)
The diff of changes is:
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index 2251c4c..1c976a2 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -32,7 +32,7 @@ import x2go.defaults as defaults
from x2go import X2GOCLIENT_OS
from x2go import defaults
-
+from x2go._paramiko import PARAMIKO_FEATURE
import notify
import basepath
@@ -251,7 +251,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
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), size=wx.Size(self._textfield_height,self._textfield_height), )
self.SSHAutoLogin = wx.CheckBox(self.tab_Connection, -1, _(u"Discover SSH keys or use SSH agent for X2Go authentication"))
- if X2GOCLIENT_OS != "Windows":
+ if PARAMIKO_FEATURE['forward-ssh-agent']
self.SSHForwardAuthAgent = wx.CheckBox(self.tab_Connection, -1, _(u"Enable forwarding of SSH authentication agent connections"))
self.UseSSHProxy = wx.CheckBox(self.tab_Connection, -1, _(u"Server behind SSH proxy"))
self.SSHProxyUserLabel = wx.StaticText(self.tab_Connection, -1, _(u"User")+": ")
@@ -584,7 +584,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
sizer_3_1_1.Add(self.SSHPortLabel, pos=(1,3), flag=wx.ALIGN_CENTRE_VERTICAL)
sizer_3_1_1.Add(self.SSHPort, pos=(1,4), span=(1,2))
sizer_3_1_1.Add(self.SSHAutoLogin, pos=(2,0), span=(1,6), flag=wx.ALIGN_CENTRE_VERTICAL)
- if X2GOCLIENT_OS != "Windows":
+ 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.Add(sizer_3_1_1, flag=wx.EXPAND|wx.ALL, border=7)
@@ -851,7 +851,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.UserName.SetValue(self.profile_config['user'])
self.SSHPort.SetValue(self.profile_config['sshport'])
self.SSHAutoLogin.SetValue(self.profile_config['autologin'])
- if X2GOCLIENT_OS != "Windows":
+ if PARAMIKO_FEATURE['forward-ssh-agent']
self.SSHForwardAuthAgent.SetValue(self.profile_config['forwardsshagent'])
self.SSHKeyFile.SetValue(self.profile_config['key'])
if self.profile_config['autologin']:
@@ -1041,7 +1041,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self._toggle_DefaultSoundPort()
self.SSHPort.SetValue(self.profile_config['rdpport'])
self.SSHAutoLogin.SetValue(False)
- if X2GOCLIENT_OS != "Windows":
+ if PARAMIKO_FEATURE['forward-ssh-agent']
self.SSHForwardAuthAgent.SetValue(False)
self.RDPOptions.SetValue(self.profile_config['directrdpsettings'])
self.RDPServerLabel.Enable(True)
@@ -1231,7 +1231,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.SSHKeyFileLabel.Enable(False)
self.SSHKeyFile.Enable(False)
self.SSHAutoLogin.Enable(False)
- if X2GOCLIENT_OS != "Windows":
+ if PARAMIKO_FEATURE['forward-ssh-agent']
self.SSHForwardAuthAgent.Enable(False)
self.UseSSHProxy.Enable(False)
self.staticbox_Proxy.Enable(False)
@@ -1270,7 +1270,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.profile_config['autostart'] = self.AutoStartSession.GetValue()
self.profile_config['autoconnect'] = self.AutoConnectSessionProfile.GetValue()
self.profile_config['autologin'] = self.SSHAutoLogin.GetValue()
- if X2GOCLIENT_OS != "Windows":
+ if PARAMIKO_FEATURE['forward-ssh-agent']
self.profile_config['forwardsshagent'] = self.SSHForwardAuthAgent.GetValue()
else:
self.profile_config['forwardsshagent'] = False
@@ -1505,7 +1505,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.SSHKeyFile.Enable(False)
self.SSHKeyFileBrowseButton.Enable(False)
self.SSHAutoLogin.Enable(False)
- if X2GOCLIENT_OS != "Windows":
+ if PARAMIKO_FEATURE['forward-ssh-agent']
self.SSHForwardAuthAgent.Enable(False)
self.UseSSHProxy.Enable(False)
self.staticbox_LinkSpeed.Enable(False)
@@ -1575,11 +1575,10 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
else:
self.SSHPort.SetValue(self.SSHProxyTunnelFromPort.GetValue())
self.SSHAutoLogin.Enable(True)
- if X2GOCLIENT_OS != "Windows":
+ if PARAMIKO_FEATURE['forward-ssh-agent']
self.SSHForwardAuthAgent.Enable(True)
- self.SSHAutoLogin.SetValue(self.profile_config_bak['autologin'])
- if X2GOCLIENT_OS != "Windows":
self.SSHForwardAuthAgent.SetValue(self.profile_config_bak['forwardsshagent'])
+ self.SSHAutoLogin.SetValue(self.profile_config_bak['autologin'])
if not self.SSHAutoLogin.GetValue():
self.SSHKeyFileLabel.Enable(True)
self.SSHKeyFile.Enable(True)
@@ -1675,12 +1674,11 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.profile_config_bak['soundsystem'] = self._get_SoundSystem()
self.profile_config_bak['usesshproxy'] = self.UseSSHProxy.GetValue()
self.profile_config_bak['autologin'] = self.SSHAutoLogin.GetValue()
- if X2GOCLIENT_OS != "Windows":
+ if PARAMIKO_FEATURE['forward-ssh-agent']
self.profile_config_bak['forwardsshagent'] = self.SSHForwardAuthAgent.GetValue()
+ self.SSHForwardAuthAgent.SetValue(False)
self.UseSSHProxy.SetValue(False)
self.SSHAutoLogin.SetValue(False)
- if X2GOCLIENT_OS != "Windows":
- self.SSHForwardAuthAgent.SetValue(False)
self.PulseAudio.SetValue(True)
self.Arts.SetValue(False)
self.Esd.SetValue(False)
@@ -1706,7 +1704,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self._set_SoundSystem(self.profile_config_bak['soundsystem'])
self._toggle_DefaultSoundPort()
self.SSHAutoLogin.SetValue(self.profile_config_bak['autologin'])
- if X2GOCLIENT_OS != "Windows":
+ if PARAMIKO_FEATURE['forward-ssh-agent']
self.SSHForwardAuthAgent.SetValue(self.profile_config_bak['forwardsshagent'])
self.RDPServerLabel.Enable(True)
self.RDPServer.Enable(True)
@@ -1725,7 +1723,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.disable_DirectRDP()
self._toggle_SetKeyboard()
self.SSHAutoLogin.SetValue(self.profile_config_bak['autologin'])
- if X2GOCLIENT_OS != "Windows":
+ if PARAMIKO_FEATURE['forward-ssh-agent']
self.SSHForwardAuthAgent.SetValue(self.profile_config_bak['forwardsshagent'])
self.UseSSHProxy.SetValue(self.profile_config_bak['usesshproxy'])
self._toggle_SSHProxy()
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