[X2go-Commits] pyhoca-gui.git - master (branch) updated: 0.1.0.10-118-ga4c8100

The branch, master has been updated via a4c8100805a54e4a2607ae9cbba80a9602ae0411 (commit) from 2bc0921e14c4a7afb42636aa9b4cbc7b3cf2ad6d (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 a4c8100805a54e4a2607ae9cbba80a9602ae0411 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Mar 20 09:47:37 2012 +0100 Add widget to configure autologin and autostart session profile parameters. ----------------------------------------------------------------------- Summary of changes: debian/changelog | 2 ++ pyhoca/wxgui/profilemanager.py | 38 +++++++++++++++++++++++++------------- 2 files changed, 27 insertions(+), 13 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 4a6606f..a2da9ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -74,6 +74,8 @@ pyhoca-gui (0.1.2.0-0~x2go1) UNRELEASED; urgency=low - The maximum number of menu items in published applications mode can now be specified as a session option for X2goSession instances. - Fix for CUPS printer recognition if no default printer was defined. + - Add widget to configure autologin and autostart session profile + parameters. * 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 9c9fcd3..9dae2af 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -187,6 +187,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog): ### ### widgets for the SESSION tab ### + self.AutoStartSession = wx.CheckBox(self.tab_Session, -1, _(u"Start session automatically after login")) + self.AutoLoginSessionProfile = wx.CheckBox(self.tab_Session, -1, _(u"Login automatically after %s has started") % self._PyHocaGUI.appname) self.SessionTypeLabel = wx.StaticText(self.tab_Session, -1, _(u"Type")+':') self.SessionType = wx.ComboBox(self.tab_Session, -1, choices=self.sessionChoices.values(), style=wx.CB_DROPDOWN|wx.CB_READONLY) self.ApplicationLabel = wx.StaticText(self.tab_Session, -1, _(u"Application")+':') @@ -364,6 +366,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.CustomSessionWindowTitle.SetMinSize((320, self._textfield_height)) self.IconButtonLabel.SetMinSize((168, 16)) + self.AutoStartSession.SetMinSize((-1, self._textfield_height)) + self.AutoLoginSessionProfile.SetMinSize((-1, self._textfield_height)) self.SessionTypeLabel.SetMinSize((120, 16)) self.SessionType.SetMinSize((320, self._textfield_height)) self.SessionType.SetSelection(5) @@ -470,19 +474,21 @@ 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.SessionTypeLabel, pos=(0,0), flag=wx.ALIGN_CENTRE_VERTICAL, ) - sizer_2_1_1.Add(self.SessionType, pos=(0,1), flag=wx.EXPAND, ) - sizer_2_1_1.Add(self.UsePublishedApplications, pos=(6,0), span=(1,2), flag=wx.EXPAND, ) - sizer_2_1_1.Add(self.ApplicationLabel, pos=(1,0), flag=wx.ALIGN_CENTRE_VERTICAL, ) - sizer_2_1_1.Add(self.Application, pos=(1,1), flag=wx.EXPAND, ) - sizer_2_1_1.Add(self.CommandLabel, pos=(2,0), flag=wx.ALIGN_CENTRE_VERTICAL, ) - sizer_2_1_1.Add(self.Command, pos=(2, 1), flag=wx.EXPAND, ) - sizer_2_1_1.Add(self.XDMCPServerLabel, (3,0), flag=wx.ALIGN_CENTRE_VERTICAL, ) - sizer_2_1_1.Add(self.XDMCPServer, pos=(3,1), flag=wx.EXPAND, ) - sizer_2_1_1.Add(self.RDPServerLabel, pos=(4,0), flag=wx.ALIGN_CENTRE_VERTICAL, ) - sizer_2_1_1.Add(self.RDPServer, pos=(4,1), flag=wx.EXPAND, ) - sizer_2_1_1.Add(self.RDPOptionsLabel, pos=(5,0), flag=wx.ALIGN_CENTRE_VERTICAL, ) - sizer_2_1_1.Add(self.RDPOptions, pos=(5,1), flag=wx.EXPAND, ) + 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.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, ) + sizer_2_1_1.Add(self.Application, pos=(3,1), flag=wx.EXPAND, ) + sizer_2_1_1.Add(self.CommandLabel, pos=(4,0), flag=wx.ALIGN_CENTRE_VERTICAL, ) + sizer_2_1_1.Add(self.Command, pos=(4,1), flag=wx.EXPAND, ) + sizer_2_1_1.Add(self.XDMCPServerLabel, (5,0), flag=wx.ALIGN_CENTRE_VERTICAL, ) + sizer_2_1_1.Add(self.XDMCPServer, pos=(5,1), flag=wx.EXPAND, ) + sizer_2_1_1.Add(self.RDPServerLabel, pos=(6,0), flag=wx.ALIGN_CENTRE_VERTICAL, ) + 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.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) @@ -762,6 +768,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.UseDefaultSessionWindowTitle.SetValue(True) self.CustomSessionWindowTitleLabel.Enable(False) self.CustomSessionWindowTitle.Enable(False) + self.Host.SetValue(self.profile_config['host']) self.UserName.SetValue(self.profile_config['user']) self.SSHPort.SetValue(self.profile_config['sshport']) @@ -824,6 +831,9 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SSHPortLabel.Enable(True) self.SSHPort.SetValue(self.profile_config_bak['sshport']) + self.AutoStartSession.SetValue(self.profile_config['autostart']) + self.AutoLoginSessionProfile.SetValue(self.profile_config['autologin']) + _command = self.profile_config['command'] _published = self.profile_config['published'] @@ -1065,6 +1075,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.profile_config['sessiontitle'] = '' else: self.profile_config['sessiontitle'] = self.CustomSessionWindowTitle.GetValue() + self.profile_config['autostart'] = self.AutoStartSession.GetValue() + self.profile_config['autologin'] = self.AutoLoginSessionProfile.GetValue() self.profile_config['published'] = self.UsePublishedApplications.GetValue() self.profile_config['icon'] = self.IconPath self.profile_config['user'] = self.UserName.GetValue() 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)).