From 069ca77ea9f01c0c7adbbce10ca2767615445452 Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@pcbsd.org>
Date: Sat, 23 May 2015 07:51:47 -0400
Subject: Add a new "phase" into the boot splash - system applications loading.

---
 lumina-desktop/BootSplash.cpp | 19 +++++++++++--------
 lumina-desktop/LSession.cpp   |  3 ++-
 2 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'lumina-desktop')

diff --git a/lumina-desktop/BootSplash.cpp b/lumina-desktop/BootSplash.cpp
index 93180e5b..5ac45a32 100644
--- a/lumina-desktop/BootSplash.cpp
+++ b/lumina-desktop/BootSplash.cpp
@@ -15,25 +15,28 @@ void BootSplash::showScreen(QString loading){ //update icon, text, and progress
   QString txt, icon;
   int per = 0;
   if(loading=="init"){
-    txt = tr("Initializing Session..."); per = 11;
+    txt = tr("Initializing Session..."); per = 10;
     icon = "preferences-system-login";
   }else if(loading=="settings"){
-    txt = tr("Loading Settings..."); per = 22;	  
+    txt = tr("Loading Settings..."); per = 20;	  
     icon = "user-home";
   }else if(loading=="user"){
-    txt = tr("Checking User Settings..."); per = 33; 
+    txt = tr("Checking User Settings..."); per = 30; 
     icon = "preferences-desktop-user";
   }else if(loading=="systray"){
-    txt = tr("Registering System Tray..."); per = 44;
+    txt = tr("Registering System Tray..."); per = 40;
     icon = "preferences-plugin";
   }else if(loading=="wm"){
-    txt = tr("Starting Window Manager..."); per = 55;
+    txt = tr("Starting Window Manager..."); per = 50;
     icon = "preferences-system-windows-actions";	  
   }else if(loading=="desktop"){
-    txt = tr("Initializing Desktop(s)..."); per = 66;
-    icon = "preferences-desktop-wallpaper";	  
+    txt = tr("Initializing Desktop(s)..."); per = 60;
+    icon = "preferences-desktop-wallpaper";	
+  }else if(loading=="apps"){
+    txt = tr("Detecting System Applications..."); per = 70;
+    icon = "preferences-desktop-icons";
   }else if(loading=="menus"){
-    txt = tr("Initializing System Menu(s)..."); per = 77;
+    txt = tr("Initializing System Menu(s)..."); per = 80;
     icon = "preferences-system-windows";
   }else if(loading=="final"){
     txt = tr("Performing Final Checks..."); per = 90;
diff --git a/lumina-desktop/LSession.cpp b/lumina-desktop/LSession.cpp
index 59e6fe57..fd2b16b3 100644
--- a/lumina-desktop/LSession.cpp
+++ b/lumina-desktop/LSession.cpp
@@ -115,10 +115,11 @@ void LSession::setupSession(){
 
   //Initialize the global menus
   qDebug() << " - Initialize system menus";
-    splash.showScreen("menus");
+    splash.showScreen("apps");
   if(DEBUG){ qDebug() << " - Init AppMenu:" << timer->elapsed();}
   appmenu = new AppMenu();
   if(DEBUG){ qDebug() << " - Init SettingsMenu:" << timer->elapsed();}
+  splash.showScreen("menus");
   settingsmenu = new SettingsMenu();
   if(DEBUG){ qDebug() << " - Init SystemWindow:" << timer->elapsed();}
   sysWindow = new SystemWindow();
-- 
cgit