diff options
| author | kali <kali@leap.se> | 2012-09-20 05:00:32 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2012-09-20 05:00:32 +0900 |
| commit | 1ab8247ecb8664af5159b7f1e050189f5e637146 (patch) | |
| tree | 1fac7766356a2a69870fd0e00fd306131bd036a9 /src/leap/baseapp/leap_app.py | |
| parent | 50396fca082652dd1a1617e0d029c1c726e4c651 (diff) | |
| parent | 3c7451d62363d0a3326552956db630dda09392fa (diff) | |
Merge branch 'feature/systray-menu' into develop
Close #536.
Cleaning up of the systray menu.
Main window starts hidden if not in debug mode.
Incidentally, some fixes related to the subprocess invocation and termination, removing many of the annoying hangs during debug.
Diffstat (limited to 'src/leap/baseapp/leap_app.py')
| -rw-r--r-- | src/leap/baseapp/leap_app.py | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/src/leap/baseapp/leap_app.py b/src/leap/baseapp/leap_app.py index f91b2329..208c4e7c 100644 --- a/src/leap/baseapp/leap_app.py +++ b/src/leap/baseapp/leap_app.py @@ -7,6 +7,9 @@ from leap.gui import mainwindow_rc logger = logging.getLogger(name=__name__) +APP_LOGO = ':/images/leap-color-small.png' + + class MainWindowMixin(object): """ create the main window @@ -32,25 +35,30 @@ class MainWindowMixin(object): widget.setLayout(mainLayout) self.setWindowTitle("LEAP Client") + self.set_app_icon() self.resize(400, 300) self.set_statusbarMessage('ready') + def set_app_icon(self): + icon = QtGui.QIcon(APP_LOGO) + self.setWindowIcon(icon) + def createWindowHeader(self): """ description lines for main window """ self.headerBox = QtGui.QGroupBox() - self.headerLabel = QtGui.QLabel("<font size=40><b>E</b>ncryption \ -<b>I</b>nternet <b>P</b>roxy</font>") - self.headerLabelSub = QtGui.QLabel("<i>trust your \ -technolust</i>") + self.headerLabel = QtGui.QLabel( + "<font size=40>LEAP Encryption Access Project</font>") + self.headerLabelSub = QtGui.QLabel( + "<br><i>your internet encryption toolkit</i>") - pixmap = QtGui.QPixmap(':/images/leapfrog.jpg') - frog_lbl = QtGui.QLabel() - frog_lbl.setPixmap(pixmap) + pixmap = QtGui.QPixmap(APP_LOGO) + leap_lbl = QtGui.QLabel() + leap_lbl.setPixmap(pixmap) headerLayout = QtGui.QHBoxLayout() - headerLayout.addWidget(frog_lbl) + headerLayout.addWidget(leap_lbl) headerLayout.addWidget(self.headerLabel) headerLayout.addWidget(self.headerLabelSub) headerLayout.addStretch() @@ -85,5 +93,5 @@ technolust</i>") # XXX send signal instead? logger.info('Shutting down') self.conductor.cleanup() - logger.info('Exiting') + logger.info('Exiting. Bye.') QtGui.qApp.quit() |