[PC-BSD Commits] r20717 - pcbsd/current/src-qt4/pc-installgui

svn at pcbsd.org svn at pcbsd.org
Wed Dec 19 16:27:10 PST 2012


Author: kris
Date: 2012-12-20 00:27:10 +0000 (Thu, 20 Dec 2012)
New Revision: 20717

Modified:
   pcbsd/current/src-qt4/pc-installgui/installer.cpp
Log:

Make the install screen better show dist file extraction, and
package total progress, with a busy indicator so we know its
not hung if it takes a while.



Modified: pcbsd/current/src-qt4/pc-installgui/installer.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-installgui/installer.cpp	2012-12-19 23:40:52 UTC (rev 20716)
+++ pcbsd/current/src-qt4/pc-installgui/installer.cpp	2012-12-20 00:27:10 UTC (rev 20717)
@@ -1427,7 +1427,7 @@
              progressBarInstall->setRange(0, range + 1);  
              installFoundCounter = true;
 	     if ( availDesktopPackageData )
-                labelInstallStatus->setText(tr("Extracting system image...")); 
+                labelInstallStatus->setText(tr("Extracting system...")); 
 	     else
                 labelInstallStatus->setText(tr("Installing system... This may take a while...")); 
           }
@@ -1443,6 +1443,7 @@
           if ( ok ) {
              progressBarInstall->setRange(0, range + 1);  
              progressBarInstall->setValue(0);  
+             progressBarInstall2->setRange(0, 0);  
              labelInstallStatus2->setHidden(false);
              progressBarInstall2->setHidden(false);  
              installFoundMetaCounter = true;
@@ -1460,6 +1461,22 @@
      // Doing file-extraction still
      if ( installFoundCounter ) {
 
+       // Doing dist-files, may have multiple images to extract
+       if ( tmp.indexOf("INSTALLCOUNT: ") != -1 ) {
+         tmp = tmp.remove(0, tmp.indexOf(":") + 1 ); 
+         range = tmp.toInt(&ok);
+         if ( ok ) {
+            progressBarInstall->setRange(0, range + 1);  
+            installFoundCounter = true;
+            if ( availDesktopPackageData )
+              labelInstallStatus->setText(tr("Extracting system...")); 
+            else
+              labelInstallStatus->setText(tr("Installing system... This may take a while...")); 
+         }
+	 break;
+       } 
+
+
        // Increment the progress
        progressBarInstall->setValue(progressBarInstall->value() + 1); 
 
@@ -1483,7 +1500,7 @@
         }
 
 	// Got this far, increment the pkg-sub count
-        progressBarInstall2->setValue(progressBarInstall2->value() + 1); 
+        progressBarInstall->setValue(progressBarInstall->value() + 1); 
         labelInstallStatus2->setText(tmp);
      }
 



More information about the Commits mailing list