This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository pyhoca-gui. from 82f3871 debian/pyhoca-gui.install: make sure that new icon names get installed new 617ac17 NSIS script: make sure SetOutPath gets called at the beginning of every section. new 44c27d6 Show printing preferences when tray icon is in restricted mode. The 2 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 | 3 +++ nsis_template.py | 2 ++ pyhoca/wxgui/menus_taskbar.py | 14 ++++++++------ 3 files changed, 13 insertions(+), 6 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 44c27d6f58a0685081d07190fea3f9c688e83ba3 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 master in repository pyhoca-gui. commit 617ac17426c3c7bf0efbaf378196d72114be22c3 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
-
git-admin＠x2go.org