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

[svn at pcbsd.org]

Author: kris
Date: 2009-12-06 05:49:57 -0800 (Sun, 06 Dec 2009)
New Revision: 5260

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

Updated install label, strip all \n's from our strings



Modified: pcbsd/trunk/SysInstaller/sys-installwidget.cpp
===================================================================
--- pcbsd/trunk/SysInstaller/sys-installwidget.cpp	2009-12-06 10:00:38 UTC (rev 5259)
+++ pcbsd/trunk/SysInstaller/sys-installwidget.cpp	2009-12-06 13:49:57 UTC (rev 5260)
@@ -63,26 +63,25 @@
    while ( installProc->canReadLine() )
    {
      tmp = installProc->readLine();
+     tmp = tmp.simplified();
+     tmp.truncate(60);
 
      // Watch for our COUNT value
      if ( ! installFoundCounter )
      {
         if ( tmp.indexOf("INSTALLCOUNT: ") != -1 ) {
           tmp = tmp.remove(0, tmp.indexOf(":") + 1 ); 
-          tmp = tmp.simplified();
           range = tmp.toInt(&ok);
           if ( ok ) {
              progressBarInstall->setRange(0, range);  
              installFoundCounter = true;
           }
         } else {
-          tmp.truncate(50);
           labelInstallStatus->setText(tmp);
         }
      } else {
        // We have found a valid count for this install
        progressBarInstall->setValue(progressBarInstall->value() + 1); 
-       tmp.truncate(50);
        labelInstallStatus->setText(tmp);
      }