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

[svn at pcbsd.org]

Author: kris
Date: 2012-12-19 17:37:36 +0000 (Wed, 19 Dec 2012)
New Revision: 20700

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

Change some of the installer GUI, to work with new pc-sysinstall
pkg installation, fix progress bars



Modified: pcbsd/current/src-qt4/pc-installgui/installer.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-installgui/installer.cpp	2012-12-19 17:36:53 UTC (rev 20699)
+++ pcbsd/current/src-qt4/pc-installgui/installer.cpp	2012-12-19 17:37:36 UTC (rev 20700)
@@ -1437,7 +1437,7 @@
         } 
 
         // Check if we are on the meta-pkg installation
-        if ( tmp.indexOf("Pending Meta-Package changes: ") != -1 ) {
+        if ( tmp.indexOf("Packages to install: ") != -1 ) {
           tmp = tmp.remove(0, tmp.indexOf(":") + 1 ); 
           range = tmp.toInt(&ok);
           if ( ok ) {
@@ -1474,24 +1474,7 @@
 
      // Doing meta-pkgs
      if ( installFoundMetaCounter ) {
-        // Check if onto the next meta-pkg
-        if ( tmp.indexOf("Installing Meta-Package: ") != -1 ) {
-           labelInstallStatus->setText(tmp);
-           progressBarInstall->setValue(progressBarInstall->value() + 1); 
-	   continue;
-        }
-
-        if ( tmp.indexOf("Pending package changes: ") != -1 ) {
-           tmp = tmp.replace("Pending package changes: ", "");
-           tmp.toInt(&ok);
-           if ( ok ) {
-              progressBarInstall2->setRange(0, tmp.toInt(&ok) + 1);  
-              progressBarInstall2->setValue(0);  
-           }
-	   continue;
-        } 
-
-        if ( tmp.indexOf("Finished installing:") != -1 ) {
+        if ( tmp.indexOf("Package installation complete!") != -1 ) {
            installFoundMetaCounter = false;
            progressBarInstall->setRange(0, 0);  
            progressBarInstall2->setHidden(true);
@@ -1574,7 +1557,7 @@
 	}
    }
 
-   cfgList << "installPackages=" + pkgList.join(",");
+   cfgList << "installPackages=" + pkgList.join(" ");
    return cfgList;
 }