x2go-commits

x2go-commits@lists.x2go.org

1 participants
37910 discussions

pyhoca-gui.git - build-main (branch) updated: 0.4.0.6-9-g6340a81
by git-admin＠x2go.org 27 Aug '13

27 Aug '13

The branch, build-main has been updated via 6340a81f55165077ff364099c9e5f62702953176 (commit) from ab019d75638bfe3479df0b7e3a9aa6de2ac3688f (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: po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/po/de.po b/po/de.po index b6097e4..35c42c4 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PyHoca-GUI VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-08-03 18:26+0200\n" -"PO-Revision-Date: 2013-08-03 18:27+0100\n" +"PO-Revision-Date: 2013-08-03 22:46+0100\n" "Last-Translator: Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de>\n" "Language-Team: X2Go i18n <x2go-i18n(a)lists.berlios.de>\n" "Language: \n" @@ -1240,7 +1240,7 @@ msgstr "" "Die/das ausgewählte(n) Sitzungsprofil(e) konnte(n) nicht\n" "aus der Datei ,,%s'' importiert werden.\n" "\n" -"Bitte häufige Fehlerursachen prüfen (Datenträger voll, unzureichender Zugriff, usw)." +"Hat die Sitzungsprofildatei wirklich ein korrektes Format?" #: ../pyhoca/wxgui/frontend.py:1165 #, python-format 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)).

1 0

pyhoca-gui.git - build-main (branch) updated: 0.4.0.6-4-g527741c
by git-admin＠x2go.org 27 Aug '13

27 Aug '13

The branch, build-main has been updated via 527741ca629a8e39b7dfa08e601079d627c70911 (commit) from d08b602e0ba1c0b143c4875a77b074180fe607cf (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 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 1a8b8db..6fa2c94 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ pyhoca-gui (0.4.0.7-0~x2go1) UNRELEASED; urgency=low - Add import feature to the session profile manager. * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. + + Depend on python-x2go (>= 0.4.0.7). -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 30 Jul 2013 13:35:59 +0200 diff --git a/debian/control b/debian/control index 9bc0f97..fd14008 100644 --- a/debian/control +++ b/debian/control @@ -24,7 +24,7 @@ Architecture: all Depends: ${misc:Depends}, python, - python-x2go (>=0.4.0.6-0~), + python-x2go (>=0.4.0.7-0~), python-argparse, python-notify, python-setproctitle, 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)).

1 0

pyhoca-gui.git - build-main (branch) updated: 0.4.0.6-7-g0246201
by git-admin＠x2go.org 27 Aug '13

27 Aug '13

The branch, build-main has been updated via 024620112e170ed8ff326b4873b920bf00855954 (commit) from a8352af72f296ac837f69eaa46da71800b58f6c4 (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/frontend.py | 4 ++++ 1 file changed, 4 insertions(+) The diff of changes is: diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 16eb935..4dad362 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -1159,6 +1159,10 @@ class PyHocaGUI(wx.App, x2go.X2GoClient): self._pyhoca_logger('Importing session profile %s failed. Reason: %s' % (profile_name, str(e)), loglevel=x2go.loglevel_ERROR) failed_profiles.append(profile_name) + imported_profiles = imported_session_profiles.profile_names + imported_profiles.sort() + failed_profiles.sort() + self.session_profiles.write_user_config = True if not self.session_profiles.write(): m = messages.PyHoca_MessageWindow_Ok(self, 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)).

1 0

pyhoca-gui.git - build-main (branch) updated: 0.4.0.6-8-gab019d7
by git-admin＠x2go.org 27 Aug '13

27 Aug '13

