This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository pyhoca-gui. from 9b32500 more icon location detection fixes new 402cb1f Session profile manager: the host parameter will be of type ListType for future versions of Python X2Go (>= 0.5.0.0). new 54bedba changelog: fix layout new 1efc52b Focus the user name field on logon if no user name is stored in the session profile. new 5543711 Re-order cmdline sections (man page, defaults.py). The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 48 +++++++++++++++++-------------- man/man1/pyhoca-gui.1 | 11 +++++--- pyhoca/wxgui/defaults.py | 11 +++++++- pyhoca/wxgui/logon.py | 4 +-- pyhoca/wxgui/profilemanager.py | 61 +++++++++++++++++++++++----------------- 5 files changed, 81 insertions(+), 54 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-gui. commit 402cb1f02d10a647ccfb31e26ee1a2d994ffa0a6 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Mar 17 13:53:47 2014 +0100 Session profile manager: the host parameter will be of type ListType for future versions of Python X2Go (>= 0.5.0.0). --- debian/changelog | 2 ++ pyhoca/wxgui/profilemanager.py | 61 +++++++++++++++++++++++----------------- 2 files changed, 37 insertions(+), 26 deletions(-) diff --git a/debian/changelog b/debian/changelog index a54d8be..378d92c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,8 @@ pyhoca-gui (0.5.0.0-0x2go1) UNRELEASED; urgency=low * NSIS script: make sure SetOutPath gets called at the beginning of every section. * Show printing preferences when tray icon is in restricted mode. + * Session profile manager: the host parameter will be of type ListType + for future versions of Python X2Go (>= 0.5.0.0). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 08 Jan 2014 21:28:37 +0100 diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index 071b413..130f5f7 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -21,7 +21,7 @@ import wx import os import copy - +import types import re import x2go.log as log @@ -162,7 +162,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): elif self.profile_config['sshproxytunnel'].count(':') == 3: _from_host, _from_port, _to_host, _to_port = self.profile_config['sshproxytunnel'].split(':') - if _to_host: self.profile_config['host'] = _to_host + if _to_host: self.profile_config['host'] = [_to_host] if _to_port: self.profile_config['sshport'] = int(_to_port) self.profile_config['sshproxytunnel'] = 'DEPRECATED_CAN_BE_SAFELY_REMOVE' @@ -185,6 +185,15 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.tab_MediaResources = wx.Panel(self.X2GoTabs, -1) self.tab_SharedResources = wx.Panel(self.X2GoTabs, -1) + if not self.session_profiles.is_writable(self.profile_id): + self.tab_Profile.Enable(False) + self.tab_Session.Enable(False) + self.tab_Connection.Enable(False) + self.tab_LinkQuality.Enable(False) + self.tab_IO.Enable(False) + self.tab_MediaResources.Enable(False) + self.tab_SharedResources.Enable(False) + # boxes for all tabs self.staticbox_Profile = wx.StaticBox(self.tab_Profile, -1, ' %s ' % _(u'Session Title')) self.staticbox_Window = wx.StaticBox(self.tab_Profile, -1, ' %s ' % _(u'Session Window')) @@ -374,6 +383,9 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.OKButton.SetDefault() self.ApplyButton = wx.Button(self, -1, _(u"Apply")) self.CancelButton = wx.Button(self, -1, _(u"Cancel")) + if not self.session_profiles.is_writable(self.profile_id): + self.OKButton.Enable(False) + self.ApplyButton.Enable(False) self.__set_properties() self.__do_layout() @@ -855,7 +867,10 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.ProfileName.SetValue(self.profile_config['name']) self.SetSessionWindowTitle.SetValue(self.profile_config['setsessiontitle']) self.CustomSessionWindowTitle.SetValue(self.profile_config['sessiontitle']) - self.Host.SetValue(self.profile_config['host']) + if type(self.profile_config['host']) is types.ListType: + self.Host.SetValue(",".join(self.profile_config['host'])) + else: + self.Host.SetValue(self.profile_config['host']) self.UserName.SetValue(self.profile_config['user']) self.SSHPort.SetValue(self.profile_config['sshport']) self.SSHAutoLogin.SetValue(self.profile_config['autologin']) @@ -1119,26 +1134,15 @@ class PyHocaGUI_ProfileManager(wx.Dialog): # export = "{string(path_1)}:{boolint(autoconnect_1);...;string(path_n)}:{boolint(autoconnect_n)};" # rewrite path separator from "," to ";" to correct pyhoca-gui (<0.1.0.9) - if ',' in self.profile_config['export']: - self.profile_config['export'] = self.profile_config['export'].replace(',', ';') + #if ',' in self.profile_config['export']: + # self.profile_config['export'] = self.profile_config['export'].replace(',', ';') # strip off whitespaces and ";" from beginning and end of string - _shared_folders = self.profile_config['export'].strip().strip(';').strip() - # strip off '"' from beginning and end of string - _shared_folders = _shared_folders.strip('"') - # again: strip off whitespaces and ";" from beginning and end of string - _shared_folders = _shared_folders.strip().strip(';').strip() - - _shared_folders = [ sf for sf in _shared_folders.split(';') if sf ] - - for _shared_folder in _shared_folders: + _shared_folders = self.profile_config['export'].keys() - # support path names with and without ":" as separator between path and autoconnect flag (pyhoca-gui < 0.1.0.9) - if not re.match('^.*:(1|0)$', _shared_folder): - _shared_folder = "%s:1" % _shared_folder + for _shared_folder_path in _shared_folders: - _shared_folder_path = ":".join(_shared_folder.split(':')[:-1]) - if int(_shared_folder.split(':')[-1]): + if self.profile_config['export'][_shared_folder_path]: _shared_folder_autoconnect = _("automatically") else: _shared_folder_autoconnect = _("manually") @@ -1147,7 +1151,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): idx = self.SharedFoldersList.InsertStringItem(0, _shared_folder_path) self.SharedFoldersList.SetStringItem(idx, 1, _shared_folder_autoconnect) - if int(_shared_folder.split(':')[-1]): + if self.profile_config['export'][_shared_folder_path]: self.SharedFoldersList.CheckItem(idx) self.AddSharedFolderPathButton.Enable(False) @@ -1305,7 +1309,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.profile_config['icon'] = ':icons/128x128/x2gosession.png' self.profile_config['user'] = self.UserName.GetValue() self.profile_config['key'] = self.SSHKeyFile.GetValue() - self.profile_config['host'] = self.Host.GetValue() + _hosts = self.Host.GetValue() + self.profile_config['host'] = _hosts.split(',') self.profile_config['usesshproxy'] = self.UseSSHProxy.GetValue() if _session_type != 'DirectRDP': self.profile_config['sshport'] = self.SSHPort.GetValue() @@ -1557,9 +1562,12 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SoundPortLabel.Enable(False) self.SoundPort.Enable(False) self.Esd.Enable(False) - self.tab_SharedResources.Enable(True) + if self.session_profiles.is_writable(self.profile_id): + self.tab_SharedResources.Enable(True) self.RDPServer.Enable(False) - self.RDPServer.SetValue(self.Host.GetValue()) + _hosts = self.Host.GetValue() + # only one host address supported + self.RDPServer.SetValue(_hosts.split(',')[0]) self.RDPOptions.SetValue(self.profile_config_bak['directrdpsettings']) if self.Application.GetValue() in self.applicationChoices.keys(): self._last_application = self.Application.GetValue() @@ -1612,7 +1620,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.DefaultSoundPort.Enable(True) self.DefaultSoundPort.SetValue(True) self.Esd.Enable(True) - self.tab_SharedResources.Enable(True) + if self.session_profiles.is_writable(self.profile_id): + self.tab_SharedResources.Enable(True) self.RDPServer.SetValue(self.profile_config_bak['rdpserver']) self.RDPOptions.SetValue(self.profile_config_bak['rdpoptions']) if self.Application.GetValue() in self.rdpclientChoices.keys(): @@ -1761,7 +1770,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): else: self.profile_config_bak['rdpport'] = self.SSHPort.GetValue() self.profile_config_bak['directrdpsettings'] = self.RDPOptions.GetValue() - if self.RDPServer.GetValue() != self.Host.GetValue(): + if self.RDPServer.GetValue() != self.Host.GetValue().split(',')[0]: self.profile_config_bak['rdpserver'] = self.RDPServer.GetValue() self.profile_config_bak['rdpoptions'] = self.RDPOptions.GetValue() self.disable_DirectRDP() @@ -1889,7 +1898,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): """ if [ k for k in self.sessionChoices.keys() if self.sessionChoices[k] == self.SessionType.GetValue() ][0] == 'DirectRDP': - self.RDPServer.SetValue(self.Host.GetValue()) + self.RDPServer.SetValue(self.Host.GetValue().split(',')[0]) def OnSSHKeyFileBrowse(self, event): """\ -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-gui. commit 5543711895f14121cbcb98f54a55415b1c28706b Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Mar 17 14:19:14 2014 +0100 Re-order cmdline sections (man page, defaults.py). --- debian/changelog | 1 + man/man1/pyhoca-gui.1 | 11 +++++++---- pyhoca/wxgui/defaults.py | 11 ++++++++++- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 22de7e4..59e98ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -26,6 +26,7 @@ pyhoca-gui (0.5.0.0-0x2go1) UNRELEASED; urgency=low for future versions of Python X2Go (>= 0.5.0.0). - Focus the user name field on logon if no user name is stored in the session profile. + - Re-order cmdline sections (man page, defaults.py). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 08 Jan 2014 21:28:37 +0100 diff --git a/man/man1/pyhoca-gui.1 b/man/man1/pyhoca-gui.1 index 97eeb65..de03803 100644 --- a/man/man1/pyhoca-gui.1 +++ b/man/man1/pyhoca-gui.1 @@ -55,7 +55,7 @@ Enable debugging code of the unterlying Python X2Go module. .TP \*(T<\fB\-\-libdebug-sftpxfer\fR\*(T> Enable debugging code of Python X2Go's sFTP server code (very verbose, and it may even reveal promiscuous data). -.SH GUI OPTIONS +.SH SESSION RELATED OPTIONS .TP \*(T<\fB\-P, \-\-session-profile\fR\*(T> The name of the session profile to be used to make the connection. You can actually pass a komma-separated list of @@ -124,6 +124,12 @@ Disconnect from a server if a session on that server has been suspended. \*(T<\fB\-\-disconnect-on-terminate\fR\*(T> Disconnect from a server if a session on that server has been terminated. .TP +\*(T<\fB\-\-display <hostname>:<screennumber>\fR\*(T> +Set the DISPLAY environment variable to <hostname>:<screennumber>. +.SH BRANDING OPTIONS +The \fBpyhoca-gui\fR provides some feature that allow to easily brand its appearance. Here some options +for tweaking the \fBpyhoca-gui\fR appearance and behaviour. +.TP \*(T<\fB\-\-splash-image\fR \fI<your-splash-image>\fR\*(T> Define an alternative splash image that gets shown on application startup (PNG files only, full path or filename as found in <share>/img). .TP @@ -149,9 +155,6 @@ Grey-out the profile manager menu items and thus disable all profile management \*(T<\fB\-\-disable-notifications\fR\*(T> Disable all applet notifications. .TP -\*(T<\fB\-\-display <hostname>:<screennumber>\fR\*(T> -Set the DISPLAY environment variable to <hostname>:<screennumber>. -.TP \*(T<\fB\-\-logon\-window\-position\fR \fI<x-pos>x<y-pos>\fR\*(T> Give a custom position for the logon window, use negative values to position relative to right/bottom border. .TP diff --git a/pyhoca/wxgui/defaults.py b/pyhoca/wxgui/defaults.py index c6f6615..64086e0 100644 --- a/pyhoca/wxgui/defaults.py +++ b/pyhoca/wxgui/defaults.py @@ -40,12 +40,15 @@ else: _config_backends = ('FILE') default_options = { + + # common 'debug': False, 'quiet': False, 'libdebug': False, 'libdebug_sftpxfer': False, 'version': False, + # session related options 'session_profile': '', 'remember_username': False, 'non_interactive': False, @@ -63,6 +66,9 @@ default_options = { 'resume_all_on_connect': False, 'disconnect_on_suspend': False, 'disconnect_on_terminate': False, + 'display': '', + + # branding 'splash_image': '', 'about_image': '', 'disable_splash': False, @@ -70,9 +76,10 @@ default_options = { 'disable_printingprefs': False, 'disable_profilemanager': False, 'disable_notifications': False, - 'display': '', 'logon_window_position': False, 'published_applications_no_submenus': 10, + + # backends 'backend_controlsession': '', 'backend_terminalsession': '', 'backend_serversessioninfo': '', @@ -81,6 +88,8 @@ default_options = { 'backend_sessionprofiles': '', 'backend_clientsettings': '', 'backend_clientprinting': '', + + # file locations 'client_rootdir': '', 'sessions_rootdir': '', 'ssh_rootdir': '', -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-gui. commit 1efc52bce3cda5eeb2f42352acc92d56923639d0 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Mar 17 14:16:45 2014 +0100 Focus the user name field on logon if no user name is stored in the session profile. --- debian/changelog | 2 ++ pyhoca/wxgui/logon.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4aefea7..22de7e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,8 @@ pyhoca-gui (0.5.0.0-0x2go1) UNRELEASED; urgency=low - Show printing preferences when tray icon is in restricted mode. - Session profile manager: the host parameter will be of type ListType for future versions of Python X2Go (>= 0.5.0.0). + - Focus the user name field on logon if no user name is stored in the + session profile. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 08 Jan 2014 21:28:37 +0100 diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py index 511ee53..17f03ef 100644 --- a/pyhoca/wxgui/logon.py +++ b/pyhoca/wxgui/logon.py @@ -191,8 +191,8 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog): if self.current_profile_config.has_key('user'): self.userTxt.SetValue(self.current_profile_config['user']) - else: - self.userTxt.SetValue(self._PyHocaGUI.args.username) + if not self.current_profile_config['user'] and not self.sshproxy_auth: + self.userTxt.SetFocus() if self.sshproxy_auth: -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pyhoca-gui. commit 54bedbac0fc11fb53800e61867adc2923e1a3a95 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Mar 17 14:02:51 2014 +0100 changelog: fix layout --- debian/changelog | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/debian/changelog b/debian/changelog index 378d92c..4aefea7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,28 +1,29 @@ pyhoca-gui (0.5.0.0-0x2go1) UNRELEASED; urgency=low - * Adapt to new backend concept found in Python X2Go (>= 0.5.0.0). - * Move most code of the pyhoca-gui executable into a dedicated class - named PyHocaGUI_Launcher. - * Allow automatic image branding (splash, about image, tray icon) by - setting another application name than the default. - * Rename icon files to match default application name (PyHoca-GUI). - * Make default cmdline option parameters overridable before the - arg parser gets initialized. - * Make SCRIPT_NAME in setup.py configurable (monkey-patchable). - * Make setup.py importable, only run setup() function on direct calls. - * Don't refer to py2exe anymore in nsis_template's naming scheme. - * Provide separate mswin_logging module. - * Install more modules into setup.exe: hmac (for ecdsa). - * NSIS script: empty installation destination before installing new files - into $INSTDIR. - * Allow appname based mini icons on About... windows. - * Make the hover text of the tray icon brandable (drop hard-coded - PyHoca-GUI application name). - * NSIS script: make sure SetOutPath gets called at the beginning of - every section. - * Show printing preferences when tray icon is in restricted mode. - * Session profile manager: the host parameter will be of type ListType - for future versions of Python X2Go (>= 0.5.0.0). + * New upstream version (0.5.0.0): + - Adapt to new backend concept found in Python X2Go (>= 0.5.0.0). + - Move most code of the pyhoca-gui executable into a dedicated class + named PyHocaGUI_Launcher. + - Allow automatic image branding (splash, about image, tray icon) by + setting another application name than the default. + - Rename icon files to match default application name (PyHoca-GUI). + - Make default cmdline option parameters overridable before the + arg parser gets initialized. + - Make SCRIPT_NAME in setup.py configurable (monkey-patchable). + - Make setup.py importable, only run setup() function on direct calls. + - Don't refer to py2exe anymore in nsis_template's naming scheme. + - Provide separate mswin_logging module. + - Install more modules into setup.exe: hmac (for ecdsa). + - NSIS script: empty installation destination before installing new files + into $INSTDIR. + - Allow appname based mini icons on About... windows. + - Make the hover text of the tray icon brandable (drop hard-coded + PyHoca-GUI application name). + - NSIS script: make sure SetOutPath gets called at the beginning of + every section. + - Show printing preferences when tray icon is in restricted mode. + - Session profile manager: the host parameter will be of type ListType + for future versions of Python X2Go (>= 0.5.0.0). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 08 Jan 2014 21:28:37 +0100 -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
-
git-admin＠x2go.org