[PC-BSD Commits] r2173 - pcbsd/trunk/kcmPBSystem

svn at pcbsd.org svn at pcbsd.org
Wed Jun 25 10:09:03 PDT 2008


Author: kris
Date: 2008-06-25 10:09:03 -0700 (Wed, 25 Jun 2008)
New Revision: 2173

Added:
   pcbsd/trunk/kcmPBSystem/PBSystem.qrc
   pcbsd/trunk/kcmPBSystem/cvsupprogress.cpp
   pcbsd/trunk/kcmPBSystem/cvsupprogress.h
   pcbsd/trunk/kcmPBSystem/fastestcvsup.cpp
   pcbsd/trunk/kcmPBSystem/fastestcvsup.h
   pcbsd/trunk/kcmPBSystem/notroot.cpp
   pcbsd/trunk/kcmPBSystem/notroot.h
   pcbsd/trunk/kcmPBSystem/pbsystemtab.cpp
   pcbsd/trunk/kcmPBSystem/pbsystemtab.h
   pcbsd/trunk/kcmPBSystem/portsnapprogress.cpp
   pcbsd/trunk/kcmPBSystem/portsnapprogress.h
Modified:
   pcbsd/trunk/kcmPBSystem/PBSystem.pro
   pcbsd/trunk/kcmPBSystem/cvsupprogress.ui
   pcbsd/trunk/kcmPBSystem/fastestcvsup.ui
   pcbsd/trunk/kcmPBSystem/kcm.cpp
   pcbsd/trunk/kcmPBSystem/kcm.h
   pcbsd/trunk/kcmPBSystem/notroot.ui
   pcbsd/trunk/kcmPBSystem/pbsystemtab.ui
   pcbsd/trunk/kcmPBSystem/portsnapprogress.ui
Log:


Added KDE4 version of kcmPBSystem



Modified: pcbsd/trunk/kcmPBSystem/PBSystem.pro
===================================================================
--- pcbsd/trunk/kcmPBSystem/PBSystem.pro	2008-06-25 17:08:39 UTC (rev 2172)
+++ pcbsd/trunk/kcmPBSystem/PBSystem.pro	2008-06-25 17:09:03 UTC (rev 2173)
@@ -3,13 +3,13 @@
 
 CONFIG	+= qt warn_on release
 
-LIBS	+= -lpcbsd
+LIBS	+= -lpcbsd -L/usr/local/kde4/lib -lkdecore -lkio -lkdeui -Ikdelibs
 
-INCLUDEPATH	+= /PCBSD/includes
+INCLUDEPATH	+= /PCBSD/includes /usr/local/kde4/include
 
-HEADERS	+= kcm.h
+HEADERS	+= kcm.h notroot.h cvsupprogress.h fastestcvsup.h pbsystemtab.h portsnapprogress.h
 
-SOURCES	+= kcm.cpp
+SOURCES	+= kcm.cpp notroot.cpp cvsupprogress.cpp fastestcvsup.cpp pbsystemtab.cpp portsnapprogress.cpp
 
 FORMS	= pbsystemtab.ui \
 	cvsupprogress.ui \
@@ -17,22 +17,12 @@
 	notroot.ui \
 	fastestcvsup.ui
 
-IMAGES	= NewLogoSmall.png \
-	system.png
+RESOURCES = PBSystem.qrc 
 
-TARGET  = kcm_pcbsdsystool
-DESTDIR = /usr/local/lib/kde3/
+TARGET  = kcm_pcbsdsystem
 
+DESTDIR = /usr/local/kde4/lib/kde4/
 
-
-
-
 TRANSLATIONS = PBSystem_en.ts
 
-unix {
-  UI_DIR = .ui
-  MOC_DIR = .moc
-  OBJECTS_DIR = .obj
-}
-
-
+QT += qt3support

Added: pcbsd/trunk/kcmPBSystem/PBSystem.qrc

Added: pcbsd/trunk/kcmPBSystem/cvsupprogress.cpp

Added: pcbsd/trunk/kcmPBSystem/cvsupprogress.h

Modified: pcbsd/trunk/kcmPBSystem/cvsupprogress.ui
===================================================================
--- pcbsd/trunk/kcmPBSystem/cvsupprogress.ui	2008-06-25 17:08:39 UTC (rev 2172)
+++ pcbsd/trunk/kcmPBSystem/cvsupprogress.ui	2008-06-25 17:09:03 UTC (rev 2173)
@@ -1,184 +1,182 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>CVSUpProgress</class>
-<widget class="QDialog">
-    <property name="name">
-        <cstring>CVSUpProgress</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>361</width>
-            <height>328</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>CSup Progress</string>
-    </property>
-    <property name="modal">
-        <bool>true</bool>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <widget class="QPushButton" row="5" column="2">
-            <property name="name">
-                <cstring>cancelBut</cstring>
-            </property>
-            <property name="text">
-                <string>&amp;Start</string>
-            </property>
-            <property name="accel">
-                <string>Alt+S</string>
-            </property>
-            <property name="default">
-                <bool>true</bool>
-            </property>
-        </widget>
-        <spacer row="5" column="0" rowspan="1" colspan="2">
-            <property name="name">
-                <cstring>spacer19</cstring>
-            </property>
-            <property name="orientation">
-                <enum>Horizontal</enum>
-            </property>
-            <property name="sizeType">
-                <enum>Expanding</enum>
-            </property>
-            <property name="sizeHint">
-                <size>
-                    <width>481</width>
-                    <height>31</height>
-                </size>
-            </property>
-        </spacer>
-        <widget class="QLabel" row="0" column="0">
-            <property name="name">
-                <cstring>progressLabel</cstring>
-            </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>5</hsizetype>
-                    <vsizetype>5</vsizetype>
-                    <horstretch>1</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
-            </property>
-            <property name="frameShape">
-                <enum>NoFrame</enum>
-            </property>
-            <property name="frameShadow">
-                <enum>Plain</enum>
-            </property>
-            <property name="text">
-                <string>Please wait...</string>
-            </property>
-        </widget>
-        <widget class="QPushButton" row="0" column="1" rowspan="1" colspan="2">
-            <property name="name">
-                <cstring>changeServerBut</cstring>
-            </property>
-            <property name="text">
-                <string>&amp;Find Fastest...</string>
-            </property>
-            <property name="accel">
-                <string>Alt+F</string>
-            </property>
-        </widget>
-        <widget class="QTextEdit" row="4" column="0" rowspan="1" colspan="3">
-            <property name="name">
-                <cstring>outputBox</cstring>
-            </property>
-            <property name="enabled">
-                <bool>true</bool>
-            </property>
-            <property name="paletteBackgroundColor">
-                <color>
-                    <red>199</red>
-                    <green>199</green>
-                    <blue>199</blue>
-                </color>
-            </property>
-            <property name="readOnly">
-                <bool>true</bool>
-            </property>
-        </widget>
-        <widget class="QButtonGroup" row="3" column="0" rowspan="1" colspan="3">
-            <property name="name">
-                <cstring>srcSelectionGrp</cstring>
-            </property>
-            <property name="title">
-                <string></string>
-            </property>
-        </widget>
-        <widget class="QLabel" row="2" column="0">
-            <property name="name">
-                <cstring>textLabel1</cstring>
-            </property>
-            <property name="text">
-                <string>Parts of sourcecode to download:</string>
-            </property>
-        </widget>
-        <widget class="Line" row="1" column="0" rowspan="1" colspan="3">
-            <property name="name">
-                <cstring>line4</cstring>
-            </property>
-            <property name="frameShape">
-                <enum>HLine</enum>
-            </property>
-            <property name="frameShadow">
-                <enum>Sunken</enum>
-            </property>
-            <property name="orientation">
-                <enum>Horizontal</enum>
-            </property>
-        </widget>
-    </grid>
-</widget>
-<connections>
-    <connection>
-        <sender>cancelBut</sender>
-        <signal>clicked()</signal>
-        <receiver>CVSUpProgress</receiver>
-        <slot>quitSlot()</slot>
-    </connection>
-    <connection>
-        <sender>changeServerBut</sender>
-        <signal>clicked()</signal>
-        <receiver>CVSUpProgress</receiver>
-        <slot>changeServers()</slot>
-    </connection>
-</connections>
-<includes>
-    <include location="global" impldecl="in declaration">qprocess.h</include>
-    <include location="local" impldecl="in declaration">fastestcvsup.h</include>
-    <include location="global" impldecl="in declaration">kmessagebox.h</include>
-    <include location="global" impldecl="in declaration">kio/netaccess.h</include>
-    <include location="global" impldecl="in declaration">qcheckbox.h</include>
-    <include location="local" impldecl="in implementation">cvsupprogress.ui.h</include>
-</includes>
-<variables>
-    <variable access="private">QString supfile;</variable>
-    <variable access="private">QProcess *cvsup;</variable>
-    <variable access="private">int step;</variable>
-    <variable access="private">FastestCvsup *changeUi;</variable>
-    <variable access="private">QStringList srcNames;</variable>
-</variables>
-<slots>
-    <slot access="private">displayOutput()</slot>
-    <slot access="private">cvsupFinished()</slot>
-    <slot access="private">quitSlot()</slot>
-    <slot access="private">changeServers()</slot>
-    <slot>setCvsupServer( QString * server )</slot>
-    <slot>writeServer( QString server )</slot>
-    <slot access="private">boxTicked()</slot>
-</slots>
-<functions>
-    <function>setup( QString task, QString supfile )</function>
-    <function access="private">start()</function>
-    <function access="private" returnType="QString">getServer()</function>
-</functions>
-<pixmapinproject/>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
+<ui version="4.0" >
+ <class>CVSUpProgress</class>
+ <widget class="QDialog" name="CVSUpProgress" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>361</width>
+    <height>328</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>CSup Progress</string>
+  </property>
+  <property name="windowIcon" >
+   <iconset resource="PBSystem.qrc" >
+    <normaloff>:/system.png</normaloff>:/system.png</iconset>
+  </property>
+  <property name="modal" >
+   <bool>true</bool>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="5" column="2" >
+    <widget class="QPushButton" name="cancelBut" >
+     <property name="text" >
+      <string>&amp;Start</string>
+     </property>
+     <property name="shortcut" >
+      <string>Alt+S</string>
+     </property>
+     <property name="default" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0" colspan="2" >
+    <spacer name="spacer19" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>481</width>
+       <height>31</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="0" >
+    <widget class="QLabel" name="progressLabel" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
+       <horstretch>1</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>Please wait...</string>
+     </property>
+     <property name="wordWrap" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1" colspan="2" >
+    <widget class="QPushButton" name="changeServerBut" >
+     <property name="text" >
+      <string>&amp;Find Fastest...</string>
+     </property>
+     <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" >
+      <string>Parts of sourcecode to download:</string>
+     </property>
+     <property name="wordWrap" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="3" >
+    <widget class="Line" name="line4" >
+     <property name="frameShape" >
+      <enum>QFrame::HLine</enum>
+     </property>
+     <property name="frameShadow" >
+      <enum>QFrame::Sunken</enum>
+     </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>
+ <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>
+ </includes>
+ <resources>
+  <include location="PBSystem.qrc" />
+ </resources>
+ <connections>
+  <connection>
+   <sender>cancelBut</sender>
+   <signal>clicked()</signal>
+   <receiver>CVSUpProgress</receiver>
+   <slot>quitSlot()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>changeServerBut</sender>
+   <signal>clicked()</signal>
+   <receiver>CVSUpProgress</receiver>
+   <slot>changeServers()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

