From 479710e977327774b9ba9e1839f75b4a38b51e5f Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Mon, 8 Oct 2012 09:32:34 +0900
Subject: add leap-status to main window in non-debug mode

not very DRY but just to have it ready for rc cut.
---
 src/leap/baseapp/leap_app.py | 42 ++++++++++++++++++++++--------------------
 1 file changed, 22 insertions(+), 20 deletions(-)

(limited to 'src/leap/baseapp/leap_app.py')

diff --git a/src/leap/baseapp/leap_app.py b/src/leap/baseapp/leap_app.py
index 460d1269..f9eb3bb1 100644
--- a/src/leap/baseapp/leap_app.py
+++ b/src/leap/baseapp/leap_app.py
@@ -31,6 +31,8 @@ class MainWindowMixin(object):
         # add widgets to layout
         #self.createWindowHeader()
         #mainLayout.addWidget(self.headerBox)
+
+        # created in systray
         mainLayout.addWidget(self.statusIconBox)
         if self.debugmode:
             mainLayout.addWidget(self.statusBox)
@@ -87,26 +89,26 @@ class MainWindowMixin(object):
         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>LEAP Encryption Access Project</font>")
-        self.headerLabelSub = QtGui.QLabel(
-            "<br><i>your internet encryption toolkit</i>")
-
-        pixmap = QtGui.QPixmap(APP_LOGO)
-        leap_lbl = QtGui.QLabel()
-        leap_lbl.setPixmap(pixmap)
-
-        headerLayout = QtGui.QHBoxLayout()
-        headerLayout.addWidget(leap_lbl)
-        headerLayout.addWidget(self.headerLabel)
-        headerLayout.addWidget(self.headerLabelSub)
-        headerLayout.addStretch()
-        self.headerBox.setLayout(headerLayout)
+    #def createWindowHeader(self):
+        #"""
+        #description lines for main window
+        #"""
+        #self.headerBox = QtGui.QGroupBox()
+        #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(APP_LOGO)
+        #leap_lbl = QtGui.QLabel()
+        #leap_lbl.setPixmap(pixmap)
+#
+        #headerLayout = QtGui.QHBoxLayout()
+        #headerLayout.addWidget(leap_lbl)
+        #headerLayout.addWidget(self.headerLabel)
+        #headerLayout.addWidget(self.headerLabelSub)
+        #headerLayout.addStretch()
+        #self.headerBox.setLayout(headerLayout)
 
     def set_statusbarMessage(self, msg):
         self.statusBar().showMessage(msg)
-- 
cgit v1.2.3