[PC-BSD Commits] r7252 - in pcbsd/current: . src-qt4 src-qt4/pc-servicemanager src-qt4/pc-sysmanager

svn at pcbsd.org svn at pcbsd.org
Thu Jul 22 12:14:18 PDT 2010


Author: kris
Date: 2010-07-22 12:14:17 -0700 (Thu, 22 Jul 2010)
New Revision: 7252

Added:
   pcbsd/current/src-qt4/pc-sysmanager/
   pcbsd/current/src-qt4/pc-sysmanager/arrow-left.png
   pcbsd/current/src-qt4/pc-sysmanager/arrow-right.png
   pcbsd/current/src-qt4/pc-sysmanager/pc-sysmanager.pro
Removed:
   pcbsd/current/kcmPBSystem/
   pcbsd/current/src-qt4/pc-servicemanager/pcbsdservices.desktop
   pcbsd/current/src-qt4/pc-sysmanager/PBSystem.pro
   pcbsd/current/src-qt4/pc-sysmanager/kcm.cpp
   pcbsd/current/src-qt4/pc-sysmanager/kcm.h
   pcbsd/current/src-qt4/pc-sysmanager/notroot.cpp
   pcbsd/current/src-qt4/pc-sysmanager/notroot.h
   pcbsd/current/src-qt4/pc-sysmanager/notroot.ui
Modified:
   pcbsd/current/src-qt4/pc-sysmanager/PBSystem.qrc
   pcbsd/current/src-qt4/pc-sysmanager/cvsupprogress.cpp
   pcbsd/current/src-qt4/pc-sysmanager/cvsupprogress.h
   pcbsd/current/src-qt4/pc-sysmanager/cvsupprogress.ui
   pcbsd/current/src-qt4/pc-sysmanager/fastestcvsup.cpp
   pcbsd/current/src-qt4/pc-sysmanager/fastestcvsup.h
   pcbsd/current/src-qt4/pc-sysmanager/fastestcvsup.ui
   pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.cpp
   pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.h
   pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.ui
   pcbsd/current/src-qt4/pc-sysmanager/portsnapprogress.cpp
   pcbsd/current/src-qt4/pc-sysmanager/portsnapprogress.ui
   pcbsd/current/src-qt4/src-qt4.pro
Log:

Move kcmPBSystem -> src-qt4/pc-sysmanager, and rework it to be 100% QT4 based, remove old KDE4
/QT3 cruft



Modified: pcbsd/current/src-qt4/pc-sysmanager/PBSystem.qrc
===================================================================
--- pcbsd/current/kcmPBSystem/PBSystem.qrc	2010-07-20 13:48:22 UTC (rev 7242)
+++ pcbsd/current/src-qt4/pc-sysmanager/PBSystem.qrc	2010-07-22 19:14:17 UTC (rev 7252)
@@ -1,5 +1,7 @@
 <RCC>
   <qresource>
+    <file>arrow-left.png</file>
+    <file>arrow-right.png</file>
     <file>NewLogoSmall.png</file>
     <file>system.png</file>
   </qresource>


Property changes on: pcbsd/current/src-qt4/pc-sysmanager/arrow-left.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream


Property changes on: pcbsd/current/src-qt4/pc-sysmanager/arrow-right.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: pcbsd/current/src-qt4/pc-sysmanager/cvsupprogress.cpp
===================================================================
--- pcbsd/current/kcmPBSystem/cvsupprogress.cpp	2010-07-20 13:48:22 UTC (rev 7242)
+++ pcbsd/current/src-qt4/pc-sysmanager/cvsupprogress.cpp	2010-07-22 19:14:17 UTC (rev 7252)
@@ -11,27 +11,28 @@
 *****************************************************************************/
 #include "cvsupprogress.h"
 #include <qtextstream.h>