Added: pcbsd/trunk/kcmPBSystem/fastestcvsup.cpp

Added: pcbsd/trunk/kcmPBSystem/fastestcvsup.h

Modified: pcbsd/trunk/kcmPBSystem/fastestcvsup.ui
===================================================================
--- pcbsd/trunk/kcmPBSystem/fastestcvsup.ui	2008-06-25 17:08:39 UTC (rev 2172)
+++ pcbsd/trunk/kcmPBSystem/fastestcvsup.ui	2008-06-25 17:09:03 UTC (rev 2173)
@@ -1,280 +1,294 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>FastestCvsup</class>
-<widget class="QDialog">
-    <property name="name">
-        <cstring>FastestCvsup</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>517</width>
-            <height>458</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>Change CVSup server</string>
-    </property>
-    <property name="modal">
-        <bool>true</bool>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>0</number>
-        </property>
-        <property name="spacing">
-            <number>0</number>
-        </property>
-        <widget class="QWidgetStack" row="0" column="0">
-            <property name="name">
-                <cstring>mainWidget</cstring>
-            </property>
-            <property name="frameShape">
-                <enum>NoFrame</enum>
-            </property>
-            <property name="frameShadow">
-                <enum>Plain</enum>
-            </property>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>WStackPage</cstring>
-                </property>
-                <attribute name="id">
-                    <number>0</number>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <spacer row="3" column="0">
-                        <property name="name">
-                            <cstring>spacer37</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>31</width>
-                                <height>21</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="QCheckBox" row="1" column="0">
-                        <property name="name">
-                            <cstring>allCheck</cstring>
-                        </property>
-                        <property name="text">
-                            <string>All</string>
-                        </property>
-                        <property name="checked">
-                            <bool>true</bool>
-                        </property>
-                    </widget>
-                    <widget class="KActionSelector" row="2" column="0" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>hostsSelector</cstring>
-                        </property>
-                        <property name="enabled">
-                            <bool>false</bool>
-                        </property>
-                        <property name="selectedInsertionPolicy">
-                            <enum>Sorted</enum>
-                        </property>
-                        <property name="showUpDownButtons">
-                            <bool>false</bool>
-                        </property>
-                    </widget>
-                    <widget class="QPushButton" row="3" column="1">
-                        <property name="name">
-                            <cstring>startBut</cstring>
-                        </property>
-                        <property name="text">
-                            <string>&amp;Start</string>
-                        </property>
-                        <property name="accel">
-                            <string>Alt+S</string>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>textLabel3</cstring>
-                        </property>
-                        <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>WordBreak|AlignVCenter</set>
-                        </property>
-                    </widget>
-                </grid>
-            </widget>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>WStackPage</cstring>
-                </property>
-                <attribute name="id">
-                    <number>1</number>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <widget class="QLabel" row="0" column="0" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>textLabel1</cstring>
-                        </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>5</hsizetype>
-                                <vsizetype>5</vsizetype>
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                        <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">
-                            <set>WordBreak|AlignVCenter</set>
-                        </property>
-                    </widget>
-                    <widget class="QPushButton" row="3" column="1">
-                        <property name="name">
-                            <cstring>cancelBut</cstring>
-                        </property>
-                        <property name="text">
-                            <string>&amp;Cancel</string>
-                        </property>
-                        <property name="accel">
-                            <string>Alt+C</string>
-                        </property>
-                    </widget>
-                    <spacer row="3" column="0">
-                        <property name="name">
-                            <cstring>spacer38</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>91</width>
-                                <height>21</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>layout1</cstring>
-                        </property>
-                        <vbox>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <widget class="QLabel">
-                                <property name="name">
-                                    <cstring>serverLbl</cstring>
-                                </property>
-                                <property name="sizePolicy">
-                                    <sizepolicy>
-                                        <hsizetype>5</hsizetype>
-                                        <vsizetype>0</vsizetype>
-                                        <horstretch>0</horstretch>
-                                        <verstretch>0</verstretch>
-                                    </sizepolicy>
-                                </property>
-                                <property name="text">
-                                    <string></string>
-                                </property>
-                                <property name="alignment">
-                                    <set>WordBreak|AlignCenter</set>
-                                </property>
-                            </widget>
-                            <widget class="QProgressBar">
-                                <property name="name">
-                                    <cstring>progress</cstring>
-                                </property>
-                            </widget>
-                        </vbox>
-                    </widget>
-                    <spacer row="2" column="0">
-                        <property name="name">
-                            <cstring>spacer39</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>31</width>
-                                <height>61</height>
-                            </size>
-                        </property>
-                    </spacer>
-                </grid>
-            </widget>
+<ui version="4.0" >
+ <class>FastestCvsup</class>
+ <widget class="QDialog" name="FastestCvsup" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>517</width>
+    <height>458</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Change CVSup server</string>
+  </property>
+  <property name="windowIcon" >
+   <iconset resource="PBSystem.qrc" >
+    <normaloff>:/system.png</normaloff>:/system.png</iconset>
+  </property>
+  <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>
+     </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>
+         </property>
+         <property name="sizeType" >
+          <enum>QSizePolicy::Expanding</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>31</width>
+           <height>21</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="1" column="0" >
+        <widget class="QCheckBox" name="allCheck" >
+         <property name="text" >
+          <string>All</string>
+         </property>
+         <property name="checked" >
+          <bool>true</bool>
+         </property>
         </widget>
-    </grid>
-</widget>
-<connections>
-    <connection>
-        <sender>startBut</sender>
-        <signal>clicked()</signal>
-        <receiver>FastestCvsup</receiver>
-        <slot>startPressed()</slot>
-    </connection>
-    <connection>
-        <sender>cancelBut</sender>
-        <signal>clicked()</signal>
-        <receiver>FastestCvsup</receiver>
-        <slot>cancel()</slot>
-    </connection>
-    <connection>
-        <sender>allCheck</sender>
-        <signal>clicked()</signal>
-        <receiver>FastestCvsup</receiver>
-        <slot>allToggled()</slot>
-    </connection>
-</connections>
-<includes>
-    <include location="global" impldecl="in declaration">klocale.h</include>
-    <include location="global" impldecl="in declaration">qlistbox.h</include>
-    <include location="global" impldecl="in declaration">qprocess.h</include>
-    <include location="global" impldecl="in declaration">kmessagebox.h</include>
-    <include location="local" impldecl="in implementation">fastestcvsup.ui.h</include>
-</includes>
-<variables>
-    <variable access="private">QProcess *process;</variable>
-    <variable access="private">QMap&lt;QString, QString&gt; serverMap;</variable>
-</variables>
-<signals>
-    <signal>found(QString *fastest);</signal>
-</signals>
-<slots>
-    <slot>startPressed()</slot>
-    <slot>readOutput()</slot>
-    <slot access="private">cancel()</slot>
-    <slot access="private">allToggled()</slot>
-</slots>
-<functions>
-    <function access="private">init()</function>
-</functions>
-<pixmapinproject/>
-<layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kactionselector.h</includehint>
-</includehints>
-</UI>
+       </item>
+       <item row="2" column="0" colspan="2" >
+        <widget class="KActionSelector" name="hostsSelector" >
+         <property name="enabled" >
+          <bool>false</bool>
+         </property>
+         <property name="selectedInsertionPolicy" >
+          <enum>KActionSelector::Sorted</enum>
+         </property>
+         <property name="showUpDownButtons" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="1" >
+        <widget class="QPushButton" name="startBut" >
+         <property name="text" >
+          <string>&amp;Start</string>
+         </property>
+         <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" >
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <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" >
+          <set>Qt::AlignVCenter</set>
+         </property>
+         <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>
+          <widget class="QLabel" name="serverLbl" >
+           <property name="sizePolicy" >
+            <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="text" >
+            <string/>
+           </property>
+           <property name="alignment" >
+            <set>Qt::AlignCenter</set>
+           </property>
+           <property name="wordWrap" >
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="Q3ProgressBar" name="progress" />
+         </item>
+        </layout>
+       </item>
+       <item row="2" column="0" >
+        <spacer name="spacer39" >
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType" >
+          <enum>QSizePolicy::Expanding</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>31</width>
+           <height>61</height>
+          </size>
+         </property>
+        </spacer>
+       </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>
+ <resources>
+  <include location="PBSystem.qrc" />
+ </resources>
+ <connections>
+  <connection>
+   <sender>startBut</sender>
+   <signal>clicked()</signal>
+   <receiver>FastestCvsup</receiver>
+   <slot>startPressed()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>cancelBut</sender>
+   <signal>clicked()</signal>
+   <receiver>FastestCvsup</receiver>
+   <slot>cancel()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>allCheck</sender>
+   <signal>clicked()</signal>
+   <receiver>FastestCvsup</receiver>
+   <slot>allToggled()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

