From d3b332c98f7d7ff105e39b3ae2bbf88ad5fcd9cd Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Wed, 30 Nov 2016 10:04:52 -0500
Subject: A few more tweaks for the boot splash. Font weights and such to
 better accent the rest of the UI.

---
 src-qt5/core/lumina-desktop/BootSplash.ui | 60 ++++++++++++++++++++++---------
 src-qt5/core/lumina-desktop/LSession.cpp  |  3 ++
 2 files changed, 46 insertions(+), 17 deletions(-)

(limited to 'src-qt5/core')

diff --git a/src-qt5/core/lumina-desktop/BootSplash.ui b/src-qt5/core/lumina-desktop/BootSplash.ui
index 7b2bebf9..43070eee 100644
--- a/src-qt5/core/lumina-desktop/BootSplash.ui
+++ b/src-qt5/core/lumina-desktop/BootSplash.ui
@@ -80,23 +80,49 @@
       </spacer>
      </item>
      <item row="0" column="1" rowspan="3">
-      <widget class="QLabel" name="label_welcome">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text">
-        <string>Welcome to the Lumina Desktop Environment!</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignCenter</set>
-       </property>
-       <property name="wordWrap">
-        <bool>true</bool>
-       </property>
-      </widget>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <widget class="QLabel" name="label">
+         <property name="font">
+          <font>
+           <weight>75</weight>
+           <bold>true</bold>
+           <underline>false</underline>
+          </font>
+         </property>
+         <property name="text">
+          <string>Starting the Lumina Desktop...</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignHCenter|Qt::AlignTop</set>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QLabel" name="label_welcome">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="font">
+          <font>
+           <italic>true</italic>
+          </font>
+         </property>
+         <property name="text">
+          <string notr="true"/>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignCenter</set>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
     </layout>
    </item>
diff --git a/src-qt5/core/lumina-desktop/LSession.cpp b/src-qt5/core/lumina-desktop/LSession.cpp
index 22439911..289d7ede 100644
--- a/src-qt5/core/lumina-desktop/LSession.cpp
+++ b/src-qt5/core/lumina-desktop/LSession.cpp
@@ -161,7 +161,10 @@ void LSession::setupSession(){
   for(int i=0; i<4; i++){ LSession::processEvents(); } //Again, just a few event loops here so thing can settle before we close the splash screen
   //launchStartupApps();
   QTimer::singleShot(500, this, SLOT(launchStartupApps()) );
+  splash.hide();
+  LSession::processEvents();
   splash.close(); 
+  LSession::processEvents();
 }
 
 void LSession::CleanupSession(){
-- 
cgit