[PC-BSD Commits] r9850 - pcbsd/current/src-qt4/pc-sysmanager

[svn at pcbsd.org]

Author: kris
Date: 2011-03-31 10:39:35 -0700 (Thu, 31 Mar 2011)
New Revision: 9850

Modified:
   pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.cpp
   pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.ui
   pcbsd/current/src-qt4/pc-sysmanager/systemupdates.cpp
Log:

Fixed a bug generating system diagnostic sheets, also fixed UI "lag" when reading meta-pkg status



Modified: pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.cpp	2011-03-31 17:24:39 UTC (rev 9849)
+++ pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.cpp	2011-03-31 17:39:35 UTC (rev 9850)
@@ -184,7 +184,7 @@
 {
     
     	SheetGenScript = new QProcess( this );
-	QString prog = PREFIX + "/share/apps/pcbsd/scripts/GenDiagSheet.sh";
+	QString prog = PREFIX + "/share/pcbsd/scripts/GenDiagSheet.sh";
 	QStringList args;
 	args << SheetFileName;
 	connect( SheetGenScript, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(finishedSheet()) );
@@ -693,6 +693,11 @@
   QString tmp;
   QProcess pcmp;
   pcmp.start(QString("pc-metapkgmanager"), QStringList() << "status" << mPkg);
+  while ( pcmp.state() != QProcess::NotRunning ) {
+     pcmp.waitForFinished(50);
+     QCoreApplication::processEvents();
+  }
+
   if (pcmp.waitForFinished()) {
     while (pcmp.canReadLine()) {
         tmp = pcmp.readLine().simplified();

Modified: pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.ui
===================================================================
--- pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.ui	2011-03-31 17:24:39 UTC (rev 9849)
+++ pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.ui	2011-03-31 17:39:35 UTC (rev 9850)
@@ -469,7 +469,7 @@
             </sizepolicy>
            </property>
            <property name="text">
-            <string>The following system updates are available:</string>
+            <string>Preparing to check for updates... Please Wait...</string>
            </property>
            <property name="alignment">
             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>

Modified: pcbsd/current/src-qt4/pc-sysmanager/systemupdates.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-sysmanager/systemupdates.cpp	2011-03-31 17:24:39 UTC (rev 9849)
+++ pcbsd/current/src-qt4/pc-sysmanager/systemupdates.cpp	2011-03-31 17:39:35 UTC (rev 9850)
@@ -25,7 +25,7 @@
   UpdaterStatusDialog->setModal(true);
 
   // Start the monitor service for system updates
-  QTimer::singleShot(10000, this, SLOT(slotStartUpdateCheck()));
+  QTimer::singleShot(1000, this, SLOT(slotStartUpdateCheck()));
 
   // Initialize some of our various variables
   totalSeconds = 0;