From 3c26d5b5427e788aebfa174de3f0689bb1e146d2 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Thu, 13 Sep 2012 04:55:21 +0900
Subject: display about and aboutqt dialogs

---
 src/leap/app.py             |  2 ++
 src/leap/baseapp/systray.py | 14 ++++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/src/leap/app.py b/src/leap/app.py
index 322118c5..b721468f 100644
--- a/src/leap/app.py
+++ b/src/leap/app.py
@@ -5,6 +5,7 @@ import sip
 sip.setapi('QVariant', 2)
 from PyQt4.QtGui import (QApplication, QSystemTrayIcon, QMessageBox)
 
+from leap import __version__ as VERSION
 from leap.baseapp.mainwindow import LeapWindow
 from leap.baseapp import unitychecks
 
@@ -45,6 +46,7 @@ def main():
 
     logger.debug('args: %s' % opts)
     logger.info('Starting app')
+    logger.info('Running client version %s', VERSION)
 
     app = QApplication(sys.argv)
     unitychecks.do_check()
diff --git a/src/leap/baseapp/systray.py b/src/leap/baseapp/systray.py
index c696ee74..762dac13 100644
--- a/src/leap/baseapp/systray.py
+++ b/src/leap/baseapp/systray.py
@@ -1,6 +1,7 @@
 from PyQt4 import QtCore
 from PyQt4 import QtGui
 
+from leap import __version__ as VERSION
 from leap.gui import mainwindow_rc
 
 
@@ -82,6 +83,9 @@ class StatusAwareTrayIconMixin(object):
         self.trayIconMenu.addAction(self.maximizeAction)
         self.trayIconMenu.addAction(self.restoreAction)
         self.trayIconMenu.addSeparator()
+        self.trayIconMenu.addAction(self.aboutAct)
+        self.trayIconMenu.addAction(self.aboutQtAct)
+        self.trayIconMenu.addSeparator()
         self.trayIconMenu.addAction(self.quitAction)
 
         self.trayIcon = QtGui.QSystemTrayIcon(self)
@@ -104,9 +108,19 @@ class StatusAwareTrayIconMixin(object):
                                             triggered=self.showMaximized)
         self.restoreAction = QtGui.QAction("&Restore", self,
                                            triggered=self.showNormal)
+        self.aboutAct = QtGui.QAction("&About", self,
+                                      triggered=self.about)
+        self.aboutQtAct = QtGui.QAction("About Q&t", self,
+                                        triggered=QtGui.qApp.aboutQt)
         self.quitAction = QtGui.QAction("&Quit", self,
                                         triggered=self.cleanupAndQuit)
 
+    def about(self):
+        # move to widget
+        QtGui.QMessageBox.about(self, "About",
+                                "Running LEAP client<br>"
+                                "version <b>%s</b>" % VERSION)
+
     def setConnWidget(self, icon_name):
         oldlayout = self.statusIconBox.layout()
 
-- 
cgit v1.2.3