This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository pyhoca-gui. from f1f1b88 common: update copyright notices. Happy new year! new da81512 misc: whitespace only. The 1 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: Makefile.docupload | 1 - README | 2 +- README.i18n | 6 +++--- debian/changelog | 24 ++++++++++++------------ debian/copyright | 2 +- man/man1/pyhoca-gui.1 | 10 +++++----- nsis_template.py | 6 +++--- pyhoca/wxgui/profilemanager.py | 6 +++--- setup.py | 4 ++-- 9 files changed, 30 insertions(+), 31 deletions(-) -- Alioth's /srv/git/code.x2go.org/pyhoca-gui.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 da8151225dad3c28893f4bcfbd7c42c4eb83e8b5 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Jan 28 16:46:01 2016 +0100 misc: whitespace only. --- Makefile.docupload | 1 - README | 2 +- README.i18n | 6 +++--- debian/changelog | 24 ++++++++++++------------ debian/copyright | 2 +- man/man1/pyhoca-gui.1 | 10 +++++----- nsis_template.py | 6 +++--- pyhoca/wxgui/profilemanager.py | 6 +++--- setup.py | 4 ++-- 9 files changed, 30 insertions(+), 31 deletions(-) diff --git a/Makefile.docupload b/Makefile.docupload index fd0b499..7872539 100644 --- a/Makefile.docupload +++ b/Makefile.docupload @@ -13,6 +13,5 @@ docbuild: make -f Makefile.man2html build_man2html docupload: - ssh -l${DOC_USER} ${DOC_HOST} "{ mkdir -p ${DOC_PATH}; rm -Rfv ${DOC_PATH}/*; }" scp -r .build_man2html/html/* ${DOC_USER}@${DOC_HOST}:${DOC_PATH}/ diff --git a/README b/README index 2d6e6ce..5d65bcf 100644 --- a/README +++ b/README @@ -33,7 +33,7 @@ See http://www.gnu.org/licenses/agpl.html for a recent copy. === How to use it === -Please refer to the man page: +Please refer to the man page: man pyhoca-gui diff --git a/README.i18n b/README.i18n index 1a365d5..e8e69e8 100644 --- a/README.i18n +++ b/README.i18n @@ -70,7 +70,7 @@ with this command in PyHoca-GUI's base directory: If you system already runs with the locale (language setting) that you are translating for then you simply have to start pyhoca-gui from the source base folder: - + $ cd <current_dir>/pyhoca-gui $ ./pyhoca-gui @@ -82,7 +82,7 @@ for testing the German translation): Sending in the Translation File ------------------------------- -When done, please send the complete translation file +When done, please send the complete translation file <current_dir>/pyhoca-gui/po/<lang>.po @@ -102,7 +102,7 @@ You will get informed on x2go-i18n if a translation update is necessary. So chec your mails there regularly. For updating a translation, either keep the pyhoca-gui source project folder and -read more on Git by your self. +read more on Git by your self. Alternatively, just remove the folder (once you have sent in the translation file) and start with this documentation all over again. diff --git a/debian/changelog b/debian/changelog index 9918a31..a38b748 100644 --- a/debian/changelog +++ b/debian/changelog @@ -192,7 +192,7 @@ pyhoca-gui (0.5.0.0-0x2go1) unstable; urgency=low - Windows: Set the pyhoca-gui icon on pyhoca-gui.exe (Fixes: #548) The icon will show up in Task Manager too. - Windows: Upgrade PulseAudio from 1.1 to 5.0-rev18 from OBS. - Fixes choppy sound in Adobe Flash Player (Fixes: #533) + Fixes choppy sound in Adobe Flash Player (Fixes: #533) - Windows: Upgrade from VcXsrv 1.14.2.0 to VcXsrv-xp 1.14.3.2 Windows: Update nxproxy from 3.5.0.12 to 3.5.0.27 (linked against latest cygwin packages as of 2014-06-09) @@ -405,7 +405,7 @@ pyhoca-gui (0.4.0.2-0~x2go1) unstable; urgency=low - Make PyHoca-GUI aware of the Cinnamon desktop shell. - Make sure that there is no KeyException when checking/unchecking the restoreexports item in the shared folders menu. - * MS Windows specific: + * MS Windows specific: + Use bbfreeze to freeze the Win32 version of PyHoca-GUI. + Make sure PyHoca-GUI freezing works with gevent 1.0b3 and later. + Freeze with gui_only enabled, hides the console Window PyHoca-GUI runs in. @@ -518,7 +518,7 @@ pyhoca-gui (0.2.1.0-0~x2go1) unstable; urgency=low - Make sure RDP (X2Go-proxy) sessions stored by PyHoca-GUI get recognized as such by X2goClient. - Make session icon handling more robust, be more compatible with X2Go - Client about the session icon name. Rewrite mistakes pyhoca-gui + Client about the session icon name. Rewrite mistakes pyhoca-gui (<= 0.2.0.4) did on the icon attribute in the session profile config. - Make DirectRDP sessions configurable through PyHoca-GUI profile manager. - Slight change in internal message box API, rename custom_message class @@ -680,7 +680,7 @@ pyhoca-gui (0.2.0.0-0~x2go1) unstable; urgency=low - Add extra session menu item: Rename Session Window. - Show desktop session name in menu for ,,start session'' item. - Show session window title in session menu. - - Add support for bringing a session window on top of all other + - Add support for bringing a session window on top of all other windows (i.e. to foreground). Currently only works on MS Windows. - Add icons folder ,,icons_symlinked'' for people who will package PyHoca-GUI on Debian or other Distros that also ship the @@ -722,7 +722,7 @@ pyhoca-gui (0.2.0.0-0~x2go1) unstable; urgency=low anymore. - Implement single session profile support (--single-session-profile boolean command line option). - - Rendering of published applications menu tree has partially been moved + - Rendering of published applications menu tree has partially been moved into Python X2Go. - Fix disabling of published applications tick box in profile manager. - Show the detected GUI language in GUI output. @@ -904,7 +904,7 @@ pyhoca-gui (0.1.0.5-0~x2go1) unstable; urgency=low * New upstream version (0.1.0.5): - bugfix release - - Fix for new color depth filter feature if the session is not registered + - Fix for new color depth filter feature if the session is not registered any more. - Add --logon-window-position option that allows custom placing of the logon window on your desktop. @@ -1017,7 +1017,7 @@ pyhoca-gui (0.0.32.0-0~nwt1) natty lucid maverick stable testing unstable; urgen * new upstream - adds --disable-splash cmdline option - speeds up application bootstrap - - adds --non-interactive cmdline option + - adds --non-interactive cmdline option - support for Trinity X Desktop sessions -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 26 Mar 2011 21:11:27 +0100 @@ -1065,7 +1065,7 @@ pyhoca-gui (0.0.29.0-0~nwt1) natty lucid maverick stable testing unstable; urgen pyhoca-gui (0.0.28.0-0~nwt1) natty lucid maverick stable testing unstable; urgency=low * depending on python-x2go 0.0.37.0 - * new upstream: + * new upstream: - reworked profile manager layout (added loads of invisible borders) -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 25 Feb 2011 17:48:00 +0100 @@ -1122,7 +1122,7 @@ pyhoca-gui (0.0.23-0~nwt1) lucid maverick testing unstable; urgency=low pyhoca-gui (0.0.22-0~nwt1) lucid maverick testing unstable; urgency=low - * bugfix for error reporting when a non-X2Go user authenticates + * bugfix for error reporting when a non-X2Go user authenticates -- Mike Gabriel <m.gabriel@das-netzwerkteam.de> Wed, 12 Jan 2011 00:35:00 +0100 @@ -1142,7 +1142,7 @@ pyhoca-gui (0.0.21-0~nwt1) lucid maverick testing unstable; urgency=low * added ,,Transfer session'' menu item for running sessions that are not associated (i.e. running from within PyHoca-GUI) - * now X2goSessionRegistry.update_status() can differentiate between + * now X2goSessionRegistry.update_status() can differentiate between ,,already running'' sessions (directly after connect) and newly appearing running sessions while having been connected for quite a while * added i18n support @@ -1260,7 +1260,7 @@ pyhoca-gui (0.0.10-0~nwt1) lucid maverick testing unstable; urgency=low pyhoca-gui (0.0.9-0~nwt1) lucid maverick testing unstable; urgency=low - * reducing CPU usage by factor 2-3 (allowing 25 nxproxy window refreshes + * reducing CPU usage by factor 2-3 (allowing 25 nxproxy window refreshes per second, instead of 50) -- Mike Gabriel <m.gabriel@das-netzwerkteam.de> Fri, 10 Dec 2010 12:39:00 +0100 @@ -1273,7 +1273,7 @@ pyhoca-gui (0.0.8-0~nwt1) lucid maverick testing unstable; urgency=low pyhoca-gui (0.0.7-0~nwt1) lucid maverick testing unstable; urgency=low - * still fiddling around with desktop icon... + * still fiddling around with desktop icon... using hicolor folder in /usr/share/icons now -- Mike Gabriel <m.gabriel@das-netzwerkteam.de> Fri, 10 Dec 2010 12:10:00 +0100 diff --git a/debian/copyright b/debian/copyright index 6b0ae63..378beb6 100644 --- a/debian/copyright +++ b/debian/copyright @@ -59,7 +59,7 @@ License: AGPL-3+ License: AGPL-3+ PyHoca-GUI is free software; you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published + it under the terms of the GNU Affero General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. . diff --git a/man/man1/pyhoca-gui.1 b/man/man1/pyhoca-gui.1 index a4a2c62..31e9b4c 100644 --- a/man/man1/pyhoca-gui.1 +++ b/man/man1/pyhoca-gui.1 @@ -29,7 +29,7 @@ From your desktop's system tray you can start/resume/share pre-configured X2Go s pre-configured session profiles in the X2Go profile manager and also configure the basic setup of \fBpyhoca-gui\fR. .PP -\fBpyhoca-gui\fR uses the same set of config files (\fBsettings\fR, \fBprinting\fR and \fBsessions\fR in ~/.x2goclient) as the original +\fBpyhoca-gui\fR uses the same set of config files (\fBsettings\fR, \fBprinting\fR and \fBsessions\fR in ~/.x2goclient) as the original X2Go Client application (by Heinz-M. Graesing and Oleksandr Schneyder) does. .PP On Windows systems \fBpyhoca-gui\fR uses the same set of Windows registry keys and values as the original X2Go Client application. @@ -91,7 +91,7 @@ Define an alternative system tray icon file (PNG files only, leave out file exte Define an alternative system tray icon file while connecting to a server (PNG files only, leave out file extension here, size 22x22 on Linux, 16x16 on Windows). .TP \*(T<\fB\-\-restricted-trayicon\fR\*(T> -Restrict functionality of \fBpyhoca-gui\fR's main session manager icon that is shown in the notification area / system tray. This +Restrict functionality of \fBpyhoca-gui\fR's main session manager icon that is shown in the notification area / system tray. This switch limits the icon 's functionality to a right-click menu that allows one to raise the ,,About'' window and exit the application. On left-click only a minimal session menu is shown. .TP @@ -135,7 +135,7 @@ Specify the <URL> of the X2Go Session Broker. \fBpyhoca\-gui\fR can access http: Syntax of <URL> for HTTP brokerage: -http(s)://<user>:<password>@<hostname>:<port>/path/to/broker +http(s)://<user>:<password>@<hostname>:<port>/path/to/broker Syntax of <URL> for SSH brokerage: @@ -199,7 +199,7 @@ The number of published applications that will be rendered without submenus. .PP .SH BACKEND OPTIONS \fBpyhoca-gui\fR supports transparent use of different data backends. For configuration three backends are common: -FILE, GCONF (Linux only) and WINREG (Windows only). The default backend currently is the FILE backend +FILE, GCONF (Linux only) and WINREG (Windows only). The default backend currently is the FILE backend on all platforms. .PP For client-server communication the only yet implemented backend is the STDOUT backend (as X2Go server commands @@ -246,7 +246,7 @@ Define an alternative location for user SSH files (default: <HOME>/.ssh). There are some options that are only available on Windows: .TP \*(T<\fB\-\-start-xserver\fR\*(T> -Start an XServer (if available) before starting \fBpyhoca-gui\fR. The application will detect the best +Start an XServer (if available) before starting \fBpyhoca-gui\fR. The application will detect the best suitable XServer automatically, if more than one XServer is installed on your system (currently known: Xming, Cygwin-X). .TP diff --git a/nsis_template.py b/nsis_template.py index 33dbe9a..0839c50 100644 --- a/nsis_template.py +++ b/nsis_template.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # Copyright (C) 2010-2016 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# +# # PyHoca is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by # the Free Software Foundation; either version 3 of the License, or @@ -46,7 +46,7 @@ InstallDir $PROGRAMFILES\\{program_name} ; builds (which include no fonts for the X server) by about 27% SetCompressor /SOLID lzma -; Registry key to check for directory (so if you install again, it will +; Registry key to check for directory (so if you install again, it will ; overwrite the old one automatically) InstallDirRegKey HKLM "Software\\{program_name}" "Install_Dir" @@ -268,7 +268,7 @@ Section "{program_name} ($REQUIRED)" WriteRegStr HKLM SOFTWARE\\{program_name} "Install_Dir" "$INSTDIR" ; Write the uninstall keys for Windows - + WriteRegStr HKLM ${{UNINSTALL_REGKEY}} "InstallLocation" "$INSTDIR" WriteRegStr HKLM ${{UNINSTALL_REGKEY}} "UninstallString" "$INSTDIR\\uninstall.exe" WriteRegStr HKLM ${{UNINSTALL_REGKEY}} "DisplayIcon" "$INSTDIR\\{icon_location}" diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index 0e0d248..dbb173a 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -99,8 +99,8 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.applicationChoices = { 'WWWBROWSER': _(u'Internet Browser'), 'MAILCLIENT': _(u'Email Client'), - 'OFFICE': _(u'Office'), - 'TERMINAL': _(u'Terminal'), + 'OFFICE': _(u'Office'), + 'TERMINAL': _(u'Terminal'), } self.clipboardModeChoices = { 'both': _(u'between client and server'), @@ -1167,7 +1167,7 @@ class PyHocaGUI_ProfileManager(wx.Dialog): self.SharedFoldersList.DeleteAllItems() # until pyhoca-gui 0.1.0.8 we used a wrong format for the export field in session profiles - # the correct export field format is: + # the correct export field format is: # # export = "{string(path_1)}:{boolint(autoconnect_1);...;string(path_n)}:{boolint(autoconnect_n)};" diff --git a/setup.py b/setup.py index 42d9455..cf68510 100755 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # Copyright (C) 2010-2016 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# +# # PyHoca is free software; you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by # the Free Software Foundation; either version 3 of the License, or @@ -62,7 +62,7 @@ if platform.system() == 'Windows': # Prefer Unicode NSIS over regular NSIS. # See x2goclient bug #528 for reasoning. # This should be reevaluated once regular NSIS 3.0 is released. - if os.path.isfile(UNICODE_NSIS): + if os.path.isfile(UNICODE_NSIS): NSIS_COMPILE = UNICODE_NSIS else: NSIS_COMPILE = REGULAR_NSIS -- Alioth's /srv/git/code.x2go.org/pyhoca-gui.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git