[X2Go-Commits] [pyhoca-gui] 68/71: Show printing preferences when tray icon is in restricted mode.
git-admin at x2go.org
git-admin at x2go.org
Thu Mar 20 00:32:44 CET 2014
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch cvix/2.x
in repository pyhoca-gui.
commit dce16c2147a410aad3b32c4c722ab5614ed9be53
Author: Mike Gabriel <mike.gabriel at 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 at 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
More information about the x2go-commits
mailing list