[PC-BSD Commits] r19549 - pcbsd-projects/PCDM

[svn at pcbsd.org]

Author: kenmoore
Date: 2012-09-27 14:58:42 +0000 (Thu, 27 Sep 2012)
New Revision: 19549

Modified:
   pcbsd-projects/PCDM/main.cpp
Log:
Change when the splash screen is shown during main.cpp



Modified: pcbsd-projects/PCDM/main.cpp
===================================================================
--- pcbsd-projects/PCDM/main.cpp	2012-09-27 14:51:25 UTC (rev 19548)
+++ pcbsd-projects/PCDM/main.cpp	2012-09-27 14:58:42 UTC (rev 19549)
@@ -10,6 +10,7 @@
 #include "pcdm-gui.h"
 #include "pcdm-backend.h"
 #include "pcdm-config.h"
+#include "pcdm-xprocess.h"
 
 #define TMPLANGFILE QString("/tmp/.PCDMLang")
 
@@ -25,16 +26,22 @@
   QString changeLang; 
   // Load the configuration file
   Config::loadConfigFile("/usr/local/share/PCDM/pcdm.conf");
-  
+  // Load the Desired Theme
+  Theme::loadTheme(Config::themeFile());
 
+  // Show our splash screen, so the user doesn't freak that that it takes a few seconds to show up
+  QSplashScreen splash;
+  if(Theme::useSplashscreen()){
+    splash.setPixmap( QPixmap(Theme::splashscreen()) ); //load the splashscreen file
+  }
+  splash.show();
+    
   if( ALtriggered && Config::useAutoLogin() ){
     //Setup the Auto Login
     Backend::startAutoLogin();
   }else{
     // ------START THE PCDM GUI-------
     
-    // Load the Desired Theme
-    Theme::loadTheme(Config::themeFile());
     // Startup the main application
     QApplication a(argc,argv); 
     // Check what directory our app is in
@@ -56,12 +63,6 @@
       langCode = "";
     }
 
-    // Show our splash screen, so the user doesn't freak that that it takes a few seconds to show up
-    QSplashScreen splash;
-    if(Theme::useSplashscreen()){
-      splash.setPixmap( QPixmap(Theme::splashscreen()) ); //load the splashscreen file
-    }
-    splash.show();
 
     Backend::log("Starting up PCDM interface");
     PCDMgui w;
@@ -103,6 +104,7 @@
       }
       */
   // Startup the desktop environment if possible
+  splash.close();
   Backend::startXSession();
 
   return returnCode;