diff options
| author | kali <kali@leap.se> | 2012-09-13 04:59:08 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2012-09-13 04:59:08 +0900 |
| commit | 157dbbd6dba18a0b10ba045eab9b1cfca8d579c6 (patch) | |
| tree | 06fcac9f0c4d059899e0842c4226720ea3f5106b /src/leap/baseapp | |
| parent | 99058b9f6536a3717ab82a9d77b09d5489334eb5 (diff) | |
| parent | ffa95a22b2073f75d51af32232e150bf36395f31 (diff) | |
Merge branch 'feature/client-versioning' into develop
Close #533. Using versioneer for fetching version from git info and tags
in a setup friendly way. Added info to logs and small about dialog.
Diffstat (limited to 'src/leap/baseapp')
| -rw-r--r-- | src/leap/baseapp/systray.py | 14 | ||||
| -rw-r--r-- | src/leap/baseapp/unitychecks.py | 2 |
2 files changed, 14 insertions, 2 deletions
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() diff --git a/src/leap/baseapp/unitychecks.py b/src/leap/baseapp/unitychecks.py index 72c9ee6f..2d06f629 100644 --- a/src/leap/baseapp/unitychecks.py +++ b/src/leap/baseapp/unitychecks.py @@ -10,9 +10,7 @@ import platform import sys from subprocess import Popen, PIPE -logging.basicConfig() logger = logging.getLogger(__name__) -logger.setLevel('DEBUG') from leap.base.constants import APP_NAME from leap.baseapp.dialogs import ErrorDialog |