-#include <kio/netaccess.h>
+#include <QUrl>
+#include <QDebug>
 
 
 void CVSUpProgress::setup( QString task, QString supfile )
 {
-    qDebug("Using supfile: " + supfile);
-    QString captionText = this->caption();
+    qDebug() << "Using supfile: " + supfile;
+    QString captionText = this->windowTitle();
     captionText += " - ";
     captionText += task;
-    this->setCaption(captionText);
+    this->setWindowTitle(captionText);
     this->supfile = supfile;
-    KUrl url1 = KUrl::fromPath("/usr/share/examples/cvsup/standard-supfile");
-    KUrl url2 = KUrl::fromPath(supfile);
-    if (! QFile::exists(this->supfile)) KIO::NetAccess::file_copy(url1, url2, this);
+    QFile sysFile;
+    sysFile.setFileName("/usr/share/examples/cvsup/standard-supfile");
+    if (! QFile::exists(this->supfile)) sysFile.copy(supfile);
     progressLabel->setText(tr("Selected CVSup server: ") + getServer());
 
     //Populate source selection box
     QFile srcFile(this->supfile);
-    new QGridLayout(srcSelectionGrp, 5, 5);
+    new QGridLayout(srcSelectionGrp);
     QStringList checkedItems;
-    if (srcFile.open(IO_ReadOnly))
+    if (srcFile.open(QIODevice::ReadOnly))
     {
        QTextStream stream(&srcFile);
        stream.setCodec("UTF-8");
@@ -39,7 +40,7 @@
        while (!stream.atEnd())
        {
           line = stream.readLine();
-          int findResult = line.find("src-");
+          int findResult = line.indexOf("src-");
           if (findResult < 2 && findResult > -1)
           {
              QString srcName = line.section("-", 1);
@@ -51,17 +52,17 @@
        srcNames.sort();
        for (QStringList::Iterator it = srcNames.begin(); it != srcNames.end(); ++it)
        {
-         QCheckBox *srcBox = new QCheckBox(*it, srcSelectionGrp, *it + "Chk");
+         QCheckBox *srcBox = new QCheckBox(*it);
          if (checkedItems.contains(*it) > 0) srcBox->setChecked(true);
-         srcSelectionGrp->layout()->add(srcBox);
+         srcSelectionGrp->layout()->addWidget(srcBox);
        }
-       QCheckBox *allChk = (QCheckBox*) srcSelectionGrp->child("allChk", "QCheckBox", false);
+       QCheckBox *allChk = (QCheckBox*) srcSelectionGrp->findChild<QCheckBox *>("allChk");
        if (allChk != NULL) connect(allChk, SIGNAL(clicked()), this, SLOT(boxTicked()));
        boxTicked();
     }
     else
     {
-       KMessageBox::error(this, tr("Unable to open file") + ": " + supfile, tr("Error"));
+       QMessageBox::critical(this, tr("Error"), tr("Unable to open file") + ": " + supfile);
     }
 }
 
@@ -72,9 +73,9 @@
    QFile supRead(supfile);
    QStringList lines;
    bool allChecked = false;
-   QCheckBox *allChk = (QCheckBox*) srcSelectionGrp->child("allChk", "QCheckBox", false);
+   QCheckBox *allChk = (QCheckBox*) srcSelectionGrp->findChild<QCheckBox *>("allChk");
    if (allChk != NULL) allChecked = allChk->isChecked();
-   if (supRead.open(IO_ReadOnly))
+   if (supRead.open(QIODevice::ReadOnly))
    {
       QTextStream stream(&supRead);
       stream.setCodec("UTF-8");
@@ -82,12 +83,12 @@
       while (! stream.atEnd())
       {
          line = stream.readLine();
-         int findResult = line.find("src-");
+         int findResult = line.indexOf("src-");
          if (findResult < 2 && findResult > -1)
          {
             QString writeLine = "";
             QString srcName = line.section("-", 1);
-            QCheckBox *srcChk = (QCheckBox*) srcSelectionGrp->child(srcName + "Chk", "QCheckBox", false);
+            QCheckBox *srcChk = (QCheckBox*) srcSelectionGrp->findChild<QCheckBox *>(srcName + "Chk");
             if (srcChk != NULL)
             {
                if (!srcChk->isChecked() || (allChecked && (srcName != "all"))) writeLine += "#";
@@ -100,7 +101,7 @@
       supRead.close();
    }
    QFile supWrite(supfile);
-   if (supWrite.open(IO_WriteOnly))
+   if (supWrite.open(QIODevice::WriteOnly))
    {
       QTextStream stream(&supWrite);
       stream.setCodec("UTF-8");
@@ -112,18 +113,22 @@
    //Fetch Source
    outputBox->clear();
    cancelBut->setText(tr("&Cancel"));
-   cvsup = new Q3Process(this);
-   cvsup->addArgument("/usr/bin/csup");
-   cvsup->addArgument(supfile);
-   connect(cvsup, SIGNAL(processExited()), this, SLOT(cvsupFinished()));
-   connect(cvsup, SIGNAL(readyReadStdout()), this, SLOT(displayOutput()));
-   if (!cvsup->start()) { KMessageBox::error(this, tr("Unable to execute command") + ": /usr/bin/csup " + supfile, tr("Error")); }
+   QString prog;
+   QStringList args; 
+   prog="/usr/bin/csup";
+
+   cvsup = new QProcess(this);
+   args << supfile;
+   connect(cvsup, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(cvsupFinished()));
+   connect(cvsup, SIGNAL(readyReadStandardOutput()), this, SLOT(displayOutput()));
+   cvsup->setProcessChannelMode(QProcess::MergedChannels);
+   cvsup->start(prog, args);
 }
 
 
 void CVSUpProgress::displayOutput()
 {
-    outputBox->append(cvsup->readLineStdout());
+    outputBox->append(cvsup->readLine());
 }
 
 
@@ -141,7 +146,7 @@
     }
     else if (cancelBut->text() == tr("&Start"))
     {
-   if (getServer() == "UNSET") { KMessageBox::information(this, tr("CVSup server not set. To set your CVSup server, please click the 'Find Fastest...' button and follow the instructions. Alternatively, the CVSup server for this operation may be set manually from the following file") + ":\n" + supfile, tr("Please set CVSup server before proceeding")); }
+   if (getServer() == "UNSET") { QMessageBox::information(this, tr("CVSup server not set. To set your CVSup server, please click the 'Find Fastest...' button and follow the instructions. Alternatively, the CVSup server for this operation may be set manually from the following file") + ":\n" + supfile, tr("Please set CVSup server before proceeding")); }
    else { start(); }
    return;
     }
@@ -160,8 +165,8 @@
 
 void CVSUpProgress::setCvsupServer( QString *server )
 {
-    int question = KMessageBox::questionYesNo(this, tr("PC-BSD has detected the fastest server to be:") + "\n" + *server + "\n\n" + tr("Would you like to use this server in future?"), tr("Confirm server selection"));
-    if (question == KMessageBox::Yes)
+    int question = QMessageBox::question(this, tr("PC-BSD has detected the fastest server to be:") + "\n" + *server + "\n\n" + tr("Would you like to use this server in future?"), tr("Confirm server selection"), QMessageBox::Yes | QMessageBox::No);
+    if (question == QMessageBox::Yes)
     {
    writeServer(*server);
    progressLabel->setText(tr("Selected CVSup server: ") + getServer());
@@ -172,7 +177,7 @@
 {
     QFile supRead(supfile);
     QStringList lines;
-    if (supRead.open(IO_ReadOnly))
+    if (supRead.open(QIODevice::ReadOnly))
     {
    QTextStream stream(&supRead);
    stream.setCodec("UTF-8");
@@ -188,7 +193,7 @@
     }
     
     QFile supWrite(supfile);
-    if (supWrite.open(IO_WriteOnly))
+    if (supWrite.open(QIODevice::WriteOnly))
     {
    QTextStream stream(&supWrite);
    stream.setCodec("UTF-8");
@@ -204,7 +209,7 @@
     QString result = "UNSET";
     
     QFile supfile(this->supfile);
-    if (supfile.open(IO_ReadOnly))
+    if (supfile.open(QIODevice::ReadOnly))
     {
       QTextStream stream(&supfile);
       stream.setCodec("UTF-8");
@@ -216,7 +221,7 @@
          if (line.contains("*default host=")  && !(line.contains("CHANGE_THIS")))
          {
             supfile.close();
-            return QStringList::split("=", line)[1];
+            return line.section("=", 0, 1);
          }
       }
     }
@@ -228,12 +233,12 @@
 
 void CVSUpProgress::boxTicked()
 {
-   QCheckBox *allChk = (QCheckBox*) srcSelectionGrp->child("allChk", "QCheckBox", false);
+   QCheckBox *allChk = (QCheckBox*) srcSelectionGrp->findChild<QCheckBox *>("allChk");
    if (allChk != NULL)
    {
       for (QStringList::Iterator it = srcNames.begin(); it != srcNames.end(); ++it)
       {
-         QCheckBox *chkBox = (QCheckBox*) srcSelectionGrp->child(*it + "Chk", "QCheckBox", false);
+         QCheckBox *chkBox = (QCheckBox*) srcSelectionGrp->findChild<QCheckBox *>(*it + "Chk");
          if ((chkBox != NULL) && (chkBox != allChk)) chkBox->setEnabled(!allChk->isChecked());
       }
    }

Modified: pcbsd/current/src-qt4/pc-sysmanager/cvsupprogress.h
===================================================================
--- pcbsd/current/kcmPBSystem/cvsupprogress.h	2010-07-20 13:48:22 UTC (rev 7242)
+++ pcbsd/current/src-qt4/pc-sysmanager/cvsupprogress.h	2010-07-22 19:14:17 UTC (rev 7252)
@@ -5,6 +5,7 @@
 #include <qmessagebox.h>
 #include <qstring.h>
 #include <qdialog.h>
+#include <QProcess>
 #include "ui_cvsupprogress.h"
 
 class CVSUpProgress : public QDialog, private Ui::CVSUpProgress
@@ -34,7 +35,7 @@
 
 private:
    QString supfile;
-   Q3Process *cvsup;
+   QProcess *cvsup;
    int step;
    FastestCvsup *changeUi;
    QStringList srcNames;

Modified: pcbsd/current/src-qt4/pc-sysmanager/cvsupprogress.ui
===================================================================
--- pcbsd/current/kcmPBSystem/cvsupprogress.ui	2010-07-20 13:48:22 UTC (rev 7242)
+++ pcbsd/current/src-qt4/pc-sysmanager/cvsupprogress.ui	2010-07-22 19:14:17 UTC (rev 7252)
@@ -1,47 +1,48 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>CVSUpProgress</class>
- <widget class="QDialog" name="CVSUpProgress" >
-  <property name="geometry" >
+ <widget class="QDialog" name="CVSUpProgress">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>361</width>
-    <height>328</height>
+    <width>360</width>
+    <height>300</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>CSup Progress</string>
   </property>
-  <property name="windowIcon" >
-   <iconset resource="PBSystem.qrc" >
+  <property name="windowIcon">
+   <iconset resource="PBSystem.qrc">
     <normaloff>:/system.png</normaloff>:/system.png</iconset>
   </property>
-  <property name="modal" >
+  <property name="modal">
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout" >
-   <item row="5" column="2" >
-    <widget class="QPushButton" name="cancelBut" >
-     <property name="text" >
+  <layout class="QGridLayout">
+   <item row="5" column="2">
+    <widget class="QPushButton" name="cancelBut">
+     <property name="text">
       <string>&amp;Start</string>
      </property>
-     <property name="shortcut" >
+     <property name="shortcut">
       <string>Alt+S</string>
      </property>
-     <property name="default" >
+     <property name="default">
       <bool>true</bool>
      </property>
     </widget>
    </item>
-   <item row="5" column="0" colspan="2" >
-    <spacer name="spacer19" >
-     <property name="orientation" >
+   <item row="5" column="0" colspan="2">
+    <spacer name="spacer19">
+     <property name="orientation">
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="sizeType" >
+     <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
-     <property name="sizeHint" stdset="0" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>481</width>
        <height>31</height>
@@ -49,101 +50,77 @@
      </property>
     </spacer>
    </item>
-   <item row="0" column="0" >
-    <widget class="QLabel" name="progressLabel" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+   <item row="0" column="0">
+    <widget class="QLabel" name="progressLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>1</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
-     <property name="frameShape" >
+     <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
-     <property name="frameShadow" >
+     <property name="frameShadow">
       <enum>QFrame::Plain</enum>
      </property>
-     <property name="text" >
+     <property name="text">
       <string>Please wait...</string>
      </property>
-     <property name="wordWrap" >
+     <property name="wordWrap">
       <bool>false</bool>
      </property>
     </widget>
    </item>
-   <item row="0" column="1" colspan="2" >
-    <widget class="QPushButton" name="changeServerBut" >
-     <property name="text" >
+   <item row="0" column="1" colspan="2">
+    <widget class="QPushButton" name="changeServerBut">
+     <property name="text">
       <string>&amp;Find Fastest...</string>
      </property>
-     <property name="shortcut" >
+     <property name="shortcut">
       <string>Alt+F</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="0" colspan="3" >
-    <widget class="Q3TextEdit" name="outputBox" >
-     <property name="enabled" >
-      <bool>true</bool>
-     </property>
-     <property name="readOnly" >
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0" colspan="3" >
-    <widget class="Q3ButtonGroup" name="srcSelectionGrp" >
-     <property name="title" >
-      <string/>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" >
-    <widget class="QLabel" name="textLabel1" >
-     <property name="text" >
+   <item row="2" column="0">
+    <widget class="QLabel" name="textLabel1">
+     <property name="text">
       <string>Parts of source code to download:</string>
      </property>
-     <property name="wordWrap" >
+     <property name="wordWrap">
       <bool>false</bool>
      </property>
     </widget>
    </item>
-   <item row="1" column="0" colspan="3" >
-    <widget class="Line" name="line4" >
-     <property name="frameShape" >
+   <item row="1" column="0" colspan="3">
+    <widget class="Line" name="line4">
+     <property name="frameShape">
       <enum>QFrame::HLine</enum>
      </property>
-     <property name="frameShadow" >
+     <property name="frameShadow">
       <enum>QFrame::Sunken</enum>
      </property>
     </widget>
    </item>
+   <item row="4" column="0" colspan="3">
+    <widget class="QTextEdit" name="outputBox"/>
+   </item>
+   <item row="3" column="0" colspan="3">
+    <widget class="QGroupBox" name="srcSelectionGrp">
+     <property name="title">
+      <string/>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>Q3ButtonGroup</class>
-   <extends>Q3GroupBox</extends>
-   <header>Qt3Support/Q3ButtonGroup</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>Q3TextEdit</class>
-   <extends>Q3Frame</extends>
-   <header>q3textedit.h</header>
-  </customwidget>
- </customwidgets>
+ <layoutdefault spacing="6" margin="11"/>
  <includes>
-  <include location="global" >q3process.h</include>
-  <include location="local" >fastestcvsup.h</include>
-  <include location="global" >kmessagebox.h</include>
-  <include location="global" >kio/netaccess.h</include>
-  <include location="global" >qcheckbox.h</include>
+  <include location="local">fastestcvsup.h</include>
+  <include location="global">qcheckbox.h</include>
  </includes>
  <resources>
-  <include location="PBSystem.qrc" />
+  <include location="PBSystem.qrc"/>
  </resources>
  <connections>
   <connection>
@@ -152,11 +129,11 @@
    <receiver>CVSUpProgress</receiver>
    <slot>quitSlot()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>20</x>
      <y>20</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -168,11 +145,11 @@
    <receiver>CVSUpProgress</receiver>
    <slot>changeServers()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>20</x>
      <y>20</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>

Modified: pcbsd/current/src-qt4/pc-sysmanager/fastestcvsup.cpp
===================================================================
--- pcbsd/current/kcmPBSystem/fastestcvsup.cpp	2010-07-20 13:48:22 UTC (rev 7242)
+++ pcbsd/current/src-qt4/pc-sysmanager/fastestcvsup.cpp	2010-07-22 19:14:17 UTC (rev 7252)
@@ -12,15 +12,17 @@
 #include "fastestcvsup.h"
 #include <qtextstream.h>
 #include <qlistwidget.h>
+#include <QDebug>
 
-
-
 void FastestCvsup::init()
 {  
+    connect( pushAdd, SIGNAL(clicked()), this, SLOT(slotAddServer()) );
+    connect( pushRemove, SIGNAL(clicked()), this, SLOT(slotRemoveServer()) );
+
     QStringList servers;
     serverMap = QMap<QString, QString>();
     QFile file("/PCBSD/Scripts/System/fastest_cvsup");
-    if (file.open(IO_ReadOnly))
+    if (file.open(QIODevice::ReadOnly))
     {
 	QTextStream stream(&file);
 	stream.setCodec("UTF-8");
@@ -36,7 +38,7 @@
 	    {
 		QString serverCode = line.section("'", 1, 1);
 		QString serverName = line.section("# ", 1, 1);
-		qDebug(serverCode + "=" + serverName);
+		qDebug() << serverCode + "=" + serverName;
 		servers += serverName;
 		serverMap[serverName] = serverCode;
 	    }
@@ -44,61 +46,61 @@
     }
     file.close();
     
-    hostsSelector->availableListWidget()->setSelectionMode(QAbstractItemView::ExtendedSelection);
-    hostsSelector->selectedListWidget()->setSelectionMode(QAbstractItemView::ExtendedSelection);
-    
-    hostsSelector->availableListWidget()->addItems(servers);
+    listAvail->addItems(servers);
 }
 
 
 void FastestCvsup::startPressed()
 {
-    mainWidget->raiseWidget(1);
+    mainWidget->setCurrentIndex(1);
     
-    process = new Q3Process(this);
-    process->addArgument("/PCBSD/Scripts/System/fastest_cvsup");
-    process->addArgument("-m");
-    process->addArgument("-c");
-    if (allCheck->isChecked()) { process->addArgument("all"); }
+    QString prog = "/PCBSD/Scripts/System/fastest_cvsup";
+    QStringList args;
+
+    args << "-m";
+    args << "-c";
+
+    if (allCheck->isChecked()) { args << "all"; }
     else
     {
-	QListWidget *selected = hostsSelector->selectedListWidget();
 	QString hostString;
-	for (uint i=0; i<selected->count(); i++)
+	for (int i=0; i<listSelected->count(); i++)
 	{
 	    if (i > 0) { hostString += ","; }
-	    hostString += serverMap[selected->item(i)->text()];
+	    hostString += serverMap[listSelected->item(i)->text()];
 	}
-	qDebug("Host string: " + hostString);
-	process->addArgument(hostString);
+	qDebug() << "Host string: " + hostString;
+	args << hostString;
     }
     
-    connect(process, SIGNAL(readyReadStdout()), this, SLOT(readOutput()));
-    connect(process, SIGNAL(processExited()), this, SLOT(readOutput()));
+    process = new QProcess(this);
+    connect(process, SIGNAL(readyReadStandardOutput()), this, SLOT(readOutput()));
+    connect(process, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(readOutput()));
     
-    qDebug("Executing: " + process->arguments().join(" "));
-    process->start();
+    qDebug() << "Executing: " + args.join(" ");
+    process->setProcessChannelMode(QProcess::MergedChannels);
+    process->start(prog, args);
 }
 
 
 void FastestCvsup::readOutput()
 {
-    while (process->canReadLineStdout())
+    while (process->canReadLine())
     {
-	QString line = process->readLineStdout();
-	qWarning("Captured from stdout: " + line);
+	QString line = process->readLine();
+	qWarning() << "Captured from stdout: " + line;
 	
-	QStringList list = QStringList::split(":", line);
-	if (list[0] == "Total") { progress->setTotalSteps(list[1].toInt() + 1); }
+	QStringList list = line.split(":");
+	if (list[0] == "Total") { progress->setMaximum(list[1].toInt() + 1); }
 	if (list[0] == "Testing")
 	{
 	    serverLbl->setText(list[1]);
-	    progress->setProgress(progress->progress() + 1);
+	    progress->setValue(progress->value() + 1);
 	}
 	if (list[0] == "Result")
 	{
-	    progress->setProgress(progress->totalSteps());
-	    if (list[1] == "FAILED") { KMessageBox::error(this, tr("Unable to reach any server. This could be because all selected servers are down, or because your internet connection is improperly configured. You may wish to try testing other servers."), tr("Error")); }
+	    progress->setValue(progress->maximum());
+	    if (list[1] == "FAILED") { QMessageBox::critical(this, tr("Unable to reach any server. This could be because all selected servers are down, or because your internet connection is improperly configured. You may wish to try testing other servers."), tr("Error")); }
 	    else { emit found(&list[1]); }
 	    close();
 	}
@@ -112,9 +114,39 @@
     close();
 }
 
+void FastestCvsup::slotAddServer()
+{
+   QListWidgetItem *item = listAvail->currentItem();
+   if (!item)
+	return;
 
+   listSelected->addItem(item->text());
+   // Remove old item
+   listAvail->removeItemWidget(item);
+}
+
+void FastestCvsup::slotRemoveServer()
+{
+   QListWidgetItem *item = listSelected->currentItem();
+   if (!item)
+	return;
+
+   listAvail->addItem(item->text());
+   // Remove old item
+   listSelected->removeItemWidget(item);
+}
+
 void FastestCvsup::allToggled()
 {
-    if (allCheck->isChecked()) { hostsSelector->setEnabled(false); }
-    else { hostsSelector->setEnabled(true); }
+    if (allCheck->isChecked()) { 
+      listAvail->setEnabled(false); 
+      listSelected->setEnabled(false); 
+      pushAdd->setEnabled(false); 
+      pushRemove->setEnabled(false); 
+    } else { 
+      listAvail->setEnabled(true); 
+      listSelected->setEnabled(true); 
+      pushAdd->setEnabled(true); 
+      pushRemove->setEnabled(true); 
+    }
 }

Modified: pcbsd/current/src-qt4/pc-sysmanager/fastestcvsup.h
===================================================================
--- pcbsd/current/kcmPBSystem/fastestcvsup.h	2010-07-20 13:48:22 UTC (rev 7242)
+++ pcbsd/current/src-qt4/pc-sysmanager/fastestcvsup.h	2010-07-22 19:14:17 UTC (rev 7252)
@@ -4,7 +4,7 @@
 #include <qfile.h>
 #include <qmessagebox.h>
 #include <qdialog.h>
-#include <Q3Process>
+#include <QProcess>
 #include <qstring.h>
 #include "ui_fastestcvsup.h"
 
@@ -27,9 +27,11 @@
 private slots:
     void cancel();
     void allToggled();
+    void slotAddServer();
+    void slotRemoveServer();
 
 private:
-    Q3Process *process;
+    QProcess *process;
     QMap <QString, QString> serverMap;
 
 signals:

Modified: pcbsd/current/src-qt4/pc-sysmanager/fastestcvsup.ui
===================================================================
--- pcbsd/current/kcmPBSystem/fastestcvsup.ui	2010-07-20 13:48:22 UTC (rev 7242)
+++ pcbsd/current/src-qt4/pc-sysmanager/fastestcvsup.ui	2010-07-22 19:14:17 UTC (rev 7252)
@@ -1,203 +1,232 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>FastestCvsup</class>
- <widget class="QDialog" name="FastestCvsup" >
-  <property name="geometry" >
+ <widget class="QDialog" name="FastestCvsup">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>517</width>
-    <height>458</height>
+    <width>418</width>
+    <height>379</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Change CVSup server</string>
   </property>
-  <property name="windowIcon" >
-   <iconset resource="PBSystem.qrc" >
+  <property name="windowIcon">
+   <iconset resource="PBSystem.qrc">
     <normaloff>:/system.png</normaloff>:/system.png</iconset>
   </property>
-  <property name="modal" >
+  <property name="modal">
    <bool>true</bool>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>0</number>
-   </property>
-   <property name="spacing" >
-    <number>0</number>
-   </property>
-   <item row="0" column="0" >
-    <widget class="Q3WidgetStack" name="mainWidget" >
-     <property name="frameShape" >
-      <enum>QFrame::NoFrame</enum>
+  <layout class="QGridLayout" name="gridLayout_2">
+   <item row="0" column="0">
+    <widget class="QStackedWidget" name="mainWidget">
+     <property name="currentIndex">
+      <number>0</number>
      </property>
-     <property name="frameShadow" >
-      <enum>QFrame::Plain</enum>
-     </property>
-     <widget class="QWidget" name="WStackPage" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>517</width>
-        <height>458</height>
-       </rect>
-      </property>
-      <layout class="QGridLayout" >
-       <item row="3" column="0" >
-        <spacer name="spacer37" >
-         <property name="orientation" >
-          <enum>Qt::Horizontal</enum>
+     <widget class="QWidget" name="wStackPage">
+      <layout class="QGridLayout" name="gridLayout_4">
+       <item row="0" column="0" colspan="2">
+        <widget class="QLabel" name="textLabel3">
+         <property name="text">
+          <string>This dialog will detect the fastest CVSup server for your location. Detection may take several minutes if all countries are selected. To narrow down the search, and speed up detection, please unselect 'All' below, and select your country, and a couple of its neighbours from the list below.</string>
          </property>
-         <property name="sizeType" >
-          <enum>QSizePolicy::Expanding</enum>
+         <property name="alignment">
+          <set>Qt::AlignVCenter</set>
          </property>
-         <property name="sizeHint" stdset="0" >
-          <size>
-           <width>31</width>
-           <height>21</height>
-          </size>
+         <property name="wordWrap">
+          <bool>true</bool>
          </property>
-        </spacer>
+        </widget>
        </item>
-       <item row="1" column="0" >
-        <widget class="QCheckBox" name="allCheck" >
-         <property name="text" >
+       <item row="1" column="0">
+        <widget class="QCheckBox" name="allCheck">
+         <property name="text">
           <string>All</string>
          </property>
-         <property name="checked" >
+         <property name="checked">
           <bool>true</bool>
          </property>
         </widget>
        </item>
-       <item row="2" column="0" colspan="2" >
-        <widget class="KActionSelector" name="hostsSelector" >
-         <property name="enabled" >
-          <bool>false</bool>
+       <item row="2" column="0" colspan="2">
+        <layout class="QGridLayout" name="gridLayout">
+         <item row="0" column="0">
+          <widget class="QLabel" name="label">
+           <property name="text">
+            <string>Available:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <spacer name="horizontalSpacer">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Fixed</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>25</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item row="0" column="2">
+          <widget class="QLabel" name="label_2">
+           <property name="text">
+            <string>Selected:</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0" rowspan="4">
+          <widget class="QListWidget" name="listAvail"/>
+         </item>
+         <item row="1" column="1">
+          <spacer name="verticalSpacer">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>18</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item row="1" column="2" rowspan="4">
+          <widget class="QListWidget" name="listSelected"/>
+         </item>
+         <item row="2" column="1">
+          <widget class="QPushButton" name="pushAdd">
+           <property name="text">
+            <string/>
+           </property>
+           <property name="icon">
+            <iconset resource="PBSystem.qrc">
+             <normaloff>:/arrow-right.png</normaloff>:/arrow-right.png</iconset>
+           </property>
+          </widget>
+         </item>
+         <item row="3" column="1">
+          <widget class="QPushButton" name="pushRemove">
+           <property name="text">
+            <string/>
+           </property>
+           <property name="icon">
+            <iconset resource="PBSystem.qrc">
+             <normaloff>:/arrow-left.png</normaloff>:/arrow-left.png</iconset>
+           </property>
+          </widget>
+         </item>
+         <item row="4" column="1">
+          <spacer name="verticalSpacer_2">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>13</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+       <item row="3" column="0">
+        <spacer name="spacer37">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
          </property>
-         <property name="selectedInsertionPolicy" >
-          <enum>KActionSelector::Sorted</enum>
+         <property name="sizeType">
+          <enum>QSizePolicy::Expanding</enum>
          </property>
-         <property name="showUpDownButtons" >
-          <bool>false</bool>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>31</width>
+           <height>21</height>
+          </size>
          </property>
-        </widget>
+        </spacer>
        </item>
-       <item row="3" column="1" >
-        <widget class="QPushButton" name="startBut" >
-         <property name="text" >
+       <item row="3" column="1">
+        <widget class="QPushButton" name="startBut">
+         <property name="text">
           <string>&amp;Start</string>
          </property>
-         <property name="shortcut" >
+         <property name="shortcut">
           <string>Alt+S</string>
          </property>
         </widget>
        </item>
-       <item row="0" column="0" colspan="2" >
-        <widget class="QLabel" name="textLabel3" >
-         <property name="text" >
-          <string>This dialog will detect the fastest CVSup server for your location. Detection may take several minutes if all countries are selected. To narrow down the search, and speed up detection, please unselect 'All' below, and select your country, and a couple of its neighbours from the list below.</string>
-         </property>
-         <property name="alignment" >
-          <set>Qt::AlignVCenter</set>
-         </property>
-         <property name="wordWrap" >
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="WStackPage" >
-      <property name="geometry" >
-       <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>100</width>
-        <height>30</height>
-       </rect>
-      </property>
-      <layout class="QGridLayout" >
-       <item row="0" column="0" colspan="2" >
-        <widget class="QLabel" name="textLabel1" >
-         <property name="sizePolicy" >
-          <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+     <widget class="QWidget" name="wStackPage_2">
+      <layout class="QGridLayout" name="gridLayout_3">
+       <item row="0" column="0" colspan="2">
+        <widget class="QLabel" name="textLabel1">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <property name="text" >
+         <property name="text">
           <string>Please wait whilst PC-BSD attempts to find the fastest CVSup server available for your location.</string>
          </property>
-         <property name="alignment" >
+         <property name="alignment">
           <set>Qt::AlignVCenter</set>
          </property>
-         <property name="wordWrap" >
+         <property name="wordWrap">
           <bool>true</bool>
          </property>
         </widget>
        </item>
-       <item row="3" column="1" >
-        <widget class="QPushButton" name="cancelBut" >
-         <property name="text" >
-          <string>&amp;Cancel</string>
-         </property>
-         <property name="shortcut" >
-          <string>Alt+C</string>
-         </property>
-        </widget>
-       </item>
-       <item row="3" column="0" >
-        <spacer name="spacer38" >
-         <property name="orientation" >
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeType" >
-          <enum>QSizePolicy::Expanding</enum>
-         </property>
-         <property name="sizeHint" stdset="0" >
-          <size>
-           <width>91</width>
-           <height>21</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="1" column="0" colspan="2" >
-        <layout class="QVBoxLayout" >
+       <item row="1" column="0" colspan="2">
+        <layout class="QVBoxLayout">
          <item>
-          <widget class="QLabel" name="serverLbl" >
-           <property name="sizePolicy" >
-            <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+          <widget class="QLabel" name="serverLbl">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
-           <property name="text" >
+           <property name="text">
             <string/>
            </property>
-           <property name="alignment" >
+           <property name="alignment">
             <set>Qt::AlignCenter</set>
            </property>
-           <property name="wordWrap" >
+           <property name="wordWrap">
             <bool>true</bool>
            </property>
           </widget>
          </item>
          <item>
-          <widget class="Q3ProgressBar" name="progress" />
+          <widget class="QProgressBar" name="progress">
+           <property name="value">
+            <number>24</number>
+           </property>
+          </widget>
          </item>
         </layout>
        </item>
-       <item row="2" column="0" >
-        <spacer name="spacer39" >
-         <property name="orientation" >
+       <item row="2" column="0">
+        <spacer name="spacer39">
+         <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
-         <property name="sizeType" >
+         <property name="sizeType">
           <enum>QSizePolicy::Expanding</enum>
          </property>
-         <property name="sizeHint" stdset="0" >
+         <property name="sizeHint" stdset="0">
           <size>
            <width>31</width>
            <height>61</height>
@@ -205,41 +234,41 @@
          </property>
         </spacer>
        </item>
+       <item row="3" column="0">
+        <spacer name="spacer38">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Expanding</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>91</width>
+           <height>21</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="3" column="1">
+        <widget class="QPushButton" name="cancelBut">
+         <property name="text">
+          <string>&amp;Cancel</string>
+         </property>
+         <property name="shortcut">
+          <string>Alt+C</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
     </widget>
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>Q3WidgetStack</class>
-   <extends>Q3WidgetStack</extends>
-   <header>q3widgetstack.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>Q3ProgressBar</class>
-   <extends>QFrame</extends>
-   <header>Qt3Support/Q3ProgressBar</header>
-  </customwidget>
-  <customwidget>
-   <class>KActionSelector</class>
-   <extends>QWidget</extends>
-   <header>kactionselector.h</header>
-  </customwidget>
- </customwidgets>
- <includes>
-  <include location="global" >klocale.h</include>
-  <include location="global" >q3listbox.h</include>
-  <include location="global" >q3process.h</include>
-  <include location="global" >kmessagebox.h</include>
-  <include location="local" >kactionselector.h</include>
- </includes>
+ <layoutdefault spacing="6" margin="11"/>
  <resources>
-  <include location="PBSystem.qrc" />
+  <include location="PBSystem.qrc"/>
  </resources>
  <connections>
   <connection>
@@ -248,11 +277,11 @@
    <receiver>FastestCvsup</receiver>
    <slot>startPressed()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>20</x>
      <y>20</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -264,11 +293,11 @@
    <receiver>FastestCvsup</receiver>
    <slot>cancel()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>20</x>
      <y>20</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -280,11 +309,11 @@
    <receiver>FastestCvsup</receiver>
    <slot>allToggled()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>20</x>
      <y>20</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>

Modified: pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.cpp
===================================================================
--- pcbsd/current/kcmPBSystem/pbsystemtab.cpp	2010-07-20 13:48:22 UTC (rev 7242)
+++ pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.cpp	2010-07-22 19:14:17 UTC (rev 7252)
@@ -13,13 +13,11 @@
 #include <pcbsd-utils.h>
 #include <cvsupprogress.h>
 #include <qfiledialog.h>
+#include <QTextStream>
 #include "pbsystemtab.h"
 
 void PBSystemTab::ProgramInit()
 {
-    //Add support for PCX
-    //KImageIO::registerFormats();
-
     buttonOk->setEnabled(FALSE);
     buttonOk->setHidden(TRUE);
     
@@ -32,7 +30,7 @@
     CheckPBVer();
     
     //Get & Set CPU Type
-    labelCPU->setText(Utils::sysctl("hw.model").stripWhiteSpace());
+    labelCPU->setText(Utils::sysctl("hw.model").simplified());
     
     //Get & Set RAM
     labelMemory->setText(Utils::bytesToHumanReadable(Utils::sysctlAsInt("hw.realmem")));
@@ -56,13 +54,13 @@
 
 void PBSystemTab::CheckUname()
 {
-	GetUname = new Q3Process( this );
-	GetUname->addArgument( "uname");
-	GetUname->addArgument( "-r" ); 
-	connect( GetUname, SIGNAL(readyReadStdout()), this, SLOT(ReadUname()) );
+	QString prog = "uname";
+        QStringList args;  
+	args << "-r"; 
 		
-	if ( !GetUname->start() ) {
-	}
+	GetUname = new QProcess( this );
+	connect( GetUname, SIGNAL(readyReadStandardOutput()), this, SLOT(ReadUname()) );
+	GetUname->start(prog, args);
 }
 
 
@@ -73,7 +71,7 @@
  QString value;
  bool check = TRUE;
 
- value = settings.readEntry("/PC-BSD/Version", value, &check);
+ value = settings.value("/PC-BSD/Version", value).toString();
  
  if ( check )
  {
@@ -86,9 +84,9 @@
 void PBSystemTab::ReadUname()
 {
 
-    if (GetUname->canReadLineStdout() )
+    if (GetUname->canReadLine() )
     {	
-	labelBASEVer->setText( GetUname->readLineStdout() );
+	labelBASEVer->setText( GetUname->readLine().simplified() );
     }
     
 }
@@ -99,15 +97,14 @@
 {
     SheetFileName="";
         SheetFileName = QFileDialog::getSaveFileName(
-                    "/home/" + username + "/Desktop",
-                    "Text File (*.txt)",
                     this,
                     "save file dialog",
-                    "Choose a filename to save under" );
+                    "/home/" + username + "/Desktop",
+                    "Text File (*.txt)");
 	
       if ( ! SheetFileName.isEmpty() )
      {
-	  if ( SheetFileName.find(".txt", 0) == -1)
+	  if ( SheetFileName.indexOf(".txt", 0) == -1)
 	  {
 	      SheetFileName.append(".txt");
 	  }
@@ -130,29 +127,23 @@
 void PBSystemTab::CreateSheetFile()
 {
     
-    	SheetGenScript = new Q3Process( this );
-	SheetGenScript->addArgument( "/PCBSD/Scripts/System/GenDiagSheet.sh");
-	SheetGenScript->addArgument( SheetFileName );
-	connect( SheetGenScript, SIGNAL(processExited()), this, SLOT(finishedSheet()) );
+    	SheetGenScript = new QProcess( this );
+	QString prog = "/PCBSD/Scripts/System/GenDiagSheet.sh";
+	QStringList args;
+	args << SheetFileName;
+	connect( SheetGenScript, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(finishedSheet()) );
 		
-	if ( !SheetGenScript->start() ) {
-	     
-	}
-    
-
+	SheetGenScript->start(prog, args);
 }
 
 
 void PBSystemTab::finishedSheet()
 {
-	ViewSheet = new Q3Process( this );
-	ViewSheet->addArgument( "kedit");
-	ViewSheet->addArgument( SheetFileName );
-		
-	if ( !ViewSheet->start() ) {
-	     
-	}
-	
+	ViewSheet = new QProcess( this );
+	QString prog = "kedit";
+	QStringList args;
+	args << SheetFileName;
+	ViewSheet->start(prog, args);
 }
 
 
@@ -233,7 +224,7 @@
     
     // Load the old file, find the oldKey, remove it and replace with newKey
     QFile file( File );
-    if ( file.open( IO_ReadOnly ) ) {
+    if ( file.open( QIODevice::ReadOnly ) ) {
         QTextStream stream( &file );
 	stream.setCodec("UTF-8");
         QString line;
@@ -264,7 +255,7 @@
     
     // Save the new file
     QFile fileout( File );
-    if ( fileout.open( IO_WriteOnly ) ) {
+    if ( fileout.open( QIODevice::WriteOnly ) ) {
         QTextStream streamout( &fileout );
 	streamout.setCodec("UTF-8");
                     streamout << SavedFile;
@@ -302,7 +293,7 @@
 QString PBSystemTab::getValue( QString File, QString Key )
 {
     QFile file( File );
-    if ( file.open( IO_ReadOnly ) ) {
+    if ( file.open( QIODevice::ReadOnly ) ) {
         QTextStream stream( &file );
 	stream.setCodec("UTF-8");
         QString line;
@@ -312,7 +303,7 @@
                // If the KEY is found in the line, continue processing 
 	if ( line.indexOf(Key, 0) != -1 && line.indexOf("#") != 0)
 	{
-	    line.remove(line.find(Key, 0), Key.length());
+	    line.remove(line.indexOf(Key, 0), Key.length());
 	    //Remove instances of " and =
 	    line.remove("\"");
 	    line.remove("=");
@@ -329,7 +320,7 @@
 
 void PBSystemTab::customSplashPressed()
 {
-    QString file = KFileDialog::getOpenFileName("/home/" + username, "*.pcx");
+    QString file = QFileDialog::getOpenFileName(this, tr("Select Splash"), "/home/" + username, "*.pcx");
     if (file == "") { return; }
     
     QImage image(file, "PCX");
@@ -345,10 +336,10 @@
 	return;
     }
 
-    system("cp '" + file + "' /boot/loading-screen.pcx");
+    system("cp '" + file.toAscii() + "' /boot/loading-screen.pcx");
     splashSelect->clear();
     loadBootData();
-    splashSelect->setCurrentItem(0);
+    splashSelect->setCurrentIndex(0);
 }
 
 
@@ -357,10 +348,10 @@
     //Change registry entry
     QSettings settings;
     QString code = codeMap[splashSelect->currentText()];
-    settings.writeEntry("/PCBSD/splash-screen", code);
+    settings.setValue("/PCBSD/splash-screen", code);
     
     //Move files about
-    system("cp /PCBSD/splash-screens/loading-screen-" + code + ".pcx /boot/loading-screen.pcx");
+    system("cp /PCBSD/splash-screens/loading-screen-" + code.toAscii() + ".pcx /boot/loading-screen.pcx");
     system("chmod 644 /boot/loading-screen.pcx");
     
     if ( showBootCheck->isChecked() )
@@ -406,19 +397,20 @@
     
     QRegExp screenMatcher = QRegExp("^loading-screen-(([a-z]|[A-Z]|_)+)\\.pcx$");
     QStringList langList = QStringList();
-    KLocale langResolver = KLocale(KLocale::defaultLanguage());
+    QLocale langResolver;
     codeMap = QMap<QString, QString>();
     bool customPresent = false;
     for (QStringList::Iterator it = screensList.begin(); it != screensList.end(); it++)
     {
-	int pos  = screenMatcher.search(*it);
+	int pos  = screenMatcher.indexIn(*it);
 	if (pos > -1)
 	{
 	    QString code = screenMatcher.cap(1);
 	    if (code == "custom") { customPresent = true; }
 	    else
-	    {
-		QString langName = langResolver.languageCodeToName(code);
+	    { 
+                QLocale lang(code);
+		QString langName = langResolver.languageToString(lang.language());
                 if ( langName.isEmpty() )
                 {
 		    langName = "Splash Screen: " + code;
@@ -432,36 +424,37 @@
     
     //Populate select box
     langList.sort();
-    splashSelect->insertStringList(langList);
+    splashSelect->addItems(langList);
 
     int indexMod = 0;
     
     if (customPresent)
     {
 	codeMap[tr("Custom")] = "custom";
-	splashSelect->insertItem(tr("Custom"), 0);
+	splashSelect->addItem(tr("Custom"), 0);
 	indexMod = 1;
     }
     
     //Load current, get info from registry - /PCBSD/splash-screen
     QSettings settings;
-    QString selectedLang = settings.readEntry("/PCBSD/splash-screen", langResolver.language());
-    qDebug("Current Splash: " + selectedLang + " - User's language: " + langResolver.language());
+    QString selectedLang = settings.value("/PCBSD/splash-screen", langResolver.language()).toString();
     
-    if (selectedLang == "custom") { splashSelect->setCurrentItem(0); }
+    if (selectedLang == "custom") { splashSelect->setCurrentIndex(0); }
     else
     {
 	//If we don't have a splash for the user's language, default to english
-        QString testLangName = langResolver.languageCodeToName(selectedLang);
+	QLocale tlocale(selectedLang);
+        QString testLangName = langResolver.languageToString(tlocale.language());
 	if (codeMap[testLangName] == "") selectedLang = "en";
 
-	selectedLang = langResolver.languageCodeToName(selectedLang);
+	QLocale tlocale2(selectedLang);
+	selectedLang = langResolver.languageToString(tlocale2.language());
         if ( selectedLang.isEmpty() )
         {
 	     selectedLang = "Splash Screen: " + selectedLang;
         }
 
-	splashSelect->setCurrentItem(langList.findIndex(selectedLang) + indexMod);
+	splashSelect->setCurrentIndex(langList.indexOf(selectedLang) + indexMod);
     }
     
     if ( checkValue("/boot/loader.conf", "splash_pcx_load", "YES" ) )

Modified: pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.h
===================================================================
--- pcbsd/current/kcmPBSystem/pbsystemtab.h	2010-07-20 13:48:22 UTC (rev 7242)
+++ pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.h	2010-07-22 19:14:17 UTC (rev 7252)
@@ -4,7 +4,7 @@
 #include <qfile.h>
 #include <qmessagebox.h>
 #include <qdialog.h>
-#include <Q3Process>
+#include <QProcess>
 #include <pcbsd-utils.h>
 #include "ui_pbsystemtab.h"
 #include "portsnapprogress.h"
@@ -46,11 +46,11 @@
     QString KernDefaultTag;
     QString KernTag[50];
     QString KernFileName[50];
-    Q3Process *ViewSheet;
-    Q3Process *SheetGenScript;
+    QProcess *ViewSheet;
+    QProcess *SheetGenScript;
     QString SheetFileName;
-    Q3Process *GetPBVer;
-    Q3Process *GetUname;
+    QProcess *GetPBVer;
+    QProcess *GetUname;
     PortsnapProgress *portsnapUI;
     QString username;
     bool miscChanged;

Modified: pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.ui
===================================================================
--- pcbsd/current/kcmPBSystem/pbsystemtab.ui	2010-07-20 13:48:22 UTC (rev 7242)
+++ pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.ui	2010-07-22 19:14:17 UTC (rev 7252)
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>444</width>
-    <height>465</height>
+    <width>441</width>
+    <height>398</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -48,25 +48,99 @@
       <attribute name="title">
        <string>General</string>
       </attribute>
-      <layout class="QGridLayout">
-       <item row="6" column="2">
-        <spacer name="spacer11">
+      <layout class="QGridLayout" name="gridLayout_7">
+       <item row="0" column="0" colspan="4">
+        <layout class="QHBoxLayout">
+         <item>
+          <spacer name="spacer7">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Expanding</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>51</width>
+             <height>21</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QLabel" name="pixmapLabel3">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="pixmap">
+            <pixmap resource="PBSystem.qrc">:/NewLogoSmall.png</pixmap>
+           </property>
+           <property name="scaledContents">
+            <bool>true</bool>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignCenter</set>
+           </property>
+           <property name="wordWrap">
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="spacer8">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Expanding</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>61</width>
+             <height>21</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+       <item row="1" column="0" colspan="4">
+        <widget class="Line" name="line1">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="frameShape">
+          <enum>QFrame::HLine</enum>
+         </property>
+         <property name="frameShadow">
+          <enum>QFrame::Sunken</enum>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0" rowspan="2">
+        <spacer name="spacer17">
          <property name="orientation">
-          <enum>Qt::Vertical</enum>
+          <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeType">
           <enum>QSizePolicy::Expanding</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
-           <width>30</width>
-           <height>60</height>
+           <width>91</width>
+           <height>21</height>
           </size>
          </property>
         </spacer>
        </item>
-       <item row="5" column="3" colspan="2">
-        <spacer name="spacer4">
+       <item row="2" column="3" rowspan="2">
+        <spacer name="spacer18">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
@@ -75,13 +149,181 @@
          </property>
          <property name="sizeHint" stdset="0">
           <size>
-           <width>102</width>
+           <width>111</width>
            <height>21</height>
           </size>
          </property>
         </spacer>
        </item>
-       <item row="3" column="0" colspan="5">
+       <item row="3" column="1" colspan="2">
+        <layout class="QGridLayout" name="gridLayout_6">
+         <item row="0" column="0">
+          <widget class="QLabel" name="textLabel2">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>PC-BSD Version:</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           </property>
+           <property name="wordWrap">
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="0" column="1">
+          <widget class="QLabel" name="labelPCBSD">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+           </property>
+           <property name="wordWrap">
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QLabel" name="textLabel2_2">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="frameShape">
+            <enum>QFrame::NoFrame</enum>
+           </property>
+           <property name="frameShadow">
+            <enum>QFrame::Plain</enum>
+           </property>
+           <property name="text">
+            <string>Base Version:</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           </property>
+           <property name="wordWrap">
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="1">
+          <widget class="QLabel" name="labelBASEVer">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+           </property>
+           <property name="wordWrap">
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="0">
+          <widget class="QLabel" name="textLabel2_2_2">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string>CPU Type:</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           </property>
+           <property name="wordWrap">
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="1">
+          <widget class="QLabel" name="labelCPU">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+           </property>
+           <property name="wordWrap">
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="3" column="0">
+          <widget class="QLabel" name="textLabel2_2_3">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>0</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>System Memory:</string>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+           </property>
+           <property name="wordWrap">
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+         <item row="3" column="1">
+          <widget class="QLabel" name="labelMemory">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+           <property name="alignment">
+            <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+           </property>
+           <property name="wordWrap">
+            <bool>false</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="5" column="0" colspan="4">
         <widget class="Line" name="line2">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -97,14 +339,20 @@
          </property>
         </widget>
        </item>
-       <item row="5" column="2">
-        <widget class="QPushButton" name="buttonGenerate">
+       <item row="6" column="0" colspan="4">
+        <widget class="QLabel" name="textLabel4">
          <property name="text">
-          <string>Generate</string>
+          <string>You may also generate a diagnostic sheet, with information about your system. This sheet can be used by technicians for troubleshooting purposes.</string>
          </property>
+         <property name="alignment">
+          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
         </widget>
        </item>
-       <item row="5" column="0" colspan="2">
+       <item row="7" column="0">
         <spacer name="spacer5">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
@@ -120,197 +368,15 @@
          </property>
         </spacer>
        </item>
-       <item row="4" column="0" colspan="5">
-        <widget class="QLabel" name="textLabel4">
+       <item row="7" column="1">
+        <widget class="QPushButton" name="buttonGenerate">
          <property name="text">
-          <string>You may also generate a diagnostic sheet, with information about your system. This sheet can be used by technicians for troubleshooting purposes.</string>
+          <string>Generate</string>
          </property>
-         <property name="alignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-         </property>
-         <property name="wordWrap">
-          <bool>true</bool>
-         </property>
         </widget>
        </item>
-       <item row="2" column="1" colspan="3">
-        <layout class="QHBoxLayout">
-         <item>
-          <layout class="QVBoxLayout">
-           <item>
-            <widget class="QLabel" name="textLabel2">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="text">
-              <string>PC-BSD Version:</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-             </property>
-             <property name="wordWrap">
-              <bool>false</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="textLabel2_2">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="frameShape">
-              <enum>QFrame::NoFrame</enum>
-             </property>
-             <property name="frameShadow">
-              <enum>QFrame::Plain</enum>
-             </property>
-             <property name="text">
-              <string>Base Version:</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-             </property>
-             <property name="wordWrap">
-              <bool>false</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="textLabel2_2_2">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="text">
-              <string>CPU Type:</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-             </property>
-             <property name="wordWrap">
-              <bool>false</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="textLabel2_2_3">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="minimumSize">
-              <size>
-               <width>0</width>
-               <height>0</height>
-              </size>
-             </property>
-             <property name="text">
-              <string>System Memory:</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-             </property>
-             <property name="wordWrap">
-              <bool>false</bool>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <layout class="QVBoxLayout">
-           <item>
-            <widget class="QLabel" name="labelPCBSD">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="text">
-              <string/>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-             </property>
-             <property name="wordWrap">
-              <bool>false</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="labelBASEVer">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="text">
-              <string/>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-             </property>
-             <property name="wordWrap">
-              <bool>false</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="labelCPU">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="text">
-              <string/>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-             </property>
-             <property name="wordWrap">
-              <bool>false</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="labelMemory">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="text">
-              <string/>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
-             </property>
-             <property name="wordWrap">
-              <bool>false</bool>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-        </layout>
-       </item>
-       <item row="2" column="0">
-        <spacer name="spacer17">
+       <item row="7" column="2" colspan="2">
+        <spacer name="spacer4">
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
@@ -319,102 +385,41 @@
          </property>
          <property name="sizeHint" stdset="0">
           <size>
-           <width>91</width>
+           <width>102</width>
            <height>21</height>
           </size>
          </property>
         </spacer>
        </item>
-       <item row="2" column="4">
-        <spacer name="spacer18">
+       <item row="8" column="1">
+        <spacer name="spacer11">
          <property name="orientation">
-          <enum>Qt::Horizontal</enum>
+          <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeType">
           <enum>QSizePolicy::Expanding</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
-           <width>111</width>
-           <height>21</height>
+           <width>30</width>
+           <height>60</height>
           </size>
          </property>
         </spacer>
        </item>
-       <item row="1" column="0" colspan="5">
-        <widget class="Line" name="line1">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
+       <item row="4" column="0" colspan="4">
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
          </property>
-         <property name="frameShape">
-          <enum>QFrame::HLine</enum>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
          </property>
-         <property name="frameShadow">
-          <enum>QFrame::Sunken</enum>
-         </property>
-        </widget>
+        </spacer>
        </item>
-       <item row="0" column="0" colspan="5">
-        <layout class="QHBoxLayout">
-         <item>
-          <spacer name="spacer7">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeType">
-            <enum>QSizePolicy::Expanding</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>51</width>
-             <height>21</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QLabel" name="pixmapLabel3">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="pixmap">
-            <pixmap resource="PBSystem.qrc">:/NewLogoSmall.png</pixmap>
-           </property>
-           <property name="scaledContents">
-            <bool>true</bool>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignCenter</set>
-           </property>
-           <property name="wordWrap">
-            <bool>false</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="spacer8">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeType">
-            <enum>QSizePolicy::Expanding</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>61</width>
-             <height>21</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="Widget9">
@@ -490,28 +495,6 @@
        <string>Tasks</string>
       </attribute>
       <layout class="QGridLayout">
-       <item row="1" column="0">
-        <widget class="Q3ButtonGroup" name="portsnapBGrp">
-         <property name="title">
-          <string>Ports Console</string>
-         </property>
-         <layout class="QGridLayout">
-          <item row="0" column="0">
-           <widget class="QPushButton" name="fetchPortsConsoleBut">
-            <property name="text">
-             <string>Fetch &amp;Ports Tree</string>
-            </property>
-            <property name="shortcut">
-             <string>Alt+P</string>
-            </property>
-            <attribute name="buttonGroup">
-             <string/>
-            </attribute>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
        <item row="5" column="0">
         <spacer name="spacer27">
          <property name="orientation">
@@ -529,11 +512,11 @@
         </spacer>
        </item>
        <item row="2" column="0">
-        <widget class="Q3ButtonGroup" name="cvsupBGrp">
+        <widget class="QGroupBox" name="groupBox_2">
          <property name="title">
-          <string>System Tasks - Advanced Users Only</string>
+          <string>System Tasks - Advanced Users</string>
          </property>
-         <layout class="QGridLayout" name="gridLayout">
+         <layout class="QGridLayout" name="gridLayout_4">
           <item row="0" column="0">
            <widget class="QPushButton" name="fetchSourceBut">
             <property name="text">
@@ -542,9 +525,6 @@
             <property name="shortcut">
              <string>Alt+S</string>
             </property>
-            <attribute name="buttonGroup">
-             <string/>
-            </attribute>
            </widget>
           </item>
           <item row="1" column="0">
@@ -552,14 +532,30 @@
             <property name="text">
              <string>Fetch System P&amp;orts Tree</string>
             </property>
-            <attribute name="buttonGroup">
-             <string/>
-            </attribute>
            </widget>
           </item>
          </layout>
         </widget>
        </item>
+       <item row="1" column="0">
+        <widget class="QGroupBox" name="groupBox_3">
+         <property name="title">
+          <string>Ports Console</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout">
+          <item row="0" column="0">
+           <widget class="QPushButton" name="fetchPortsConsoleBut">
+            <property name="text">
+             <string>Fetch &amp;Ports Tree</string>
+            </property>
+            <property name="shortcut">
+             <string>Alt+P</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="TabPage">
@@ -567,12 +563,28 @@
        <string>Misc</string>
       </attribute>
       <layout class="QGridLayout">
+       <item row="1" column="0">
+        <spacer name="spacer37">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Expanding</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>30</width>
+           <height>190</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
        <item row="0" column="0">
-        <widget class="Q3ButtonGroup" name="splashGroup">
+        <widget class="QGroupBox" name="groupBox_4">
          <property name="title">
           <string>Boot Screen</string>
          </property>
-         <layout class="QGridLayout">
+         <layout class="QGridLayout" name="gridLayout_5">
           <item row="0" column="0" colspan="2">
            <widget class="QCheckBox" name="showBootCheck">
             <property name="text">
@@ -584,24 +596,8 @@
             <property name="checked">
              <bool>true</bool>
             </property>
-            <attribute name="buttonGroup">
-             <string/>
-            </attribute>
            </widget>
           </item>
-          <item row="2" column="1">
-           <widget class="QPushButton" name="customBut">
-            <property name="text">
-             <string>&amp;Custom...</string>
-            </property>
-            <property name="shortcut">
-             <string>Alt+C</string>
-            </property>
-            <attribute name="buttonGroup">
-             <string/>
-            </attribute>
-           </widget>
-          </item>
           <item row="1" column="0" colspan="2">
            <widget class="QComboBox" name="splashSelect"/>
           </item>
@@ -621,25 +617,19 @@
             </property>
            </spacer>
           </item>
+          <item row="2" column="1">
+           <widget class="QPushButton" name="customBut">
+            <property name="text">
+             <string>&amp;Custom...</string>
+            </property>
+            <property name="shortcut">
+             <string>Alt+C</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </item>
-       <item row="1" column="0">
-        <spacer name="spacer37">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeType">
-          <enum>QSizePolicy::Expanding</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>30</width>
-           <height>190</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
       </layout>
      </widget>
     </widget>
@@ -663,48 +653,20 @@
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>Q3GroupBox</class>
-   <extends>QGroupBox</extends>
-   <header>Qt3Support/Q3GroupBox</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>Q3ButtonGroup</class>
-   <extends>Q3GroupBox</extends>
-   <header>Qt3Support/Q3ButtonGroup</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
  <tabstops>
   <tabstop>tabWidget</tabstop>
   <tabstop>buttonGenerate</tabstop>
   <tabstop>buttonOk</tabstop>
   <tabstop>checkKernATAPI</tabstop>
   <tabstop>checkKernDelay</tabstop>
-  <tabstop>fetchSourceBut</tabstop>
-  <tabstop>fetchPortsConsoleBut</tabstop>
-  <tabstop>showBootCheck</tabstop>
-  <tabstop>splashSelect</tabstop>
-  <tabstop>customBut</tabstop>
  </tabstops>
  <includes>
-  <include location="local">q3process.h</include>
-  <include location="local">q3filedialog.h</include>
   <include location="local">qmessagebox.h</include>
   <include location="local">qfile.h</include>
   <include location="local">qsettings.h</include>
   <include location="local">cvsupprogress.h</include>
   <include location="local">portsnapprogress.h</include>
-  <include location="local">kgenericfactory.h</include>
-  <include location="local">kcmodule.h</include>
-  <include location="local">kglobal.h</include>
   <include location="global">qregexp.h</include>
-  <include location="global">kio/job.h</include>
-  <include location="global">kfiledialog.h</include>
-  <include location="global">kimageio.h</include>
   <include location="global">pcbsd-utils.h</include>
  </includes>
  <resources>

Modified: pcbsd/current/src-qt4/pc-sysmanager/portsnapprogress.cpp
===================================================================
--- pcbsd/current/kcmPBSystem/portsnapprogress.cpp	2010-07-20 13:48:22 UTC (rev 7242)
+++ pcbsd/current/src-qt4/pc-sysmanager/portsnapprogress.cpp	2010-07-22 19:14:17 UTC (rev 7252)
@@ -12,6 +12,7 @@
 #include "portsnapprogress.h"
 #include <qtextstream.h>
 #include <QProcess>
+#include <QDebug>
 #include <QDir>
 
 void PortsnapProgress::init(bool usingPortConsole)
@@ -20,8 +21,8 @@
     QFile newsnap("/PCBSD/Scripts/System/portsnap.sh");
     if (! newsnap.exists()) {
 	QFile oldsnap("/usr/sbin/portsnap");
-	oldsnap.open(IO_ReadOnly);
-	newsnap.open(IO_WriteOnly);
+	oldsnap.open(QIODevice::ReadOnly);
+	newsnap.open(QIODevice::WriteOnly);
 	QTextStream oldstream(&oldsnap);
 	oldstream.setCodec("UTF-8");
 	QTextStream newstream(&newsnap);
@@ -31,7 +32,7 @@
 	while (!oldstream.atEnd()) {
 	    line = oldstream.readLine();
 	    //Remove the six lines from the file, we want to run non-interactively!
-	    if (line.find("if [ ! -t 0 ]; then") != -1) {
+	    if (line.indexOf("if [ ! -t 0 ]; then") != -1) {
 		i = 6;
 	    }
 	    if ( i > 0) {
@@ -80,7 +81,7 @@
   while (portsnap->canReadLine() )
   {
     QString output = portsnap->readLine();
-    qDebug("Portsnap Fetch: " + output);
+    qDebug() << "Portsnap Fetch: " + output;
     taskProgressLbl->setText(displayString);
   }
 }
@@ -131,7 +132,7 @@
   while( portsnap->canReadLine() )
   {
     QString output = portsnap->readLine();
-    qDebug("Portsnap Update: " + output);
+    qDebug() << "Portsnap Update: " + output;
     taskProgressLbl->setText(output);
   }
 }

Modified: pcbsd/current/src-qt4/pc-sysmanager/portsnapprogress.ui
===================================================================
--- pcbsd/current/kcmPBSystem/portsnapprogress.ui	2010-07-20 13:48:22 UTC (rev 7242)
+++ pcbsd/current/src-qt4/pc-sysmanager/portsnapprogress.ui	2010-07-22 19:14:17 UTC (rev 7252)
@@ -74,9 +74,7 @@
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <includes>
-  <include location="global">q3process.h</include>
   <include location="global">sys/types.h</include>
   <include location="global">sys/stat.h</include>
   <include location="global">qmessagebox.h</include>

Modified: pcbsd/current/src-qt4/src-qt4.pro
===================================================================
--- pcbsd/current/src-qt4/src-qt4.pro	2010-07-22 16:15:31 UTC (rev 7251)
+++ pcbsd/current/src-qt4/src-qt4.pro	2010-07-22 19:14:17 UTC (rev 7252)
@@ -5,4 +5,5 @@
 	 pc-crashhandler \
 	 pc-usermanager \
 	 pc-servicemanager \
+	 pc-sysmanager \
 	 pc-xgui



More information about the Commits mailing list