The branch, build-main has been updated via ab019d75638bfe3479df0b7e3a9aa6de2ac3688f (commit) from 024620112e170ed8ff326b4873b920bf00855954 (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/frontend.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) The diff of changes is: diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 4dad362..93dca84 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -1171,30 +1171,30 @@ class PyHocaGUI(wx.App, x2go.X2GoClient): icon='error', profile_name=profile_name) m.ShowModal() - elif len(failed_profiles) == len(imported_session_profiles.profile_names): + elif len(failed_profiles) == len(imported_profiles): _notify_text = _(u'None of the session profiles could be imported...') + '\n' for failed_profile in failed_profiles: _notify_text += '\n %s' % failed_profile _notify_text += '\n\n' + _(u'For details, start %s from the command line and retry the import.') % self.appname self.notifier.send(u'Session Profile Import (Failure)', _notify_text, icon='profile_error', timeout=10000) - elif 0 < len(failed_profiles) < len(imported_session_profiles.profile_names): + elif 0 < len(failed_profiles) < len(imported_profiles): _notify_text = _(u'Only these session profiles could be imported...') + '\n' - for profile_name in [ pn for pn in imported_session_profiles.profile_names if pn not in failed_profiles ]: + for profile_name in [ pn for pn in imported_profiles if pn not in failed_profiles ]: _notify_text += '\n %s' % profile_name _notify_text += '\n\n' + _(u'Whereas these session profiles failed to import...') + '\n' for failed_profile in failed_profiles: _notify_text += '\n %s' % failed_profile _notify_text += '\n\n' + _(u'For details, start %s from the command line and retry the import.') % self.appname self.notifier.send(u'Session Profile Import (Warning)', _notify_text, icon='profile_warning', timeout=10000) - elif 1 < len(imported_session_profiles.profile_names): + elif 1 < len(imported_profiles): _notify_text = _(u'New session profiles have been imported...') + '\n' - for profile_name in imported_session_profiles.profile_names: + for profile_name in imported_profiles: _notify_text += '\n %s' % profile_name self.notifier.send(u'Session Profile Import (Success)', _notify_text, icon='profile_add', timeout=10000) - elif 1 == len(imported_session_profiles.profile_names): + elif 1 == len(imported_profiles): _notify_text = _(u'New session profile has been imported...') + '\n' - for profile_name in imported_session_profiles.profile_names: + for profile_name in imported_profiles: _notify_text += '\n %s' % profile_name self.notifier.send(u'Session Profile Import (Success)', _notify_text, icon='profile_add', timeout=10000) 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)).

1 0

pyhoca-gui.git - build-main (branch) updated: 0.4.0.6-1-gd4dc4d1
by git-admin＠x2go.org 27 Aug '13

27 Aug '13

The branch, build-main has been updated via d4dc4d1144f3b243d7d5b77f2767a542a17461af (commit) from fe808853c291be4fd7297f8bc04dffc83cfc7dde (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 | 6 ++++++ pyhoca/wxgui/__init__.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 01e851f..20ad980 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pyhoca-gui (0.4.0.7-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 30 Jul 2013 13:35:59 +0200 + pyhoca-gui (0.4.0.6-0~x2go1) unstable; urgency=low * New upstream version (0.4.0.6): diff --git a/pyhoca/wxgui/__init__.py b/pyhoca/wxgui/__init__.py index f362aec..6f92ff7 100644 --- a/pyhoca/wxgui/__init__.py +++ b/pyhoca/wxgui/__init__.py @@ -18,6 +18,6 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. -__VERSION__ = '0.4.0.6' +__VERSION__ = '0.4.0.7' from frontend import * 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)).

1 0

pyhoca-gui.git - build-main (branch) updated: 0.4.0.6-2-gc2c9d03
by git-admin＠x2go.org 27 Aug '13

27 Aug '13

The branch, build-main has been updated via c2c9d034a3449c45572bdab775082a93097807e1 (commit) from d4dc4d1144f3b243d7d5b77f2767a542a17461af (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 | 3 ++- debian/control | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index 20ad980..d192e7a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ pyhoca-gui (0.4.0.7-0~x2go1) UNRELEASED; urgency=low - * Continue development... + * /debian/control: + + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. -- Mike Gabriel <mike.gabriel(a)das-netzwerkteam.de> Tue, 30 Jul 2013 13:35:59 +0200 diff --git a/debian/control b/debian/control index 11f709d..9bc0f97 100644 --- a/debian/control +++ b/debian/control @@ -36,7 +36,7 @@ Description: Graphical X2Go client written in (wx)Python X2Go is a server based computing environment with - session resuming - low bandwidth support - - LDAP support + - session brokerage support - client-side mass storage mounting support - client-side printing support - audio support 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)).

1 0

pyhoca-gui.git - build-main (branch) updated: 0.4.0.6-3-gd08b602
by git-admin＠x2go.org 27 Aug '13

27 Aug '13