Modified: pcbsd/trunk/kcmPBSystem/kcm.cpp
===================================================================
--- pcbsd/trunk/kcmPBSystem/kcm.cpp	2008-06-25 17:08:39 UTC (rev 2172)
+++ pcbsd/trunk/kcmPBSystem/kcm.cpp	2008-06-25 17:09:03 UTC (rev 2173)
@@ -2,31 +2,38 @@
 
 #include <klocale.h>
 #include <kglobal.h>
-#include <kparts/genericfactory.h>
-#include <notroot.h>
+#include <kgenericfactory.h>
+#include "notroot.h"
 #include <kcm.h>
+#include <utils.h>
+#include "pbsystemtab.h"
+#include <qstring.h>
 
+K_PLUGIN_FACTORY(PCBSDSysFactory,
+                 registerPlugin<PCBSDKCModule>();
+                )
+K_EXPORT_PLUGIN(PCBSDSysFactory("kcmpcbsdsystem"))
 
-PCBSDKCModule::PCBSDKCModule(QWidget  *parent,
-                           const char  *name,
-                           __unused  const QStringList &  list)
-   :    KCModule(parent, name)
+PBSystemTab *systab;
+
+
+PCBSDKCModule::PCBSDKCModule(QWidget *parent, const QVariantList &lst)
+   :    KCModule(PCBSDSysFactory::componentData(), parent, lst)
 {
   layout = new QGridLayout(this);
   layout->setAutoAdd(true);
   QString LANG="PBSystem";
-  KGlobal::locale()->insertCatalogue(LANG);
+  //KGlobal::locale()->insertCatalogue(LANG);
   
   buttons();
   setButtons(KCModule::Apply);
-  systab = new PBSystemTab(parent);
-  connect(systab, SIGNAL(changed()), this, SLOT(configChanged()));
+  systab = new PBSystemTab();
   systab->ProgramInit();
   
   if ( checkRoot() ) { systab->reparent(this, QPoint()); }
   else
   {
-      NotRoot *nroot = new NotRoot(parent);
+      NotRoot *nroot = new NotRoot();
       nroot->reparent(this, QPoint());
   }
    
@@ -63,29 +70,3 @@
 }
 
 
-/*
-* Start the KFactory Creation  
-*
-*/
-
-
-
-typedef KGenericFactory<PCBSDSysTool, QWidget> PCBSDSysToolFactory;
-K_EXPORT_COMPONENT_FACTORY(kcm_PCBSDSysTool, PCBSDSysToolFactory("kcm_pcbsdsystool"))
-
-extern "C" {
-   KCModule *create_pcbsdsystool(QWidget  *parent, const char  *name) {
-      return new PCBSDSysTool(parent, name);
-   }
-}
-
-PCBSDSysTool::PCBSDSysTool( QWidget  *parent,  const char *name,  const QStringList&) : PCBSDKCModule( parent, name)
-{
-}
-
-PCBSDSysTool::~PCBSDSysTool() {
-}
-
-QString  PCBSDSysTool::kcmoduleName() {
-   return  "pcbsdsystool";
-}

Modified: pcbsd/trunk/kcmPBSystem/kcm.h
===================================================================
--- pcbsd/trunk/kcmPBSystem/kcm.h	2008-06-25 17:08:39 UTC (rev 2172)
+++ pcbsd/trunk/kcmPBSystem/kcm.h	2008-06-25 17:09:03 UTC (rev 2173)
@@ -3,17 +3,17 @@
 #include <qdialog.h>
 #include <pbsystemtab.h>
 #include <kcmodule.h>
