This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository pyhoca-gui. from 51e345d pyhoca/wxgui/frontend.py: Fix loading PyHocaGUI_DialogBoxPassphrase from wrong module (passphrase -> logon). new 4579a61 debian/changelog: update with commit 51e345d63f51392b3a3bfc271637362fe72db8e4 new 9b06a33 pyhoca/wxgui/logon.py: Use wx.Cursor with wxgtk4.0. 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 | 6 +++++- pyhoca/wxgui/logon.py | 12 ++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/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 4579a615737f0503245d8c1e19c30fe76edf01dd Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Dec 27 12:41:15 2019 +0000 debian/changelog: update with commit 51e345d63f51392b3a3bfc271637362fe72db8e4 --- debian/changelog | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5a05a0d..0d3c67a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ pyhoca-gui (0.6.1.1-0x2go1) UNRELEASED; urgency=medium - * Continue development + [ Mike Gabriel ] + * New upstream version (0.6.1.1): + - pyhoca/wxgui/frontend.py: Fix loading PyHocaGUI_DialogBoxPassphrase from + wrong module (passphrase -> logon). -- X2Go Release Manager <git-admin@x2go.org> Fri, 27 Dec 2019 07:42:21 +0100 -- Alioth's /home/x2go-admin/maintenancescripts/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 9b06a33a4c355f603433770c641e0433ab7e29bf Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Dec 27 12:39:50 2019 +0000 pyhoca/wxgui/logon.py: Use wx.Cursor with wxgtk4.0. --- debian/changelog | 1 + pyhoca/wxgui/logon.py | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0d3c67a..e0a0041 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ pyhoca-gui (0.6.1.1-0x2go1) UNRELEASED; urgency=medium * New upstream version (0.6.1.1): - pyhoca/wxgui/frontend.py: Fix loading PyHocaGUI_DialogBoxPassphrase from wrong module (passphrase -> logon). + - pyhoca/wxgui/logon.py: Use wx.Cursor with wxgtk4.0. -- X2Go Release Manager <git-admin@x2go.org> Fri, 27 Dec 2019 07:42:21 +0100 diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py index 9853299..bda4364 100644 --- a/pyhoca/wxgui/logon.py +++ b/pyhoca/wxgui/logon.py @@ -33,6 +33,8 @@ import wx import os import base64 +wx_major = int(wx.__version__.split('.')[0]) + if 'DESKTOP_SESSION' in os.environ: WINDOW_MANAGER = os.environ['DESKTOP_SESSION'] else: @@ -471,7 +473,10 @@ class PyHocaGUI_DialogBoxPassword(wx.Dialog): raise self._PyHocaGUI.notifier.send(self.current_profile_name, context='AUTH_%s' % self.current_profile_name, timeout=4000) - wx.SetCursor(wx.StockCursor(wx.CURSOR_ARROW)) + if wx_major >= 4: + wx.Cursor(wx.CURSOR_ARROW) + else: + wx.SetCursor(wx.StockCursor(wx.CURSOR_ARROW)) # Windows's GUI is more picky then Linux's GTK GUI about EndBusyCursor if cursor is not busy... try: wx.EndBusyCursor() except: pass @@ -805,7 +810,10 @@ class PyHocaGUI_DialogBoxPassphrase(wx.Dialog): self._PyHocaGUI.notifier.send(self.current_profile_name, context='AUTH_%s' % self.current_profile_name, timeout=4000) - wx.SetCursor(wx.StockCursor(wx.CURSOR_ARROW)) + if wx_major >= 4: + wx.Cursor(wx.CURSOR_ARROW) + else: + wx.SetCursor(wx.StockCursor(wx.CURSOR_ARROW)) # Windows's GUI is more picky then Linux's GTK GUI about EndBusyCursor if cursor is not busy... try: wx.EndBusyCursor() except: pass -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
-
git-admin＠x2go.org