The branch, master has been updated via 599510c98452fe4bfc943ac193a3574b95e0f804 (commit) from 77b2ebabe63fbf410cae2138ce6f1f39924e83ea (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 599510c98452fe4bfc943ac193a3574b95e0f804 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Mar 20 16:27:53 2012 +0100 disable AutoStartSession checkbox for session type PUBLISHEDAPPLICATIONS ----------------------------------------------------------------------- Summary of changes: pyhoca/wxgui/profilemanager.py | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index 9dae2af..7735530 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -203,6 +203,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.RDPOptions = wx.TextCtrl(self.tab_Session, -1, "", ) self.UsePublishedApplications = wx.CheckBox(self.tab_Session, -1, _(u"Menu of published applications")) self._last_pubapp_value = None + self._last_auto_start_value = None ### ### widgets for the CONNECTION tab @@ -474,8 +475,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog): sizer_2 = wx.BoxSizer(wx.VERTICAL) sizer_2_1 = wx.StaticBoxSizer(self.staticbox_SessionType, wx.VERTICAL) sizer_2_1_1 = wx.GridBagSizer(hgap=2,vgap=6) - sizer_2_1_1.Add(self.AutoStartSession, pos=(0,0), span=(1,2), flag=wx.EXPAND, ) - sizer_2_1_1.Add(self.AutoLoginSessionProfile, pos=(1,0), span=(1,2), flag=wx.EXPAND, ) + sizer_2_1_1.Add(self.AutoLoginSessionProfile, pos=(0,0), span=(1,2), flag=wx.EXPAND, ) + sizer_2_1_1.Add(self.AutoStartSession, pos=(1,0), span=(1,2), flag=wx.EXPAND, ) sizer_2_1_1.Add(self.SessionTypeLabel, pos=(2,0), flag=wx.ALIGN_CENTRE_VERTICAL, ) sizer_2_1_1.Add(self.SessionType, pos=(2,1), flag=wx.EXPAND, ) sizer_2_1_1.Add(self.ApplicationLabel, pos=(3,0), flag=wx.ALIGN_CENTRE_VERTICAL, ) @@ -779,6 +780,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHProxyHost.SetValue(self.profile_config['sshproxyhost']) self.SSHProxyUser.SetValue(self.profile_config['sshproxyuser']) self.SSHProxyKeyFile.SetValue(self.profile_config['sshproxykeyfile']) + _from_host = _from_port = _to_host = _to_port = None if self.profile_config['sshproxytunnel'].count(':') == 2: _from_port, _to_host, _to_port = self.profile_config['sshproxytunnel'].split(':') @@ -861,6 +863,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog): elif not _command and _published: self.SessionType.SetValue(self.sessionChoices['PUBLISHEDAPPLICATIONS']) self.UsePublishedApplications.Enable(False) + self.AutoStartSession.Enable(False) + self.AutoStartSession.SetValue(True) self.Command.SetValue('') self._last_pubapp_value = True else: @@ -1248,7 +1252,6 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.tab_Settings.Enable(False) self.tab_SharedFilesAndFolders.Enable(False) - def disable_DirectRDP(self): if not self.UseSSHProxy.GetValue(): self.HostLabel.Enable(True) @@ -1275,6 +1278,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): def OnSessionTypeSelected(self, event): _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 == 'APPLICATION': self.ApplicationLabel.Enable(True) self.Application.Enable(True) @@ -1326,13 +1330,19 @@ class PyHocaGUI_ProfileManager(wx.Dialog): if _session_type == 'PUBLISHEDAPPLICATIONS': self._last_pubapp_value = self.UsePublishedApplications.GetValue() + self._last_auto_start_value = self.AutoStartSession.GetValue() self.UsePublishedApplications.SetValue(True) self.UsePublishedApplications.Enable(False) + self.AutoStartSession.SetValue(True) + self.AutoStartSession.Enable(False) self.Command.SetValue('') else: if self._last_pubapp_value is not None: self.UsePublishedApplications.SetValue(self._last_pubapp_value) self._last_pubapp_value = None + if self._last_auto_start_value is not None: + self.AutoStartSession.SetValue(self._last_auto_start_value) + self._last_auto_start_value = None self.disable_EditConnected_options() 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)).
-
git-admin＠x2go.org