From 71cedd4e4a882765862496d77c7f04173ab4712a Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Thu, 13 Sep 2012 16:38:22 +0900
Subject: fix race condition on app init

still fragile; sometimes the qt app inits faster and make the send
command miss the not yet created managemente socket.
---
 src/leap/baseapp/leap_app.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(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 f91b2329..f861f945 100644
--- a/src/leap/baseapp/leap_app.py
+++ b/src/leap/baseapp/leap_app.py
@@ -45,7 +45,7 @@ class MainWindowMixin(object):
         self.headerLabelSub = QtGui.QLabel("<i>trust your \
 technolust</i>")
 
-        pixmap = QtGui.QPixmap(':/images/leapfrog.jpg')
+        pixmap = QtGui.QPixmap(':/images/leap-color-small.png')
         frog_lbl = QtGui.QLabel()
         frog_lbl.setPixmap(pixmap)
 
-- 
cgit v1.2.3


From 1e9ae8c5cf64a347ee59b24ad426a8ed929127c1 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Fri, 14 Sep 2012 03:07:02 +0900
Subject: init icon

---
 src/leap/baseapp/leap_app.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(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 f861f945..18b5084b 100644
--- a/src/leap/baseapp/leap_app.py
+++ b/src/leap/baseapp/leap_app.py
@@ -85,5 +85,5 @@ technolust</i>")
         # XXX send signal instead?
         logger.info('Shutting down')
         self.conductor.cleanup()
-        logger.info('Exiting')
+        logger.info('Exiting. Bye.')
         QtGui.qApp.quit()
-- 
cgit v1.2.3


From add7973b3d1633b2776cb90f237415c6cac65d99 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Fri, 14 Sep 2012 08:34:59 +0900
Subject: set app icon

(shows on window, minimized icons and about dialog)
---
 src/leap/baseapp/leap_app.py | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 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 18b5084b..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/leap-color-small.png')
-        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()
-- 
cgit v1.2.3