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

[svn at pcbsd.org]

Author: kenmoore
Date: 2012-09-27 15:21:53 +0000 (Thu, 27 Sep 2012)
New Revision: 19552

Modified:
   pcbsd-projects/PCDM/PCDM.pro
   pcbsd-projects/PCDM/main.cpp
Log:
Get the main.cpp and project file ready to use the new xprocess class



Modified: pcbsd-projects/PCDM/PCDM.pro
===================================================================
--- pcbsd-projects/PCDM/PCDM.pro	2012-09-27 15:10:12 UTC (rev 19551)
+++ pcbsd-projects/PCDM/PCDM.pro	2012-09-27 15:21:53 UTC (rev 19552)
@@ -8,6 +8,7 @@
     	   pcdm-backend.cpp \
     	   pcdm-themes.cpp \
            pcdm-config.cpp \
+	   pcdm-xprocess.cpp \
            fancySwitcher.cpp \
            dialogKeyboard.cpp \
            dialogLocale.cpp \
@@ -17,6 +18,7 @@
     	   pcdm-backend.h \
 	   pcdm-themes.h \
            pcdm-config.h \
+	   pcdm-xprocess.h \
            fancySwitcher.h \
            dialogKeyboard.h \
            dialogLocale.h \

Modified: pcbsd-projects/PCDM/main.cpp
===================================================================
--- pcbsd-projects/PCDM/main.cpp	2012-09-27 15:10:12 UTC (rev 19551)
+++ pcbsd-projects/PCDM/main.cpp	2012-09-27 15:21:53 UTC (rev 19552)
@@ -10,7 +10,7 @@
 #include "pcdm-gui.h"
 #include "pcdm-backend.h"
 #include "pcdm-config.h"
-//#include "pcdm-xprocess.h"
+#include "pcdm-xprocess.h"
 
 #define TMPLANGFILE QString("/tmp/.PCDMLang")
 
@@ -33,19 +33,22 @@
   QApplication a(argc,argv); 
   
   // Show our splash screen, so the user doesn't freak that that it takes a few seconds to show up
-  qDebug() << "Starting splash screen";
   QSplashScreen splash;
   if(Theme::useSplashscreen()){
     splash.setPixmap( QPixmap(Theme::splashscreen()) ); //load the splashscreen file
   }
   splash.show();
-   qDebug() << "starting autologin check"; 
+
+  //Initialize the xprocess
+  //XProcess desktop;
+  
+  //*** STARTUP THE PROGRAM ***
+  
   if( ALtriggered && Config::useAutoLogin() ){
     //Setup the Auto Login
     Backend::startAutoLogin();
     splash.close();
   }else{
-	  qDebug() << "starting PCDM GUI";
     // ------START THE PCDM GUI-------
     
     // Check what directory our app is in
@@ -110,6 +113,6 @@
       */
   // Startup the desktop environment if possible
   Backend::startXSession();
-
+  //desktop.waitForFinished();
   return returnCode;
 }