From 75f86f3a855b52432a0d4811674311c50fb4cab4 Mon Sep 17 00:00:00 2001
From: pvdk <pvdkloet@gmail.com>
Date: Tue, 12 Mar 2013 01:03:15 +0100
Subject: [PATCH 1/2] Some changes to the stylesheet and other small GUI
 improvements

---
 files/ui/mainwindow.ui |  2 +-
 files/ui/playpage.ui   | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/files/ui/mainwindow.ui b/files/ui/mainwindow.ui
index 8143fa24df..a1dfb172b2 100644
--- a/files/ui/mainwindow.ui
+++ b/files/ui/mainwindow.ui
@@ -5,7 +5,7 @@
   <property name="minimumSize">
    <size>
     <width>575</width>
-    <height>525</height>
+    <height>535</height>
    </size>
   </property>
   <property name="windowTitle">
diff --git a/files/ui/playpage.ui b/files/ui/playpage.ui
index 6b8b66b208..c0320de1eb 100644
--- a/files/ui/playpage.ui
+++ b/files/ui/playpage.ui
@@ -19,6 +19,9 @@
      <property name="frameShadow">
       <enum>QFrame::Plain</enum>
      </property>
+     <property name="lineWidth">
+      <number>0</number>
+     </property>
      <layout class="QGridLayout" name="gridLayout">
       <property name="leftMargin">
        <number>30</number>
@@ -40,10 +43,14 @@
     border-color: rgba(0, 0, 0, 125);
     border-style: solid;
     border-radius: 2px;
+
+    font-size: 12pt;
+    font-family: &quot;EB Garamond&quot;, &quot;EB Garamond 08&quot;;
+	color: black;
 }
 
 /*QComboBox gets the &quot;on&quot; state when the popup is open */
-#profilesComboBox:!editable:on, #ProfilesComboBox::drop-down:editable:on {
+#profilesComboBox:!editable:on {
     background: qlineargradient(x1:0, y1:0, x2:0, y2:1,
         stop:0 rgba(0, 0, 0, 75),
         stop:0.1 rgba(0, 0, 0, 15),
@@ -52,13 +59,9 @@
     border: 1px solid rgba(0, 0, 0, 55);
 }
 
-#profilesComboBox { /* shift the text when the popup opens */
+#profilesComboBox:on { /* shift the text when the popup opens */
     padding-top: 3px;
     padding-left: 4px;
-
-    font-size: 12pt;
-    font-family: &quot;EB Garamond&quot;, &quot;EB Garamond 08&quot;;
-	color: black;
 }
 
 #profilesComboBox::drop-down {
@@ -82,7 +85,6 @@
     left: 1px;
 }
 
-
 #profilesComboBox QAbstractItemView {
     border: 0px;
 }</string>

From 31ba332647e74e1955909d1dd57a7b7c8409de17 Mon Sep 17 00:00:00 2001
From: pvdk <pvdkloet@gmail.com>
Date: Tue, 12 Mar 2013 04:05:14 +0100
Subject: [PATCH 2/2] Moved Windows icon to files/launcher

---
 apps/launcher/CMakeLists.txt         | 10 +++++-----
 {apps => files}/launcher/launcher.rc |  0
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename {apps => files}/launcher/launcher.rc (100%)

diff --git a/apps/launcher/CMakeLists.txt b/apps/launcher/CMakeLists.txt
index a63898c0ec..eb93d71e78 100644
--- a/apps/launcher/CMakeLists.txt
+++ b/apps/launcher/CMakeLists.txt
@@ -12,7 +12,7 @@ set(LAUNCHER
     utils/checkablemessagebox.cpp
     utils/textinputdialog.cpp
 
-    launcher.rc
+    ${CMAKE_SOURCE_DIR}/files/launcher/launcher.rc
 )
 
 set(LAUNCHER_HEADER
@@ -43,10 +43,10 @@ set(LAUNCHER_HEADER_MOC
 )
 
 set(LAUNCHER_UI
-    ../../files/ui/datafilespage.ui
-    ../../files/ui/graphicspage.ui
-    ../../files/ui/mainwindow.ui
-    ../../files/ui/playpage.ui
+    ${CMAKE_SOURCE_DIR}/files/ui/datafilespage.ui
+    ${CMAKE_SOURCE_DIR}/files/ui/graphicspage.ui
+    ${CMAKE_SOURCE_DIR}/files/ui/mainwindow.ui
+    ${CMAKE_SOURCE_DIR}/files/ui/playpage.ui
 )
 
 source_group(launcher FILES ${LAUNCHER} ${LAUNCHER_HEADER})
diff --git a/apps/launcher/launcher.rc b/files/launcher/launcher.rc
similarity index 100%
rename from apps/launcher/launcher.rc
rename to files/launcher/launcher.rc