The branch, build-main has been updated via d08b602e0ba1c0b143c4875a77b074180fe607cf (commit) from c2c9d034a3449c45572bdab775082a93097807e1 (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 | 2 + pyhoca/wxgui/frontend.py | 88 ++++++++++++++++++++++++++++++++++++++--- pyhoca/wxgui/menus_taskbar.py | 6 +++ 3 files changed, 91 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index d192e7a..1a8b8db 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ pyhoca-gui (0.4.0.7-0~x2go1) UNRELEASED; urgency=low + * New upstream version (0.4.0.7): + - Add import feature to the session profile manager. * /debian/control: + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 3bc6574..9b7c44d 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -1116,9 +1116,87 @@ class PyHocaGUI(wx.App, x2go.X2GoClient): pass self._temp_disabled_profile_names.remove(profile_name) + def OnProfileImport(self, evt):# + """\ + Gets called if the user requests a session profile (group) import. + + @param evt: event + @type evt: C{obj} + + """ + dlg = wx.FileDialog( + self.about, message=_(u"import session profile(s)"), wildcard="*.x2go", style=wx.FD_OPEN) + + # Show the dialog and retrieve the user response. If it is the OK response, + # process the data. + if dlg.ShowModal() == wx.ID_OK: + + _import_file = dlg.GetPath() + + try: + imported_session_profiles = x2go.X2GoSessionProfiles(config_files=[_import_file]) + except: + m = messages.PyHoca_MessageWindow_Ok(self, + title=_(u'%s: Import of session profile(s) failed') % self.appname, + msg=_(u"The selected session profile(s) could not be imported from \nfile »%s«.\n\nAre you sure the session profiles file has the correct format?") % os.path.normpath(_import_file), + icon='error') + m.ShowModal() + return + + + failed_profiles = [] + for profile_name in imported_session_profiles.profile_names: + this_profile = imported_session_profiles.get_profile_config(profile_name) + + # clean up session profile options that are unknown to Python X2Go + for key in copy.deepcopy(this_profile).keys(): + if key not in x2go.defaults.X2GO_SESSIONPROFILE_DEFAULTS: + del this_profile[key] + + try: + self.session_profiles.add_profile(**this_profile) + except x2go.x2go_exceptions.X2GoProfileException, e: + self._pyhoca_logger('Importing session profile %s failed. Reason: %s' % (profile_name, str(e)), loglevel=x2go.loglevel_ERROR) + failed_profiles.append(profile_name) + + self.session_profiles.write_user_config = True + if not self.session_profiles.write(): + m = messages.PyHoca_MessageWindow_Ok(self, + title=_(u'%s: Write failure after import') % self.appname, + msg=_(u"The session profiles configuration could not be written to file after import\n\nCheck for common problems (disk full, insufficient access, etc.)."), + icon='error', + profile_name=profile_name) + m.ShowModal() + elif len(failed_profiles) == len(imported_session_profiles.profile_names): + _notify_text = _(u'None of the session profiles could be imported...') + '\n' + for failed_profile in failed_profiles: + _notify_text += '\n %s' % failed_profile + _notify_text += '\n\n' + _(u'For details, start %s from the command line and retry the import.') % self.appname + self.notifier.send(u'Session Profile Import (Failure)', _notify_text, icon='profile_error', timeout=10000) + + elif 0 < len(failed_profiles) < len(imported_session_profiles.profile_names): + _notify_text = _(u'Only these session profiles could be imported...') + '\n' + for profile_name in [ pn for pn in imported_session_profiles.profile_names if pn not in failed_profiles ]: + _notify_text += '\n %s' % profile_name + _notify_text += '\n\n' + (u'Whereas these session profiles failed to import...') + '\n' + for failed_profile in failed_profiles: + _notify_text += '\n %s' % failed_profile + _notify_text += '\n\n' + _(u'For details, start %s from the command line and retry the import.') % self.appname + self.notifier.send(u'Session Profile Import (Warning)', _notify_text, icon='profile_warning', timeout=10000) + elif 1 < len(imported_session_profiles.profile_names): + _notify_text = _(u'New session profiles have been imported...') + '\n' + for profile_name in imported_session_profiles.profile_names: + _notify_text += '\n %s' % profile_name + self.notifier.send(u'Session Profile Import (Success)', _notify_text, icon='profile_add', timeout=10000) + elif 1 == len(imported_session_profiles.profile_names): + _notify_text = _(u'New session profile has been imported...') + '\n' + for profile_name in imported_session_profiles.profile_names: + _notify_text += '\n %s' % profile_name + self.notifier.send(u'Session Profile Import (Success)', _notify_text, icon='profile_add', timeout=10000) + def OnProfileExport(self, evt): """\ - Gets called if the user request a session profile (group) export. + Gets called if the user requests a session profile (group) export. @param evt: event @type evt: C{obj} @@ -1165,7 +1243,7 @@ class PyHocaGUI(wx.App, x2go.X2GoClient): if not m.Yes(): return else: os.remove(_export_file) - exported_sessions = x2go.X2GoSessionProfiles(config_files=[_export_file]) + exported_session_profiles = x2go.X2GoSessionProfiles(config_files=[_export_file]) for profile_name in filtered_profile_names: this_profile = self._X2GoClient__get_profile_config(profile_name) @@ -1174,10 +1252,10 @@ class PyHocaGUI(wx.App, x2go.X2GoClient): if key not in x2go.defaults.X2GO_SESSIONPROFILE_DEFAULTS: del this_profile[key] - exported_sessions.add_profile(**this_profile) + exported_session_profiles.add_profile(**this_profile) - exported_sessions.write_user_config = True - if exported_sessions.write(): + exported_session_profiles.write_user_config = True + if exported_session_profiles.write(): if profile_group: self.notifier.send(_(u'%s - profiles exported') % profile_group, _(u'Successfully exported session profile group »%s« to file »%s«.') % (profile_group, os.path.basename(_export_file)), icon='success', timeout=10000) elif profile_name: diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py index 5815454..413b4c0 100644 --- a/pyhoca/wxgui/menus_taskbar.py +++ b/pyhoca/wxgui/menus_taskbar.py @@ -968,6 +968,12 @@ class PyHocaGUI_Menu_TaskbarProfileNames(wx.Menu): self.Append(text=_(u'Export Profile Group'), id=_export_id) self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnProfileExport, id=_export_id) + if bind_method is None and not group_name: + _import_id = wx.NewId() + self.AppendSeparator() + self.Append(text=_(u'Import Session Profiles'), id=_import_id) + self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnProfileImport, id=_import_id) + def OnUpdateUI(self, evt): profile_name = self._PyHocaGUI._eventid_profilenames_map[evt.GetId()] if profile_name in self._PyHocaGUI._temp_disabled_profile_names: 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)).

1 0

page changed: doc:organigram
by wiki-admin＠x2go.org 27 Aug '13

27 Aug '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/08/27 11:14 Browser : Mozilla/5.0 (X11; Linux i686 on x86_64; rv:23.0) Gecko/20100101 Firefox/23.0 Iceweasel/23.0 IP-Address : 194.242.20.98 Hostname : 194.242.20.98 Old Revision: http://wiki.x2go.org/doku.php/doc:organigram?rev=1377602057 New Revision: http://wiki.x2go.org/doku.php/doc:organigram Edit Summary: [Package maintainers] User : sunweaver @@ -75,8 +75,9 @@ * Jan Engelhardt (X2Go for RPM-based distros) * Mike Gabriel (X2Go Package Repositories, Debian Developer) * Clemens Lang (X2Go Client for Mac OS X, MacPorts Developer) + * Orion Paplowski (X2Go packages in Fedora) * Oleksandr Shneyder (Windows Installer) * Reinhard Tartler (Debian/Ubuntu Developer) ===== Miscellaneous Contributors ===== -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: doc:organigram
by wiki-admin＠x2go.org 27 Aug '13

27 Aug '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/08/27 11:14 Browser : Mozilla/5.0 (X11; Linux i686 on x86_64; rv:23.0) Gecko/20100101 Firefox/23.0 Iceweasel/23.0 IP-Address : 194.242.20.98 Hostname : 194.242.20.98 Old Revision: http://wiki.x2go.org/doku.php/doc:organigram?rev=1377601998 New Revision: http://wiki.x2go.org/doku.php/doc:organigram Edit Summary: User : sunweaver @@ -27,8 +27,9 @@ Contact: [[x2go-dev(a)lists.berlios.de]] * Mike Gabriel + * Orion Paplowski * Oleksandr Shneyder * Moritz (Morty) Strübe * Reinhard Tartler * Alexander Wuerstlein @@ -90,12 +91,11 @@ * Ivan Kabaivanov * Milan Knížek * Mihai Moldovan * Martin Oehler - * Orion Paplowski * Sören Plönnigs * Jochen Schulz * John A. Sullivan * Hayawardh Vijayakumar * John Williams * ... -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

page changed: doc:organigram
by wiki-admin＠x2go.org 27 Aug '13

27 Aug '13

A page in your DokuWiki was added or changed. Here are the details: Date : 2013/08/27 11:13 Browser : Mozilla/5.0 (X11; Linux i686 on x86_64; rv:23.0) Gecko/20100101 Firefox/23.0 Iceweasel/23.0 IP-Address : 194.242.20.98 Hostname : 194.242.20.98 Old Revision: http://wiki.x2go.org/doku.php/doc:organigram?rev=1368650845 New Revision: http://wiki.x2go.org/doku.php/doc:organigram Edit Summary: [Translation (i18n) Team] User : sunweaver @@ -62,9 +62,9 @@ * Stefan Baur (German) * Ricardo Diaz (Spanish) * Mike Gabriel (German) * Dick Kniep (Dutch) - * Christoffer Krakou (Danish) + * Kjetil Fleten & Staff (Danish) * Daniel Lindgren (Swedish) * Jean Milot (French) * Frédéric Motte (French) * Oleksandr Shneyder (Russian) -- This mail was generated by DokuWiki at http://wiki.x2go.org/

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits