[PC-BSD Commits] r3684 - pcbsd/trunk/PCInstall

[svn at pcbsd.org]

Author: kris
Date: 2009-03-27 12:15:16 -0700 (Fri, 27 Mar 2009)
New Revision: 3684

Modified:
   pcbsd/trunk/PCInstall/pcinstall.cpp
   pcbsd/trunk/PCInstall/pcinstall.h
Log:

Updated PCInstall, now it'll read messages during the upgrade process and display them
on the GUI for the user to know why the heck its taking so long :P



Modified: pcbsd/trunk/PCInstall/pcinstall.cpp
===================================================================
--- pcbsd/trunk/PCInstall/pcinstall.cpp	2009-03-27 18:57:36 UTC (rev 3683)
+++ pcbsd/trunk/PCInstall/pcinstall.cpp	2009-03-27 19:15:16 UTC (rev 3684)
@@ -1414,7 +1414,7 @@
 }
 
 
-
+// Function which reads the output of the tar extraction and displays it on the GUI
 void PCInstall::readTarStdoutSlot()
 {
     QString Buffer;
@@ -1444,7 +1444,24 @@
     } // End while loop
 }
 
+// Function which reads the output of PCBSD.MountUpgrade.sh and displays on GUI its messages
+void PCInstall::readUpgradeStdoutSlot()
+{
+    QString Buffer;
+    QString tmp;
 
+    // Loop while getting input
+    while (RunUpgradeProc->canReadLineStdout() )
+    {
+	// Read the line
+	Buffer = RunUpgradeProc->readLineStdout();
+	
+	// Set the Label to current text
+	textFileProgress->setText(Buffer);
+
+    } // End while loop
+}
+
 void PCInstall::setupUsersSlot()
 {
 
@@ -2063,6 +2080,7 @@
     RunUpgradeProc->addArgument( tmp );
 
     connect( RunUpgradeProc, SIGNAL(processExited()), this, SLOT(startTarExtractSlot()) );
+    connect( RunUpgradeProc, SIGNAL(readyReadStdout() ), this, SLOT(readUpgradeStdoutSlot() ) );
 
     if ( !RunUpgradeProc->start() ) {
 	QMessageBox::warning( this, "PCBSD Installer", "Failed Starting MountCD", "Retry", "Quit", 0, 0, 1 );

Modified: pcbsd/trunk/PCInstall/pcinstall.h
===================================================================
--- pcbsd/trunk/PCInstall/pcinstall.h	2009-03-27 18:57:36 UTC (rev 3683)
+++ pcbsd/trunk/PCInstall/pcinstall.h	2009-03-27 19:15:16 UTC (rev 3684)
@@ -64,6 +64,7 @@
     void startMountCD();
     void startTarExtractSlot();
     void readTarStdoutSlot();
+    void readUpgradeStdoutSlot();
     void setupUsersSlot();
     void slotRunLastScripts();
     void setupFinishedSlot();