diff options
| -rw-r--r-- | lumina-desktop/BootSplash.cpp | 10 | ||||
| -rw-r--r-- | lumina-desktop/LSession.cpp | 15 |
2 files changed, 13 insertions, 12 deletions
diff --git a/lumina-desktop/BootSplash.cpp b/lumina-desktop/BootSplash.cpp index 5ac45a32..e8502647 100644 --- a/lumina-desktop/BootSplash.cpp +++ b/lumina-desktop/BootSplash.cpp @@ -29,15 +29,15 @@ void BootSplash::showScreen(QString loading){ //update icon, text, and progress }else if(loading=="wm"){ txt = tr("Starting Window Manager..."); per = 50; icon = "preferences-system-windows-actions"; - }else if(loading=="desktop"){ - txt = tr("Initializing Desktop(s)..."); per = 60; - icon = "preferences-desktop-wallpaper"; }else if(loading=="apps"){ - txt = tr("Detecting System Applications..."); per = 70; + txt = tr("Detecting System Applications..."); per = 60; icon = "preferences-desktop-icons"; }else if(loading=="menus"){ - txt = tr("Initializing System Menu(s)..."); per = 80; + txt = tr("Initializing System Menu(s)..."); per = 70; icon = "preferences-system-windows"; + }else if(loading=="desktop"){ + txt = tr("Initializing Desktop(s)..."); per = 80; + icon = "preferences-desktop-wallpaper"; }else if(loading=="final"){ txt = tr("Performing Final Checks..."); per = 90; icon = "pcbsd"; diff --git a/lumina-desktop/LSession.cpp b/lumina-desktop/LSession.cpp index d4f7c2f0..5866b19d 100644 --- a/lumina-desktop/LSession.cpp +++ b/lumina-desktop/LSession.cpp @@ -25,7 +25,7 @@ #include <X11/extensions/Xdamage.h> #ifndef DEBUG -#define DEBUG 0 +#define DEBUG 1 #endif XCBEventFilter *evFilter = 0; @@ -108,22 +108,23 @@ void LSession::setupSession(){ WM = new WMProcess(); WM->startWM(); - //Initialize the desktops - splash.showScreen("desktop"); - if(DEBUG){ qDebug() << " - Init Desktops:" << timer->elapsed();} - updateDesktops(); - //Initialize the global menus qDebug() << " - Initialize system menus"; splash.showScreen("apps"); if(DEBUG){ qDebug() << " - Init AppMenu:" << timer->elapsed();} appmenu = new AppMenu(); + + splash.showScreen("menus"); if(DEBUG){ qDebug() << " - Init SettingsMenu:" << timer->elapsed();} - //splash.showScreen("menus"); settingsmenu = new SettingsMenu(); if(DEBUG){ qDebug() << " - Init SystemWindow:" << timer->elapsed();} sysWindow = new SystemWindow(); + //Initialize the desktops + splash.showScreen("desktop"); + if(DEBUG){ qDebug() << " - Init Desktops:" << timer->elapsed();} + updateDesktops(); + //Now setup the system watcher for changes splash.showScreen("final"); qDebug() << " - Initialize file system watcher"; |