[PC-BSD Commits] r4616 - pcbsd/trunk/SysInstaller/phases

[svn at pcbsd.org]

Author: kris
Date: 2009-10-08 13:41:38 -0700 (Thu, 08 Oct 2009)
New Revision: 4616

Modified:
   pcbsd/trunk/SysInstaller/phases/anteinstall.cpp
Log:

Fixed up device loading, refresh the screen properly now, and add a debug message



Modified: pcbsd/trunk/SysInstaller/phases/anteinstall.cpp
===================================================================
--- pcbsd/trunk/SysInstaller/phases/anteinstall.cpp	2009-10-08 20:37:30 UTC (rev 4615)
+++ pcbsd/trunk/SysInstaller/phases/anteinstall.cpp	2009-10-08 20:41:38 UTC (rev 4616)
@@ -1,6 +1,7 @@
 #include <QtGui/QFileDialog>
 #include <QtGui/QInputDialog>
 #include <QProcess>
+#include <QDebug>
 
 #include "anteinstall.h"
 #include "globals.h"
@@ -205,17 +206,18 @@
         // Get the disk size / type
         args.clear();
         args << "disk-info" << dev;
+
         getDiskInfoProc.setReadChannel(QProcess::StandardOutput);
         getDiskInfoProc.start(prog, args);
         // Wait for the process to finish
         if ( getDiskInfoProc.waitForFinished() )
         {
-          // load keyboards in "keyboards" stringlist
           while (getDiskInfoProc.canReadLine()) {
             // Get the disk device name
             line2 = getDiskInfoProc.readLine();
+            line2 = line2.simplified();
             if ( line2.indexOf("size=") == 0) {
-              size = line2.replace("size=", "");
+              size = line2.replace("size=", "") + "MB";
             }
             if ( line2.indexOf("type=") == 0) {
               type = line2.replace("type=", "");
@@ -225,8 +227,12 @@
 
         // Add our Device info to the GUI now
         comboHardDrive->addItem(device);
-        drive << device << size << type << devinfo;
+        qDebug() << "Found Device Info:" << device << size << devinfo << type;
+        drive << device << size << devinfo << type;
         drives.append(drive);
+
+        // Update the display now
+        slotHardDriveChanged(0);
       }
     }