This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository pyhoca-gui. from 0d03b6d Windows: Use Unicode NSIS instead of regular NSIS new ccc1d4c Prepare for running against wxPython 3.0. More testing needed. (Fixes: #534). 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: debian/changelog | 2 ++ pyhoca/wxgui/about.py | 5 +++++ pyhoca/wxgui/brokerlogon.py | 5 +++++ pyhoca/wxgui/frontend.py | 9 +++++---- pyhoca/wxgui/launcher.py | 5 +++++ pyhoca/wxgui/listdesktops.py | 5 +++++ pyhoca/wxgui/logon.py | 5 +++++ pyhoca/wxgui/menus_taskbar.py | 5 +++++ pyhoca/wxgui/messages.py | 15 +++++++++++++++ pyhoca/wxgui/notify.py | 15 +++++++++++++++ pyhoca/wxgui/passphrase.py | 5 +++++ pyhoca/wxgui/printingprefs.py | 16 ++++++++++++++++ pyhoca/wxgui/profilemanager.py | 17 ++++++++++++++++- pyhoca/wxgui/serverinfo.py | 5 +++++ pyhoca/wxgui/sessiontitle.py | 5 +++++ pyhoca/wxgui/splash.py | 5 +++++ pyhoca/wxgui/taskbar.py | 5 +++++ 17 files changed, 124 insertions(+), 5 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 ccc1d4c3acc1dca6ccfed748c5cc0d1c3db04805 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Jul 6 20:59:40 2014 +0200 Prepare for running against wxPython 3.0. More testing needed. (Fixes: #534). --- debian/changelog | 2 ++ pyhoca/wxgui/about.py | 5 +++++ pyhoca/wxgui/brokerlogon.py | 5 +++++ pyhoca/wxgui/frontend.py | 9 +++++---- pyhoca/wxgui/launcher.py | 5 +++++ pyhoca/wxgui/listdesktops.py | 5 +++++ pyhoca/wxgui/logon.py | 5 +++++ pyhoca/wxgui/menus_taskbar.py | 5 +++++ pyhoca/wxgui/messages.py | 15 +++++++++++++++ pyhoca/wxgui/notify.py | 15 +++++++++++++++ pyhoca/wxgui/passphrase.py | 5 +++++ pyhoca/wxgui/printingprefs.py | 16 ++++++++++++++++ pyhoca/wxgui/profilemanager.py | 17 ++++++++++++++++- pyhoca/wxgui/serverinfo.py | 5 +++++ pyhoca/wxgui/sessiontitle.py | 5 +++++ pyhoca/wxgui/splash.py | 5 +++++ pyhoca/wxgui/taskbar.py | 5 +++++ 17 files changed, 124 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1a321a7..43c4e85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -66,6 +66,8 @@ pyhoca-gui (0.5.0.0-0x2go1) UNRELEASED; urgency=low window. (Fixes: #507). - Make the published applications menu tree more robust against unknown icon image types. + - Prepare for running against wxPython 3.0. More testing needed. (Fixes: + #534). * debian/control: + Add D (bin:package pyhoca-gui): python-cups. (Fixes: #460). diff --git a/pyhoca/wxgui/about.py b/pyhoca/wxgui/about.py index 5ef2b08..9d8844b 100644 --- a/pyhoca/wxgui/about.py +++ b/pyhoca/wxgui/about.py @@ -24,6 +24,11 @@ import os try: import wxversion + wxversion.select('3.0') +except: pass + +try: + import wxversion wxversion.select('2.9') except: pass diff --git a/pyhoca/wxgui/brokerlogon.py b/pyhoca/wxgui/brokerlogon.py index 11edc17..8fff733 100644 --- a/pyhoca/wxgui/brokerlogon.py +++ b/pyhoca/wxgui/brokerlogon.py @@ -22,6 +22,11 @@ modules ={} try: import wxversion + wxversion.select('3.0') +except: pass + +try: + import wxversion wxversion.select('2.9') except: pass diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py index 75df88d..7b08de3 100644 --- a/pyhoca/wxgui/frontend.py +++ b/pyhoca/wxgui/frontend.py @@ -22,16 +22,17 @@ modules ={} try: import wxversion - wxversion.select('2.9') - #print 'USING wxPython 2.9' + wxversion.select('3.0') +except: pass +try: + import wxversion + wxversion.select('2.9') except: pass try: import wxversion wxversion.select('2.8') - #print 'USING wxPython 2.8' - except: pass import os diff --git a/pyhoca/wxgui/launcher.py b/pyhoca/wxgui/launcher.py index a9080db..83ee09d 100644 --- a/pyhoca/wxgui/launcher.py +++ b/pyhoca/wxgui/launcher.py @@ -34,6 +34,11 @@ gevent.monkey.patch_all() try: import wxversion + wxversion.select('3.0') +except: pass + +try: + import wxversion wxversion.select('2.9') except: pass diff --git a/pyhoca/wxgui/listdesktops.py b/pyhoca/wxgui/listdesktops.py index 49eb356..5970514 100644 --- a/pyhoca/wxgui/listdesktops.py +++ b/pyhoca/wxgui/listdesktops.py @@ -22,6 +22,11 @@ modules ={} try: import wxversion + wxversion.select('3.0') +except: pass + +try: + import wxversion wxversion.select('2.9') except: pass diff --git a/pyhoca/wxgui/logon.py b/pyhoca/wxgui/logon.py index 4a4ed22..93d80a8 100644 --- a/pyhoca/wxgui/logon.py +++ b/pyhoca/wxgui/logon.py @@ -22,6 +22,11 @@ modules ={} try: import wxversion + wxversion.select('3.0') +except: pass + +try: + import wxversion wxversion.select('2.9') except: pass diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py index b4fb7cc..a31faa9 100644 --- a/pyhoca/wxgui/menus_taskbar.py +++ b/pyhoca/wxgui/menus_taskbar.py @@ -20,6 +20,11 @@ try: import wxversion + wxversion.select('3.0') +except: pass + +try: + import wxversion wxversion.select('2.9') except: pass diff --git a/pyhoca/wxgui/messages.py b/pyhoca/wxgui/messages.py index c1a7330..1acd9cb 100644 --- a/pyhoca/wxgui/messages.py +++ b/pyhoca/wxgui/messages.py @@ -21,6 +21,21 @@ # Dick Kniep <dick.kniep@lindix.nl> +try: + import wxversion + wxversion.select('3.0') +except: pass + +try: + import wxversion + wxversion.select('2.9') +except: pass + +try: + import wxversion + wxversion.select('2.8') +except: pass + import wx import os diff --git a/pyhoca/wxgui/notify.py b/pyhoca/wxgui/notify.py index db1ceba..58d89e6 100644 --- a/pyhoca/wxgui/notify.py +++ b/pyhoca/wxgui/notify.py @@ -18,6 +18,21 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +try: + import wxversion + wxversion.select('3.0') +except: pass + +try: + import wxversion + wxversion.select('2.9') +except: pass + +try: + import wxversion + wxversion.select('2.8') +except: pass + import wx from x2go import X2GOCLIENT_OS from x2go import log diff --git a/pyhoca/wxgui/passphrase.py b/pyhoca/wxgui/passphrase.py index 484fe5c..ce91001 100644 --- a/pyhoca/wxgui/passphrase.py +++ b/pyhoca/wxgui/passphrase.py @@ -22,6 +22,11 @@ modules ={} try: import wxversion + wxversion.select('3.0') +except: pass + +try: + import wxversion wxversion.select('2.9') except: pass diff --git a/pyhoca/wxgui/printingprefs.py b/pyhoca/wxgui/printingprefs.py index 67c1324..9cbce6f 100644 --- a/pyhoca/wxgui/printingprefs.py +++ b/pyhoca/wxgui/printingprefs.py @@ -20,6 +20,22 @@ import os import re + +try: + import wxversion + wxversion.select('3.0') +except: pass + +try: + import wxversion + wxversion.select('2.9') +except: pass + +try: + import wxversion + wxversion.select('2.8') +except: pass + import wx import x2go.log as log diff --git a/pyhoca/wxgui/profilemanager.py b/pyhoca/wxgui/profilemanager.py index 36af68c..35334c9 100644 --- a/pyhoca/wxgui/profilemanager.py +++ b/pyhoca/wxgui/profilemanager.py @@ -18,8 +18,23 @@ # Free Software Foundation, Inc., # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. +try: + import wxversion + wxversion.select('3.0') +except: pass + +try: + import wxversion + wxversion.select('2.9') +except: pass + +try: + import wxversion + wxversion.select('2.8') +except: pass + import wx -import os +import os import copy import types import re diff --git a/pyhoca/wxgui/serverinfo.py b/pyhoca/wxgui/serverinfo.py index 23177e6..1853a83 100644 --- a/pyhoca/wxgui/serverinfo.py +++ b/pyhoca/wxgui/serverinfo.py @@ -22,6 +22,11 @@ modules ={} try: import wxversion + wxversion.select('3.0') +except: pass + +try: + import wxversion wxversion.select('2.9') except: pass diff --git a/pyhoca/wxgui/sessiontitle.py b/pyhoca/wxgui/sessiontitle.py index 5ce9783..c0c6c8f 100644 --- a/pyhoca/wxgui/sessiontitle.py +++ b/pyhoca/wxgui/sessiontitle.py @@ -22,6 +22,11 @@ modules ={} try: import wxversion + wxversion.select('3.0') +except: pass + +try: + import wxversion wxversion.select('2.9') except: pass diff --git a/pyhoca/wxgui/splash.py b/pyhoca/wxgui/splash.py index 87e44f7..e393f68 100644 --- a/pyhoca/wxgui/splash.py +++ b/pyhoca/wxgui/splash.py @@ -20,6 +20,11 @@ try: import wxversion + wxversion.select('3.0') +except: pass + +try: + import wxversion wxversion.select('2.9') except: pass diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py index ddd2104..3813c81 100644 --- a/pyhoca/wxgui/taskbar.py +++ b/pyhoca/wxgui/taskbar.py @@ -22,6 +22,11 @@ modules ={} try: import wxversion + wxversion.select('3.0') +except: pass + +try: + import wxversion wxversion.select('2.9') except: pass -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git
-
git-admin＠x2go.org