[X2Go-Commits] pyhoca-gui.git - twofactorauth (branch) updated: 0.1.0.10-247-g47c31b7
X2Go dev team
git-admin at x2go.org
Sat Sep 14 15:56:10 CEST 2013
The branch, twofactorauth has been updated
via 47c31b7c33fc0e0a77d36ae983865fbee9720870 (commit)
from 12e0b9a0396ffb5651b21e0959dd09373a4ed921 (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 | 1 +
pyhoca/wxgui/profilemanager.py | 32 ++++++++++++++++++++++++++++++--
2 files changed, 31 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 87b9095..f2f1b83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -135,6 +135,7 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
- os.path.is<type> require string option, not Unicode.
- Add option --about-image. Allow changing the application's name by
renaming the ,,pyhoca-gui'' script.
+ - Allow custom commands to be desktop sessions.
* Depend on Python X2Go 0.1.2.0.
* Install GNOME icons via dh_links.
* Install X2Go icons with explicit install paths.
diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py
index 7e4df6f..f1d6c5e 100644
--- a/pyhoca/wxgui/profilemanager.py
+++ b/pyhoca/wxgui/profilemanager.py
@@ -205,6 +205,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.RDPServer = wx.TextCtrl(self.tab_Session, -1, "", )
self.RDPOptionsLabel = wx.StaticText(self.tab_Session, -1, _(u"RDP options")+':')
self.RDPOptions = wx.TextCtrl(self.tab_Session, -1, "", )
+ self.RootlessSession = wx.CheckBox(self.tab_Session, -1, _(u"Integrate remote application(s) into local desktop (rootless mode)"))
self.UsePublishedApplications = wx.CheckBox(self.tab_Session, -1, _(u"Menu of published applications"))
self._last_pubapp_value = None
self._last_auto_start_value = None
@@ -386,6 +387,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.RDPServer.SetMinSize((-1, self._textfield_height))
self.RDPOptionsLabel.SetMinSize((180, 16))
self.RDPOptions.SetMinSize((-1, self._textfield_height))
+ self.RootlessSession.SetMinSize((-1, self._textfield_height))
self.UsePublishedApplications.SetMinSize((-1, self._textfield_height))
self.UserNameLabel.SetMinSize((110, 16))
@@ -493,7 +495,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
sizer_2_1_1.Add(self.RDPServer, pos=(6,1), flag=wx.EXPAND, )
sizer_2_1_1.Add(self.RDPOptionsLabel, pos=(7,0), flag=wx.ALIGN_CENTRE_VERTICAL, )
sizer_2_1_1.Add(self.RDPOptions, pos=(7,1), flag=wx.EXPAND, )
- sizer_2_1_1.Add(self.UsePublishedApplications, pos=(8,0), span=(1,2), flag=wx.EXPAND, )
+ sizer_2_1_1.Add(self.RootlessSession, pos=(8,0), span=(1,2), flag=wx.EXPAND, )
+ sizer_2_1_1.Add(self.UsePublishedApplications, pos=(9,0), span=(1,2), flag=wx.EXPAND, )
sizer_2_1.Add(sizer_2_1_1, flag=wx.EXPAND|wx.ALL, border=7)
sizer_2.Add(sizer_2_1, proportion=1, flag=wx.EXPAND|wx.ALL, border=5)
self.tab_Session.SetSizerAndFit(sizer_2)
@@ -842,6 +845,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
_command = self.profile_config['command']
_published = self.profile_config['published']
+ self.RootlessSession.SetValue(self.profile_config['rootless'])
# disable all command relevant widgets first
self.ApplicationLabel.Enable(False)
@@ -850,12 +854,15 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.Command.Enable(False)
self.XDMCPServerLabel.Enable(False)
self.XDMCPServer.Enable(False)
+ self.RootlessSession.Enable(False)
self.UsePublishedApplications.SetValue(_published)
if _command in self.sessionChoices.keys():
self.SessionType.SetValue(self.sessionChoices[_command])
self.Application.SetValue('')
self.Command.SetValue('')
+ if _command not in defaults.X2GO_DESKTOPSESSIONS.keys():
+ self.RootlessSession.SetValue(True)
elif _command in self.applicationChoices.keys():
self.SessionType.SetValue(self.sessionChoices['APPLICATION'])
self.ApplicationLabel.Enable(True)
@@ -864,6 +871,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.Command.SetValue('')
self.UsePublishedApplications.SetValue(False)
self.UsePublishedApplications.Enable(False)
+ self.RootlessSession.SetValue(True)
elif not _command and _published:
self.SessionType.SetValue(self.sessionChoices['PUBLISHEDAPPLICATIONS'])
self.UsePublishedApplications.Enable(False)
@@ -871,18 +879,21 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.AutoStartSession.SetValue(True)
self.Command.SetValue('')
self._last_pubapp_value = True
+ self.RootlessSession.SetValue(True)
else:
self.SessionType.SetValue(self.sessionChoices['CUSTOM'])
self.UsePublishedApplications.SetValue(False)
self.UsePublishedApplications.Enable(False)
self.Command.Enable(True)
self.Command.SetValue(_command)
+ self.RootlessSession.Enable(True)
if _command == 'XDMCP':
self.XDMCPServerLabel.Enable(True)
self.XDMCPServer.Enable(True)
self.UsePublishedApplications.SetValue(False)
self.UsePublishedApplications.Enable(False)
+ self.RootlessSession.Enable(False)
if _command in ('RDP', 'DirectRDP'):
self.RDPServerLabel.Enable(True)
@@ -891,6 +902,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.RDPOptions.Enable(True)
self.UsePublishedApplications.SetValue(False)
self.UsePublishedApplications.Enable(False)
+ self.RootlessSession.SetValue(True)
+ self.RootlessSession.Enable(False)
else:
self.RDPServerLabel.Enable(False)
self.RDPServer.Enable(False)
@@ -1113,7 +1126,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.profile_config['rootless'] = True
elif _session_type == 'CUSTOM':
_command = self.Command.GetValue()
- self.profile_config['rootless'] = True
+ self.profile_config['rootless'] = self.RootlessSession.GetValue()
elif _session_type == 'RDP':
_command = _session_type
self.profile_config['rootless'] = True
@@ -1283,6 +1296,11 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
_session_type = [ i for i in self.sessionChoices.keys() if self.sessionChoices[i] == self.SessionType.GetValue() ][0]
self.UsePublishedApplications.Enable(True)
self.AutoStartSession.Enable(True)
+
+ if _session_type in defaults.X2GO_DESKTOPSESSIONS.keys():
+ self.RootlessSession.SetValue(False)
+ self.RootlessSession.Enable(False)
+
if _session_type == 'APPLICATION':
self.ApplicationLabel.Enable(True)
self.Application.Enable(True)
@@ -1290,6 +1308,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.UsePublishedApplications.Enable(False)
if not self.Application.GetValue():
self.Application.SetValue(self.applicationChoices['TERMINAL'])
+ self.RootlessSession.SetValue(True)
+ self.RootlessSession.Enable(False)
else:
self.ApplicationLabel.Enable(False)
self.Application.Enable(False)
@@ -1301,6 +1321,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.UsePublishedApplications.Enable(False)
if not self.Command.GetValue():
self.Command.SetValue('xterm')
+ self.RootlessSession.SetValue(True)
+ self.RootlessSession.Enable(True)
else:
self.CommandLabel.Enable(False)
self.Command.Enable(False)
@@ -1310,6 +1332,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.XDMCPServer.Enable(True)
self.UsePublishedApplications.SetValue(False)
self.UsePublishedApplications.Enable(False)
+ self.RootlessSession.SetValue(False)
+ self.RootlessSession.Enable(False)
else:
self.XDMCPServerLabel.Enable(False)
self.XDMCPServer.Enable(False)
@@ -1321,6 +1345,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.RDPOptions.Enable(True)
self.UsePublishedApplications.SetValue(False)
self.UsePublishedApplications.Enable(False)
+ self.RootlessSession.SetValue(True)
+ self.RootlessSession.Enable(False)
else:
self.RDPServerLabel.Enable(False)
self.RDPServer.Enable(False)
@@ -1340,6 +1366,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog):
self.AutoStartSession.SetValue(True)
self.AutoStartSession.Enable(False)
self.Command.SetValue('')
+ self.RootlessSession.SetValue(True)
+ self.RootlessSession.Enable(False)
else:
if self._last_pubapp_value is not None:
self.UsePublishedApplications.SetValue(self._last_pubapp_value)
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