This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch brokerclient in repository pyhoca-gui. from 743f4fd debian/pyhoca-gui.install: make sure that new icon names get installed new 59cb511 Explicitly add pyhoca.mswin to setup.py if building on MS Windows. new 49a88d6 Provide mswin_logging as separate module in pyhoca.wxgui namespace, undo earlier namespace split-off. new 3aa69e1 Don't include the py.exe shell in frozen builds. new 91a3876 Provide script for cleaning up before running bbfreeze. new d6b9d4f make bbfreeze_cleanup.sh executable new 28bfc60 Make the hover text of the tray icon brandable (drop hard-coded PyHoca-GUI application name). new df0e1ad NSIS script: make sure SetOutPath gets called at the beginning of every section. new 3b84465 Show printing preferences when tray icon is in restricted mode. The 8 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: bbfreeze_cleanup.sh | 4 ++++ debian/changelog | 7 ++++++- nsis_template.py | 2 ++ pyhoca-gui | 2 +- pyhoca/mswin/__init__.py | 20 -------------------- pyhoca/wxgui/__init__.py | 3 --- pyhoca/wxgui/launcher.py | 3 ++- pyhoca/wxgui/menus_taskbar.py | 14 ++++++++------ pyhoca/{mswin => wxgui}/mswin_logging.py | 0 pyhoca/wxgui/taskbar.py | 8 ++++---- setup.py | 1 + 11 files changed, 28 insertions(+), 36 deletions(-) create mode 100755 bbfreeze_cleanup.sh delete mode 100644 pyhoca/mswin/__init__.py rename pyhoca/{mswin => wxgui}/mswin_logging.py (100%) -- 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 brokerclient in repository pyhoca-gui. commit 49a88d6164ec9f404fce729cff67911d2e954e61 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Feb 7 20:13:18 2014 +0100 Provide mswin_logging as separate module in pyhoca.wxgui namespace, undo earlier namespace split-off. --- debian/changelog | 3 +-- pyhoca-gui | 2 +- pyhoca/mswin/__init__.py | 20 -------------------- pyhoca/wxgui/__init__.py | 3 --- pyhoca/wxgui/launcher.py | 3 ++- pyhoca/{mswin => wxgui}/mswin_logging.py | 0 setup.py | 4 +--- 7 files changed, 5 insertions(+), 30 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0a49617..46bd578 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,12 +11,11 @@ pyhoca-gui (0.5.0.0-0x2go1) UNRELEASED; urgency=low * 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. - * Move setup_mswinlog to a separate module namespace. + * 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. - * Explicitly add pyhoca.mswin to setup.py if building on MS Windows. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 08 Jan 2014 21:28:37 +0100 diff --git a/pyhoca-gui b/pyhoca-gui index 2082daf..c45acca 100755 --- a/pyhoca-gui +++ b/pyhoca-gui @@ -24,7 +24,7 @@ import sys PROG_NAME = "PyHoca-GUI" try: - from pyhoca.mswin.mswin_logging import setup_mswinlog + from pyhoca.wxgui.mswin_logging import setup_mswinlog setup_mswinlog(PROG_NAME) except ImportError: pass diff --git a/pyhoca/mswin/__init__.py b/pyhoca/mswin/__init__.py deleted file mode 100644 index f04d824..0000000 --- a/pyhoca/mswin/__init__.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- - -# Copyright (C) 2010-2013 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -# Copyright (C) 2010-2013 by Dick Kniep <dick.kniep@lindix.nl> -# -# 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 by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# PyHoca GUI is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program; if not, write to the -# Free Software Foundation, Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. - diff --git a/pyhoca/wxgui/__init__.py b/pyhoca/wxgui/__init__.py index 89a1d1f..97a7a07 100644 --- a/pyhoca/wxgui/__init__.py +++ b/pyhoca/wxgui/__init__.py @@ -19,6 +19,3 @@ # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. __VERSION__ = '0.5.0.0' - -from frontend import * -from launcher import * \ No newline at end of file diff --git a/pyhoca/wxgui/launcher.py b/pyhoca/wxgui/launcher.py index 8dcb8f8..af703e9 100644 --- a/pyhoca/wxgui/launcher.py +++ b/pyhoca/wxgui/launcher.py @@ -49,7 +49,8 @@ from x2go import CURRENT_LOCAL_USER from x2go import BACKENDS from x2go import X2GoLogger -from pyhoca.wxgui import PyHocaGUI, __VERSION__ +from pyhoca.wxgui import __VERSION__ +from frontend import PyHocaGUI from messages import PyHoca_MessageWindow_Ok import defaults diff --git a/pyhoca/mswin/mswin_logging.py b/pyhoca/wxgui/mswin_logging.py similarity index 100% rename from pyhoca/mswin/mswin_logging.py rename to pyhoca/wxgui/mswin_logging.py diff --git a/setup.py b/setup.py index 9ab5b58..a12cdfb 100755 --- a/setup.py +++ b/setup.py @@ -296,10 +296,8 @@ if platform.system() == 'Windows': } } cmd_options.update({ 'build_exe': cmd_options['build_with_{freezer}'.format(freezer=default_win32exe_freezer)] }) - packages = [ 'pyhoca.wxgui', 'pyhoca.mswin', ] else: cmd_options={} - packages = [ 'pyhoca.wxgui', ] if __name__ == "__main__": @@ -311,7 +309,7 @@ if __name__ == "__main__": author = AUTHOR, url = URL, namespace_packages = [ 'pyhoca', ], - packages = packages, + packages = [ 'pyhoca.wxgui', ], package_dir = {'': '.'}, install_requires = [ 'setuptools', ], cmdclass = cmd_class, -- 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 brokerclient in repository pyhoca-gui. commit 91a3876242f050820e9e8117143fa3cf2b797722 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Feb 7 22:59:12 2014 +0100 Provide script for cleaning up before running bbfreeze. --- bbfreeze_cleanup.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bbfreeze_cleanup.sh b/bbfreeze_cleanup.sh new file mode 100644 index 0000000..0a5fd40 --- /dev/null +++ b/bbfreeze_cleanup.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +rm dist/ -Rfv +find * | egrep ".*\.pyc$" | while read file; do rm -v "$file"; done -- 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 brokerclient in repository pyhoca-gui. commit d6b9d4f742f53b48edb93626f2b3cd9497b0c236 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Feb 7 22:59:44 2014 +0100 make bbfreeze_cleanup.sh executable --- 0 files changed diff --git a/bbfreeze_cleanup.sh b/bbfreeze_cleanup.sh old mode 100644 new mode 100755 -- 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 brokerclient in repository pyhoca-gui. commit 3b844658ca683b2b67c1684b1afa7b33db2235d6 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Feb 21 00:38:54 2014 +0100 Show printing preferences when tray icon is in restricted mode. --- debian/changelog | 1 + pyhoca/wxgui/menus_taskbar.py | 14 ++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index a281687..a54d8be 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,7 @@ pyhoca-gui (0.5.0.0-0x2go1) UNRELEASED; urgency=low 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. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 08 Jan 2014 21:28:37 +0100 diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py index 413b4c0..22fa58f 100644 --- a/pyhoca/wxgui/menus_taskbar.py +++ b/pyhoca/wxgui/menus_taskbar.py @@ -143,13 +143,15 @@ class PyHocaGUI_Menu_TaskbarOptionsManager(wx.Menu): if self._PyHocaGUI.args.session_profile in self._PyHocaGUI.client_connected_profiles(return_profile_names=True): _maintain_profile_item.Enable(False) - self.AppendSeparator() + self.AppendSeparator() - ID_PRINTINGPREFS = wx.NewId() - _printingprefs_item = self.Append(id=ID_PRINTINGPREFS, text=_(u"Printing Preferences")) - self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnPrintingPreferences, id=ID_PRINTINGPREFS) - if self._PyHocaGUI.printingprefs_disabled: - _printingprefs_item.Enable(False) + ID_PRINTINGPREFS = wx.NewId() + _printingprefs_item = self.Append(id=ID_PRINTINGPREFS, text=_(u"Printing Preferences")) + self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnPrintingPreferences, id=ID_PRINTINGPREFS) + if self._PyHocaGUI.printingprefs_disabled: + _printingprefs_item.Enable(False) + + if not self._PyHocaGUI.restricted_trayicon: ID_OPTIONS = wx.NewId() _options_item = self.Append(id=ID_OPTIONS, text=_(u"Client Options")) -- 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 brokerclient in repository pyhoca-gui. commit 59cb5117c6fdf8f849491be461aa9a7b1671288b Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Feb 7 15:06:27 2014 +0100 Explicitly add pyhoca.mswin to setup.py if building on MS Windows. --- debian/changelog | 1 + setup.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2d7db4e..0a49617 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ pyhoca-gui (0.5.0.0-0x2go1) UNRELEASED; urgency=low * NSIS script: empty installation destination before installing new files into $INSTDIR. * Allow appname based mini icons on About... windows. + * Explicitly add pyhoca.mswin to setup.py if building on MS Windows. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 08 Jan 2014 21:28:37 +0100 diff --git a/setup.py b/setup.py index a12cdfb..9ab5b58 100755 --- a/setup.py +++ b/setup.py @@ -296,8 +296,10 @@ if platform.system() == 'Windows': } } cmd_options.update({ 'build_exe': cmd_options['build_with_{freezer}'.format(freezer=default_win32exe_freezer)] }) + packages = [ 'pyhoca.wxgui', 'pyhoca.mswin', ] else: cmd_options={} + packages = [ 'pyhoca.wxgui', ] if __name__ == "__main__": @@ -309,7 +311,7 @@ if __name__ == "__main__": author = AUTHOR, url = URL, namespace_packages = [ 'pyhoca', ], - packages = [ 'pyhoca.wxgui', ], + packages = packages, package_dir = {'': '.'}, install_requires = [ 'setuptools', ], cmdclass = cmd_class, -- 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 brokerclient in repository pyhoca-gui. commit df0e1ad70582e58b247d14bc554a9f956689b332 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Feb 21 00:22:23 2014 +0100 NSIS script: make sure SetOutPath gets called at the beginning of every section. --- debian/changelog | 2 ++ nsis_template.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index f50cc1f..a281687 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,8 @@ pyhoca-gui (0.5.0.0-0x2go1) UNRELEASED; urgency=low * 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. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 08 Jan 2014 21:28:37 +0100 diff --git a/nsis_template.py b/nsis_template.py index 3adf94f..42daf46 100644 --- a/nsis_template.py +++ b/nsis_template.py @@ -264,6 +264,7 @@ SectionEnd ; Optional section (can be disabled by the user) Section "$STARTMENU_LINKS" + SetOutPath "$INSTDIR" CreateDirectory "$SMPROGRAMS\\{program_name}" CreateShortCut "$SMPROGRAMS\\{program_name}\\{program_name}.lnk" "$INSTDIR\\{program_name}.exe" "--quiet --start-xserver --start-pulseaudio --lang $LC_MESSAGES" "$INSTDIR\\icons\\{program_name}.ico" 0 CreateShortCut "$SMPROGRAMS\\{program_name}\\{program_name} ($WITHOUT_PULSEAUDIO).lnk" "$INSTDIR\\{program_name}.exe" "--quiet --start-xserver --lang $LC_MESSAGES" "$INSTDIR\\icons\\{program_name}.ico" 0 @@ -277,6 +278,7 @@ SectionEnd ; Optional section (can be disabled by the user) Section "$DESKTOP_LINKS" + SetOutPath "$INSTDIR" CreateShortCut "$DESKTOP\\{program_name}.lnk" "$INSTDIR\\{program_name}.exe" "--quiet --start-xserver --start-pulseaudio --lang $LC_MESSAGES" "$INSTDIR\\icons\\{program_name}.ico" 0 SectionEnd -- 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 brokerclient in repository pyhoca-gui. commit 28bfc6052a451ad122f69ca2854bf4572e6aebf9 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Feb 10 17:15:35 2014 +0100 Make the hover text of the tray icon brandable (drop hard-coded PyHoca-GUI application name). --- debian/changelog | 2 ++ pyhoca/wxgui/taskbar.py | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 46bd578..f50cc1f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,8 @@ pyhoca-gui (0.5.0.0-0x2go1) UNRELEASED; urgency=low * 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). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 08 Jan 2014 21:28:37 +0100 diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py index 035dd2a..a1f1d9f 100644 --- a/pyhoca/wxgui/taskbar.py +++ b/pyhoca/wxgui/taskbar.py @@ -125,11 +125,11 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon): if x2go.X2GOCLIENT_OS == 'Windows': icon_name = self._PyHocaGUI.tray_icon_connecting or self._PyHocaGUI.tray_icon self.icon = MakeIcon(icon_name=icon_name, appname=self._PyHocaGUI.appname) - self.SetIcon(self.icon, _(u"PyHoca-GUI\nConnecting you to ,,%s\'\'") % profile_name) + self.SetIcon(self.icon, _(u"%s\nConnecting you to ,,%s\'\'") % (self._PyHocaGUI.appname, profile_name)) else: icon_name = self._PyHocaGUI.tray_icon_connecting or self._PyHocaGUI.tray_icon self.icon = MakeIcon(icon_name=icon_name, appname=self._PyHocaGUI.appname) - self.SetIcon(self.icon, _(u"PyHoca-GUI (Python X2Go Client)\nCurrently connecting you to remote X2Go server ,,%s\'\'") % profile_name) + self.SetIcon(self.icon, _(u"%s\nCurrently connecting you to remote X2Go server ,,%s\'\'") % (self._PyHocaGUI.appname, profile_name)) def SetIconIdle(self): """\ @@ -139,11 +139,11 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon): if x2go.X2GOCLIENT_OS == 'Windows': icon_name = self._PyHocaGUI.tray_icon self.icon = MakeIcon(icon_name=icon_name, appname=self._PyHocaGUI.appname) - self.SetIcon(self.icon, _(u"PyHoca-GUI\nConnecting you to X2Go...")) + self.SetIcon(self.icon, _(u"%s\nConnecting you to X2Go...") % self._PyHocaGUI.appname) else: icon_name = self._PyHocaGUI.tray_icon self.icon = MakeIcon(icon_name=icon_name, appname=self._PyHocaGUI.appname) - self.SetIcon(self.icon, _(u"PyHoca-GUI (Python X2Go Client)\nClient for connecting you to a remote X2Go server")) + self.SetIcon(self.icon, _(u"%s\nClient for connecting you to a remote X2Go server") % self._PyHocaGUI.appname) def CreateSessionManagerPopupMenu(self, evt): """\ -- 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 brokerclient in repository pyhoca-gui. commit 3aa69e1c51c2c8edd9c7d677d2110084bd9c7363 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Feb 7 22:53:04 2014 +0100 Don't include the py.exe shell in frozen builds. --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index a12cdfb..409c991 100755 --- a/setup.py +++ b/setup.py @@ -189,6 +189,7 @@ class build_installer_bbfreeze(build_installer, Freezer, Command): self.excludes = [] self.packages = [] self.compressed = False + self.include_py = False self.dist_dir = None def finalize_options(self): -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
-
git-admin＠x2go.org