[X2Go-Commits] pyhoca-gui.git - twofactorauth (branch) updated: 0.4.0.2-7-ge754860

[X2Go dev team]

The branch, twofactorauth has been updated
       via  e75486006e00f7b199ce52c4fbcff0bae8409c7d (commit)
      from  a31b8d7e62cd48bef9c6b25c85c99956802ae3fc (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              |    2 ++
 img/pythonx2go-about-logo.png |  Bin 0 -> 58603 bytes
 pyhoca/wxgui/frontend.py      |   15 ++++++++++++++-
 pyhoca/wxgui/menus_taskbar.py |    3 +++
 4 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 img/pythonx2go-about-logo.png

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 4f1b0b1..7b5e47d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ pyhoca-gui (0.4.0.3-0~x2go1) UNRELEASED; urgency=low
       in the session profile.
     - Catch SSH Exception for mismatching host keys and make it translatable.
       (Fixes: #166).
+    - Add an ,,About Python X2Go...'' menu item that opens a window providing
+      information on the Python X2Go source code download information.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Sun, 21 Apr 2013 23:09:12 +0200
 
diff --git a/img/pythonx2go-about-logo.png b/img/pythonx2go-about-logo.png
new file mode 100644
index 0000000..45afc23
Binary files /dev/null and b/img/pythonx2go-about-logo.png differ
diff --git a/pyhoca/wxgui/frontend.py b/pyhoca/wxgui/frontend.py
index dd2bff6..dba3afc 100644
--- a/pyhoca/wxgui/frontend.py
+++ b/pyhoca/wxgui/frontend.py
@@ -295,7 +295,6 @@ class PyHocaGUI(wx.App, x2go.X2GoClient):
         self.remember_username = self.args.remember_username
 
         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, )
 
         if self.args.tray_icon:
             self.about = about.PyHocaGUI_AboutFrame(self, about_image=self.args.about_image, icon_name=self.args.tray_icon)
@@ -303,6 +302,9 @@ 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.Show(False)
+
         self.taskbar = taskbar.PyHocaGUI_TaskBarIcon(self.about)
         self.taskbar.Bind(wx.EVT_TASKBAR_LEFT_DCLICK, lambda _Show: self.about.Show(True))
         self.taskbar.Bind(wx.EVT_TASKBAR_LEFT_DOWN, self.taskbar.CreateSessionManagerPopupMenu)
@@ -1305,6 +1307,17 @@ class PyHocaGUI(wx.App, x2go.X2GoClient):
         self._pyhoca_logger('Showing the ,,About...\'\' window', loglevel=x2go.log.loglevel_INFO, )
         self.about.Show(True)
 
+    def OnAboutPythonX2Go(self, evt):
+        """\
+        Gets called if the user requests to see the Python X2Go module's ,,About'' window.
+
+        @param evt: event
+        @type evt: C{obj}
+
+        """
+        self._pyhoca_logger('Showing the ,,About Python X2Go...\'\' window', loglevel=x2go.log.loglevel_INFO)
+        self.about_pythonx2go.Show(True)
+
     def OnOptions(self, evt):
         """\
         Not implemented, yet.
diff --git a/pyhoca/wxgui/menus_taskbar.py b/pyhoca/wxgui/menus_taskbar.py
index 831cc35..5815454 100644
--- a/pyhoca/wxgui/menus_taskbar.py
+++ b/pyhoca/wxgui/menus_taskbar.py
@@ -108,8 +108,11 @@ class PyHocaGUI_Menu_TaskbarOptionsManager(wx.Menu):
         wx.Menu.__init__(self)
 
         ID_ABOUT = wx.NewId()
+        ID_ABOUT_PYTHONX2GO = wx.NewId()
         self.Append(id=ID_ABOUT, text=_(u"About %s (%s)...") % (self._PyHocaGUI.appname, self._PyHocaGUI.version))
+        self.Append(id=ID_ABOUT_PYTHONX2GO, text=_(u"About %s (%s)...") % ("Python X2Go", x2go.__VERSION__))
         self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnAbout, id=ID_ABOUT)
+        self._PyHocaGUI.Bind(wx.EVT_MENU, self._PyHocaGUI.OnAboutPythonX2Go, id=ID_ABOUT_PYTHONX2GO)
 
         if not self._PyHocaGUI.restricted_trayicon:
 


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)).