[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: 64cad6f19a35e387e2f5a3b4600df90c6f03d1ea
X2Go dev team
git-admin at x2go.org
Tue Aug 27 13:20:51 CEST 2013
The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
via 64cad6f19a35e387e2f5a3b4600df90c6f03d1ea (commit)
from 0acc412c8915ea3099a9b2499351f5dcb470f027 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
pyhoca-gui | 5 +++++
pyhoca/wxgui/about.py | 9 ++-------
pyhoca/wxgui/frontend.py | 30 +++++++++++++-----------------
pyhoca/wxgui/notify.py | 6 ++++++
pyhoca/wxgui/taskbar.py | 5 +++--
5 files changed, 29 insertions(+), 26 deletions(-)
The diff of changes is:
diff --git a/pyhoca-gui b/pyhoca-gui
index 32e8206..906c0fd 100755
--- a/pyhoca-gui
+++ b/pyhoca-gui
@@ -132,6 +132,7 @@ if _X2GOCLIENT_OS == 'Windows':
# debug options...
debug_options = [
{'args':['-d','--debug'], 'default': False, 'action': 'store_true', 'help': 'enable application debugging code', },
+ {'args':['--quiet'], 'default': False, 'action': 'store_true', 'help': 'disable any kind of log output', },
{'args':['--libdebug'], 'default': False, 'action': 'store_true', 'help': 'enable debugging code of the underlying Python X2go module', },
{'args':['--libdebug-sftpxfer'], 'default': False, 'action': 'store_true', 'help': 'enable debugging code of Python X2go\'s sFTP server code (very verbose, and even promiscuous)', },
{'args':['-V', '--version'], 'default': False, 'action': 'store_true', 'help': 'print version number and exit', },
@@ -191,6 +192,10 @@ def parseargs():
if a.libdebug:
liblogger.set_loglevel_debug()
+ if a.quiet:
+ logger.set_loglevel_quiet()
+ liblogger.set_loglevel_quiet()
+
if a.libdebug_sftpxfer:
liblogger.enable_debug_sftpxfer()
diff --git a/pyhoca/wxgui/about.py b/pyhoca/wxgui/about.py
index cf4dca9..d791e73 100644
--- a/pyhoca/wxgui/about.py
+++ b/pyhoca/wxgui/about.py
@@ -55,7 +55,7 @@ class PyHocaGUI_AboutFrame(wx.Frame):
wx.Frame.__init__(self, None, -1, 'About PyHoca-GUI...', size=(403,319))
else:
wx.Frame.__init__(self, None, -1, 'About PyHoca-GUI...', size=(400,298))
- self.Bind(wx.EVT_CLOSE, self.OnClose)
+ self.Bind(wx.EVT_CLOSE, self.OnHide)
_logo_bitmap = wx.StaticBitmap(self, wx.ID_ANY, wx.Bitmap(os.path.join(basepath.images_basepath, 'pyhoca-about-logo.png')), (0, 0))
self.bitmap = _logo_bitmap
@@ -70,12 +70,7 @@ class PyHocaGUI_AboutFrame(wx.Frame):
self.CenterOnScreen()
- def OnClose(self, evt):
+ def OnHide(self, evt):
self.Show(False)
- def Destroy(self):
- self._PyHocaGUI._sub_windows.remove(self)
- wx.Frame.Destroy(self)
-
-
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index 085f68b..1bce4fe 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -132,12 +132,13 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
"""
- # THIS HAS TO MOVE INTO Python X2go
- #if platform.system() == 'Windows':
- # #parent.settingsProfile = SessionProfile.XServer(parent.liblogger)
- # import x2go.X2goXServer as _xserver
- # _xserver.startXserver(parent)
-
+ # cmd line options
+ self.start_on_connect = self.args.start_on_connect
+ self.resume_newest_on_connect = self.args.resume_newest_on_connect
+ self.resume_oldest_on_connect = self.args.resume_oldest_on_connect
+ self.resume_all_on_connect = self.args.resume_all_on_connect
+ self.show_profile_metatypes = self.args.show_profile_metatypes
+
self._pyhoca_logger('PyHoca GUI is starting up', loglevel=x2go.log.loglevel_INFO, )
self._pyhoca_logger('registering PyHocaGUI control sessions', loglevel=x2go.log.loglevel_INFO, )
@@ -171,13 +172,6 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
self._pyhoca_logger('auto-connecting to %s session profile' % s.get_profile_name(), loglevel=x2go.log.loglevel_NOTICE)
gevent.spawn(self._auto_connect, session_uuid)
- # prepare start/resume options
- self.start_on_connect = self.args.start_on_connect
- self.resume_newest_on_connect = self.args.resume_newest_on_connect
- self.resume_oldest_on_connect = self.args.resume_oldest_on_connect
- self.resume_all_on_connect = self.args.resume_all_on_connect
- self.show_profile_metatypes = self.args.show_profile_metatypes
-
###
### disable functionality for release versions
###
@@ -220,9 +214,13 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
x2go.x2go_cleanup()
# close open password dialogs (or other remaining windows)
for _win in self._sub_windows:
+ _win.Close()
_win.Destroy()
- self.Destroy()
-
+ self.taskbar.Close()
+ self.taskbar.Destroy()
+ self.about.Close()
+ self.about.Destroy()
+
# the taskbar's OnExit method...
def OnTaskbarExit(self, evt):
"""\
@@ -230,8 +228,6 @@ class PyHocaGUI(wx.App, x2go.X2goClient):
"""
self._pyhoca_logger('exit application', loglevel=x2go.log.loglevel_INFO, )
- self.taskbar.Close()
- self.notifier.Close()
self.Exit()
def _start_on_connect(self, evt, session_uuid):
diff --git a/pyhoca/wxgui/notify.py b/pyhoca/wxgui/notify.py
index dddbe63..25a6d81 100644
--- a/pyhoca/wxgui/notify.py
+++ b/pyhoca/wxgui/notify.py
@@ -85,6 +85,9 @@ class libnotify_NotifierPopup(object):
def Close(self):
pass
+ def Destroy(self):
+ pass
+
class notificationmessage_NotifierPopup(object):
@@ -162,3 +165,6 @@ class notificationmessage_NotifierPopup(object):
def Close(self):
pass
+
+ def Destroy(self):
+ pass
diff --git a/pyhoca/wxgui/taskbar.py b/pyhoca/wxgui/taskbar.py
index 7ff43f2..db1e595 100644
--- a/pyhoca/wxgui/taskbar.py
+++ b/pyhoca/wxgui/taskbar.py
@@ -140,5 +140,6 @@ class PyHocaGUI_TaskBarIcon(wx.TaskBarIcon):
return icon
def Close(self):
- self.Destroy()
-
+ self.RemoveIcon()
+
+
hooks/post-receive
--
pyhoca-gui.git (Python X2Go Client (wxPython GUI))
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).
More information about the x2go-commits
mailing list