+#include <qstring.h>
+#include <utils.h>
+class KConfigDialogManager;
 
 
 
 class  PCBSDKCModule : public KCModule {
    Q_OBJECT
 
-private:
-    PBSystemTab *systab;
-    
 public:
-   PCBSDKCModule(QWidget * = NULL,  const char * = NULL,  const QStringList & = QStringList());
+   PCBSDKCModule(QWidget *parent =0,  const QVariantList &args=QVariantList());
    ~PCBSDKCModule();
    
    void load();
@@ -29,14 +29,3 @@
 
 
 
-class PCBSDSysTool: public PCBSDKCModule { 
-   Q_OBJECT
-   
-public:
-   PCBSDSysTool(QWidget * = NULL,  const char * = NULL,  const QStringList & = QStringList() );
-   virtual  ~PCBSDSysTool();
-void   getParent(QWidget * = NULL);
-   
-protected:
-   QString      kcmoduleName();
-};

Added: pcbsd/trunk/kcmPBSystem/notroot.cpp

Added: pcbsd/trunk/kcmPBSystem/notroot.h

Modified: pcbsd/trunk/kcmPBSystem/notroot.ui
===================================================================
--- pcbsd/trunk/kcmPBSystem/notroot.ui	2008-06-25 17:08:39 UTC (rev 2172)
+++ pcbsd/trunk/kcmPBSystem/notroot.ui	2008-06-25 17:09:03 UTC (rev 2173)
@@ -1,175 +1,222 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>NotRoot</class>
-<widget class="QDialog">
-    <property name="name">
-        <cstring>NotRoot</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>552</width>
-            <height>409</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>Root Access Required</string>
-    </property>
-    <property name="icon">
-        <pixmap>system.png</pixmap>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <spacer row="0" column="0" rowspan="1" colspan="2">
-            <property name="name">
-                <cstring>spacer3_2</cstring>
-            </property>
-            <property name="orientation">
-                <enum>Horizontal</enum>
-            </property>
-            <property name="sizeType">
-                <enum>Expanding</enum>
-            </property>
-            <property name="sizeHint">
-                <size>
-                    <width>151</width>
-                    <height>21</height>
-                </size>
-            </property>
-        </spacer>
-        <widget class="QLabel" row="0" column="2">
-            <property name="name">
-                <cstring>pixmapLabel2</cstring>
-            </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>0</hsizetype>
-                    <vsizetype>5</vsizetype>
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
-            </property>
-            <property name="pixmap">
-                <pixmap>NewLogoSmall.png</pixmap>
-            </property>
-            <property name="scaledContents">
-                <bool>true</bool>
-            </property>
-        </widget>
-        <spacer row="0" column="3" rowspan="1" colspan="2">
-            <property name="name">
-                <cstring>spacer4_2</cstring>
-            </property>
-            <property name="orientation">
-                <enum>Horizontal</enum>
-            </property>
-            <property name="sizeType">
-                <enum>Expanding</enum>
-            </property>
-            <property name="sizeHint">
-                <size>
-                    <width>161</width>
-                    <height>21</height>
-                </size>
-            </property>
-        </spacer>
-        <spacer row="1" column="2">
-            <property name="name">
-                <cstring>spacer3</cstring>
-            </property>
-            <property name="orientation">
-                <enum>Vertical</enum>
-            </property>
-            <property name="sizeType">
-                <enum>Fixed</enum>
-            </property>
-            <property name="sizeHint">
-                <size>
-                    <width>20</width>
-                    <height>30</height>
-                </size>
-            </property>
-        </spacer>
-        <spacer row="3" column="2">
-            <property name="name">
-                <cstring>spacer4</cstring>
-            </property>
-            <property name="orientation">
-                <enum>Vertical</enum>
-            </property>
-            <property name="sizeType">
-                <enum>Expanding</enum>
-            </property>
-            <property name="sizeHint">
-                <size>
-                    <width>20</width>
-                    <height>170</height>
-                </size>
-            </property>
-        </spacer>
-        <spacer row="2" column="4">
-            <property name="name">
-                <cstring>spacer6</cstring>
-            </property>
-            <property name="orientation">
-                <enum>Horizontal</enum>
-            </property>
-            <property name="sizeType">
-                <enum>Fixed</enum>
-            </property>
-            <property name="sizeHint">
-                <size>
-                    <width>71</width>
-                    <height>21</height>
-                </size>
-            </property>
-        </spacer>
-        <widget class="QLabel" row="2" column="1" rowspan="1" colspan="3">
-            <property name="name">
-                <cstring>textLabel1</cstring>
-            </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>7</hsizetype>
-                    <vsizetype>3</vsizetype>
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
-            </property>
-            <property name="frameShape">
-                <enum>NoFrame</enum>
-            </property>
-            <property name="frameShadow">
-                <enum>Plain</enum>
-            </property>
-            <property name="text">
-                <string>This program must be run as root. Click the "Administrator Mode" button below or restart the program as root.</string>
-            </property>
-            <property name="alignment">
-                <set>WordBreak|AlignVCenter</set>
-            </property>
-        </widget>
-        <spacer row="2" column="0">
-            <property name="name">
-                <cstring>spacer5</cstring>
-            </property>
-            <property name="orientation">
-                <enum>Horizontal</enum>
-            </property>
-            <property name="sizeType">
-                <enum>Fixed</enum>
-            </property>
-            <property name="sizeHint">
-                <size>
-                    <width>61</width>
-                    <height>21</height>
-                </size>
-            </property>
-        </spacer>
-    </grid>
-</widget>
-<pixmapinproject/>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
+<ui version="4.0" >
+ <class>NotRoot</class>
+ <widget class="QDialog" name="NotRoot" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>552</width>
+    <height>409</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Root Access Required</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout" >
+   <item row="0" column="0" >
+    <layout class="QHBoxLayout" name="horizontalLayout" >
+     <item>
+      <spacer name="spacer3_2" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType" >
+        <enum>QSizePolicy::Expanding</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>151</width>
+         <height>21</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="pixmapLabel2" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Preferred" hsizetype="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="wordWrap" >
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="spacer4_2" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType" >
+        <enum>QSizePolicy::Expanding</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>161</width>
+         <height>21</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0" >
+    <spacer name="spacer3" >
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Fixed</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>20</width>
+       <height>30</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="2" column="0" >
+    <layout class="QHBoxLayout" name="horizontalLayout_2" >
+     <item>
+      <spacer name="spacer5" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType" >
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>61</width>
+         <height>21</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QLabel" name="textLabel1" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="MinimumExpanding" hsizetype="Expanding" >
+         <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>This program must be run as root. Click the "Administrator Mode" button below or restart the program as root.</string>
+       </property>
+       <property name="alignment" >
+        <set>Qt::AlignVCenter</set>
+       </property>
+       <property name="wordWrap" >
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="spacer6" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType" >
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>61</width>
+         <height>21</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item row="3" column="0" >
+    <spacer name="verticalSpacer" >
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>20</width>
+       <height>51</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="4" column="0" >
+    <layout class="QHBoxLayout" name="horizontalLayout_3" >
+     <item>
+      <spacer name="horizontalSpacer" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="pushAdmin" >
+       <property name="text" >
+        <string>Run in Administrator Mode</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2" >
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item row="5" column="0" >
+    <spacer name="spacer4" >
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>20</width>
+       <height>170</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <resources>
+  <include location="PBSystem.qrc" />
+ </resources>
+ <connections/>
+</ui>

Added: pcbsd/trunk/kcmPBSystem/pbsystemtab.cpp

Added: pcbsd/trunk/kcmPBSystem/pbsystemtab.h

Modified: pcbsd/trunk/kcmPBSystem/pbsystemtab.ui
===================================================================
--- pcbsd/trunk/kcmPBSystem/pbsystemtab.ui	2008-06-25 17:08:39 UTC (rev 2172)
+++ pcbsd/trunk/kcmPBSystem/pbsystemtab.ui	2008-06-25 17:09:03 UTC (rev 2173)
@@ -1,931 +1,877 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>PBSystemTab</class>
-<widget class="QDialog">
-    <property name="name">
-        <cstring>PBSystemTab</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>444</width>
-            <height>465</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>PC-BSD System Configuration</string>
-    </property>
-    <property name="icon">
-        <pixmap>system.png</pixmap>
-    </property>
-    <property name="sizeGripEnabled">
-        <bool>true</bool>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>11</number>
-        </property>
-        <property name="spacing">
-            <number>6</number>
-        </property>
-        <widget class="QPushButton" row="1" column="1">
-            <property name="name">
-                <cstring>buttonOk</cstring>
-            </property>
-            <property name="text">
-                <string>&amp;Close</string>
-            </property>
-            <property name="accel">
-                <string>Alt+C</string>
-            </property>
-            <property name="autoDefault">
-                <bool>true</bool>
-            </property>
-            <property name="default">
-                <bool>true</bool>
-            </property>
+<ui version="4.0" >
+ <class>PBSystemTab</class>
+ <widget class="QDialog" name="PBSystemTab" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>444</width>
+    <height>465</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>PC-BSD System Configuration</string>
+  </property>
+  <property name="sizeGripEnabled" >
+   <bool>true</bool>
+  </property>
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>11</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item row="1" column="1" >
+    <widget class="QPushButton" name="buttonOk" >
+     <property name="text" >
+      <string>&amp;Close</string>
+     </property>
+     <property name="shortcut" >
+      <string>Alt+C</string>
+     </property>
+     <property name="autoDefault" >
+      <bool>true</bool>
+     </property>
+     <property name="default" >
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" colspan="2" >
+    <widget class="QTabWidget" name="tabWidget" >
+     <property name="currentIndex" >
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="Widget8" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>410</width>
+        <height>369</height>
+       </rect>
+      </property>
+      <attribute name="title" >
+       <string>General</string>
+      </attribute>
+      <layout class="QGridLayout" >
+       <item row="6" column="2" >
+        <spacer name="spacer11" >
+         <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>60</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="5" column="3" colspan="2" >
+        <spacer name="spacer4" >
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeType" >
+          <enum>QSizePolicy::Expanding</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>102</width>
+           <height>21</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="3" column="0" colspan="5" >
+        <widget class="Line" name="line2" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+           <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>
-        <widget class="QTabWidget" row="0" column="0" rowspan="1" colspan="2">
-            <property name="name">
-                <cstring>tabWidget</cstring>
-            </property>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>Widget8</cstring>
-                </property>
-                <attribute name="title">
-                    <string>General</string>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <spacer row="6" column="2">
-                        <property name="name">
-                            <cstring>spacer11</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>30</width>
-                                <height>60</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <spacer row="5" column="3" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>spacer4</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>102</width>
-                                <height>21</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="Line" row="3" column="0" rowspan="1" colspan="5">
-                        <property name="name">
-                            <cstring>line2</cstring>
-                        </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>5</hsizetype>
-                                <vsizetype>0</vsizetype>
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                        <property name="frameShape">
-                            <enum>HLine</enum>
-                        </property>
-                        <property name="frameShadow">
-                            <enum>Sunken</enum>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                    </widget>
-                    <widget class="QPushButton" row="5" column="2">
-                        <property name="name">
-                            <cstring>buttonGenerate</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Generate</string>
-                        </property>
-                    </widget>
-                    <spacer row="5" column="0" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>spacer5</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>92</width>
-                                <height>21</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="QLabel" row="4" column="0" rowspan="1" colspan="5">
-                        <property name="name">
-                            <cstring>textLabel4</cstring>
-                        </property>
-                        <property name="text">
-                            <string>You may also generate a diagnostic sheet, with information about your system. This sheet can be used by technicans for troubleshooting purposes.</string>
-                        </property>
-                        <property name="alignment">
-                            <set>WordBreak|AlignTop|AlignLeft</set>
-                        </property>
-                    </widget>
-                    <widget class="QLayoutWidget" row="2" column="1" rowspan="1" colspan="3">
-                        <property name="name">
-                            <cstring>layout7</cstring>
-                        </property>
-                        <hbox>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <widget class="QLayoutWidget">
-                                <property name="name">
-                                    <cstring>layout5</cstring>
-                                </property>
-                                <vbox>
-                                    <property name="name">
-                                        <cstring>unnamed</cstring>
-                                    </property>
-                                    <widget class="QLabel">
-                                        <property name="name">
-                                            <cstring>textLabel2</cstring>
-                                        </property>
-                                        <property name="sizePolicy">
-                                            <sizepolicy>
-                                                <hsizetype>5</hsizetype>
-                                                <vsizetype>0</vsizetype>
-                                                <horstretch>0</horstretch>
-                                                <verstretch>0</verstretch>
-                                            </sizepolicy>
-                                        </property>
-                                        <property name="text">
-                                            <string>PC-BSD Version:</string>
-                                        </property>
-                                        <property name="alignment">
-                                            <set>AlignVCenter|AlignRight</set>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLabel">
-                                        <property name="name">
-                                            <cstring>textLabel2_2</cstring>
-                                        </property>
-                                        <property name="sizePolicy">
-                                            <sizepolicy>
-                                                <hsizetype>5</hsizetype>
-                                                <vsizetype>0</vsizetype>
-                                                <horstretch>0</horstretch>
-                                                <verstretch>0</verstretch>
-                                            </sizepolicy>
-                                        </property>
-                                        <property name="frameShape">
-                                            <enum>NoFrame</enum>
-                                        </property>
-                                        <property name="frameShadow">
-                                            <enum>Plain</enum>
-                                        </property>
-                                        <property name="text">
-                                            <string>Base Version:</string>
-                                        </property>
-                                        <property name="alignment">
-                                            <set>AlignVCenter|AlignRight</set>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLabel">
-                                        <property name="name">
-                                            <cstring>textLabel2_2_2</cstring>
-                                        </property>
-                                        <property name="sizePolicy">
-                                            <sizepolicy>
-                                                <hsizetype>5</hsizetype>
-                                                <vsizetype>0</vsizetype>
-                                                <horstretch>0</horstretch>
-                                                <verstretch>0</verstretch>
-                                            </sizepolicy>
-                                        </property>
-                                        <property name="text">
-                                            <string>CPU Type:</string>
-                                        </property>
-                                        <property name="alignment">
-                                            <set>AlignVCenter|AlignRight</set>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLabel">
-                                        <property name="name">
-                                            <cstring>textLabel2_2_3</cstring>
-                                        </property>
-                                        <property name="sizePolicy">
-                                            <sizepolicy>
-                                                <hsizetype>5</hsizetype>
-                                                <vsizetype>0</vsizetype>
-                                                <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>AlignVCenter|AlignRight</set>
-                                        </property>
-                                    </widget>
-                                </vbox>
-                            </widget>
-                            <widget class="QLayoutWidget">
-                                <property name="name">
-                                    <cstring>layout6</cstring>
-                                </property>
-                                <vbox>
-                                    <property name="name">
-                                        <cstring>unnamed</cstring>
-                                    </property>
-                                    <widget class="QLabel">
-                                        <property name="name">
-                                            <cstring>labelPCBSD</cstring>
-                                        </property>
-                                        <property name="sizePolicy">
-                                            <sizepolicy>
-                                                <hsizetype>5</hsizetype>
-                                                <vsizetype>0</vsizetype>
-                                                <horstretch>0</horstretch>
-                                                <verstretch>0</verstretch>
-                                            </sizepolicy>
-                                        </property>
-                                        <property name="text">
-                                            <string></string>
-                                        </property>
-                                        <property name="alignment">
-                                            <set>AlignVCenter|AlignLeft</set>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLabel">
-                                        <property name="name">
-                                            <cstring>labelBASEVer</cstring>
-                                        </property>
-                                        <property name="sizePolicy">
-                                            <sizepolicy>
-                                                <hsizetype>5</hsizetype>
-                                                <vsizetype>0</vsizetype>
-                                                <horstretch>0</horstretch>
-                                                <verstretch>0</verstretch>
-                                            </sizepolicy>
-                                        </property>
-                                        <property name="text">
-                                            <string></string>
-                                        </property>
-                                        <property name="alignment">
-                                            <set>AlignVCenter|AlignLeft</set>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLabel">
-                                        <property name="name">
-                                            <cstring>labelCPU</cstring>
-                                        </property>
-                                        <property name="sizePolicy">
-                                            <sizepolicy>
-                                                <hsizetype>5</hsizetype>
-                                                <vsizetype>0</vsizetype>
-                                                <horstretch>0</horstretch>
-                                                <verstretch>0</verstretch>
-                                            </sizepolicy>
-                                        </property>
-                                        <property name="text">
-                                            <string></string>
-                                        </property>
-                                        <property name="alignment">
-                                            <set>AlignVCenter|AlignLeft</set>
-                                        </property>
-                                    </widget>
-                                    <widget class="QLabel">
-                                        <property name="name">
-                                            <cstring>labelMemory</cstring>
-                                        </property>
-                                        <property name="sizePolicy">
-                                            <sizepolicy>
-                                                <hsizetype>5</hsizetype>
-                                                <vsizetype>0</vsizetype>
-                                                <horstretch>0</horstretch>
-                                                <verstretch>0</verstretch>
-                                            </sizepolicy>
-                                        </property>
-                                        <property name="text">
-                                            <string></string>
-                                        </property>
-                                        <property name="alignment">
-                                            <set>AlignVCenter|AlignLeft</set>
-                                        </property>
-                                    </widget>
-                                </vbox>
-                            </widget>
-                        </hbox>
-                    </widget>
-                    <spacer row="2" column="0">
-                        <property name="name">
-                            <cstring>spacer17</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>91</width>
-                                <height>21</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <spacer row="2" column="4">
-                        <property name="name">
-                            <cstring>spacer18</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>111</width>
-                                <height>21</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="Line" row="1" column="0" rowspan="1" colspan="5">
-                        <property name="name">
-                            <cstring>line1</cstring>
-                        </property>
-                        <property name="sizePolicy">
-                            <sizepolicy>
-                                <hsizetype>5</hsizetype>
-                                <vsizetype>0</vsizetype>
-                                <horstretch>0</horstretch>
-                                <verstretch>0</verstretch>
-                            </sizepolicy>
-                        </property>
-                        <property name="frameShape">
-                            <enum>HLine</enum>
-                        </property>
-                        <property name="frameShadow">
-                            <enum>Sunken</enum>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                    </widget>
-                    <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="5">
-                        <property name="name">
-                            <cstring>layout8</cstring>
-                        </property>
-                        <hbox>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <spacer>
-                                <property name="name">
-                                    <cstring>spacer7</cstring>
-                                </property>
-                                <property name="orientation">
-                                    <enum>Horizontal</enum>
-                                </property>
-                                <property name="sizeType">
-                                    <enum>Expanding</enum>
-                                </property>
-                                <property name="sizeHint">
-                                    <size>
-                                        <width>51</width>
-                                        <height>21</height>
-                                    </size>
-                                </property>
-                            </spacer>
-                            <widget class="QLabel">
-                                <property name="name">
-                                    <cstring>pixmapLabel3</cstring>
-                                </property>
-                                <property name="sizePolicy">
-                                    <sizepolicy>
-                                        <hsizetype>0</hsizetype>
-                                        <vsizetype>0</vsizetype>
-                                        <horstretch>0</horstretch>
-                                        <verstretch>0</verstretch>
-                                    </sizepolicy>
-                                </property>
-                                <property name="pixmap">
-                                    <pixmap>NewLogoSmall.png</pixmap>
-                                </property>
-                                <property name="scaledContents">
-                                    <bool>true</bool>
-                                </property>
-                                <property name="alignment">
-                                    <set>AlignCenter</set>
-                                </property>
-                            </widget>
-                            <spacer>
-                                <property name="name">
-                                    <cstring>spacer8</cstring>
-                                </property>
-                                <property name="orientation">
-                                    <enum>Horizontal</enum>
-                                </property>
-                                <property name="sizeType">
-                                    <enum>Expanding</enum>
-                                </property>
-                                <property name="sizeHint">
-                                    <size>
-                                        <width>61</width>
-                                        <height>21</height>
-                                    </size>
-                                </property>
-                            </spacer>
-                        </hbox>
-                    </widget>
-                </grid>
+       </item>
+       <item row="5" column="2" >
+        <widget class="QPushButton" name="buttonGenerate" >
+         <property name="text" >
+          <string>Generate</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="0" colspan="2" >
+        <spacer name="spacer5" >
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeType" >
+          <enum>QSizePolicy::Expanding</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>92</width>
+           <height>21</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="4" column="0" colspan="5" >
+        <widget class="QLabel" name="textLabel4" >
+         <property name="text" >
+          <string>You may also generate a diagnostic sheet, with information about your system. This sheet can be used by technicans 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="2" column="1" colspan="3" >
+        <layout class="QHBoxLayout" >
+         <item>
+          <layout class="QVBoxLayout" >
+           <item>
+            <widget class="QLabel" name="textLabel2" >
+             <property name="sizePolicy" >
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+               <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>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>Widget9</cstring>
-                </property>
-                <attribute name="title">
-                    <string>Kernel</string>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <widget class="QLabel" row="0" column="0" rowspan="1" colspan="4">
-                        <property name="name">
-                            <cstring>textLabel5</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Selected PC-BSD Kernel</string>
-                        </property>
-                        <property name="alignment">
-                            <set>AlignCenter</set>
-                        </property>
-                    </widget>
-                    <widget class="Line" row="3" column="0" rowspan="2" colspan="4">
-                        <property name="name">
-                            <cstring>line3</cstring>
-                        </property>
-                        <property name="frameShape">
-                            <enum>HLine</enum>
-                        </property>
-                        <property name="frameShadow">
-                            <enum>Sunken</enum>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="2" column="0" rowspan="1" colspan="4">
-                        <property name="name">
-                            <cstring>textLabel6</cstring>
-                        </property>
-                        <property name="text">
-                            <string>&lt;font size="-1"&gt;&lt;font color="#ff0000"&gt;Warning!!! Changing the booted kernel can be dangerous. Use at your own risk!&lt;/font&gt;&lt;/font&gt;</string>
-                        </property>
-                        <property name="alignment">
-                            <set>WordBreak|AlignTop|AlignLeft</set>
-                        </property>
-                    </widget>
-                    <widget class="QComboBox" row="1" column="0" rowspan="1" colspan="4">
-                        <property name="name">
-                            <cstring>comboKernel</cstring>
-                        </property>
-                    </widget>
-                    <spacer row="5" column="0" rowspan="1" colspan="2">
-                        <property name="name">
-                            <cstring>spacer15</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>50</width>
-                                <height>21</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="QLabel" row="4" column="2" rowspan="2" colspan="1">
-                        <property name="name">
-                            <cstring>textLabel7</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Kernel Options</string>
-                        </property>
-                        <property name="alignment">
-                            <set>AlignCenter</set>
-                        </property>
-                    </widget>
-                    <spacer row="5" column="3">
-                        <property name="name">
-                            <cstring>spacer14</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Horizontal</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>51</width>
-                                <height>21</height>
-                            </size>
-                        </property>
-                    </spacer>
-                    <widget class="QCheckBox" row="7" column="0" rowspan="1" colspan="4">
-                        <property name="name">
-                            <cstring>checkKernATAPI</cstring>
-                        </property>
-                        <property name="text">
-                            <string>Enable ATAPI DMA Mode</string>
-                        </property>
-                    </widget>
-                    <widget class="QLabel" row="8" column="1" rowspan="1" colspan="3">
-                        <property name="name">
-                            <cstring>checkKernDelayLbl</cstring>
-                        </property>
-                        <property name="enabled">
-                            <bool>true</bool>
-                        </property>
-                        <property name="text">
-                            <string>Boot delay (seconds)</string>
-                        </property>
-                    </widget>
-                    <widget class="QSpinBox" row="8" column="0">
-                        <property name="name">
-                            <cstring>checkKernDelay</cstring>
-                        </property>
-                        <property name="enabled">
-                            <bool>true</bool>
-                        </property>
-                        <property name="specialValueText">
-                            <string>Off</string>
-                        </property>
-                        <property name="maxValue">
-                            <number>60</number>
-                        </property>
-                        <property name="minValue">
-                            <number>0</number>
-                        </property>
-                        <property name="value">
-                            <number>2</number>
-                        </property>
-                    </widget>
-                    <spacer row="12" column="2">
-                        <property name="name">
-                            <cstring>spacer25</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>21</width>
-                                <height>31</height>
-                            </size>
-                        </property>
-                    </spacer>
-                </grid>
+           </item>
+           <item>
+            <widget class="QLabel" name="textLabel2_2" >
+             <property name="sizePolicy" >
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+               <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>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>TabPage</cstring>
-                </property>
-                <attribute name="title">
-                    <string>Tasks</string>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <widget class="QButtonGroup" row="0" column="0">
-                        <property name="name">
-                            <cstring>cvsupBGrp</cstring>
-                        </property>
-                        <property name="title">
-                            <string>CSup</string>
-                        </property>
-                        <grid>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <widget class="QPushButton" row="0" column="0">
-                                <property name="name">
-                                    <cstring>fetchSourceBut</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Fetch &amp;System Source</string>
-                                </property>
-                                <property name="accel">
-                                    <string>Alt+S</string>
-                                </property>
-                            </widget>
-                        </grid>
-                    </widget>
-                    <widget class="QButtonGroup" row="1" column="0">
-                        <property name="name">
-                            <cstring>portsnapBGrp</cstring>
-                        </property>
-                        <property name="title">
-                            <string>Portsnap</string>
-                        </property>
-                        <grid>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <widget class="QPushButton" row="0" column="0">
-                                <property name="name">
-                                    <cstring>fetchPortsBut</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>Fetch &amp;Ports</string>
-                                </property>
-                                <property name="accel">
-                                    <string>Alt+P</string>
-                                </property>
-                            </widget>
-                        </grid>
-                    </widget>
-                    <spacer row="2" column="0">
-                        <property name="name">
-                            <cstring>spacer27</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>31</width>
-                                <height>110</height>
-                            </size>
-                        </property>
-                    </spacer>
-                </grid>
+           </item>
+           <item>
+            <widget class="QLabel" name="textLabel2_2_2" >
+             <property name="sizePolicy" >
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+               <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>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>TabPage</cstring>
-                </property>
-                <attribute name="title">
-                    <string>Misc</string>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <widget class="QButtonGroup" row="0" column="0">
-                        <property name="name">
-                            <cstring>splashGroup</cstring>
-                        </property>
-                        <property name="title">
-                            <string>Boot Screen</string>
-                        </property>
-                        <grid>
-                            <property name="name">
-                                <cstring>unnamed</cstring>
-                            </property>
-                            <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2">
-                                <property name="name">
-                                    <cstring>showBootCheck</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>S&amp;how splash image on boot</string>
-                                </property>
-                                <property name="accel">
-                                    <string>Alt+H</string>
-                                </property>
-                                <property name="checked">
-                                    <bool>true</bool>
-                                </property>
-                            </widget>
-                            <widget class="QPushButton" row="2" column="1">
-                                <property name="name">
-                                    <cstring>customBut</cstring>
-                                </property>
-                                <property name="text">
-                                    <string>&amp;Custom...</string>
-                                </property>
-                                <property name="accel">
-                                    <string>Alt+C</string>
-                                </property>
-                            </widget>
-                            <widget class="QComboBox" row="1" column="0" rowspan="1" colspan="2">
-                                <property name="name">
-                                    <cstring>splashSelect</cstring>
-                                </property>
-                            </widget>
-                            <spacer row="2" column="0">
-                                <property name="name">
-                                    <cstring>spacer39</cstring>
-                                </property>
-                                <property name="orientation">
-                                    <enum>Horizontal</enum>
-                                </property>
-                                <property name="sizeType">
-                                    <enum>Expanding</enum>
-                                </property>
-                                <property name="sizeHint">
-                                    <size>
-                                        <width>251</width>
-                                        <height>31</height>
-                                    </size>
-                                </property>
-                            </spacer>
-                        </grid>
-                    </widget>
-                    <spacer row="1" column="0">
-                        <property name="name">
-                            <cstring>spacer37</cstring>
-                        </property>
-                        <property name="orientation">
-                            <enum>Vertical</enum>
-                        </property>
-                        <property name="sizeType">
-                            <enum>Expanding</enum>
-                        </property>
-                        <property name="sizeHint">
-                            <size>
-                                <width>30</width>
-                                <height>190</height>
-                            </size>
-                        </property>
-                    </spacer>
-                </grid>
+           </item>
+           <item>
+            <widget class="QLabel" name="textLabel2_2_3" >
+             <property name="sizePolicy" >
+              <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+               <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 vsizetype="Fixed" hsizetype="Preferred" >
+               <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 vsizetype="Fixed" hsizetype="Preferred" >
+               <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 vsizetype="Fixed" hsizetype="Preferred" >
+               <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 vsizetype="Fixed" hsizetype="Preferred" >
+               <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" >
+         <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="2" column="4" >
+        <spacer name="spacer18" >
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeType" >
+          <enum>QSizePolicy::Expanding</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>111</width>
+           <height>21</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="1" column="0" colspan="5" >
+        <widget class="Line" name="line1" >
+         <property name="sizePolicy" >
+          <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+           <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>
-        <spacer row="1" column="0">
-            <property name="name">
-                <cstring>Horizontal Spacing2</cstring>
+       </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 vsizetype="Fixed" hsizetype="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" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>410</width>
+        <height>369</height>
+       </rect>
+      </property>
+      <attribute name="title" >
+       <string>Kernel</string>
+      </attribute>
+      <layout class="QGridLayout" >
+       <item row="0" column="0" colspan="4" >
+        <widget class="QLabel" name="textLabel5" >
+         <property name="text" >
+          <string>Selected PC-BSD Kernel</string>
+         </property>
+         <property name="alignment" >
+          <set>Qt::AlignCenter</set>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item rowspan="2" row="3" column="0" colspan="4" >
+        <widget class="Line" name="line3" >
+         <property name="frameShape" >
+          <enum>QFrame::HLine</enum>
+         </property>
+         <property name="frameShadow" >
+          <enum>QFrame::Sunken</enum>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0" colspan="4" >
+        <widget class="QLabel" name="textLabel6" >
+         <property name="text" >
+          <string>&lt;font size="-1">&lt;font color="#ff0000">Warning!!! Changing the booted kernel can be dangerous. Use at your own risk!&lt;/font>&lt;/font></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="1" column="0" colspan="4" >
+        <widget class="QComboBox" name="comboKernel" />
+       </item>
+       <item row="5" column="0" colspan="2" >
+        <spacer name="spacer15" >
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeType" >
+          <enum>QSizePolicy::Expanding</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>50</width>
+           <height>21</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item rowspan="2" row="4" column="2" >
+        <widget class="QLabel" name="textLabel7" >
+         <property name="text" >
+          <string>Kernel Options</string>
+         </property>
+         <property name="alignment" >
+          <set>Qt::AlignCenter</set>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="3" >
+        <spacer name="spacer14" >
+         <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 row="7" column="0" colspan="4" >
+        <widget class="QCheckBox" name="checkKernATAPI" >
+         <property name="text" >
+          <string>Enable ATAPI DMA Mode</string>
+         </property>
+        </widget>
+       </item>
+       <item row="8" column="1" colspan="3" >
+        <widget class="QLabel" name="checkKernDelayLbl" >
+         <property name="enabled" >
+          <bool>true</bool>
+         </property>
+         <property name="text" >
+          <string>Boot delay (seconds)</string>
+         </property>
+         <property name="wordWrap" >
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="8" column="0" >
+        <widget class="QSpinBox" name="checkKernDelay" >
+         <property name="enabled" >
+          <bool>true</bool>
+         </property>
+         <property name="specialValueText" >
+          <string>Off</string>
+         </property>
+         <property name="minimum" >
+          <number>0</number>
+         </property>
+         <property name="maximum" >
+          <number>60</number>
+         </property>
+         <property name="value" >
+          <number>2</number>
+         </property>
+        </widget>
+       </item>
+       <item row="12" column="2" >
+        <spacer name="spacer25" >
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType" >
+          <enum>QSizePolicy::Expanding</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>21</width>
+           <height>31</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="TabPage" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>410</width>
+        <height>369</height>
+       </rect>
+      </property>
+      <attribute name="title" >
+       <string>Tasks</string>
+      </attribute>
+      <layout class="QGridLayout" >
+       <item row="0" column="0" >
+        <widget class="Q3ButtonGroup" name="cvsupBGrp" >
+         <property name="title" >
+          <string>CSup</string>
+         </property>
+         <layout class="QGridLayout" >
+          <item row="0" column="0" >
+           <widget class="QPushButton" name="fetchSourceBut" >
+            <property name="text" >
+             <string>Fetch &amp;System Source</string>
             </property>
-            <property name="orientation">
-                <enum>Horizontal</enum>
+            <property name="shortcut" >
+             <string>Alt+S</string>
             </property>
-            <property name="sizeType">
-                <enum>Expanding</enum>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="1" column="0" >
+        <widget class="Q3ButtonGroup" name="portsnapBGrp" >
+         <property name="title" >
+          <string>Portsnap</string>
+         </property>
+         <layout class="QGridLayout" >
+          <item row="0" column="0" >
+           <widget class="QPushButton" name="fetchPortsBut" >
+            <property name="text" >
+             <string>Fetch &amp;Ports</string>
             </property>
-            <property name="sizeHint">
-                <size>
-                    <width>20</width>
-                    <height>20</height>
-                </size>
+            <property name="shortcut" >
+             <string>Alt+P</string>
             </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item row="2" column="0" >
+        <spacer name="spacer27" >
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType" >
+          <enum>QSizePolicy::Expanding</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>31</width>
+           <height>110</height>
+          </size>
+         </property>
         </spacer>
-    </grid>
-</widget>
-<connections>
-    <connection>
-        <sender>buttonOk</sender>
-        <signal>clicked()</signal>
-        <receiver>PBSystemTab</receiver>
-        <slot>accept()</slot>
-    </connection>
-    <connection>
-        <sender>fetchPortsBut</sender>
-        <signal>clicked()</signal>
-        <receiver>PBSystemTab</receiver>
-        <slot>fetchPortsPressed()</slot>
-    </connection>
-    <connection>
-        <sender>fetchSourceBut</sender>
-        <signal>clicked()</signal>
-        <receiver>PBSystemTab</receiver>
-        <slot>fetchSourcePressed()</slot>
-    </connection>
-    <connection>
-        <sender>customBut</sender>
-        <signal>clicked()</signal>
-        <receiver>PBSystemTab</receiver>
-        <slot>customSplashPressed()</slot>
-    </connection>
-    <connection>
-        <sender>showBootCheck</sender>
-        <signal>stateChanged(int)</signal>
-        <receiver>PBSystemTab</receiver>
-        <slot>showSplashChecked(int)</slot>
-    </connection>
-</connections>
-<tabstops>
-    <tabstop>tabWidget</tabstop>
-    <tabstop>buttonGenerate</tabstop>
-    <tabstop>buttonOk</tabstop>
-    <tabstop>comboKernel</tabstop>
-    <tabstop>checkKernATAPI</tabstop>
-    <tabstop>checkKernDelay</tabstop>
-    <tabstop>fetchSourceBut</tabstop>
-    <tabstop>fetchPortsBut</tabstop>
-    <tabstop>showBootCheck</tabstop>
-    <tabstop>splashSelect</tabstop>
-    <tabstop>customBut</tabstop>
-</tabstops>
-<includes>
-    <include location="local" impldecl="in declaration">qprocess.h</include>
-    <include location="local" impldecl="in declaration">qfiledialog.h</include>
-    <include location="local" impldecl="in declaration">qmessagebox.h</include>
-    <include location="local" impldecl="in declaration">qfile.h</include>
-    <include location="local" impldecl="in declaration">qsettings.h</include>
-    <include location="local" impldecl="in declaration">cvsupprogress.h</include>
-    <include location="local" impldecl="in declaration">portsnapprogress.h</include>
-    <include location="local" impldecl="in declaration">kgenericfactory.h</include>
-    <include location="local" impldecl="in declaration">kcmodule.h</include>
-    <include location="local" impldecl="in declaration">kglobal.h</include>
-    <include location="global" impldecl="in declaration">qregexp.h</include>
-    <include location="global" impldecl="in declaration">kio/job.h</include>
-    <include location="global" impldecl="in declaration">kfiledialog.h</include>
-    <include location="global" impldecl="in declaration">kimageio.h</include>
-    <include location="global" impldecl="in declaration">utils.h</include>
-    <include location="local" impldecl="in implementation">pbsystemtab.ui.h</include>
-</includes>
-<variables>
-    <variable access="private">CVSUpProgress *cvsUpUi;</variable>
-    <variable access="private">QProcess *InstallKernel;</variable>
-    <variable access="private">QString KernDescr[50];</variable>
-    <variable access="private">QString KernDefaultTag;</variable>
-    <variable access="private">QString KernTag[50];</variable>
-    <variable access="private">QString KernFileName[50];</variable>
-    <variable access="private">QProcess *ViewSheet;</variable>
-    <variable access="private">QProcess *SheetGenScript;</variable>
-    <variable access="private">QString SheetFileName;</variable>
-    <variable access="private">QProcess *GetPBVer;</variable>
-    <variable access="private">QProcess *GetUname;</variable>
-    <variable access="private">PortsnapProgress *portsnapUI;</variable>
-    <variable>QMap&lt;QString, QString&gt; codeMap;</variable>
-    <variable access="private">QString username;</variable>
-    <variable access="private">bool miscChanged;</variable>
-    <variable access="private">bool kernelChanged;</variable>
-</variables>
-<signals>
-    <signal>changed();</signal>
-</signals>
-<slots>
-    <slot>ProgramInit()</slot>
-    <slot access="private">ReadUname()</slot>
-    <slot access="private">startGenerateSheet()</slot>
-    <slot access="private">finishedSheet()</slot>
-    <slot>saveKernScreen()</slot>
-    <slot access="private">finishedKernInstall()</slot>
-    <slot access="private">fetchSourcePressed()</slot>
-    <slot access="private">fetchPortsPressed()</slot>
-    <slot access="private">customSplashPressed()</slot>
-    <slot>miscSavePressed()</slot>
-    <slot access="private">showSplashChecked( int newState )</slot>
-    <slot access="private">loadBootData()</slot>
-</slots>
-<functions>
-    <function access="private">CheckUname()</function>
-    <function access="private">CheckPBVer()</function>
-    <function access="private">CreateSheetFile()</function>
-    <function access="private">CheckKernels()</function>
-    <function access="private">showRebootRequired()</function>
-    <function access="private">InstallNewKernel()</function>
-    <function access="private">LoadKernSettings()</function>
-    <function returnType="bool">checkValue( QString File, QString Key, QString Value )</function>
-    <function>saveValue( QString File, QString oldKey, QString newKey )</function>
-    <function access="private" returnType="QString">getValue( QString File, QString Key )</function>
-</functions>
-<pixmapinproject/>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="TabPage" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>410</width>
+        <height>369</height>
+       </rect>
+      </property>
+      <attribute name="title" >
+       <string>Misc</string>
+      </attribute>
+      <layout class="QGridLayout" >
+       <item row="0" column="0" >
+        <widget class="Q3ButtonGroup" name="splashGroup" >
+         <property name="title" >
+          <string>Boot Screen</string>
+         </property>
+         <layout class="QGridLayout" >
+          <item row="0" column="0" colspan="2" >
+           <widget class="QCheckBox" name="showBootCheck" >
+            <property name="text" >
+             <string>S&amp;how splash image on boot</string>
+            </property>
+            <property name="shortcut" >
+             <string>Alt+H</string>
+            </property>
+            <property name="checked" >
+             <bool>true</bool>
+            </property>
+           </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>
+           </widget>
+          </item>
+          <item row="1" column="0" colspan="2" >
+           <widget class="QComboBox" name="splashSelect" />
+          </item>
+          <item row="2" column="0" >
+           <spacer name="spacer39" >
+            <property name="orientation" >
+             <enum>Qt::Horizontal</enum>
+            </property>
+            <property name="sizeType" >
+             <enum>QSizePolicy::Expanding</enum>
+            </property>
+            <property name="sizeHint" stdset="0" >
+             <size>
+              <width>251</width>
+              <height>31</height>
+             </size>
+            </property>
+           </spacer>
+          </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>
+   </item>
+   <item row="1" column="0" >
+    <spacer name="Horizontal Spacing2" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>20</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </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>
+ </customwidgets>
+ <tabstops>
+  <tabstop>tabWidget</tabstop>
+  <tabstop>buttonGenerate</tabstop>
+  <tabstop>buttonOk</tabstop>
+  <tabstop>comboKernel</tabstop>
+  <tabstop>checkKernATAPI</tabstop>
+  <tabstop>checkKernDelay</tabstop>
+  <tabstop>fetchSourceBut</tabstop>
+  <tabstop>fetchPortsBut</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" >utils.h</include>
+ </includes>
+ <resources>
+  <include location="PBSystem.qrc" />
+ </resources>
+ <connections>
+  <connection>
+   <sender>buttonOk</sender>
+   <signal>clicked()</signal>
+   <receiver>PBSystemTab</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>fetchPortsBut</sender>
+   <signal>clicked()</signal>
+   <receiver>PBSystemTab</receiver>
+   <slot>fetchPortsPressed()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>fetchSourceBut</sender>
+   <signal>clicked()</signal>
+   <receiver>PBSystemTab</receiver>
+   <slot>fetchSourcePressed()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>customBut</sender>
+   <signal>clicked()</signal>
+   <receiver>PBSystemTab</receiver>
+   <slot>customSplashPressed()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>showBootCheck</sender>
+   <signal>stateChanged(int)</signal>
+   <receiver>PBSystemTab</receiver>
+   <slot>showSplashChecked(int)</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

Added: pcbsd/trunk/kcmPBSystem/portsnapprogress.cpp

Added: pcbsd/trunk/kcmPBSystem/portsnapprogress.h

Modified: pcbsd/trunk/kcmPBSystem/portsnapprogress.ui
===================================================================
--- pcbsd/trunk/kcmPBSystem/portsnapprogress.ui	2008-06-25 17:08:39 UTC (rev 2172)
+++ pcbsd/trunk/kcmPBSystem/portsnapprogress.ui	2008-06-25 17:09:03 UTC (rev 2173)
@@ -1,211 +1,204 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>PortsnapProgress</class>
-<widget class="QDialog">
-    <property name="name">
-        <cstring>PortsnapProgress</cstring>
-    </property>
-    <property name="geometry">
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>614</width>
-            <height>161</height>
-        </rect>
-    </property>
-    <property name="caption">
-        <string>Portsnap Progress</string>
-    </property>
-    <property name="modal">
-        <bool>true</bool>
-    </property>
-    <grid>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <widget class="QLabel" row="0" column="0">
-            <property name="name">
-                <cstring>totalProgressLbl</cstring>
-            </property>
-            <property name="frameShape">
-                <enum>NoFrame</enum>
-            </property>
-            <property name="frameShadow">
-                <enum>Plain</enum>
-            </property>
-            <property name="text">
-                <string>Total Progress</string>
-            </property>
+<ui version="4.0" >
+ <class>PortsnapProgress</class>
+ <widget class="QDialog" name="PortsnapProgress" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>614</width>
+    <height>161</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Portsnap Progress</string>
+  </property>
+  <property name="windowIcon" >
+   <iconset resource="PBSystem.qrc" >
+    <normaloff>:/system.png</normaloff>:/system.png</iconset>
+  </property>
+  <property name="modal" >
+   <bool>true</bool>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="0" column="0" >
+    <widget class="QLabel" name="totalProgressLbl" >
+     <property name="frameShape" >
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="frameShadow" >
+      <enum>QFrame::Plain</enum>
+     </property>
+     <property name="text" >
+      <string>Total Progress</string>
+     </property>
+     <property name="wordWrap" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="4" >
+    <widget class="Q3ProgressBar" name="totalProgress" >
+     <property name="totalSteps" >
+      <number>18</number>
+     </property>
+     <property name="progress" >
+      <number>0</number>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="3" >
+    <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" colspan="3" >
+    <spacer name="spacer40" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>491</width>
+       <height>31</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="2" column="2" colspan="2" >
+    <widget class="Q3WidgetStack" name="barWidget" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="MinimumExpanding" hsizetype="Minimum" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <widget class="QWidget" name="BarOff" >
+      <property name="geometry" >
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>158</width>
+        <height>66</height>
+       </rect>
+      </property>
+     </widget>
+     <widget class="QWidget" name="BarOn" >
+      <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" >
+        <widget class="Q3ProgressBar" name="taskProgress" >
+         <property name="minimumSize" >
+          <size>
+           <width>150</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="font" >
+          <font>
+           <pointsize>8</pointsize>
+          </font>
+         </property>
+         <property name="frameShape" >
+          <enum>QFrame::NoFrame</enum>
+         </property>
+         <property name="totalSteps" >
+          <number>100</number>
+         </property>
+         <property name="progress" >
+          <number>0</number>
+         </property>
+         <property name="percentageVisible" >
+          <bool>true</bool>
+         </property>
         </widget>
-        <widget class="QProgressBar" row="1" column="0" rowspan="1" colspan="4">
-            <property name="name">
-                <cstring>totalProgress</cstring>
-            </property>
-            <property name="totalSteps">
-                <number>18</number>
-            </property>
-            <property name="progress">
-                <number>0</number>
-            </property>
-        </widget>
-        <widget class="QPushButton" row="3" column="3">
-            <property name="name">
-                <cstring>cancelBut</cstring>
-            </property>
-            <property name="text">
-                <string>&amp;Cancel</string>
-            </property>
-            <property name="accel">
-                <string>Alt+C</string>
-            </property>
-        </widget>
-        <spacer row="3" column="0" rowspan="1" colspan="3">
-            <property name="name">
-                <cstring>spacer40</cstring>
-            </property>
-            <property name="orientation">
-                <enum>Horizontal</enum>
-            </property>
-            <property name="sizeType">
-                <enum>Expanding</enum>
-            </property>
-            <property name="sizeHint">
-                <size>
-                    <width>491</width>
-                    <height>31</height>
-                </size>
-            </property>
-        </spacer>
-        <widget class="QWidgetStack" row="2" column="2" rowspan="1" colspan="2">
-            <property name="name">
-                <cstring>barWidget</cstring>
-            </property>
-            <property name="sizePolicy">
-                <sizepolicy>
-                    <hsizetype>1</hsizetype>
-                    <vsizetype>3</vsizetype>
-                    <horstretch>0</horstretch>
-                    <verstretch>0</verstretch>
-                </sizepolicy>
-            </property>
-            <property name="backgroundOrigin">
-                <enum>WidgetOrigin</enum>
-            </property>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>BarOff</cstring>
-                </property>
-                <attribute name="id">
-                    <number>0</number>
-                </attribute>
-            </widget>
-            <widget class="QWidget">
-                <property name="name">
-                    <cstring>BarOn</cstring>
-                </property>
-                <attribute name="id">
-                    <number>1</number>
-                </attribute>
-                <grid>
-                    <property name="name">
-                        <cstring>unnamed</cstring>
-                    </property>
-                    <widget class="QProgressBar" row="0" column="0">
-                        <property name="name">
-                            <cstring>taskProgress</cstring>
-                        </property>
-                        <property name="minimumSize">
-                            <size>
-                                <width>150</width>
-                                <height>0</height>
-                            </size>
-                        </property>
-                        <property name="font">
-                            <font>
-                                <pointsize>8</pointsize>
-                            </font>
-                        </property>
-                        <property name="frameShape">
-                            <enum>NoFrame</enum>
-                        </property>
-                        <property name="frameShadow">
-                        </property>
-                        <property name="totalSteps">
-                            <number>100</number>
-                        </property>
-                        <property name="progress">
-                            <number>0</number>
-                        </property>
-                        <property name="percentageVisible">
-                            <bool>true</bool>
-                        </property>
-                    </widget>
-                </grid>
-            </widget>
-        </widget>
-        <spacer row="2" column="1">
-            <property name="name">
-                <cstring>spacer41</cstring>
-            </property>
-            <property name="orientation">
-                <enum>Horizontal</enum>
-            </property>
-            <property name="sizeType">
-                <enum>Expanding</enum>
-            </property>
-            <property name="sizeHint">
-                <size>
-                    <width>220</width>
-                    <height>21</height>
-                </size>
-            </property>
-        </spacer>
-        <widget class="QLabel" row="2" column="0">
-            <property name="name">
-                <cstring>taskProgressLbl</cstring>
-            </property>
-            <property name="text">
-                <string>Task Progress...</string>
-            </property>
-        </widget>
-    </grid>
-</widget>
-<connections>
-    <connection>
-        <sender>cancelBut</sender>
-        <signal>clicked()</signal>
-        <receiver>PortsnapProgress</receiver>
-        <slot>cancel()</slot>
-    </connection>
-</connections>
-<includes>
-    <include location="global" impldecl="in declaration">qprocess.h</include>
-    <include location="global" impldecl="in declaration">sys/types.h</include>
-    <include location="global" impldecl="in declaration">sys/stat.h</include>
-    <include location="global" impldecl="in declaration">qmessagebox.h</include>
-    <include location="local" impldecl="in implementation">portsnapprogress.ui.h</include>
-</includes>
-<variables>
-    <variable access="private">QProcess *portsnap;</variable>
-    <variable access="private">QString workdir;</variable>
-    <variable access="private">QString portsdir;</variable>
-    <variable access="private">bool firstRun;</variable>
-    <variable access="private">bool steppedOp;</variable>
-    <variable access="private">QString displayString;</variable>
-    <variable access="private">int numberSteps;</variable>
-</variables>
-<slots>
-    <slot access="private">parseFetch()</slot>
-    <slot access="private">cancel()</slot>
-    <slot access="private">fetchDone()</slot>
-    <slot access="private">parseUpdate()</slot>
-    <slot access="private">updateDone()</slot>
-    <slot access="private">changesDone()</slot>
-    <slot access="private">parseChanges()</slot>
-</slots>
-<functions>
-    <function access="private">init()</function>
-    <function access="private">finish()</function>
-</functions>
-<pixmapinproject/>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+   <item row="2" column="1" >
+    <spacer name="spacer41" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>220</width>
+       <height>21</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="2" column="0" >
+    <widget class="QLabel" name="taskProgressLbl" >
+     <property name="text" >
+      <string>Task Progress...</string>
+     </property>
+     <property name="wordWrap" >
+      <bool>false</bool>
+     </property>
+    </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>
+ </customwidgets>
+ <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>
+ </includes>
+ <resources>
+  <include location="PBSystem.qrc" />
+ </resources>
+ <connections>
+  <connection>
+   <sender>cancelBut</sender>
+   <signal>clicked()</signal>
+   <receiver>PortsnapProgress</receiver>
+   <slot>cancel()</slot>
+   <hints>
+    <hint type="sourcelabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+    <hint type="destinationlabel" >
+     <x>20</x>
+     <y>20</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>



More information about the Commits mailing list