[X2Go-Commits] pyhoca-gui.git - build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d (branch) updated: 0.4.0.3-2-g450a9fe

X2Go dev team git-admin at x2go.org
Tue Aug 27 13:23:01 CEST 2013


The branch, build-59a18b6e3b5d3f1dd8f07f26433d37fe5984a57d has been updated
       via  450a9feb1b38c30ecb88a462c898521330b18114 (commit)
      from  065423d954716d531410be66235ac310b1ccba7e (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:
 debian/changelog         |    3 ++-
 pyhoca/wxgui/about.py    |   11 ++++++++---
 pyhoca/wxgui/frontend.py |    2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index d7d7f92..30ef643 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 pyhoca-gui (0.4.0.4-0~x2go1) UNRELEASED; urgency=low
 
-  * Continue development...
+  * New upstream version (0.4.0.4):
+    - Allow custom window titles for About...windows.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 19 Jul 2013 20:57:10 +0200
 
diff --git a/pyhoca/wxgui/about.py b/pyhoca/wxgui/about.py
index a79c31f..9e3ded0 100644
--- a/pyhoca/wxgui/about.py
+++ b/pyhoca/wxgui/about.py
@@ -46,7 +46,7 @@ class PyHocaGUI_AboutFrame(wx.Frame):
     wxWidget displaying an ,,About'' window for this application.
 
     """
-    def __init__(self, _PyHocaGUI, caller=None, about_image=None, icon_name='pyhoca-winicon.png'):
+    def __init__(self, _PyHocaGUI, caller=None, about_image=None, icon_name='pyhoca-winicon.png', about_what=None, ):
         """\
         About window (constructor).
 
@@ -58,6 +58,8 @@ class PyHocaGUI_AboutFrame(wx.Frame):
         @type about_image: C{str}
         @param icon_name: icon name for window icon
         @type icon_name: C{str}
+        @param about_what: about what is this about window?
+        @type about_what: C{str}
 
         """
         self._PyHocaGUI = _PyHocaGUI
@@ -74,10 +76,13 @@ class PyHocaGUI_AboutFrame(wx.Frame):
         if not (os.path.isfile(about_image) or os.path.islink(about_image)):
             about_image = os.path.join(basepath.images_basepath, fallback_about_image)
 
+        if about_what is None:
+            about_what = self._PyHocaGUI.appname
+
         if x2go.X2GOCLIENT_OS == 'Windows':
-            wx.Frame.__init__(self, None, -1, _(u'About %s ...') % self._PyHocaGUI.appname, size=(403,319))
+            wx.Frame.__init__(self, None, -1, _(u'About %s ...') % about_what, size=(403,319))
         else:
-            wx.Frame.__init__(self, None, -1, _(u'About %s ...') % self._PyHocaGUI.appname, size=(400,298))
+            wx.Frame.__init__(self, None, -1, _(u'About %s ...') % about_what, size=(400,298))
         self.Bind(wx.EVT_CLOSE, self.OnHide)
 
         panel = wx.Panel(self, -1, pos=(0,0), size=(0,0), )
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index dba3afc..3bc6574 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -302,7 +302,7 @@ class PyHocaGUI(wx.App, x2go.X2GoClient):
             self.about = about.PyHocaGUI_AboutFrame(self, about_image=self.args.about_image)
         self.about.Show(False)
 
-        self.about_pythonx2go = about.PyHocaGUI_AboutFrame(self, about_image='pythonx2go-about-logo.png')
+        self.about_pythonx2go = about.PyHocaGUI_AboutFrame(self, about_image='pythonx2go-about-logo.png', about_what="Python X2Go")
         self.about_pythonx2go.Show(False)
 
         self.taskbar = taskbar.PyHocaGUI_TaskBarIcon(self.about)


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