[PC-BSD Commits] r7525 - pcbsd/current/src-qt4/pc-sysinstaller

[svn at pcbsd.org]

Author: kris
Date: 2010-09-07 07:50:56 -0700 (Tue, 07 Sep 2010)
New Revision: 7525

Modified:
   pcbsd/current/src-qt4/pc-sysinstaller/sys-installwidget.cpp
   pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.h
Log:

Updated pc-sysinstaller, display output when doing meta-pkg installation, since it may be of interest
to the end user :)



Modified: pcbsd/current/src-qt4/pc-sysinstaller/sys-installwidget.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-sysinstaller/sys-installwidget.cpp	2010-09-07 13:58:18 UTC (rev 7524)
+++ pcbsd/current/src-qt4/pc-sysinstaller/sys-installwidget.cpp	2010-09-07 14:50:56 UTC (rev 7525)
@@ -10,6 +10,7 @@
   backButton->setEnabled(false);
   progressBarInstall->setValue(0); 
   installFoundCounter = false;
+  installFoundMetaCounter = false;
   installFoundFetchOutput = false;
 
   // Start our process to begin the install
@@ -144,7 +145,7 @@
         } else {
           installFoundFetchOutput = false;
         }
-     } else if ( ! installFoundCounter ) {
+     } else if ( ! installFoundCounter && ! installFoundMetaCounter ) {
 
         // Check if we've found fetch output to update the progress bar with
         if ( tmp.indexOf("FETCH: ") != -1 ) {
@@ -172,7 +173,7 @@
           range = tmp.toInt(&ok);
           if ( ok ) {
              progressBarInstall->setRange(0, range);  
-             installFoundCounter = true;
+             installFoundMetaCounter = true;
              labelInstallStatus->setText(tr("Installing Desktop-Packages... This may take a while...")); 
           }
 
@@ -182,13 +183,17 @@
        // We have found a valid count for this install go ahead and just increment the progress bar
        progressBarInstall->setValue(progressBarInstall->value() + 1); 
 
+       // If we are doing meta-packages, we can display output
+       if ( installFoundMetaCounter )
+         labelInstallStatus->setText(tmp);
+
        // We've reached the end of this counted section
        if ( tmp.indexOf("Extraction Finished") != -1 ) {
          installFoundCounter = false;
          progressBarInstall->setRange(0, 0);  
        }
        if ( tmp.indexOf("Meta-Package changes finished!") != -1 ) {
-         installFoundCounter = false;
+         installFoundMetaCounter = false;
          progressBarInstall->setRange(0, 0);  
        }
      }

Modified: pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.h
===================================================================
--- pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.h	2010-09-07 13:58:18 UTC (rev 7524)
+++ pcbsd/current/src-qt4/pc-sysinstaller/sysinstaller.h	2010-09-07 14:50:56 UTC (rev 7525)
@@ -184,6 +184,7 @@
     QStringList updatePartitions;
     QProcess *installProc;
     bool installFoundCounter;
+    bool installFoundMetaCounter;
     bool installFoundFetchOutput;
     QString fetchDownloadFile;
     bool availPackageData;