[PC-BSD Commits] r5823 - pcbsd/trunk/SysInstaller

[svn at pcbsd.org]

Author: kris
Date: 2010-01-07 09:41:47 -0800 (Thu, 07 Jan 2010)
New Revision: 5823

Modified:
   pcbsd/trunk/SysInstaller/main.cpp
   pcbsd/trunk/SysInstaller/sysinstaller.cpp
   pcbsd/trunk/SysInstaller/sysinstaller.h
Log:

Set us to load a splash screen for starting SysInstaller, since the backend takes a while to probe,
and we don't want users getting anxious at lack of anything showing up right away



Modified: pcbsd/trunk/SysInstaller/main.cpp
===================================================================
--- pcbsd/trunk/SysInstaller/main.cpp	2010-01-07 16:24:06 UTC (rev 5822)
+++ pcbsd/trunk/SysInstaller/main.cpp	2010-01-07 17:41:47 UTC (rev 5823)
@@ -3,6 +3,7 @@
 #include <QLocale>
 #include <QDesktopWidget>
 #include <QFile>
+#include <QSplashScreen>
 
 #include "sysinstaller.h"
 #include "backend.h"
@@ -41,22 +42,27 @@
         langCode = "";
       }
 
+      // Show our splash screen, so the user doesn't freak that that it takes a few seconds to show up
+      QPixmap pixmap(":/PCBSD/images/pcbsdheader.png");
+      QSplashScreen splash(pixmap);
+      splash.show();
 
+
       SysInstaller w;
 
       // Check if we are using diff language
       if ( ! langCode.isEmpty() )
         w.changeLang(langCode);
 
+
       // Center the installer
-      QDesktopWidget *desk = a.desktop();
-      QRect dimensions = desk->screenGeometry();
+      QRect dimensions = QApplication::desktop()->screenGeometry();
       int wid = dimensions.width();     // returns desktop width
       int hig = dimensions.height();    // returns desktop height
       w.setGeometry((wid/2) - (800/2), (hig/2) - (600/2), 800, 600);
-  
 
       w.show();
+      splash.finish(&w);
       
 
       returnCode = a.exec();

Modified: pcbsd/trunk/SysInstaller/sysinstaller.cpp
===================================================================
--- pcbsd/trunk/SysInstaller/sysinstaller.cpp	2010-01-07 16:24:06 UTC (rev 5822)
+++ pcbsd/trunk/SysInstaller/sysinstaller.cpp	2010-01-07 17:41:47 UTC (rev 5823)
@@ -86,6 +86,7 @@
 
 void SysInstaller::initAnteInstall()
 {
+
     // load languages
     comboLanguage->clear();
     languages = Scripts::Backend::languages();
@@ -144,6 +145,7 @@
     loadNics();
 
     systemMemory = Scripts::Backend::systemMemory();
+
 }
 
 

Modified: pcbsd/trunk/SysInstaller/sysinstaller.h
===================================================================
--- pcbsd/trunk/SysInstaller/sysinstaller.h	2010-01-07 16:24:06 UTC (rev 5822)
+++ pcbsd/trunk/SysInstaller/sysinstaller.h	2010-01-07 17:41:47 UTC (rev 5823)
@@ -6,7 +6,6 @@
 #include <QFile>
 #include <QProcess>
 
-
 #include "ui_sysinstaller.h"
 #include "dialogFileSystem.h"
 #include "dialogSelectNet.h"