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

[svn at pcbsd.org]

Author: kris
Date: 2010-03-29 08:04:56 -0700 (Mon, 29 Mar 2010)
New Revision: 6464

Modified:
   pcbsd/trunk/SysInstaller/sys-installwidget.cpp
Log:

Cleanup some of the progressbar output again



Modified: pcbsd/trunk/SysInstaller/sys-installwidget.cpp
===================================================================
--- pcbsd/trunk/SysInstaller/sys-installwidget.cpp	2010-03-29 14:58:51 UTC (rev 6463)
+++ pcbsd/trunk/SysInstaller/sys-installwidget.cpp	2010-03-29 15:04:56 UTC (rev 6464)
@@ -107,7 +107,8 @@
 
   while ( installProc->canReadLine() )
   {
-     tmp = installProc->readLine(70);
+     tmp = installProc->readLine();
+     tmp.truncate(70);
      //qDebug() << tmp;
 
      // Check if we are doing Fetch Output
@@ -152,17 +153,19 @@
              range = range + 50;
              progressBarInstall->setRange(0, range);  
              installFoundCounter = true;
+             labelInstallStatus->setText(tr("Installing system... This may take a while...")); 
           }
-        } else {
+        } else 
           labelInstallStatus->setText(tmp);
-        }
      } else {
-       // We have found a valid count for this install
+       // We have found a valid count for this install go ahead and just increment the progress bar
        progressBarInstall->setValue(progressBarInstall->value() + 1); 
-       if ( tmp.indexOf("x ") == 0 )
-         labelInstallStatus->setText(tr("Installing system... This may take a while...")); 
-       else
-         labelInstallStatus->setText(tmp);
+
+       // We've reached the end of this counted section
+       if ( tmp.indexOf("Extraction Finished") != -1 ) {
+         installFoundCounter = false;
+         progressBarInstall->setRange(0, 0);  
+       }
      }
 
   } // end of while loop