[PC-BSD Commits] r4116 - pcbsd/trunk-current/SysInstaller

svn at pcbsd.org svn at pcbsd.org
Wed Jun 17 11:57:11 PDT 2009


Author: kris
Date: 2009-06-17 11:57:11 -0700 (Wed, 17 Jun 2009)
New Revision: 4116

Added:
   pcbsd/trunk-current/SysInstaller/setupnetwork.cpp
Modified:
   pcbsd/trunk-current/SysInstaller/Installer.pro
   pcbsd/trunk-current/SysInstaller/installer.cpp
   pcbsd/trunk-current/SysInstaller/installer.h
   pcbsd/trunk-current/SysInstaller/installer.ui
   pcbsd/trunk-current/SysInstaller/layoutdesign.cpp
   pcbsd/trunk-current/SysInstaller/layoutdesign.ui
   pcbsd/trunk-current/SysInstaller/manhattanstyle.cpp
   pcbsd/trunk-current/SysInstaller/setupcomponents.cpp
   pcbsd/trunk-current/SysInstaller/setupcomponents.ui
   pcbsd/trunk-current/SysInstaller/setupinstallation.h
   pcbsd/trunk-current/SysInstaller/setupinstallation.ui
   pcbsd/trunk-current/SysInstaller/setupnetwork.h
   pcbsd/trunk-current/SysInstaller/setupnetwork.ui
   pcbsd/trunk-current/SysInstaller/setupslices.cpp
   pcbsd/trunk-current/SysInstaller/setupslices.h
   pcbsd/trunk-current/SysInstaller/setupslices.ui
   pcbsd/trunk-current/SysInstaller/ui_installer.h
   pcbsd/trunk-current/SysInstaller/ui_layoutdesign.h
   pcbsd/trunk-current/SysInstaller/ui_setupcomponents.h
   pcbsd/trunk-current/SysInstaller/ui_setupinstallation.h
   pcbsd/trunk-current/SysInstaller/ui_setupnetwork.h
   pcbsd/trunk-current/SysInstaller/ui_setupslices.h
Log:

Updated the Sys Installer from Ken 



Modified: pcbsd/trunk-current/SysInstaller/Installer.pro
===================================================================
--- pcbsd/trunk-current/SysInstaller/Installer.pro	2009-06-17 18:09:03 UTC (rev 4115)
+++ pcbsd/trunk-current/SysInstaller/Installer.pro	2009-06-17 18:57:11 UTC (rev 4116)
@@ -14,9 +14,12 @@
     styleanimator.cpp \
     fancytabwidget.cpp \
     fancyactionbar.cpp \
-    setupslices.cpp \
     setuplanguage.cpp \
-    setupcomponents.cpp
+    setupcomponents.cpp \
+    setupinstallation.cpp \
+    setupnetwork.cpp \
+    layoutdesign.cpp \
+    setupslices.cpp
 HEADERS += installer.h \
     qtcassert.h \
     manhattanstyle.h \
@@ -25,12 +28,18 @@
     fancytabwidget.h \
     fancyactionbar.h \
     core_global.h \
-    setupslices.h \
     setuplanguage.h \
-    setupcomponents.h
+    setupcomponents.h \
+    setupinstallation.h \
+    setupnetwork.h \
+    layoutdesign.h \
+    setupslices.h
 FORMS += installer.ui \
-    setupslices.ui \
     setuplanguage.ui \
-    setupcomponents.ui
+    setupcomponents.ui \
+    setupinstallation.ui \
+    setupnetwork.ui \
+    layoutdesign.ui \
+    setupslices.ui
 RESOURCES += fancyactionbar.qrc \
     installer.qrc

Modified: pcbsd/trunk-current/SysInstaller/installer.cpp
===================================================================
--- pcbsd/trunk-current/SysInstaller/installer.cpp	2009-06-17 18:09:03 UTC (rev 4115)
+++ pcbsd/trunk-current/SysInstaller/installer.cpp	2009-06-17 18:57:11 UTC (rev 4116)
@@ -9,16 +9,16 @@
 
 using namespace Core::Internal;
 
-Installer::Installer(QWidget *parent) : QWidget(parent), ui(new Ui::InstallerClass)
+Installer::Installer(QWidget *parent) : QWidget(parent) //, ui(new Ui::InstallerClass)
 {
-    ui->setupUi(this);
+	setupUi(this);
 
 	m_setupLanguage = new SetupLanguage(this);
 
 
 
-	ui->stackedWidget->addWidget(m_setupLanguage);
-	ui->stackedWidget->setCurrentIndex(ui->stackedWidget->count() - 1);
+	stackedWidget->addWidget(m_setupLanguage);
+	stackedWidget->setCurrentIndex(stackedWidget->count() - 1);
 
 	m_setupInstallation = new SetupInstallation(this);
 	//ui->stackedWidget->addWidget(m_setupInstallation);
@@ -28,42 +28,67 @@
 	//ftw->insertTab(0, m_setupInstallation, QIcon(":/modules/images/install.png"), "Install");
 	//ftw->insertTab(1, m_setupInstallation, QIcon(":/modules/images/update.png"), "Repair");
 	//ftw->insertTab(2, m_setupInstallation, QIcon(":/modules/images/upgrade.png"), "Advanced");
-	ui->stackedWidget->addWidget(m_setupInstallation);
-	ui->stackedWidget->setCurrentIndex(ui->stackedWidget->count() - 1);
+	stackedWidget->addWidget(m_setupInstallation);
+	stackedWidget->setCurrentIndex(stackedWidget->count() - 1);
 
 	m_setupSlices = new SetupSlices(this);
-	ui->stackedWidget->addWidget(m_setupSlices);
-	ui->stackedWidget->setCurrentIndex(ui->stackedWidget->count() - 1);
+	stackedWidget->addWidget(m_setupSlices);
+	stackedWidget->setCurrentIndex(stackedWidget->count() - 1);
 
+	m_statusLabel = new QLabel(this);
+	m_statusLabel->setText("Status");
 
-	m_lblStatus = new QLabel(this);
-	m_lblStatus->setText("Status");
+	m_abortButton = new QPushButton(tr("Abort"), this);
+	m_backButton  = new QPushButton(tr("Back"),  this);
+	m_nextButton  = new QPushButton(tr("Next"),  this);
 
-	m_btnAbort = new QPushButton(tr("Abort"), this);
-	m_btnBack  = new QPushButton(tr("Back"),  this);
-	m_btnNext  = new QPushButton(tr("Next"),  this);
+	QDialogButtonBox *buttonBox = new QDialogButtonBox(this);
+	buttonBox->layout()->setContentsMargins(10, 0, 10, 0);
+	buttonBox->addButton(m_abortButton,QDialogButtonBox::ActionRole);
+	buttonBox->addButton(m_backButton, QDialogButtonBox::ActionRole);
+	buttonBox->addButton(m_nextButton, QDialogButtonBox::ActionRole);
 
-	QDialogButtonBox *bb = new QDialogButtonBox(this);
-	bb->layout()->setContentsMargins(10, 0, 10, 0);
-	bb->addButton(m_btnAbort,QDialogButtonBox::ActionRole);
-	bb->addButton(m_btnBack, QDialogButtonBox::ActionRole);
-	bb->addButton(m_btnNext, QDialogButtonBox::ActionRole);
-
 	QStatusBar *statusBar = new QStatusBar(this);
-	statusBar->addWidget(m_lblStatus);
-	statusBar->insertPermanentWidget(1, bb);
+	statusBar->addWidget(m_statusLabel);
+	statusBar->insertPermanentWidget(1, buttonBox);
 	statusBar->setSizeGripEnabled(false);
 
-	ui->statusWidget->layout()->addWidget(statusBar);
+	statusWidget->layout()->addWidget(statusBar);
 
 	//ui->verticalLayout->layout()->addWidget(statusBar);
 	//ui->stackedWidget_5->setCurrentIndex(ui->stackedWidget_5->count() - 1);
 
+	connect(m_abortButton, SIGNAL(clicked()), this, SLOT(slotAbortClicked()));
+	connect(m_backButton, SIGNAL(clicked()), this, SLOT(slotBackClicked()));
+	connect(m_nextButton, SIGNAL(clicked()), this, SLOT(slotNextClicked()));
+
+
 	SetupNetwork *sn = new SetupNetwork(this);
 	sn->show();
 }
 
 Installer::~Installer()
 {
-    delete ui;
+	//delete ui;
 }
+
+void Installer::slotAbortClicked()
+{
+	//
+}
+
+void Installer::slotBackClicked()
+{
+	if (stackedWidget->currentIndex() > 0)
+	{
+		stackedWidget->setCurrentIndex(stackedWidget->currentIndex() - 1);
+	}
+}
+
+void Installer::slotNextClicked()
+{
+	if (stackedWidget->currentIndex() < stackedWidget->count())
+	{
+		stackedWidget->setCurrentIndex(stackedWidget->currentIndex() + 1);
+	}
+}

Modified: pcbsd/trunk-current/SysInstaller/installer.h
===================================================================
--- pcbsd/trunk-current/SysInstaller/installer.h	2009-06-17 18:09:03 UTC (rev 4115)
+++ pcbsd/trunk-current/SysInstaller/installer.h	2009-06-17 18:57:11 UTC (rev 4116)
@@ -9,32 +9,42 @@
 #include "setuplanguage.h"
 #include "setupslices.h"
 
+#include "ui_installer.h"
 
+/*
 namespace Ui
 {
     class InstallerClass;
 }
-
-class Installer : public QWidget
+*/
+class Installer : public QWidget, private Ui::Installer
 {
     Q_OBJECT
-
+	Q_DISABLE_COPY(Installer)
 public:
     Installer(QWidget *parent = 0);
     ~Installer();
 
 private:
-    Ui::InstallerClass *ui;
+	//Ui::InstallerClass *ui;
 
-	QLabel		*m_lblStatus;
+	//widgets
+	QLabel		*m_statusLabel;
 
-	QPushButton *m_btnAbort;
-	QPushButton *m_btnBack;
-	QPushButton *m_btnNext;
+	QPushButton *m_abortButton;
+	QPushButton *m_backButton;
+	QPushButton *m_nextButton;
 
-	SetupLanguage *m_setupLanguage;
-	SetupInstallation *m_setupInstallation;
-	SetupSlices *m_setupSlices;
+	//modules
+	SetupLanguage		*m_setupLanguage;
+	SetupInstallation	*m_setupInstallation;
+	SetupSlices			*m_setupSlices;
+
+private slots:
+	void slotAbortClicked();
+	void slotBackClicked();
+	void slotNextClicked();
+
 };
 
 #endif // INSTALLER_H

Modified: pcbsd/trunk-current/SysInstaller/installer.ui
===================================================================
--- pcbsd/trunk-current/SysInstaller/installer.ui	2009-06-17 18:09:03 UTC (rev 4115)
+++ pcbsd/trunk-current/SysInstaller/installer.ui	2009-06-17 18:57:11 UTC (rev 4116)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>InstallerClass</class>
- <widget class="QWidget" name="InstallerClass">
+ <class>Installer</class>
+ <widget class="QWidget" name="Installer">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -66,7 +66,7 @@
        <number>0</number>
       </property>
       <item>
-       <widget class="QLabel" name="lblPcbsd">
+       <widget class="QLabel" name="m_pcbsdLabel">
         <property name="autoFillBackground">
          <bool>false</bool>
         </property>
@@ -74,7 +74,7 @@
          <string/>
         </property>
         <property name="pixmap">
-         <pixmap resource="installer.qrc">:/PCBSD/images/NewLogoSmall2.png</pixmap>
+         <pixmap>:/PCBSD/images/NewLogoSmall2.png</pixmap>
         </property>
        </widget>
       </item>
@@ -97,7 +97,7 @@
          <string/>
         </property>
         <property name="pixmap">
-         <pixmap resource="fancyactionbar.qrc">:/fancyactionbar/images/topright_corner.png</pixmap>
+         <pixmap>:/fancyactionbar/images/topright_corner.png</pixmap>
         </property>
         <property name="alignment">
          <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
@@ -108,7 +108,7 @@
     </widget>
    </item>
    <item>
-    <widget class="QWidget" name="widget" native="true">
+    <widget class="QWidget" name="titleWidget" native="true">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
        <horstretch>0</horstretch>
@@ -137,7 +137,7 @@
          <string/>
         </property>
         <property name="pixmap">
-         <pixmap resource="fancyactionbar.qrc">:/fancyactionbar/images/botleft_corner.png</pixmap>
+         <pixmap>:/fancyactionbar/images/botleft_corner.png</pixmap>
         </property>
         <property name="alignment">
          <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
@@ -145,7 +145,7 @@
        </widget>
       </item>
       <item>
-       <widget class="QLabel" name="lblQuote">
+       <widget class="QLabel" name="m_quoteLabel">
         <property name="styleSheet">
          <string>color: rgb(148,148,148);</string>
         </property>
@@ -171,7 +171,7 @@
        </spacer>
       </item>
       <item>
-       <widget class="QLabel" name="label">
+       <widget class="QLabel" name="m_currentModule">
         <property name="font">
          <font>
           <family>Utopia</family>
@@ -189,7 +189,7 @@
        </widget>
       </item>
       <item>
-       <widget class="QLabel" name="label_11">
+       <widget class="QLabel" name="m_currentPixbuf">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
           <horstretch>0</horstretch>
@@ -209,7 +209,7 @@
          </size>
         </property>
         <property name="pixmap">
-         <pixmap resource="fancyactionbar.qrc">:/fancyactionbar/images/desktop.png</pixmap>
+         <pixmap>:/fancyactionbar/images/desktop.png</pixmap>
         </property>
         <property name="scaledContents">
          <bool>true</bool>
@@ -254,7 +254,8 @@
       <bool>false</bool>
      </property>
      <property name="styleSheet">
-      <string>background-color: rgb(220, 220, 220);</string>
+      <string>background-color: rgb(233, 233, 233);
+background-color: rgb(220, 226, 223);</string>
      </property>
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
@@ -271,6 +272,21 @@
     </widget>
    </item>
    <item>
+    <widget class="QWidget" name="statusWidget" native="true">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>0</height>
+      </size>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_4">
+      <property name="margin">
+       <number>0</number>
+      </property>
+     </layout>
+    </widget>
+   </item>
+   <item>
     <layout class="QVBoxLayout" name="verticalLayout_10">
      <property name="spacing">
       <number>0</number>
@@ -304,83 +320,6 @@
       </widget>
      </item>
      <item>
-      <widget class="QWidget" name="widget_6" native="true">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="styleSheet">
-        <string>background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(180, 188, 184, 255), stop:1 rgba(255, 255, 255, 255))</string>
-       </property>
-       <layout class="QHBoxLayout" name="horizontalLayout_9">
-        <property name="spacing">
-         <number>3</number>
-        </property>
-        <property name="leftMargin">
-         <number>26</number>
-        </property>
-        <property name="topMargin">
-         <number>0</number>
-        </property>
-        <property name="rightMargin">
-         <number>0</number>
-        </property>
-        <property name="bottomMargin">
-         <number>0</number>
-        </property>
-        <item>
-         <widget class="QLabel" name="lblQuote_2">
-          <property name="font">
-           <font>
-            <family>Utopia</family>
-            <pointsize>10</pointsize>
-            <weight>75</weight>
-            <bold>true</bold>
-           </font>
-          </property>
-          <property name="styleSheet">
-           <string>color: rgb(148,148,148);</string>
-          </property>
-          <property name="text">
-           <string>Tips</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer_12">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Expanding</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>288</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QLabel" name="label_36">
-          <property name="text">
-           <string/>
-          </property>
-          <property name="pixmap">
-           <pixmap resource="fancyactionbar.qrc">:/fancyactionbar/images/topright_corner.png</pixmap>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </item>
-     <item>
       <widget class="QWidget" name="footer" native="true">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -403,7 +342,8 @@
        <property name="styleSheet">
         <string>background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(150, 158, 154, 255), stop:1 rgba(255, 255, 255, 255));
 background-color: rgb(180, 188, 184);
-background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(245, 245, 245, 255), stop:1 rgba(180, 188, 184, 255))</string>
+background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(190, 198, 194, 255));
+background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(140, 148, 144, 255))</string>
        </property>
        <layout class="QHBoxLayout" name="horizontalLayout_2">
         <property name="spacing">
@@ -418,7 +358,7 @@
            <string/>
           </property>
           <property name="pixmap">
-           <pixmap resource="fancyactionbar.qrc">:/fancyactionbar/images/botleft_corner.png</pixmap>
+           <pixmap>:/fancyactionbar/images/botleft_corner.png</pixmap>
           </property>
           <property name="alignment">
            <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
@@ -426,7 +366,25 @@
          </widget>
         </item>
         <item>
-         <widget class="QTextEdit" name="txtInfo">
+         <widget class="QLabel" name="lblQuote_2">
+          <property name="font">
+           <font>
+            <family>Utopia</family>
+            <pointsize>10</pointsize>
+            <weight>75</weight>
+            <bold>true</bold>
+           </font>
+          </property>
+          <property name="styleSheet">
+           <string>color: rgb(148,148,148);</string>
+          </property>
+          <property name="text">
+           <string>Tips</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QTextEdit" name="m_helpInfo">
           <property name="autoFillBackground">
            <bool>false</bool>
           </property>
@@ -460,6 +418,19 @@
           </property>
          </widget>
         </item>
+        <item>
+         <widget class="QLabel" name="label_36">
+          <property name="text">
+           <string/>
+          </property>
+          <property name="pixmap">
+           <pixmap>:/fancyactionbar/images/topright_corner.png</pixmap>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
      </item>
@@ -468,9 +439,6 @@
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
- <resources>
-  <include location="fancyactionbar.qrc"/>
-  <include location="installer.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>

Modified: pcbsd/trunk-current/SysInstaller/layoutdesign.cpp
===================================================================
--- pcbsd/trunk-current/SysInstaller/layoutdesign.cpp	2009-06-17 18:09:03 UTC (rev 4115)
+++ pcbsd/trunk-current/SysInstaller/layoutdesign.cpp	2009-06-17 18:57:11 UTC (rev 4116)
@@ -18,7 +18,7 @@
 
 void LayoutDesign::setTitle(const QString &title, const QPixmap &pixmap)
 {
-	this->titleLabel->setText(title);
-	this->pixmapLabel->setPixmap(pixmap);
+	titleLabel->setText(title);
+	pixmapLabel->setPixmap(pixmap);
 }
 

Modified: pcbsd/trunk-current/SysInstaller/layoutdesign.ui
===================================================================
--- pcbsd/trunk-current/SysInstaller/layoutdesign.ui	2009-06-17 18:09:03 UTC (rev 4115)
+++ pcbsd/trunk-current/SysInstaller/layoutdesign.ui	2009-06-17 18:57:11 UTC (rev 4116)
@@ -170,7 +170,9 @@
       </sizepolicy>
      </property>
      <property name="styleSheet">
-      <string>background-color: rgb(190, 198, 194);</string>
+      <string>background-color: rgb(190, 198, 194);
+
+background-color: rgb(220, 226, 223);</string>
      </property>
      <widget class="QGroupBox" name="groupBox_2">
       <property name="geometry">
@@ -307,6 +309,61 @@
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="widget_3" native="true">
+      <property name="geometry">
+       <rect>
+        <x>260</x>
+        <y>50</y>
+        <width>40</width>
+        <height>121</height>
+       </rect>
+      </property>
+      <property name="styleSheet">
+       <string>background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(140, 148, 144, 255));
+background-color: qlineargradient(spread:pad, x1:1, y1:0.5, x2:0, y2:0.5, stop:0 rgba(140, 148, 144, 255), stop:1 rgba(255, 255, 255, 255));
+</string>
+      </property>
+      <layout class="QVBoxLayout" name="verticalLayout_6">
+       <item>
+        <layout class="QVBoxLayout" name="verticalLayout_5">
+         <item>
+          <widget class="QWidget" name="toolbarWidget" native="true">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>15</width>
+             <height>0</height>
+            </size>
+           </property>
+           <layout class="QVBoxLayout" name="verticalLayout_4">
+            <property name="margin">
+             <number>0</number>
+            </property>
+           </layout>
+          </widget>
+         </item>
+         <item>
+          <spacer name="verticalSpacer_4">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+      </layout>
+     </widget>
     </widget>
    </item>
    <item>

Modified: pcbsd/trunk-current/SysInstaller/manhattanstyle.cpp
===================================================================
--- pcbsd/trunk-current/SysInstaller/manhattanstyle.cpp	2009-06-17 18:09:03 UTC (rev 4115)
+++ pcbsd/trunk-current/SysInstaller/manhattanstyle.cpp	2009-06-17 18:57:11 UTC (rev 4116)
@@ -232,6 +232,7 @@
 {
     int retval = 0;
     retval = d->style->pixelMetric(metric, option, widget);
+
     switch (metric) {
     case PM_SplitterWidth:
         if (widget && widget->property("minisplitter").toBool())

Modified: pcbsd/trunk-current/SysInstaller/setupcomponents.cpp
===================================================================
--- pcbsd/trunk-current/SysInstaller/setupcomponents.cpp	2009-06-17 18:09:03 UTC (rev 4115)
+++ pcbsd/trunk-current/SysInstaller/setupcomponents.cpp	2009-06-17 18:57:11 UTC (rev 4116)
@@ -1,7 +1,7 @@
 #include "setupcomponents.h"
 
-SetupComponents::SetupComponents(QWidget *parent) :
-    QWidget(parent){
+SetupComponents::SetupComponents(QWidget *parent) : QWidget(parent)
+{
     setupUi(this);
 }
 

Modified: pcbsd/trunk-current/SysInstaller/setupcomponents.ui
===================================================================
--- pcbsd/trunk-current/SysInstaller/setupcomponents.ui	2009-06-17 18:09:03 UTC (rev 4115)
+++ pcbsd/trunk-current/SysInstaller/setupcomponents.ui	2009-06-17 18:57:11 UTC (rev 4116)
@@ -22,6 +22,9 @@
      <height>192</height>
     </rect>
    </property>
+   <property name="frameShadow">
+    <enum>QFrame::Plain</enum>
+   </property>
   </widget>
   <widget class="QListWidget" name="listWidget">
    <property name="geometry">
@@ -32,6 +35,9 @@
      <height>192</height>
     </rect>
    </property>
+   <property name="frameShadow">
+    <enum>QFrame::Plain</enum>
+   </property>
   </widget>
   <widget class="QWidget" name="widget" native="true">
    <property name="geometry">

Modified: pcbsd/trunk-current/SysInstaller/setupinstallation.h
===================================================================
--- pcbsd/trunk-current/SysInstaller/setupinstallation.h	2009-06-17 18:09:03 UTC (rev 4115)
+++ pcbsd/trunk-current/SysInstaller/setupinstallation.h	2009-06-17 18:57:11 UTC (rev 4116)
@@ -3,7 +3,8 @@
 
 #include "ui_setupinstallation.h"
 
-class SetupInstallation : public QWidget, private Ui::SetupInstallation {
+class SetupInstallation : public QWidget, private Ui::SetupInstallation
+{
     Q_OBJECT
     Q_DISABLE_COPY(SetupInstallation)
 public:

Modified: pcbsd/trunk-current/SysInstaller/setupinstallation.ui
===================================================================
--- pcbsd/trunk-current/SysInstaller/setupinstallation.ui	2009-06-17 18:09:03 UTC (rev 4115)
+++ pcbsd/trunk-current/SysInstaller/setupinstallation.ui	2009-06-17 18:57:11 UTC (rev 4116)
@@ -6,14 +6,14 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>668</width>
-    <height>259</height>
+    <width>709</width>
+    <height>431</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QHBoxLayout" name="horizontalLayout_7">
+  <layout class="QHBoxLayout" name="horizontalLayout">
    <item>
     <spacer name="horizontalSpacer_2">
      <property name="orientation">
@@ -29,9 +29,6 @@
    </item>
    <item>
     <layout class="QVBoxLayout" name="verticalLayout">
-     <property name="spacing">
-      <number>3</number>
-     </property>
      <item>
       <spacer name="verticalSpacer">
        <property name="orientation">
@@ -46,83 +43,80 @@
       </spacer>
      </item>
      <item>
-      <widget class="QGroupBox" name="groupBox_2">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="font">
-        <font>
-         <weight>75</weight>
-         <bold>true</bold>
-        </font>
-       </property>
-       <property name="title">
-        <string>GroupBox</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignCenter</set>
-       </property>
-       <property name="flat">
-        <bool>false</bool>
-       </property>
-       <property name="checkable">
-        <bool>false</bool>
-       </property>
-       <layout class="QHBoxLayout" name="horizontalLayout_3">
+      <widget class="QWidget" name="widget_4" native="true">
+       <layout class="QVBoxLayout" name="verticalLayout_4">
         <property name="spacing">
          <number>0</number>
         </property>
-        <property name="leftMargin">
+        <property name="margin">
          <number>0</number>
         </property>
-        <property name="topMargin">
-         <number>4</number>
-        </property>
-        <property name="rightMargin">
-         <number>0</number>
-        </property>
-        <property name="bottomMargin">
-         <number>0</number>
-        </property>
         <item>
-         <widget class="QWidget" name="widget_2" native="true">
+         <widget class="QLabel" name="label">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>20</height>
+           </size>
+          </property>
+          <property name="font">
+           <font>
+            <weight>75</weight>
+            <bold>true</bold>
+           </font>
+          </property>
           <property name="styleSheet">
+           <string>background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(220, 226, 223, 255), stop:1 rgba(190, 198, 194, 255))</string>
+          </property>
+          <property name="text">
+           <string>Installation Type</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QWidget" name="widget_5" native="true">
+          <property name="styleSheet">
            <string>background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(140, 148, 144, 255))</string>
           </property>
-          <layout class="QHBoxLayout" name="horizontalLayout_4">
+          <layout class="QHBoxLayout" name="horizontalLayout_7">
            <property name="spacing">
-            <number>40</number>
+            <number>0</number>
            </property>
-           <property name="leftMargin">
-            <number>40</number>
-           </property>
            <property name="topMargin">
             <number>0</number>
            </property>
-           <property name="rightMargin">
-            <number>40</number>
-           </property>
            <property name="bottomMargin">
             <number>0</number>
            </property>
            <item>
-            <widget class="QRadioButton" name="radioButton_4">
+            <widget class="QRadioButton" name="radioButton_8">
              <property name="sizePolicy">
-              <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+              <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
+             <property name="minimumSize">
+              <size>
+               <width>200</width>
+               <height>0</height>
+              </size>
+             </property>
              <property name="text">
-              <string>PC-BSD
-Desktop</string>
+              <string>Desktop</string>
              </property>
              <property name="icon">
-              <iconset resource="installer.qrc">
-               <normaloff>:/modules/images/desktop.png</normaloff>:/modules/images/desktop.png</iconset>
+              <iconset>
+               <normaloff>:/modules/images/pbidiricon.png</normaloff>:/modules/images/pbidiricon.png</iconset>
              </property>
              <property name="iconSize">
               <size>
@@ -130,22 +124,30 @@
                <height>42</height>
               </size>
              </property>
+             <property name="checked">
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item>
-            <widget class="QRadioButton" name="radioButton_5">
+            <widget class="QRadioButton" name="radioButton_10">
              <property name="sizePolicy">
-              <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+              <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
+             <property name="minimumSize">
+              <size>
+               <width>200</width>
+               <height>0</height>
+              </size>
+             </property>
              <property name="text">
-              <string>PC-BSD
-Server</string>
+              <string>Server</string>
              </property>
              <property name="icon">
-              <iconset resource="installer.qrc">
+              <iconset>
                <normaloff>:/modules/images/server.png</normaloff>:/modules/images/server.png</iconset>
              </property>
              <property name="iconSize">
@@ -157,18 +159,24 @@
             </widget>
            </item>
            <item>
-            <widget class="QRadioButton" name="radioButton_6">
+            <widget class="QRadioButton" name="radioButton_11">
              <property name="sizePolicy">
-              <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+              <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
+             <property name="minimumSize">
+              <size>
+               <width>200</width>
+               <height>0</height>
+              </size>
+             </property>
              <property name="text">
               <string>Freebsd</string>
              </property>
              <property name="icon">
-              <iconset resource="installer.qrc">
+              <iconset>
                <normaloff>:/modules/images/freebsd.png</normaloff>:/modules/images/freebsd.png</iconset>
              </property>
              <property name="iconSize">
@@ -199,81 +207,79 @@
       </spacer>
      </item>
      <item>
-      <widget class="QGroupBox" name="groupBox">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="font">
-        <font>
-         <weight>75</weight>
-         <bold>true</bold>
-        </font>
-       </property>
-       <property name="title">
-        <string>GroupBox</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignCenter</set>
-       </property>
-       <property name="flat">
-        <bool>false</bool>
-       </property>
-       <property name="checkable">
-        <bool>false</bool>
-       </property>
-       <layout class="QHBoxLayout" name="horizontalLayout">
+      <widget class="QWidget" name="widget_6" native="true">
+       <layout class="QVBoxLayout" name="verticalLayout_5">
         <property name="spacing">
          <number>0</number>
         </property>
-        <property name="leftMargin">
+        <property name="margin">
          <number>0</number>
         </property>
-        <property name="topMargin">
-         <number>4</number>
-        </property>
-        <property name="rightMargin">
-         <number>0</number>
-        </property>
-        <property name="bottomMargin">
-         <number>0</number>
-        </property>
         <item>
-         <widget class="QWidget" name="widget" native="true">
+         <widget class="QLabel" name="label_2">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>20</height>
+           </size>
+          </property>
+          <property name="font">
+           <font>
+            <weight>75</weight>
+            <bold>true</bold>
+           </font>
+          </property>
           <property name="styleSheet">
+           <string>background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(220, 226, 223, 255), stop:1 rgba(190, 198, 194, 255))</string>
+          </property>
+          <property name="text">
+           <string>Installation Choice</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QWidget" name="widget_7" native="true">
+          <property name="styleSheet">
            <string>background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(140, 148, 144, 255))</string>
           </property>
-          <layout class="QHBoxLayout" name="horizontalLayout_2">
+          <layout class="QHBoxLayout" name="horizontalLayout_8">
            <property name="spacing">
-            <number>40</number>
+            <number>0</number>
            </property>
-           <property name="leftMargin">
-            <number>40</number>
-           </property>
            <property name="topMargin">
             <number>0</number>
            </property>
-           <property name="rightMargin">
-            <number>40</number>
-           </property>
            <property name="bottomMargin">
             <number>0</number>
            </property>
            <item>
-            <widget class="QRadioButton" name="radioButton">
+            <widget class="QRadioButton" name="radioButton_12">
              <property name="sizePolicy">
-              <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+              <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
+             <property name="minimumSize">
+              <size>
+               <width>200</width>
+               <height>0</height>
+              </size>
+             </property>
              <property name="text">
-              <string>RadioButton</string>
+              <string>Install</string>
              </property>
              <property name="icon">
-              <iconset resource="installer.qrc">
+              <iconset>
                <normaloff>:/modules/images/install.png</normaloff>:/modules/images/install.png</iconset>
              </property>
              <property name="iconSize">
@@ -282,22 +288,31 @@
                <height>42</height>
               </size>
              </property>
+             <property name="checked">
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item>
-            <widget class="QRadioButton" name="radioButton_2">
+            <widget class="QRadioButton" name="radioButton_13">
              <property name="sizePolicy">
-              <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+              <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
+             <property name="minimumSize">
+              <size>
+               <width>180</width>
+               <height>0</height>
+              </size>
+             </property>
              <property name="text">
-              <string>RadioButton</string>
+              <string>Update</string>
              </property>
              <property name="icon">
-              <iconset resource="installer.qrc">
-               <normaloff>:/modules/images/upgrade.png</normaloff>:/modules/images/upgrade.png</iconset>
+              <iconset>
+               <normaloff>:/modules/images/update.png</normaloff>:/modules/images/update.png</iconset>
              </property>
              <property name="iconSize">
               <size>
@@ -308,19 +323,25 @@
             </widget>
            </item>
            <item>
-            <widget class="QRadioButton" name="radioButton_3">
+            <widget class="QRadioButton" name="radioButton_14">
              <property name="sizePolicy">
-              <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+              <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
+             <property name="minimumSize">
+              <size>
+               <width>200</width>
+               <height>0</height>
+              </size>
+             </property>
              <property name="text">
-              <string>RadioButton</string>
+              <string>Upgrade</string>
              </property>
              <property name="icon">
-              <iconset resource="installer.qrc">
-               <normaloff>:/modules/images/update.png</normaloff>:/modules/images/update.png</iconset>
+              <iconset>
+               <normaloff>:/modules/images/upgrade.png</normaloff>:/modules/images/upgrade.png</iconset>
              </property>
              <property name="iconSize">
               <size>
@@ -350,81 +371,79 @@
       </spacer>
      </item>
      <item>
-      <widget class="QGroupBox" name="groupBox_3">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="font">
-        <font>
-         <weight>75</weight>
-         <bold>true</bold>
-        </font>
-       </property>
-       <property name="title">
-        <string>GroupBox</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignCenter</set>
-       </property>
-       <property name="flat">
-        <bool>false</bool>
-       </property>
-       <property name="checkable">
-        <bool>false</bool>
-       </property>
-       <layout class="QHBoxLayout" name="horizontalLayout_5">
+      <widget class="QWidget" name="widget_8" native="true">
+       <layout class="QVBoxLayout" name="verticalLayout_6">
         <property name="spacing">
          <number>0</number>
         </property>
-        <property name="leftMargin">
+        <property name="margin">
          <number>0</number>
         </property>
-        <property name="topMargin">
-         <number>4</number>
-        </property>
-        <property name="rightMargin">
-         <number>0</number>
-        </property>
-        <property name="bottomMargin">
-         <number>0</number>
-        </property>
         <item>
-         <widget class="QWidget" name="widget_3" native="true">
+         <widget class="QLabel" name="label_3">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>20</height>
+           </size>
+          </property>
+          <property name="font">
+           <font>
+            <weight>75</weight>
+            <bold>true</bold>
+           </font>
+          </property>
           <property name="styleSheet">
+           <string>background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(220, 226, 223, 255), stop:1 rgba(190, 198, 194, 255))</string>
+          </property>
+          <property name="text">
+           <string>Installation Method</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QWidget" name="widget_9" native="true">
+          <property name="styleSheet">
            <string>background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(140, 148, 144, 255))</string>
           </property>
-          <layout class="QHBoxLayout" name="horizontalLayout_6">
+          <layout class="QHBoxLayout" name="horizontalLayout_9">
            <property name="spacing">
-            <number>40</number>
+            <number>0</number>
            </property>
-           <property name="leftMargin">
-            <number>40</number>
-           </property>
            <property name="topMargin">
             <number>0</number>
            </property>
-           <property name="rightMargin">
-            <number>40</number>
-           </property>
            <property name="bottomMargin">
             <number>0</number>
            </property>
            <item>
-            <widget class="QRadioButton" name="radioButton_7">
+            <widget class="QRadioButton" name="radioButton_15">
              <property name="sizePolicy">
-              <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+              <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
+             <property name="minimumSize">
+              <size>
+               <width>200</width>
+               <height>0</height>
+              </size>
+             </property>
              <property name="text">
-              <string>RadioButton</string>
+              <string>DVD</string>
              </property>
              <property name="icon">
-              <iconset resource="installer.qrc">
+              <iconset>
                <normaloff>:/modules/images/cdrom_mount.png</normaloff>:/modules/images/cdrom_mount.png</iconset>
              </property>
              <property name="iconSize">
@@ -433,6 +452,9 @@
                <height>42</height>
               </size>
              </property>
+             <property name="checked">
+              <bool>true</bool>
+             </property>
             </widget>
            </item>
            <item>
@@ -449,18 +471,27 @@
             </spacer>
            </item>
            <item>
-            <widget class="QRadioButton" name="radioButton_9">
+            <widget class="QRadioButton" name="radioButton_17">
              <property name="sizePolicy">
-              <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+              <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
+             <property name="minimumSize">
+              <size>
+               <width>200</width>
+               <height>0</height>
+              </size>
+             </property>
+             <property name="layoutDirection">
+              <enum>Qt::LeftToRight</enum>
+             </property>
              <property name="text">
-              <string>RadioButton</string>
+              <string>Network</string>
              </property>
              <property name="icon">
-              <iconset resource="installer.qrc">
+              <iconset>
                <normaloff>:/modules/images/network_local.png</normaloff>:/modules/images/network_local.png</iconset>
              </property>
              <property name="iconSize">
@@ -490,19 +521,6 @@
        </property>
       </spacer>
      </item>
-     <item>
-      <spacer name="verticalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>20</width>
-         <height>18</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
     </layout>
    </item>
    <item>
@@ -520,8 +538,6 @@
    </item>
   </layout>
  </widget>
- <resources>
-  <include location="installer.qrc"/>
- </resources>
+ <resources/>
  <connections/>
 </ui>

Modified: pcbsd/trunk-current/SysInstaller/setupnetwork.h
===================================================================
--- pcbsd/trunk-current/SysInstaller/setupnetwork.h	2009-06-17 18:09:03 UTC (rev 4115)
+++ pcbsd/trunk-current/SysInstaller/setupnetwork.h	2009-06-17 18:57:11 UTC (rev 4116)
@@ -14,9 +14,19 @@
     virtual void changeEvent(QEvent *e);
 
 private:
-	QPushButton *m_btnCancel;
-	QPushButton *m_btnConfirm;
+	QPushButton *m_cancelButton;
+	QPushButton *m_confirmButton;
 
+private slots:
+	void slotDeviceChanged(int);
+	void slotDHCPToggled(bool);
+	void slotManualToggled(bool);
+	void slotCancelClicked();
+	void slotConfirmClicked();
+
+signals:
+	void signalCancelled(bool ok);
+	void signalConfirmed(bool ok);
 };
 
 #endif // SETUPNETWORK_H

Modified: pcbsd/trunk-current/SysInstaller/setupnetwork.ui
===================================================================
--- pcbsd/trunk-current/SysInstaller/setupnetwork.ui	2009-06-17 18:09:03 UTC (rev 4115)
+++ pcbsd/trunk-current/SysInstaller/setupnetwork.ui	2009-06-17 18:57:11 UTC (rev 4116)
@@ -191,7 +191,7 @@
       </sizepolicy>
      </property>
      <property name="styleSheet">
-      <string>background-color: rgb(233, 233, 233);</string>
+      <string>background-color: rgb(220, 226, 223);</string>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_3">
       <property name="spacing">
@@ -207,12 +207,16 @@
        <number>20</number>
       </property>
       <item>
-       <widget class="QComboBox" name="comboBox"/>
+       <widget class="QComboBox" name="m_deviceCombo">
+        <property name="styleSheet">
+         <string>background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(140, 148, 144, 255))</string>
+        </property>
+       </widget>
       </item>
       <item>
        <widget class="QLabel" name="label_2">
         <property name="text">
-         <string>Please select you network device above, and then choose DHCP or enter a manual IP address.</string>
+         <string>Please select your network device above, and then choose DHCP or enter a manual IP address.</string>
         </property>
         <property name="wordWrap">
          <bool>true</bool>
@@ -233,7 +237,7 @@
        </spacer>
       </item>
       <item>
-       <widget class="QRadioButton" name="radioButton">
+       <widget class="QRadioButton" name="m_dhcpRadio">
         <property name="font">
          <font>
           <weight>75</weight>
@@ -243,6 +247,9 @@
         <property name="text">
          <string>Use DHCP</string>
         </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
        </widget>
       </item>
       <item>
@@ -251,7 +258,7 @@
          <number>3</number>
         </property>
         <item>
-         <widget class="QRadioButton" name="radioButton_2">
+         <widget class="QRadioButton" name="m_manualRadio">
           <property name="font">
            <font>
             <weight>75</weight>
@@ -276,7 +283,7 @@
             <number>25</number>
            </property>
            <item row="0" column="0">
-            <widget class="QLineEdit" name="lineEdit">
+            <widget class="QLineEdit" name="m_ipaddrEdit">
              <property name="styleSheet">
               <string>background-color: rgb(255, 255, 255);</string>
              </property>
@@ -302,7 +309,7 @@
             </widget>
            </item>
            <item row="1" column="0">
-            <widget class="QLineEdit" name="lineEdit_2">
+            <widget class="QLineEdit" name="m_netmaskEdit">
              <property name="styleSheet">
               <string>background-color: rgb(255, 255, 255);</string>
              </property>
@@ -328,7 +335,7 @@
             </widget>
            </item>
            <item row="2" column="0">
-            <widget class="QLineEdit" name="lineEdit_3">
+            <widget class="QLineEdit" name="m_gatewayEdit">
              <property name="styleSheet">
               <string>background-color: rgb(255, 255, 255);</string>
              </property>

Modified: pcbsd/trunk-current/SysInstaller/setupslices.cpp
===================================================================
--- pcbsd/trunk-current/SysInstaller/setupslices.cpp	2009-06-17 18:09:03 UTC (rev 4115)
+++ pcbsd/trunk-current/SysInstaller/setupslices.cpp	2009-06-17 18:57:11 UTC (rev 4116)
@@ -1,8 +1,25 @@
 #include "setupslices.h"
 
-SetupSlices::SetupSlices(QWidget *parent) :
-    QWidget(parent){
-    setupUi(this);
+SetupSlices::SetupSlices(QWidget *parent) : QWidget(parent)
+{
+	setupUi(this);
+
+	m_fsCombo->addItem(tr("UFS2"));
+	m_fsCombo->addItem(tr("UFS2 + Soft Updates"));
+	m_fsCombo->addItem(tr("UFS2 + Journaling"));
+	/*
+	if (QFile::exists("/tmp/zfsEnabled"))
+		m_fsCombo->addItem(tr("ZFS (experimental)"));
+	*/
+	m_fsCombo->setCurrentIndex(0);
+
+	//m_basicRadio
+
+	toolbar = new QToolBar(this);
+	toolbarWidget->layout()->addWidget(toolbar);
+
+	connect(m_basicRadio, SIGNAL(toggled(bool)), this, SLOT(slotBasicView(bool)));
+	connect(m_advancedRadio, SIGNAL(toggled(bool)), this, SLOT(slotAdvancedView(bool)));
 }
 
 void SetupSlices::changeEvent(QEvent *e)
@@ -15,3 +32,13 @@
         break;
     }
 }
+
+void SetupSlices::slotBasicView(bool toggled)
+{
+	int index = toggled ? 0 : 1;
+	stackedWidget->setCurrentIndex(index);
+}
+
+void SetupSlices::slotAdvancedView(bool toggled)
+{
+}

Modified: pcbsd/trunk-current/SysInstaller/setupslices.h
===================================================================
--- pcbsd/trunk-current/SysInstaller/setupslices.h	2009-06-17 18:09:03 UTC (rev 4115)
+++ pcbsd/trunk-current/SysInstaller/setupslices.h	2009-06-17 18:57:11 UTC (rev 4116)
@@ -1,9 +1,12 @@
 #ifndef SETUPSLICES_H
 #define SETUPSLICES_H
 
+#include <QtGui/QToolBar>
+
 #include "ui_setupslices.h"
 
-class SetupSlices : public QWidget, private Ui::SetupSlices {
+class SetupSlices : public QWidget, private Ui::SetupSlices
+{
     Q_OBJECT
     Q_DISABLE_COPY(SetupSlices)
 public:
@@ -11,6 +14,14 @@
 
 protected:
     virtual void changeEvent(QEvent *e);
+
+private:
+	QToolBar *toolbar;
+
+private slots:
+	void slotBasicView(bool);
+	void slotAdvancedView(bool);
+
 };
 
 #endif // SETUPSLICES_H

Modified: pcbsd/trunk-current/SysInstaller/setupslices.ui
===================================================================
--- pcbsd/trunk-current/SysInstaller/setupslices.ui	2009-06-17 18:09:03 UTC (rev 4115)
+++ pcbsd/trunk-current/SysInstaller/setupslices.ui	2009-06-17 18:57:11 UTC (rev 4116)
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>542</width>
-    <height>458</height>
+    <width>543</width>
+    <height>626</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -15,7 +15,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="bottomMargin">
-    <number>0</number>
+    <number>9</number>
    </property>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
@@ -33,7 +33,7 @@
       </spacer>
      </item>
      <item>
-      <widget class="QRadioButton" name="radioButton">
+      <widget class="QRadioButton" name="m_basicRadio">
        <property name="font">
         <font>
          <weight>75</weight>
@@ -46,7 +46,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QRadioButton" name="radioButton_2">
+      <widget class="QRadioButton" name="m_advancedRadio">
        <property name="font">
         <font>
          <weight>75</weight>
@@ -81,236 +81,835 @@
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="currentIndex">
+      <number>1</number>
+     </property>
      <widget class="QWidget" name="page">
-      <layout class="QVBoxLayout" name="verticalLayout_6">
-       <property name="spacing">
-        <number>40</number>
-       </property>
-       <property name="leftMargin">
-        <number>60</number>
-       </property>
-       <property name="topMargin">
-        <number>40</number>
-       </property>
-       <property name="rightMargin">
-        <number>60</number>
-       </property>
-       <property name="bottomMargin">
-        <number>40</number>
-       </property>
+      <layout class="QHBoxLayout" name="horizontalLayout_4">
        <item>
-        <layout class="QGridLayout" name="gridLayout">
-         <property name="horizontalSpacing">
-          <number>3</number>
+        <spacer name="horizontalSpacer_7">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
          </property>
-         <item row="0" column="0" rowspan="2">
-          <layout class="QVBoxLayout" name="verticalLayout_2">
-           <property name="spacing">
-            <number>3</number>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>45</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <layout class="QVBoxLayout" name="verticalLayout_2">
+         <item>
+          <spacer name="verticalSpacer_2">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
            </property>
-           <item>
-            <widget class="QLabel" name="label_24">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="maximumSize">
-              <size>
-               <width>42</width>
-               <height>42</height>
-              </size>
-             </property>
-             <property name="text">
-              <string/>
-             </property>
-             <property name="pixmap">
-              <pixmap resource="installer.qrc">:/modules/images/language.png</pixmap>
-             </property>
-             <property name="scaledContents">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <spacer name="verticalSpacer">
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>20</width>
-               <height>40</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-          </layout>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>28</height>
+            </size>
+           </property>
+          </spacer>
          </item>
-         <item row="0" column="1" rowspan="2">
-          <widget class="QFrame" name="frame">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
+         <item>
+          <widget class="QWidget" name="widget_7" native="true">
+           <property name="maximumSize">
             <size>
-             <width>50</width>
-             <height>0</height>
+             <width>16777215</width>
+             <height>200</height>
             </size>
            </property>
-           <property name="frameShape">
-            <enum>QFrame::StyledPanel</enum>
+           <property name="styleSheet">
+            <string>background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(140, 148, 144, 255))</string>
            </property>
-           <property name="frameShadow">
-            <enum>QFrame::Raised</enum>
-           </property>
-           <layout class="QVBoxLayout" name="verticalLayout_3">
-            <property name="spacing">
-             <number>3</number>
+           <layout class="QHBoxLayout" name="horizontalLayout_9">
+            <property name="topMargin">
+             <number>0</number>
             </property>
-            <property name="margin">
-             <number>3</number>
+            <property name="rightMargin">
+             <number>0</number>
             </property>
+            <property name="bottomMargin">
+             <number>0</number>
+            </property>
             <item>
-             <widget class="QLabel" name="label">
+             <widget class="QLabel" name="label_11">
               <property name="sizePolicy">
-               <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
+              <property name="maximumSize">
+               <size>
+                <width>16777215</width>
+                <height>16777215</height>
+               </size>
+              </property>
               <property name="text">
-               <string>TextLabel</string>
+               <string/>
               </property>
+              <property name="pixmap">
+               <pixmap resource="installer.qrc">:/modules/images/blockdevice.png</pixmap>
+              </property>
+              <property name="scaledContents">
+               <bool>false</bool>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignHCenter|Qt::AlignTop</set>
+              </property>
              </widget>
             </item>
             <item>
-             <widget class="QListWidget" name="listWidget">
-              <property name="styleSheet">
-               <string>background-color: rgb(255, 255, 255);</string>
+             <layout class="QVBoxLayout" name="verticalLayout_10">
+              <property name="spacing">
+               <number>0</number>
               </property>
-              <property name="frameShadow">
-               <enum>QFrame::Plain</enum>
+              <item>
+               <widget class="QWidget" name="widget_8" native="true">
+                <property name="styleSheet">
+                 <string>background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(220, 226, 223, 255), stop:1 rgba(190, 198, 194, 255))</string>
+                </property>
+                <layout class="QHBoxLayout" name="horizontalLayout_10">
+                 <property name="leftMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="topMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="bottomMargin">
+                  <number>0</number>
+                 </property>
+                 <item>
+                  <widget class="QLabel" name="label_6">
+                   <property name="sizePolicy">
+                    <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+                     <horstretch>0</horstretch>
+                     <verstretch>0</verstretch>
+                    </sizepolicy>
+                   </property>
+                   <property name="text">
+                    <string/>
+                   </property>
+                   <property name="pixmap">
+                    <pixmap resource="fancyactionbar.qrc">:/fancyactionbar/images/botleft_corner.png</pixmap>
+                   </property>
+                   <property name="alignment">
+                    <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QLabel" name="label_14">
+                   <property name="sizePolicy">
+                    <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                     <horstretch>0</horstretch>
+                     <verstretch>0</verstretch>
+                    </sizepolicy>
+                   </property>
+                   <property name="minimumSize">
+                    <size>
+                     <width>0</width>
+                     <height>20</height>
+                    </size>
+                   </property>
+                   <property name="font">
+                    <font>
+                     <weight>75</weight>
+                     <bold>true</bold>
+                    </font>
+                   </property>
+                   <property name="text">
+                    <string>Detected Hard Drives</string>
+                   </property>
+                   <property name="alignment">
+                    <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </widget>
+              </item>
+              <item>
+               <widget class="QListWidget" name="listWidget_7">
+                <property name="frameShape">
+                 <enum>QFrame::Box</enum>
+                </property>
+                <property name="frameShadow">
+                 <enum>QFrame::Plain</enum>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item>
+          <spacer name="verticalSpacer">
+           <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>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QWidget" name="widget_9" native="true">
+           <property name="maximumSize">
+            <size>
+             <width>16777215</width>
+             <height>200</height>
+            </size>
+           </property>
+           <property name="styleSheet">
+            <string>background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(140, 148, 144, 255))</string>
+           </property>
+           <layout class="QHBoxLayout" name="horizontalLayout_11">
+            <property name="topMargin">
+             <number>0</number>
+            </property>
+            <property name="rightMargin">
+             <number>0</number>
+            </property>
+            <property name="bottomMargin">
+             <number>0</number>
+            </property>
+            <item>
+             <widget class="QLabel" name="label_16">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
               </property>
+              <property name="maximumSize">
+               <size>
+                <width>16777215</width>
+                <height>16777215</height>
+               </size>
+              </property>
+              <property name="text">
+               <string/>
+              </property>
+              <property name="pixmap">
+               <pixmap resource="installer.qrc">:/modules/images/blockdevice.png</pixmap>
+              </property>
+              <property name="scaledContents">
+               <bool>false</bool>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignHCenter|Qt::AlignTop</set>
+              </property>
              </widget>
             </item>
+            <item>
+             <layout class="QVBoxLayout" name="verticalLayout_11">
+              <property name="spacing">
+               <number>0</number>
+              </property>
+              <item>
+               <widget class="QWidget" name="widget_10" native="true">
+                <property name="styleSheet">
+                 <string>background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(220, 226, 223, 255), stop:1 rgba(190, 198, 194, 255))</string>
+                </property>
+                <layout class="QHBoxLayout" name="horizontalLayout_12">
+                 <property name="leftMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="topMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="bottomMargin">
+                  <number>0</number>
+                 </property>
+                 <item>
+                  <widget class="QLabel" name="label_7">
+                   <property name="sizePolicy">
+                    <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+                     <horstretch>0</horstretch>
+                     <verstretch>0</verstretch>
+                    </sizepolicy>
+                   </property>
+                   <property name="text">
+                    <string/>
+                   </property>
+                   <property name="pixmap">
+                    <pixmap resource="fancyactionbar.qrc">:/fancyactionbar/images/botleft_corner.png</pixmap>
+                   </property>
+                   <property name="alignment">
+                    <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QLabel" name="label_17">
+                   <property name="sizePolicy">
+                    <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                     <horstretch>0</horstretch>
+                     <verstretch>0</verstretch>
+                    </sizepolicy>
+                   </property>
+                   <property name="minimumSize">
+                    <size>
+                     <width>0</width>
+                     <height>20</height>
+                    </size>
+                   </property>
+                   <property name="font">
+                    <font>
+                     <weight>75</weight>
+                     <bold>true</bold>
+                    </font>
+                   </property>
+                   <property name="text">
+                    <string>Slice Selection</string>
+                   </property>
+                   <property name="alignment">
+                    <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </widget>
+              </item>
+              <item>
+               <widget class="QListWidget" name="listWidget_8">
+                <property name="frameShape">
+                 <enum>QFrame::Box</enum>
+                </property>
+                <property name="frameShadow">
+                 <enum>QFrame::Plain</enum>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
            </layout>
           </widget>
          </item>
+         <item>
+          <spacer name="verticalSpacer_3">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
         </layout>
        </item>
        <item>
-        <layout class="QGridLayout" name="gridLayout_2">
-         <property name="horizontalSpacing">
-          <number>3</number>
+        <spacer name="horizontalSpacer_8">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
          </property>
-         <item row="0" column="0" rowspan="2">
-          <layout class="QVBoxLayout" name="verticalLayout_4">
-           <property name="spacing">
-            <number>3</number>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>45</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="page_2">
+      <layout class="QHBoxLayout" name="horizontalLayout_5">
+       <item>
+        <spacer name="horizontalSpacer_10">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>45</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <layout class="QVBoxLayout" name="verticalLayout_5">
+         <item>
+          <spacer name="verticalSpacer_4">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
            </property>
-           <item>
-            <widget class="QLabel" name="label_25">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="maximumSize">
-              <size>
-               <width>42</width>
-               <height>42</height>
-              </size>
-             </property>
-             <property name="text">
-              <string/>
-             </property>
-             <property name="pixmap">
-              <pixmap resource="installer.qrc">:/modules/images/language.png</pixmap>
-             </property>
-             <property name="scaledContents">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <spacer name="verticalSpacer_2">
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>20</width>
-               <height>40</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-          </layout>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
          </item>
-         <item row="0" column="1" rowspan="2">
-          <widget class="QFrame" name="frame_2">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
+         <item>
+          <widget class="QWidget" name="slicesWidget" native="true">
+           <property name="maximumSize">
             <size>
-             <width>50</width>
-             <height>0</height>
+             <width>16777215</width>
+             <height>200</height>
             </size>
            </property>
-           <property name="frameShape">
-            <enum>QFrame::StyledPanel</enum>
+           <property name="styleSheet">
+            <string>background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(140, 148, 144, 255))</string>
            </property>
-           <property name="frameShadow">
-            <enum>QFrame::Raised</enum>
-           </property>
-           <layout class="QVBoxLayout" name="verticalLayout_5">
+           <layout class="QHBoxLayout" name="horizontalLayout_6">
             <property name="spacing">
-             <number>3</number>
+             <number>0</number>
             </property>
-            <property name="margin">
-             <number>3</number>
+            <property name="topMargin">
+             <number>0</number>
             </property>
+            <property name="rightMargin">
+             <number>0</number>
+            </property>
+            <property name="bottomMargin">
+             <number>0</number>
+            </property>
             <item>
-             <widget class="QLabel" name="label_4">
+             <widget class="QLabel" name="label_10">
               <property name="sizePolicy">
-               <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
+              <property name="maximumSize">
+               <size>
+                <width>16777215</width>
+                <height>16777215</height>
+               </size>
+              </property>
               <property name="text">
-               <string>TextLabel</string>
+               <string/>
               </property>
+              <property name="pixmap">
+               <pixmap resource="installer.qrc">:/modules/images/blockdevice.png</pixmap>
+              </property>
+              <property name="scaledContents">
+               <bool>false</bool>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignHCenter|Qt::AlignTop</set>
+              </property>
              </widget>
             </item>
             <item>
-             <widget class="QListWidget" name="listWidget_2">
-              <property name="styleSheet">
-               <string>background-color: rgb(255, 255, 255);</string>
+             <layout class="QVBoxLayout" name="verticalLayout_8">
+              <property name="spacing">
+               <number>0</number>
               </property>
-              <property name="frameShadow">
-               <enum>QFrame::Plain</enum>
+              <property name="bottomMargin">
+               <number>0</number>
               </property>
-             </widget>
+              <item>
+               <widget class="QWidget" name="widget_5" native="true">
+                <property name="styleSheet">
+                 <string>background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(220, 226, 223, 255), stop:1 rgba(190, 198, 194, 255))</string>
+                </property>
+                <layout class="QHBoxLayout" name="horizontalLayout_7">
+                 <property name="leftMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="topMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="bottomMargin">
+                  <number>0</number>
+                 </property>
+                 <item>
+                  <widget class="QLabel" name="label">
+                   <property name="sizePolicy">
+                    <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+                     <horstretch>0</horstretch>
+                     <verstretch>0</verstretch>
+                    </sizepolicy>
+                   </property>
+                   <property name="text">
+                    <string/>
+                   </property>
+                   <property name="pixmap">
+                    <pixmap resource="fancyactionbar.qrc">:/fancyactionbar/images/botleft_corner.png</pixmap>
+                   </property>
+                   <property name="alignment">
+                    <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QLabel" name="label_12">
+                   <property name="sizePolicy">
+                    <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                     <horstretch>0</horstretch>
+                     <verstretch>0</verstretch>
+                    </sizepolicy>
+                   </property>
+                   <property name="minimumSize">
+                    <size>
+                     <width>0</width>
+                     <height>20</height>
+                    </size>
+                   </property>
+                   <property name="font">
+                    <font>
+                     <weight>75</weight>
+                     <bold>true</bold>
+                    </font>
+                   </property>
+                   <property name="text">
+                    <string>Disk Slice Setup</string>
+                   </property>
+                   <property name="alignment">
+                    <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QLabel" name="label_2">
+                   <property name="sizePolicy">
+                    <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+                     <horstretch>0</horstretch>
+                     <verstretch>0</verstretch>
+                    </sizepolicy>
+                   </property>
+                   <property name="text">
+                    <string>x of y available MB</string>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </widget>
+              </item>
+              <item>
+               <layout class="QHBoxLayout" name="horizontalLayout_14">
+                <property name="spacing">
+                 <number>0</number>
+                </property>
+                <property name="leftMargin">
+                 <number>0</number>
+                </property>
+                <property name="bottomMargin">
+                 <number>0</number>
+                </property>
+                <item>
+                 <widget class="QTreeWidget" name="treeWidget">
+                  <property name="frameShape">
+                   <enum>QFrame::Box</enum>
+                  </property>
+                  <property name="frameShadow">
+                   <enum>QFrame::Plain</enum>
+                  </property>
+                  <property name="alternatingRowColors">
+                   <bool>false</bool>
+                  </property>
+                  <column>
+                   <property name="text">
+                    <string>Device</string>
+                   </property>
+                   <property name="background">
+                    <color>
+                     <red>220</red>
+                     <green>226</green>
+                     <blue>223</blue>
+                    </color>
+                   </property>
+                  </column>
+                  <column>
+                   <property name="text">
+                    <string>Mount</string>
+                   </property>
+                   <property name="background">
+                    <color>
+                     <red>220</red>
+                     <green>226</green>
+                     <blue>223</blue>
+                    </color>
+                   </property>
+                  </column>
+                  <column>
+                   <property name="text">
+                    <string>Size</string>
+                   </property>
+                   <property name="background">
+                    <color>
+                     <red>220</red>
+                     <green>226</green>
+                     <blue>223</blue>
+                    </color>
+                   </property>
+                  </column>
+                  <column>
+                   <property name="text">
+                    <string>Type</string>
+                   </property>
+                   <property name="background">
+                    <color>
+                     <red>220</red>
+                     <green>226</green>
+                     <blue>223</blue>
+                    </color>
+                   </property>
+                  </column>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QWidget" name="widget_3" native="true">
+                  <property name="styleSheet">
+                   <string>background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(140, 148, 144, 255));
+
+background-color: qlineargradient(spread:pad, x1:1, y1:0.5, x2:0, y2:0.5, stop:0 rgba(220, 226, 223, 255), stop:1 rgba(190, 198, 194, 255));
+</string>
+                  </property>
+                  <layout class="QVBoxLayout" name="verticalLayout_3">
+                   <property name="margin">
+                    <number>0</number>
+                   </property>
+                   <item>
+                    <widget class="QWidget" name="toolbarWidget" native="true">
+                     <property name="sizePolicy">
+                      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                       <horstretch>0</horstretch>
+                       <verstretch>0</verstretch>
+                      </sizepolicy>
+                     </property>
+                     <property name="minimumSize">
+                      <size>
+                       <width>15</width>
+                       <height>0</height>
+                      </size>
+                     </property>
+                     <layout class="QVBoxLayout" name="verticalLayout_12">
+                      <property name="margin">
+                       <number>0</number>
+                      </property>
+                     </layout>
+                    </widget>
+                   </item>
+                   <item>
+                    <spacer name="verticalSpacer_8">
+                     <property name="orientation">
+                      <enum>Qt::Vertical</enum>
+                     </property>
+                     <property name="sizeHint" stdset="0">
+                      <size>
+                       <width>20</width>
+                       <height>183</height>
+                      </size>
+                     </property>
+                    </spacer>
+                   </item>
+                  </layout>
+                 </widget>
+                </item>
+               </layout>
+              </item>
+             </layout>
             </item>
            </layout>
           </widget>
          </item>
+         <item>
+          <spacer name="verticalSpacer_6">
+           <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>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_2">
+           <item>
+            <spacer name="horizontalSpacer_3">
+             <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>
+            <layout class="QGridLayout" name="gridLayout_12">
+             <property name="horizontalSpacing">
+              <number>3</number>
+             </property>
+             <property name="verticalSpacing">
+              <number>1</number>
+             </property>
+             <item row="0" column="0" rowspan="2">
+              <widget class="QLabel" name="label_26">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="maximumSize">
+                <size>
+                 <width>42</width>
+                 <height>42</height>
+                </size>
+               </property>
+               <property name="text">
+                <string/>
+               </property>
+               <property name="pixmap">
+                <pixmap resource="installer.qrc">:/modules/images/diskfilesystems.png</pixmap>
+               </property>
+               <property name="scaledContents">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="1">
+              <widget class="QLabel" name="label_15">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="minimumSize">
+                <size>
+                 <width>182</width>
+                 <height>20</height>
+                </size>
+               </property>
+               <property name="maximumSize">
+                <size>
+                 <width>200</width>
+                 <height>20</height>
+                </size>
+               </property>
+               <property name="font">
+                <font>
+                 <weight>75</weight>
+                 <bold>true</bold>
+                </font>
+               </property>
+               <property name="text">
+                <string>File System</string>
+               </property>
+               <property name="alignment">
+                <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1">
+              <widget class="QComboBox" name="m_fsCombo">
+               <property name="minimumSize">
+                <size>
+                 <width>180</width>
+                 <height>0</height>
+                </size>
+               </property>
+               <property name="maximumSize">
+                <size>
+                 <width>200</width>
+                 <height>16777215</height>
+                </size>
+               </property>
+               <property name="styleSheet">
+                <string notr="true">background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(140, 148, 144, 255))</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="2">
+              <widget class="QLabel" name="label_5">
+               <property name="styleSheet">
+                <string>color: rgb(190, 0, 0);</string>
+               </property>
+               <property name="text">
+                <string>Leave as default if unsure</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+           <item>
+            <spacer name="horizontalSpacer_6">
+             <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>
+          <spacer name="verticalSpacer_7">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
         </layout>
        </item>
+       <item>
+        <spacer name="horizontalSpacer_12">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>45</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </widget>
-     <widget class="QWidget" name="page_2"/>
     </widget>
    </item>
    <item>
@@ -345,19 +944,6 @@
        </spacer>
       </item>
       <item>
-       <widget class="QLabel" name="label_2">
-        <property name="text">
-         <string/>
-        </property>
-        <property name="pixmap">
-         <pixmap resource="fancyactionbar.qrc">:/fancyactionbar/images/botright_corner.png</pixmap>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignBottom|Qt::AlignRight|Qt::AlignTrailing</set>
-        </property>
-       </widget>
-      </item>
-      <item>
        <widget class="QCheckBox" name="checkBox">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
@@ -371,36 +957,19 @@
           <bold>false</bold>
          </font>
         </property>
-        <property name="styleSheet">
-         <string>color: rgb(255, 255, 255);
-background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(190, 190, 190, 255), stop:1 rgba(48, 48, 48, 255))</string>
-        </property>
         <property name="text">
          <string>Install the PC-BSD bootloader</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QLabel" name="label_3">
-        <property name="text">
-         <string/>
-        </property>
-        <property name="pixmap">
-         <pixmap resource="fancyactionbar.qrc">:/fancyactionbar/images/botleft_corner.png</pixmap>
-        </property>
-        <property name="alignment">
-         <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
-        </property>
-       </widget>
-      </item>
-      <item>
        <spacer name="horizontalSpacer_5">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
-          <width>202</width>
+          <width>40</width>
           <height>20</height>
          </size>
         </property>

Modified: pcbsd/trunk-current/SysInstaller/ui_installer.h
===================================================================
--- pcbsd/trunk-current/SysInstaller/ui_installer.h	2009-06-17 18:09:03 UTC (rev 4115)
+++ pcbsd/trunk-current/SysInstaller/ui_installer.h	2009-06-17 18:57:11 UTC (rev 4116)
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading ui file 'installer.ui'
 **
-** Created: Sat Jun 6 23:47:00 2009
+** Created: Fri Jun 12 18:35:22 2009
 **      by: Qt User Interface Compiler version 4.5.1
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!
@@ -25,22 +25,22 @@
 
 QT_BEGIN_NAMESPACE
 
-class Ui_InstallerClass
+class Ui_Installer
 {
 public:
     QVBoxLayout *verticalLayout;
     QWidget *header;
     QHBoxLayout *horizontalLayout;
-    QLabel *lblPcbsd;
+    QLabel *m_pcbsdLabel;
     QSpacerItem *horizontalSpacer;
     QLabel *label_32;
     QWidget *titleWidget;
     QHBoxLayout *horizontalLayout_3;
     QLabel *label_33;
-    QLabel *lblQuote;
+    QLabel *m_quoteLabel;
     QSpacerItem *horizontalSpacer_5;
-    QLabel *label;
-    QLabel *label_11;
+    QLabel *m_currentModule;
+    QLabel *m_currentPixbuf;
     QWidget *topStrip;
     QStackedWidget *stackedWidget;
     QWidget *page_2;
@@ -53,20 +53,20 @@
     QHBoxLayout *horizontalLayout_2;
     QLabel *label_35;
     QLabel *lblQuote_2;
-    QTextEdit *txtInfo;
+    QTextEdit *m_helpInfo;
     QLabel *label_36;
 
-    void setupUi(QWidget *InstallerClass)
+    void setupUi(QWidget *Installer)
     {
-        if (InstallerClass->objectName().isEmpty())
-            InstallerClass->setObjectName(QString::fromUtf8("InstallerClass"));
-        InstallerClass->resize(800, 600);
-        InstallerClass->setMinimumSize(QSize(800, 600));
-        verticalLayout = new QVBoxLayout(InstallerClass);
+        if (Installer->objectName().isEmpty())
+            Installer->setObjectName(QString::fromUtf8("Installer"));
+        Installer->resize(800, 600);
+        Installer->setMinimumSize(QSize(800, 600));
+        verticalLayout = new QVBoxLayout(Installer);
         verticalLayout->setSpacing(0);
         verticalLayout->setMargin(0);
         verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
-        header = new QWidget(InstallerClass);
+        header = new QWidget(Installer);
         header->setObjectName(QString::fromUtf8("header"));
         QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
         sizePolicy.setHorizontalStretch(0);
@@ -80,12 +80,12 @@
         horizontalLayout->setMargin(11);
         horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
         horizontalLayout->setContentsMargins(26, 0, 0, 0);
-        lblPcbsd = new QLabel(header);
-        lblPcbsd->setObjectName(QString::fromUtf8("lblPcbsd"));
-        lblPcbsd->setAutoFillBackground(false);
-        lblPcbsd->setPixmap(QPixmap(QString::fromUtf8(":/PCBSD/images/NewLogoSmall2.png")));
+        m_pcbsdLabel = new QLabel(header);
+        m_pcbsdLabel->setObjectName(QString::fromUtf8("m_pcbsdLabel"));
+        m_pcbsdLabel->setAutoFillBackground(false);
+        m_pcbsdLabel->setPixmap(QPixmap(QString::fromUtf8(":/PCBSD/images/NewLogoSmall2.png")));
 
-        horizontalLayout->addWidget(lblPcbsd);
+        horizontalLayout->addWidget(m_pcbsdLabel);
 
         horizontalSpacer = new QSpacerItem(569, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
 
@@ -101,7 +101,7 @@
 
         verticalLayout->addWidget(header);
 
-        titleWidget = new QWidget(InstallerClass);
+        titleWidget = new QWidget(Installer);
         titleWidget->setObjectName(QString::fromUtf8("titleWidget"));
         sizePolicy.setHeightForWidth(titleWidget->sizePolicy().hasHeightForWidth());
         titleWidget->setSizePolicy(sizePolicy);
@@ -117,45 +117,45 @@
 
         horizontalLayout_3->addWidget(label_33);
 
-        lblQuote = new QLabel(titleWidget);
-        lblQuote->setObjectName(QString::fromUtf8("lblQuote"));
+        m_quoteLabel = new QLabel(titleWidget);
+        m_quoteLabel->setObjectName(QString::fromUtf8("m_quoteLabel"));
 
-        horizontalLayout_3->addWidget(lblQuote);
+        horizontalLayout_3->addWidget(m_quoteLabel);
 
         horizontalSpacer_5 = new QSpacerItem(288, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
 
         horizontalLayout_3->addItem(horizontalSpacer_5);
 
-        label = new QLabel(titleWidget);
-        label->setObjectName(QString::fromUtf8("label"));
+        m_currentModule = new QLabel(titleWidget);
+        m_currentModule->setObjectName(QString::fromUtf8("m_currentModule"));
         QFont font;
         font.setFamily(QString::fromUtf8("Utopia"));
         font.setPointSize(12);
         font.setBold(true);
         font.setWeight(75);
-        label->setFont(font);
+        m_currentModule->setFont(font);
 
-        horizontalLayout_3->addWidget(label);
+        horizontalLayout_3->addWidget(m_currentModule);
 
-        label_11 = new QLabel(titleWidget);
-        label_11->setObjectName(QString::fromUtf8("label_11"));
+        m_currentPixbuf = new QLabel(titleWidget);
+        m_currentPixbuf->setObjectName(QString::fromUtf8("m_currentPixbuf"));
         QSizePolicy sizePolicy1(QSizePolicy::Fixed, QSizePolicy::Fixed);
         sizePolicy1.setHorizontalStretch(0);
         sizePolicy1.setVerticalStretch(0);
-        sizePolicy1.setHeightForWidth(label_11->sizePolicy().hasHeightForWidth());
-        label_11->setSizePolicy(sizePolicy1);
-        label_11->setMinimumSize(QSize(35, 35));
-        label_11->setMaximumSize(QSize(35, 35));
-        label_11->setPixmap(QPixmap(QString::fromUtf8(":/fancyactionbar/images/desktop.png")));
-        label_11->setScaledContents(true);
-        label_11->setMargin(1);
+        sizePolicy1.setHeightForWidth(m_currentPixbuf->sizePolicy().hasHeightForWidth());
+        m_currentPixbuf->setSizePolicy(sizePolicy1);
+        m_currentPixbuf->setMinimumSize(QSize(35, 35));
+        m_currentPixbuf->setMaximumSize(QSize(35, 35));
+        m_currentPixbuf->setPixmap(QPixmap(QString::fromUtf8(":/fancyactionbar/images/desktop.png")));
+        m_currentPixbuf->setScaledContents(true);
+        m_currentPixbuf->setMargin(1);
 
-        horizontalLayout_3->addWidget(label_11);
+        horizontalLayout_3->addWidget(m_currentPixbuf);
 
 
         verticalLayout->addWidget(titleWidget);
 
-        topStrip = new QWidget(InstallerClass);
+        topStrip = new QWidget(Installer);
         topStrip->setObjectName(QString::fromUtf8("topStrip"));
         sizePolicy.setHeightForWidth(topStrip->sizePolicy().hasHeightForWidth());
         topStrip->setSizePolicy(sizePolicy);
@@ -164,7 +164,7 @@
 
         verticalLayout->addWidget(topStrip);
 
-        stackedWidget = new QStackedWidget(InstallerClass);
+        stackedWidget = new QStackedWidget(Installer);
         stackedWidget->setObjectName(QString::fromUtf8("stackedWidget"));
         stackedWidget->setAutoFillBackground(false);
         stackedWidget->setFrameShape(QFrame::NoFrame);
@@ -179,7 +179,7 @@
 
         verticalLayout->addWidget(stackedWidget);
 
-        statusWidget = new QWidget(InstallerClass);
+        statusWidget = new QWidget(Installer);
         statusWidget->setObjectName(QString::fromUtf8("statusWidget"));
         statusWidget->setMinimumSize(QSize(0, 0));
         horizontalLayout_4 = new QHBoxLayout(statusWidget);
@@ -193,7 +193,7 @@
         verticalLayout_10->setSpacing(0);
         verticalLayout_10->setObjectName(QString::fromUtf8("verticalLayout_10"));
         verticalLayout_10->setSizeConstraint(QLayout::SetDefaultConstraint);
-        botStrip = new QWidget(InstallerClass);
+        botStrip = new QWidget(Installer);
         botStrip->setObjectName(QString::fromUtf8("botStrip"));
         sizePolicy.setHeightForWidth(botStrip->sizePolicy().hasHeightForWidth());
         botStrip->setSizePolicy(sizePolicy);
@@ -202,7 +202,7 @@
 
         verticalLayout_10->addWidget(botStrip);
 
-        footer = new QWidget(InstallerClass);
+        footer = new QWidget(Installer);
         footer->setObjectName(QString::fromUtf8("footer"));
         sizePolicy.setHeightForWidth(footer->sizePolicy().hasHeightForWidth());
         footer->setSizePolicy(sizePolicy);
@@ -230,16 +230,16 @@
 
         horizontalLayout_2->addWidget(lblQuote_2);
 
-        txtInfo = new QTextEdit(footer);
-        txtInfo->setObjectName(QString::fromUtf8("txtInfo"));
-        txtInfo->setAutoFillBackground(false);
-        txtInfo->setFrameShape(QFrame::NoFrame);
-        txtInfo->setFrameShadow(QFrame::Plain);
-        txtInfo->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
-        txtInfo->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-        txtInfo->setReadOnly(true);
+        m_helpInfo = new QTextEdit(footer);
+        m_helpInfo->setObjectName(QString::fromUtf8("m_helpInfo"));
+        m_helpInfo->setAutoFillBackground(false);
+        m_helpInfo->setFrameShape(QFrame::NoFrame);
+        m_helpInfo->setFrameShadow(QFrame::Plain);
+        m_helpInfo->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+        m_helpInfo->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+        m_helpInfo->setReadOnly(true);
 
-        horizontalLayout_2->addWidget(txtInfo);
+        horizontalLayout_2->addWidget(m_helpInfo);
 
         label_36 = new QLabel(footer);
         label_36->setObjectName(QString::fromUtf8("label_36"));
@@ -255,39 +255,40 @@
         verticalLayout->addLayout(verticalLayout_10);
 
 
-        retranslateUi(InstallerClass);
+        retranslateUi(Installer);
 
         stackedWidget->setCurrentIndex(0);
 
 
-        QMetaObject::connectSlotsByName(InstallerClass);
+        QMetaObject::connectSlotsByName(Installer);
     } // setupUi
 
-    void retranslateUi(QWidget *InstallerClass)
+    void retranslateUi(QWidget *Installer)
     {
-        InstallerClass->setWindowTitle(QApplication::translate("InstallerClass", "Installer", 0, QApplication::UnicodeUTF8));
-        header->setStyleSheet(QApplication::translate("InstallerClass", "background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(160, 168, 164, 255), stop:1 rgba(255, 255, 255, 255));", 0, QApplication::UnicodeUTF8));
-        lblPcbsd->setText(QString());
+        Installer->setWindowTitle(QApplication::translate("Installer", "Installer", 0, QApplication::UnicodeUTF8));
+        header->setStyleSheet(QApplication::translate("Installer", "background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(160, 168, 164, 255), stop:1 rgba(255, 255, 255, 255));", 0, QApplication::UnicodeUTF8));
+        m_pcbsdLabel->setText(QString());
         label_32->setText(QString());
-        titleWidget->setStyleSheet(QApplication::translate("InstallerClass", "background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(140, 148, 144, 255))", 0, QApplication::UnicodeUTF8));
+        titleWidget->setStyleSheet(QApplication::translate("Installer", "background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(140, 148, 144, 255))", 0, QApplication::UnicodeUTF8));
         label_33->setText(QString());
-        lblQuote->setStyleSheet(QApplication::translate("InstallerClass", "color: rgb(148,148,148);", 0, QApplication::UnicodeUTF8));
-        lblQuote->setText(QApplication::translate("InstallerClass", "The shape of things to come!", 0, QApplication::UnicodeUTF8));
-        label->setStyleSheet(QApplication::translate("InstallerClass", "color: rgb(48,48,48);", 0, QApplication::UnicodeUTF8));
-        label->setText(QApplication::translate("InstallerClass", "Current Module Title", 0, QApplication::UnicodeUTF8));
-        topStrip->setStyleSheet(QApplication::translate("InstallerClass", "background-color: rgb(48,48,48,);\n"
+        m_quoteLabel->setStyleSheet(QApplication::translate("Installer", "color: rgb(148,148,148);", 0, QApplication::UnicodeUTF8));
+        m_quoteLabel->setText(QApplication::translate("Installer", "The shape of things to come!", 0, QApplication::UnicodeUTF8));
+        m_currentModule->setStyleSheet(QApplication::translate("Installer", "color: rgb(48,48,48);", 0, QApplication::UnicodeUTF8));
+        m_currentModule->setText(QApplication::translate("Installer", "Current Module Title", 0, QApplication::UnicodeUTF8));
+        topStrip->setStyleSheet(QApplication::translate("Installer", "background-color: rgb(48,48,48,);\n"
 "background-color: qlineargradient(spread:pad, x1:1, y1:0.5, x2:0, y2:0.5, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(48, 48, 48, 255));", 0, QApplication::UnicodeUTF8));
-        stackedWidget->setStyleSheet(QApplication::translate("InstallerClass", "background-color: rgb(233, 233, 233);", 0, QApplication::UnicodeUTF8));
-        botStrip->setStyleSheet(QApplication::translate("InstallerClass", "background-color: qlineargradient(spread:pad, x1:1, y1:0.5, x2:0, y2:0.5, stop:0 rgba(48,48,48, 255), stop:1 rgba(255, 255, 255, 255));", 0, QApplication::UnicodeUTF8));
-        footer->setStyleSheet(QApplication::translate("InstallerClass", "background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(150, 158, 154, 255), stop:1 rgba(255, 255, 255, 255));\n"
+        stackedWidget->setStyleSheet(QApplication::translate("Installer", "background-color: rgb(233, 233, 233);\n"
+"background-color: rgb(220, 226, 223);", 0, QApplication::UnicodeUTF8));
+        botStrip->setStyleSheet(QApplication::translate("Installer", "background-color: qlineargradient(spread:pad, x1:1, y1:0.5, x2:0, y2:0.5, stop:0 rgba(48,48,48, 255), stop:1 rgba(255, 255, 255, 255));", 0, QApplication::UnicodeUTF8));
+        footer->setStyleSheet(QApplication::translate("Installer", "background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(150, 158, 154, 255), stop:1 rgba(255, 255, 255, 255));\n"
 "background-color: rgb(180, 188, 184);\n"
 "background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(190, 198, 194, 255));\n"
 "background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(140, 148, 144, 255))", 0, QApplication::UnicodeUTF8));
         label_35->setText(QString());
-        lblQuote_2->setStyleSheet(QApplication::translate("InstallerClass", "color: rgb(148,148,148);", 0, QApplication::UnicodeUTF8));
-        lblQuote_2->setText(QApplication::translate("InstallerClass", "Tips", 0, QApplication::UnicodeUTF8));
-        txtInfo->setDocumentTitle(QApplication::translate("InstallerClass", "Hints:", 0, QApplication::UnicodeUTF8));
-        txtInfo->setHtml(QApplication::translate("InstallerClass", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+        lblQuote_2->setStyleSheet(QApplication::translate("Installer", "color: rgb(148,148,148);", 0, QApplication::UnicodeUTF8));
+        lblQuote_2->setText(QApplication::translate("Installer", "Tips", 0, QApplication::UnicodeUTF8));
+        m_helpInfo->setDocumentTitle(QApplication::translate("Installer", "Hints:", 0, QApplication::UnicodeUTF8));
+        m_helpInfo->setHtml(QApplication::translate("Installer", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><title>Hints:</title><style type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
 "</style></head><body style=\" font-family:'Sans Serif'; font-size:8pt; font-weight:400; font-style:normal;\">\n"
@@ -297,13 +298,13 @@
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600;\">by Kennedy Kasina</s"
                         "pan></p></body></html>", 0, QApplication::UnicodeUTF8));
         label_36->setText(QString());
-        Q_UNUSED(InstallerClass);
+        Q_UNUSED(Installer);
     } // retranslateUi
 
 };
 
 namespace Ui {
-    class InstallerClass: public Ui_InstallerClass {};
+    class Installer: public Ui_Installer {};
 } // namespace Ui
 
 QT_END_NAMESPACE

Modified: pcbsd/trunk-current/SysInstaller/ui_layoutdesign.h
===================================================================
--- pcbsd/trunk-current/SysInstaller/ui_layoutdesign.h	2009-06-17 18:09:03 UTC (rev 4115)
+++ pcbsd/trunk-current/SysInstaller/ui_layoutdesign.h	2009-06-17 18:57:11 UTC (rev 4116)
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading ui file 'layoutdesign.ui'
 **
-** Created: Sun Jun 7 12:48:10 2009
+** Created: Fri Jun 12 21:49:53 2009
 **      by: Qt User Interface Compiler version 4.5.1
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!
@@ -45,6 +45,12 @@
     QRadioButton *radioButton_6;
     QRadioButton *radioButton_5;
     QRadioButton *radioButton_4;
+    QWidget *widget_3;
+    QVBoxLayout *verticalLayout_6;
+    QVBoxLayout *verticalLayout_5;
+    QWidget *toolbarWidget;
+    QVBoxLayout *verticalLayout_4;
+    QSpacerItem *verticalSpacer_4;
     QVBoxLayout *verticalLayout_10;
     QWidget *botStrip;
     QWidget *footer;
@@ -197,7 +203,32 @@
 
         horizontalLayout_4->addWidget(widget_2);
 
+        widget_3 = new QWidget(centralWidget);
+        widget_3->setObjectName(QString::fromUtf8("widget_3"));
+        widget_3->setGeometry(QRect(260, 50, 40, 121));
+        verticalLayout_6 = new QVBoxLayout(widget_3);
+        verticalLayout_6->setObjectName(QString::fromUtf8("verticalLayout_6"));
+        verticalLayout_5 = new QVBoxLayout();
+        verticalLayout_5->setObjectName(QString::fromUtf8("verticalLayout_5"));
+        toolbarWidget = new QWidget(widget_3);
+        toolbarWidget->setObjectName(QString::fromUtf8("toolbarWidget"));
+        sizePolicy.setHeightForWidth(toolbarWidget->sizePolicy().hasHeightForWidth());
+        toolbarWidget->setSizePolicy(sizePolicy);
+        toolbarWidget->setMinimumSize(QSize(15, 0));
+        verticalLayout_4 = new QVBoxLayout(toolbarWidget);
+        verticalLayout_4->setMargin(0);
+        verticalLayout_4->setObjectName(QString::fromUtf8("verticalLayout_4"));
 
+        verticalLayout_5->addWidget(toolbarWidget);
+
+        verticalSpacer_4 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        verticalLayout_5->addItem(verticalSpacer_4);
+
+
+        verticalLayout_6->addLayout(verticalLayout_5);
+
+
         verticalLayout_2->addWidget(centralWidget);
 
         verticalLayout_10 = new QVBoxLayout();
@@ -251,12 +282,17 @@
         titleLabel->setText(QApplication::translate("LayoutDesign", "Setup Network", 0, QApplication::UnicodeUTF8));
         topStrip->setStyleSheet(QApplication::translate("LayoutDesign", "background-color: rgb(48,48,48,);\n"
 "background-color: qlineargradient(spread:pad, x1:1, y1:0.5, x2:0, y2:0.5, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(48, 48, 48, 255));", 0, QApplication::UnicodeUTF8));
-        centralWidget->setStyleSheet(QApplication::translate("LayoutDesign", "background-color: rgb(190, 198, 194);", 0, QApplication::UnicodeUTF8));
+        centralWidget->setStyleSheet(QApplication::translate("LayoutDesign", "background-color: rgb(190, 198, 194);\n"
+"\n"
+"background-color: rgb(220, 226, 223);", 0, QApplication::UnicodeUTF8));
         groupBox_2->setTitle(QApplication::translate("LayoutDesign", "GroupBox", 0, QApplication::UnicodeUTF8));
         widget_2->setStyleSheet(QApplication::translate("LayoutDesign", "background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(140, 148, 144, 255))", 0, QApplication::UnicodeUTF8));
         radioButton_6->setText(QApplication::translate("LayoutDesign", "Freebsd", 0, QApplication::UnicodeUTF8));
         radioButton_5->setText(QApplication::translate("LayoutDesign", "PC-BSD Server", 0, QApplication::UnicodeUTF8));
         radioButton_4->setText(QApplication::translate("LayoutDesign", "PC-BSD Desktop", 0, QApplication::UnicodeUTF8));
+        widget_3->setStyleSheet(QApplication::translate("LayoutDesign", "background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(140, 148, 144, 255));\n"
+"background-color: qlineargradient(spread:pad, x1:1, y1:0.5, x2:0, y2:0.5, stop:0 rgba(140, 148, 144, 255), stop:1 rgba(255, 255, 255, 255));\n"
+"", 0, QApplication::UnicodeUTF8));
         botStrip->setStyleSheet(QApplication::translate("LayoutDesign", "background-color: qlineargradient(spread:pad, x1:1, y1:0.5, x2:0, y2:0.5, stop:0 rgba(48,48,48, 255), stop:1 rgba(255, 255, 255, 255));", 0, QApplication::UnicodeUTF8));
         footer->setStyleSheet(QApplication::translate("LayoutDesign", "background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(150, 158, 154, 255), stop:1 rgba(255, 255, 255, 255));\n"
 "background-color: rgb(180, 188, 184);\n"

Modified: pcbsd/trunk-current/SysInstaller/ui_setupcomponents.h
===================================================================
--- pcbsd/trunk-current/SysInstaller/ui_setupcomponents.h	2009-06-17 18:09:03 UTC (rev 4115)
+++ pcbsd/trunk-current/SysInstaller/ui_setupcomponents.h	2009-06-17 18:57:11 UTC (rev 4116)
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading ui file 'setupcomponents.ui'
 **
-** Created: Mon Jun 1 18:13:05 2009
+** Created: Sun Jun 7 18:39:19 2009
 **      by: Qt User Interface Compiler version 4.5.1
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!
@@ -36,9 +36,11 @@
         listView = new QListView(SetupComponents);
         listView->setObjectName(QString::fromUtf8("listView"));
         listView->setGeometry(QRect(20, 10, 161, 192));
+        listView->setFrameShadow(QFrame::Plain);
         listWidget = new QListWidget(SetupComponents);
         listWidget->setObjectName(QString::fromUtf8("listWidget"));
         listWidget->setGeometry(QRect(210, 40, 256, 192));
+        listWidget->setFrameShadow(QFrame::Plain);
         widget = new QWidget(SetupComponents);
         widget->setObjectName(QString::fromUtf8("widget"));
         widget->setGeometry(QRect(200, 10, 120, 31));

Modified: pcbsd/trunk-current/SysInstaller/ui_setupinstallation.h
===================================================================
--- pcbsd/trunk-current/SysInstaller/ui_setupinstallation.h	2009-06-17 18:09:03 UTC (rev 4115)
+++ pcbsd/trunk-current/SysInstaller/ui_setupinstallation.h	2009-06-17 18:57:11 UTC (rev 4116)
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading ui file 'setupinstallation.ui'
 **
-** Created: Sun Jun 7 12:53:12 2009
+** Created: Fri Jun 12 20:00:27 2009
 **      by: Qt User Interface Compiler version 4.5.1
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!
@@ -14,9 +14,9 @@
 #include <QtGui/QAction>
 #include <QtGui/QApplication>
 #include <QtGui/QButtonGroup>
-#include <QtGui/QGroupBox>
 #include <QtGui/QHBoxLayout>
 #include <QtGui/QHeaderView>
+#include <QtGui/QLabel>
 #include <QtGui/QRadioButton>
 #include <QtGui/QSpacerItem>
 #include <QtGui/QVBoxLayout>
@@ -27,250 +27,271 @@
 class Ui_SetupInstallation
 {
 public:
-    QHBoxLayout *horizontalLayout_7;
+    QHBoxLayout *horizontalLayout;
     QSpacerItem *horizontalSpacer_2;
     QVBoxLayout *verticalLayout;
     QSpacerItem *verticalSpacer;
-    QGroupBox *groupBox_2;
-    QHBoxLayout *horizontalLayout_3;
-    QWidget *widget_2;
-    QHBoxLayout *horizontalLayout_4;
-    QRadioButton *radioButton_4;
-    QRadioButton *radioButton_5;
-    QRadioButton *radioButton_6;
+    QWidget *widget_4;
+    QVBoxLayout *verticalLayout_4;
+    QLabel *label;
+    QWidget *widget_5;
+    QHBoxLayout *horizontalLayout_7;
+    QRadioButton *radioButton_8;
+    QRadioButton *radioButton_10;
+    QRadioButton *radioButton_11;
     QSpacerItem *verticalSpacer_3;
-    QGroupBox *groupBox;
-    QHBoxLayout *horizontalLayout;
-    QWidget *widget;
-    QHBoxLayout *horizontalLayout_2;
-    QRadioButton *radioButton;
-    QRadioButton *radioButton_2;
-    QRadioButton *radioButton_3;
+    QWidget *widget_6;
+    QVBoxLayout *verticalLayout_5;
+    QLabel *label_2;
+    QWidget *widget_7;
+    QHBoxLayout *horizontalLayout_8;
+    QRadioButton *radioButton_12;
+    QRadioButton *radioButton_13;
+    QRadioButton *radioButton_14;
     QSpacerItem *verticalSpacer_4;
-    QGroupBox *groupBox_3;
-    QHBoxLayout *horizontalLayout_5;
-    QWidget *widget_3;
-    QHBoxLayout *horizontalLayout_6;
-    QRadioButton *radioButton_7;
+    QWidget *widget_8;
+    QVBoxLayout *verticalLayout_6;
+    QLabel *label_3;
+    QWidget *widget_9;
+    QHBoxLayout *horizontalLayout_9;
+    QRadioButton *radioButton_15;
     QSpacerItem *horizontalSpacer;
-    QRadioButton *radioButton_9;
+    QRadioButton *radioButton_17;
     QSpacerItem *verticalSpacer_5;
-    QSpacerItem *verticalSpacer_2;
     QSpacerItem *horizontalSpacer_3;
 
     void setupUi(QWidget *SetupInstallation)
     {
         if (SetupInstallation->objectName().isEmpty())
             SetupInstallation->setObjectName(QString::fromUtf8("SetupInstallation"));
-        SetupInstallation->resize(668, 259);
-        horizontalLayout_7 = new QHBoxLayout(SetupInstallation);
-        horizontalLayout_7->setObjectName(QString::fromUtf8("horizontalLayout_7"));
+        SetupInstallation->resize(709, 431);
+        horizontalLayout = new QHBoxLayout(SetupInstallation);
+        horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
         horizontalSpacer_2 = new QSpacerItem(13, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
 
-        horizontalLayout_7->addItem(horizontalSpacer_2);
+        horizontalLayout->addItem(horizontalSpacer_2);
 
         verticalLayout = new QVBoxLayout();
-        verticalLayout->setSpacing(3);
         verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
         verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
 
         verticalLayout->addItem(verticalSpacer);
 
-        groupBox_2 = new QGroupBox(SetupInstallation);
-        groupBox_2->setObjectName(QString::fromUtf8("groupBox_2"));
+        widget_4 = new QWidget(SetupInstallation);
+        widget_4->setObjectName(QString::fromUtf8("widget_4"));
+        verticalLayout_4 = new QVBoxLayout(widget_4);
+        verticalLayout_4->setSpacing(0);
+        verticalLayout_4->setMargin(0);
+        verticalLayout_4->setObjectName(QString::fromUtf8("verticalLayout_4"));
+        label = new QLabel(widget_4);
+        label->setObjectName(QString::fromUtf8("label"));
         QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
         sizePolicy.setHorizontalStretch(0);
         sizePolicy.setVerticalStretch(0);
-        sizePolicy.setHeightForWidth(groupBox_2->sizePolicy().hasHeightForWidth());
-        groupBox_2->setSizePolicy(sizePolicy);
+        sizePolicy.setHeightForWidth(label->sizePolicy().hasHeightForWidth());
+        label->setSizePolicy(sizePolicy);
+        label->setMinimumSize(QSize(0, 20));
         QFont font;
         font.setBold(true);
         font.setWeight(75);
-        groupBox_2->setFont(font);
-        groupBox_2->setAlignment(Qt::AlignCenter);
-        groupBox_2->setFlat(false);
-        groupBox_2->setCheckable(false);
-        horizontalLayout_3 = new QHBoxLayout(groupBox_2);
-        horizontalLayout_3->setSpacing(0);
-        horizontalLayout_3->setObjectName(QString::fromUtf8("horizontalLayout_3"));
-        horizontalLayout_3->setContentsMargins(0, 4, 0, 0);
-        widget_2 = new QWidget(groupBox_2);
-        widget_2->setObjectName(QString::fromUtf8("widget_2"));
-        horizontalLayout_4 = new QHBoxLayout(widget_2);
-        horizontalLayout_4->setSpacing(40);
-        horizontalLayout_4->setObjectName(QString::fromUtf8("horizontalLayout_4"));
-        horizontalLayout_4->setContentsMargins(40, 0, 40, 0);
-        radioButton_4 = new QRadioButton(widget_2);
-        radioButton_4->setObjectName(QString::fromUtf8("radioButton_4"));
-        QSizePolicy sizePolicy1(QSizePolicy::Expanding, QSizePolicy::Expanding);
+        label->setFont(font);
+        label->setAlignment(Qt::AlignCenter);
+
+        verticalLayout_4->addWidget(label);
+
+        widget_5 = new QWidget(widget_4);
+        widget_5->setObjectName(QString::fromUtf8("widget_5"));
+        horizontalLayout_7 = new QHBoxLayout(widget_5);
+        horizontalLayout_7->setSpacing(0);
+        horizontalLayout_7->setObjectName(QString::fromUtf8("horizontalLayout_7"));
+        horizontalLayout_7->setContentsMargins(-1, 0, -1, 0);
+        radioButton_8 = new QRadioButton(widget_5);
+        radioButton_8->setObjectName(QString::fromUtf8("radioButton_8"));
+        QSizePolicy sizePolicy1(QSizePolicy::Fixed, QSizePolicy::Expanding);
         sizePolicy1.setHorizontalStretch(0);
         sizePolicy1.setVerticalStretch(0);
-        sizePolicy1.setHeightForWidth(radioButton_4->sizePolicy().hasHeightForWidth());
-        radioButton_4->setSizePolicy(sizePolicy1);
+        sizePolicy1.setHeightForWidth(radioButton_8->sizePolicy().hasHeightForWidth());
+        radioButton_8->setSizePolicy(sizePolicy1);
+        radioButton_8->setMinimumSize(QSize(200, 0));
         QIcon icon;
-        icon.addPixmap(QPixmap(QString::fromUtf8(":/modules/images/desktop.png")), QIcon::Normal, QIcon::Off);
-        radioButton_4->setIcon(icon);
-        radioButton_4->setIconSize(QSize(42, 42));
+        icon.addPixmap(QPixmap(QString::fromUtf8(":/modules/images/pbidiricon.png")), QIcon::Normal, QIcon::Off);
+        radioButton_8->setIcon(icon);
+        radioButton_8->setIconSize(QSize(42, 42));
+        radioButton_8->setChecked(true);
 
-        horizontalLayout_4->addWidget(radioButton_4);
+        horizontalLayout_7->addWidget(radioButton_8);
 
-        radioButton_5 = new QRadioButton(widget_2);
-        radioButton_5->setObjectName(QString::fromUtf8("radioButton_5"));
-        sizePolicy1.setHeightForWidth(radioButton_5->sizePolicy().hasHeightForWidth());
-        radioButton_5->setSizePolicy(sizePolicy1);
+        radioButton_10 = new QRadioButton(widget_5);
+        radioButton_10->setObjectName(QString::fromUtf8("radioButton_10"));
+        sizePolicy1.setHeightForWidth(radioButton_10->sizePolicy().hasHeightForWidth());
+        radioButton_10->setSizePolicy(sizePolicy1);
+        radioButton_10->setMinimumSize(QSize(200, 0));
         QIcon icon1;
         icon1.addPixmap(QPixmap(QString::fromUtf8(":/modules/images/server.png")), QIcon::Normal, QIcon::Off);
-        radioButton_5->setIcon(icon1);
-        radioButton_5->setIconSize(QSize(42, 42));
+        radioButton_10->setIcon(icon1);
+        radioButton_10->setIconSize(QSize(42, 42));
 
-        horizontalLayout_4->addWidget(radioButton_5);
+        horizontalLayout_7->addWidget(radioButton_10);
 
-        radioButton_6 = new QRadioButton(widget_2);
-        radioButton_6->setObjectName(QString::fromUtf8("radioButton_6"));
-        sizePolicy1.setHeightForWidth(radioButton_6->sizePolicy().hasHeightForWidth());
-        radioButton_6->setSizePolicy(sizePolicy1);
+        radioButton_11 = new QRadioButton(widget_5);
+        radioButton_11->setObjectName(QString::fromUtf8("radioButton_11"));
+        sizePolicy1.setHeightForWidth(radioButton_11->sizePolicy().hasHeightForWidth());
+        radioButton_11->setSizePolicy(sizePolicy1);
+        radioButton_11->setMinimumSize(QSize(200, 0));
         QIcon icon2;
         icon2.addPixmap(QPixmap(QString::fromUtf8(":/modules/images/freebsd.png")), QIcon::Normal, QIcon::Off);
-        radioButton_6->setIcon(icon2);
-        radioButton_6->setIconSize(QSize(42, 42));
+        radioButton_11->setIcon(icon2);
+        radioButton_11->setIconSize(QSize(42, 42));
 
-        horizontalLayout_4->addWidget(radioButton_6);
+        horizontalLayout_7->addWidget(radioButton_11);
 
 
-        horizontalLayout_3->addWidget(widget_2);
+        verticalLayout_4->addWidget(widget_5);
 
 
-        verticalLayout->addWidget(groupBox_2);
+        verticalLayout->addWidget(widget_4);
 
         verticalSpacer_3 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
 
         verticalLayout->addItem(verticalSpacer_3);
 
-        groupBox = new QGroupBox(SetupInstallation);
-        groupBox->setObjectName(QString::fromUtf8("groupBox"));
-        sizePolicy.setHeightForWidth(groupBox->sizePolicy().hasHeightForWidth());
-        groupBox->setSizePolicy(sizePolicy);
-        groupBox->setFont(font);
-        groupBox->setAlignment(Qt::AlignCenter);
-        groupBox->setFlat(false);
-        groupBox->setCheckable(false);
-        horizontalLayout = new QHBoxLayout(groupBox);
-        horizontalLayout->setSpacing(0);
-        horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
-        horizontalLayout->setContentsMargins(0, 4, 0, 0);
-        widget = new QWidget(groupBox);
-        widget->setObjectName(QString::fromUtf8("widget"));
-        horizontalLayout_2 = new QHBoxLayout(widget);
-        horizontalLayout_2->setSpacing(40);
-        horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2"));
-        horizontalLayout_2->setContentsMargins(40, 0, 40, 0);
-        radioButton = new QRadioButton(widget);
-        radioButton->setObjectName(QString::fromUtf8("radioButton"));
-        sizePolicy1.setHeightForWidth(radioButton->sizePolicy().hasHeightForWidth());
-        radioButton->setSizePolicy(sizePolicy1);
+        widget_6 = new QWidget(SetupInstallation);
+        widget_6->setObjectName(QString::fromUtf8("widget_6"));
+        verticalLayout_5 = new QVBoxLayout(widget_6);
+        verticalLayout_5->setSpacing(0);
+        verticalLayout_5->setMargin(0);
+        verticalLayout_5->setObjectName(QString::fromUtf8("verticalLayout_5"));
+        label_2 = new QLabel(widget_6);
+        label_2->setObjectName(QString::fromUtf8("label_2"));
+        sizePolicy.setHeightForWidth(label_2->sizePolicy().hasHeightForWidth());
+        label_2->setSizePolicy(sizePolicy);
+        label_2->setMinimumSize(QSize(0, 20));
+        label_2->setFont(font);
+        label_2->setAlignment(Qt::AlignCenter);
+
+        verticalLayout_5->addWidget(label_2);
+
+        widget_7 = new QWidget(widget_6);
+        widget_7->setObjectName(QString::fromUtf8("widget_7"));
+        horizontalLayout_8 = new QHBoxLayout(widget_7);
+        horizontalLayout_8->setSpacing(0);
+        horizontalLayout_8->setObjectName(QString::fromUtf8("horizontalLayout_8"));
+        horizontalLayout_8->setContentsMargins(-1, 0, -1, 0);
+        radioButton_12 = new QRadioButton(widget_7);
+        radioButton_12->setObjectName(QString::fromUtf8("radioButton_12"));
+        sizePolicy1.setHeightForWidth(radioButton_12->sizePolicy().hasHeightForWidth());
+        radioButton_12->setSizePolicy(sizePolicy1);
+        radioButton_12->setMinimumSize(QSize(200, 0));
         QIcon icon3;
         icon3.addPixmap(QPixmap(QString::fromUtf8(":/modules/images/install.png")), QIcon::Normal, QIcon::Off);
-        radioButton->setIcon(icon3);
-        radioButton->setIconSize(QSize(42, 42));
+        radioButton_12->setIcon(icon3);
+        radioButton_12->setIconSize(QSize(42, 42));
+        radioButton_12->setChecked(true);
 
-        horizontalLayout_2->addWidget(radioButton);
+        horizontalLayout_8->addWidget(radioButton_12);
 
-        radioButton_2 = new QRadioButton(widget);
-        radioButton_2->setObjectName(QString::fromUtf8("radioButton_2"));
-        sizePolicy1.setHeightForWidth(radioButton_2->sizePolicy().hasHeightForWidth());
-        radioButton_2->setSizePolicy(sizePolicy1);
+        radioButton_13 = new QRadioButton(widget_7);
+        radioButton_13->setObjectName(QString::fromUtf8("radioButton_13"));
+        sizePolicy1.setHeightForWidth(radioButton_13->sizePolicy().hasHeightForWidth());
+        radioButton_13->setSizePolicy(sizePolicy1);
+        radioButton_13->setMinimumSize(QSize(180, 0));
         QIcon icon4;
-        icon4.addPixmap(QPixmap(QString::fromUtf8(":/modules/images/upgrade.png")), QIcon::Normal, QIcon::Off);
-        radioButton_2->setIcon(icon4);
-        radioButton_2->setIconSize(QSize(42, 42));
+        icon4.addPixmap(QPixmap(QString::fromUtf8(":/modules/images/update.png")), QIcon::Normal, QIcon::Off);
+        radioButton_13->setIcon(icon4);
+        radioButton_13->setIconSize(QSize(42, 42));
 
-        horizontalLayout_2->addWidget(radioButton_2);
+        horizontalLayout_8->addWidget(radioButton_13);
 
-        radioButton_3 = new QRadioButton(widget);
-        radioButton_3->setObjectName(QString::fromUtf8("radioButton_3"));
-        sizePolicy1.setHeightForWidth(radioButton_3->sizePolicy().hasHeightForWidth());
-        radioButton_3->setSizePolicy(sizePolicy1);
+        radioButton_14 = new QRadioButton(widget_7);
+        radioButton_14->setObjectName(QString::fromUtf8("radioButton_14"));
+        sizePolicy1.setHeightForWidth(radioButton_14->sizePolicy().hasHeightForWidth());
+        radioButton_14->setSizePolicy(sizePolicy1);
+        radioButton_14->setMinimumSize(QSize(200, 0));
         QIcon icon5;
-        icon5.addPixmap(QPixmap(QString::fromUtf8(":/modules/images/update.png")), QIcon::Normal, QIcon::Off);
-        radioButton_3->setIcon(icon5);
-        radioButton_3->setIconSize(QSize(42, 42));
+        icon5.addPixmap(QPixmap(QString::fromUtf8(":/modules/images/upgrade.png")), QIcon::Normal, QIcon::Off);
+        radioButton_14->setIcon(icon5);
+        radioButton_14->setIconSize(QSize(42, 42));
 
-        horizontalLayout_2->addWidget(radioButton_3);
+        horizontalLayout_8->addWidget(radioButton_14);
 
 
-        horizontalLayout->addWidget(widget);
+        verticalLayout_5->addWidget(widget_7);
 
 
-        verticalLayout->addWidget(groupBox);
+        verticalLayout->addWidget(widget_6);
 
         verticalSpacer_4 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
 
         verticalLayout->addItem(verticalSpacer_4);
 
-        groupBox_3 = new QGroupBox(SetupInstallation);
-        groupBox_3->setObjectName(QString::fromUtf8("groupBox_3"));
-        sizePolicy.setHeightForWidth(groupBox_3->sizePolicy().hasHeightForWidth());
-        groupBox_3->setSizePolicy(sizePolicy);
-        groupBox_3->setFont(font);
-        groupBox_3->setAlignment(Qt::AlignCenter);
-        groupBox_3->setFlat(false);
-        groupBox_3->setCheckable(false);
-        horizontalLayout_5 = new QHBoxLayout(groupBox_3);
-        horizontalLayout_5->setSpacing(0);
-        horizontalLayout_5->setObjectName(QString::fromUtf8("horizontalLayout_5"));
-        horizontalLayout_5->setContentsMargins(0, 4, 0, 0);
-        widget_3 = new QWidget(groupBox_3);
-        widget_3->setObjectName(QString::fromUtf8("widget_3"));
-        horizontalLayout_6 = new QHBoxLayout(widget_3);
-        horizontalLayout_6->setSpacing(40);
-        horizontalLayout_6->setObjectName(QString::fromUtf8("horizontalLayout_6"));
-        horizontalLayout_6->setContentsMargins(40, 0, 40, 0);
-        radioButton_7 = new QRadioButton(widget_3);
-        radioButton_7->setObjectName(QString::fromUtf8("radioButton_7"));
-        sizePolicy1.setHeightForWidth(radioButton_7->sizePolicy().hasHeightForWidth());
-        radioButton_7->setSizePolicy(sizePolicy1);
+        widget_8 = new QWidget(SetupInstallation);
+        widget_8->setObjectName(QString::fromUtf8("widget_8"));
+        verticalLayout_6 = new QVBoxLayout(widget_8);
+        verticalLayout_6->setSpacing(0);
+        verticalLayout_6->setMargin(0);
+        verticalLayout_6->setObjectName(QString::fromUtf8("verticalLayout_6"));
+        label_3 = new QLabel(widget_8);
+        label_3->setObjectName(QString::fromUtf8("label_3"));
+        sizePolicy.setHeightForWidth(label_3->sizePolicy().hasHeightForWidth());
+        label_3->setSizePolicy(sizePolicy);
+        label_3->setMinimumSize(QSize(0, 20));
+        label_3->setFont(font);
+        label_3->setAlignment(Qt::AlignCenter);
+
+        verticalLayout_6->addWidget(label_3);
+
+        widget_9 = new QWidget(widget_8);
+        widget_9->setObjectName(QString::fromUtf8("widget_9"));
+        horizontalLayout_9 = new QHBoxLayout(widget_9);
+        horizontalLayout_9->setSpacing(0);
+        horizontalLayout_9->setObjectName(QString::fromUtf8("horizontalLayout_9"));
+        horizontalLayout_9->setContentsMargins(-1, 0, -1, 0);
+        radioButton_15 = new QRadioButton(widget_9);
+        radioButton_15->setObjectName(QString::fromUtf8("radioButton_15"));
+        sizePolicy1.setHeightForWidth(radioButton_15->sizePolicy().hasHeightForWidth());
+        radioButton_15->setSizePolicy(sizePolicy1);
+        radioButton_15->setMinimumSize(QSize(200, 0));
         QIcon icon6;
         icon6.addPixmap(QPixmap(QString::fromUtf8(":/modules/images/cdrom_mount.png")), QIcon::Normal, QIcon::Off);
-        radioButton_7->setIcon(icon6);
-        radioButton_7->setIconSize(QSize(42, 42));
+        radioButton_15->setIcon(icon6);
+        radioButton_15->setIconSize(QSize(42, 42));
+        radioButton_15->setChecked(true);
 
-        horizontalLayout_6->addWidget(radioButton_7);
+        horizontalLayout_9->addWidget(radioButton_15);
 
         horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
 
-        horizontalLayout_6->addItem(horizontalSpacer);
+        horizontalLayout_9->addItem(horizontalSpacer);
 
-        radioButton_9 = new QRadioButton(widget_3);
-        radioButton_9->setObjectName(QString::fromUtf8("radioButton_9"));
-        sizePolicy1.setHeightForWidth(radioButton_9->sizePolicy().hasHeightForWidth());
-        radioButton_9->setSizePolicy(sizePolicy1);
+        radioButton_17 = new QRadioButton(widget_9);
+        radioButton_17->setObjectName(QString::fromUtf8("radioButton_17"));
+        sizePolicy1.setHeightForWidth(radioButton_17->sizePolicy().hasHeightForWidth());
+        radioButton_17->setSizePolicy(sizePolicy1);
+        radioButton_17->setMinimumSize(QSize(200, 0));
+        radioButton_17->setLayoutDirection(Qt::LeftToRight);
         QIcon icon7;
         icon7.addPixmap(QPixmap(QString::fromUtf8(":/modules/images/network_local.png")), QIcon::Normal, QIcon::Off);
-        radioButton_9->setIcon(icon7);
-        radioButton_9->setIconSize(QSize(42, 42));
+        radioButton_17->setIcon(icon7);
+        radioButton_17->setIconSize(QSize(42, 42));
 
-        horizontalLayout_6->addWidget(radioButton_9);
+        horizontalLayout_9->addWidget(radioButton_17);
 
 
-        horizontalLayout_5->addWidget(widget_3);
+        verticalLayout_6->addWidget(widget_9);
 
 
-        verticalLayout->addWidget(groupBox_3);
+        verticalLayout->addWidget(widget_8);
 
         verticalSpacer_5 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
 
         verticalLayout->addItem(verticalSpacer_5);
 
-        verticalSpacer_2 = new QSpacerItem(20, 18, QSizePolicy::Minimum, QSizePolicy::Expanding);
 
-        verticalLayout->addItem(verticalSpacer_2);
+        horizontalLayout->addLayout(verticalLayout);
 
-
-        horizontalLayout_7->addLayout(verticalLayout);
-
         horizontalSpacer_3 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
 
-        horizontalLayout_7->addItem(horizontalSpacer_3);
+        horizontalLayout->addItem(horizontalSpacer_3);
 
 
         retranslateUi(SetupInstallation);
@@ -281,22 +302,23 @@
     void retranslateUi(QWidget *SetupInstallation)
     {
         SetupInstallation->setWindowTitle(QApplication::translate("SetupInstallation", "Form", 0, QApplication::UnicodeUTF8));
-        groupBox_2->setTitle(QApplication::translate("SetupInstallation", "GroupBox", 0, QApplication::UnicodeUTF8));
-        widget_2->setStyleSheet(QApplication::translate("SetupInstallation", "background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(140, 148, 144, 255))", 0, QApplication::UnicodeUTF8));
-        radioButton_4->setText(QApplication::translate("SetupInstallation", "PC-BSD\n"
-"Desktop", 0, QApplication::UnicodeUTF8));
-        radioButton_5->setText(QApplication::translate("SetupInstallation", "PC-BSD\n"
-"Server", 0, QApplication::UnicodeUTF8));
-        radioButton_6->setText(QApplication::translate("SetupInstallation", "Freebsd", 0, QApplication::UnicodeUTF8));
-        groupBox->setTitle(QApplication::translate("SetupInstallation", "GroupBox", 0, QApplication::UnicodeUTF8));
-        widget->setStyleSheet(QApplication::translate("SetupInstallation", "background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(140, 148, 144, 255))", 0, QApplication::UnicodeUTF8));
-        radioButton->setText(QApplication::translate("SetupInstallation", "RadioButton", 0, QApplication::UnicodeUTF8));
-        radioButton_2->setText(QApplication::translate("SetupInstallation", "RadioButton", 0, QApplication::UnicodeUTF8));
-        radioButton_3->setText(QApplication::translate("SetupInstallation", "RadioButton", 0, QApplication::UnicodeUTF8));
-        groupBox_3->setTitle(QApplication::translate("SetupInstallation", "GroupBox", 0, QApplication::UnicodeUTF8));
-        widget_3->setStyleSheet(QApplication::translate("SetupInstallation", "background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(140, 148, 144, 255))", 0, QApplication::UnicodeUTF8));
-        radioButton_7->setText(QApplication::translate("SetupInstallation", "RadioButton", 0, QApplication::UnicodeUTF8));
-        radioButton_9->setText(QApplication::translate("SetupInstallation", "RadioButton", 0, QApplication::UnicodeUTF8));
+        label->setStyleSheet(QApplication::translate("SetupInstallation", "background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(220, 226, 223, 255), stop:1 rgba(190, 198, 194, 255))", 0, QApplication::UnicodeUTF8));
+        label->setText(QApplication::translate("SetupInstallation", "Installation Type", 0, QApplication::UnicodeUTF8));
+        widget_5->setStyleSheet(QApplication::translate("SetupInstallation", "background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(140, 148, 144, 255))", 0, QApplication::UnicodeUTF8));
+        radioButton_8->setText(QApplication::translate("SetupInstallation", "Desktop", 0, QApplication::UnicodeUTF8));
+        radioButton_10->setText(QApplication::translate("SetupInstallation", "Server", 0, QApplication::UnicodeUTF8));
+        radioButton_11->setText(QApplication::translate("SetupInstallation", "Freebsd", 0, QApplication::UnicodeUTF8));
+        label_2->setStyleSheet(QApplication::translate("SetupInstallation", "background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(220, 226, 223, 255), stop:1 rgba(190, 198, 194, 255))", 0, QApplication::UnicodeUTF8));
+        label_2->setText(QApplication::translate("SetupInstallation", "Installation Choice", 0, QApplication::UnicodeUTF8));
+        widget_7->setStyleSheet(QApplication::translate("SetupInstallation", "background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(140, 148, 144, 255))", 0, QApplication::UnicodeUTF8));
+        radioButton_12->setText(QApplication::translate("SetupInstallation", "Install", 0, QApplication::UnicodeUTF8));
+        radioButton_13->setText(QApplication::translate("SetupInstallation", "Update", 0, QApplication::UnicodeUTF8));
+        radioButton_14->setText(QApplication::translate("SetupInstallation", "Upgrade", 0, QApplication::UnicodeUTF8));
+        label_3->setStyleSheet(QApplication::translate("SetupInstallation", "background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(220, 226, 223, 255), stop:1 rgba(190, 198, 194, 255))", 0, QApplication::UnicodeUTF8));
+        label_3->setText(QApplication::translate("SetupInstallation", "Installation Method", 0, QApplication::UnicodeUTF8));
+        widget_9->setStyleSheet(QApplication::translate("SetupInstallation", "background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(140, 148, 144, 255))", 0, QApplication::UnicodeUTF8));
+        radioButton_15->setText(QApplication::translate("SetupInstallation", "DVD", 0, QApplication::UnicodeUTF8));
+        radioButton_17->setText(QApplication::translate("SetupInstallation", "Network", 0, QApplication::UnicodeUTF8));
         Q_UNUSED(SetupInstallation);
     } // retranslateUi
 

Modified: pcbsd/trunk-current/SysInstaller/ui_setupnetwork.h
===================================================================
--- pcbsd/trunk-current/SysInstaller/ui_setupnetwork.h	2009-06-17 18:09:03 UTC (rev 4115)
+++ pcbsd/trunk-current/SysInstaller/ui_setupnetwork.h	2009-06-17 18:57:11 UTC (rev 4116)
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading ui file 'setupnetwork.ui'
 **
-** Created: Sun Jun 7 15:46:55 2009
+** Created: Fri Jun 12 10:23:01 2009
 **      by: Qt User Interface Compiler version 4.5.1
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!
@@ -42,19 +42,19 @@
     QWidget *topStrip;
     QWidget *widget_2;
     QVBoxLayout *verticalLayout_3;
-    QComboBox *comboBox;
+    QComboBox *m_deviceCombo;
     QLabel *label_2;
     QSpacerItem *verticalSpacer;
-    QRadioButton *radioButton;
+    QRadioButton *m_dhcpRadio;
     QVBoxLayout *verticalLayout_4;
-    QRadioButton *radioButton_2;
+    QRadioButton *m_manualRadio;
     QWidget *widget_3;
     QGridLayout *gridLayout;
-    QLineEdit *lineEdit;
+    QLineEdit *m_ipaddrEdit;
     QLabel *label_3;
-    QLineEdit *lineEdit_2;
+    QLineEdit *m_netmaskEdit;
     QLabel *label_4;
-    QLineEdit *lineEdit_3;
+    QLineEdit *m_gatewayEdit;
     QLabel *label_5;
     QWidget *statusWidget;
     QHBoxLayout *horizontalLayout_4;
@@ -159,10 +159,10 @@
         verticalLayout_3->setSpacing(4);
         verticalLayout_3->setObjectName(QString::fromUtf8("verticalLayout_3"));
         verticalLayout_3->setContentsMargins(20, 20, 20, -1);
-        comboBox = new QComboBox(widget_2);
-        comboBox->setObjectName(QString::fromUtf8("comboBox"));
+        m_deviceCombo = new QComboBox(widget_2);
+        m_deviceCombo->setObjectName(QString::fromUtf8("m_deviceCombo"));
 
-        verticalLayout_3->addWidget(comboBox);
+        verticalLayout_3->addWidget(m_deviceCombo);
 
         label_2 = new QLabel(widget_2);
         label_2->setObjectName(QString::fromUtf8("label_2"));
@@ -174,34 +174,35 @@
 
         verticalLayout_3->addItem(verticalSpacer);
 
-        radioButton = new QRadioButton(widget_2);
-        radioButton->setObjectName(QString::fromUtf8("radioButton"));
+        m_dhcpRadio = new QRadioButton(widget_2);
+        m_dhcpRadio->setObjectName(QString::fromUtf8("m_dhcpRadio"));
         QFont font1;
         font1.setBold(true);
         font1.setWeight(75);
-        radioButton->setFont(font1);
+        m_dhcpRadio->setFont(font1);
+        m_dhcpRadio->setChecked(true);
 
-        verticalLayout_3->addWidget(radioButton);
+        verticalLayout_3->addWidget(m_dhcpRadio);
 
         verticalLayout_4 = new QVBoxLayout();
         verticalLayout_4->setSpacing(3);
         verticalLayout_4->setObjectName(QString::fromUtf8("verticalLayout_4"));
-        radioButton_2 = new QRadioButton(widget_2);
-        radioButton_2->setObjectName(QString::fromUtf8("radioButton_2"));
-        radioButton_2->setFont(font1);
+        m_manualRadio = new QRadioButton(widget_2);
+        m_manualRadio->setObjectName(QString::fromUtf8("m_manualRadio"));
+        m_manualRadio->setFont(font1);
 
-        verticalLayout_4->addWidget(radioButton_2);
+        verticalLayout_4->addWidget(m_manualRadio);
 
         widget_3 = new QWidget(widget_2);
         widget_3->setObjectName(QString::fromUtf8("widget_3"));
         gridLayout = new QGridLayout(widget_3);
         gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
         gridLayout->setContentsMargins(20, 0, -1, 25);
-        lineEdit = new QLineEdit(widget_3);
-        lineEdit->setObjectName(QString::fromUtf8("lineEdit"));
-        lineEdit->setAlignment(Qt::AlignCenter);
+        m_ipaddrEdit = new QLineEdit(widget_3);
+        m_ipaddrEdit->setObjectName(QString::fromUtf8("m_ipaddrEdit"));
+        m_ipaddrEdit->setAlignment(Qt::AlignCenter);
 
-        gridLayout->addWidget(lineEdit, 0, 0, 1, 1);
+        gridLayout->addWidget(m_ipaddrEdit, 0, 0, 1, 1);
 
         label_3 = new QLabel(widget_3);
         label_3->setObjectName(QString::fromUtf8("label_3"));
@@ -213,11 +214,11 @@
 
         gridLayout->addWidget(label_3, 0, 1, 1, 1);
 
-        lineEdit_2 = new QLineEdit(widget_3);
-        lineEdit_2->setObjectName(QString::fromUtf8("lineEdit_2"));
-        lineEdit_2->setAlignment(Qt::AlignCenter);
+        m_netmaskEdit = new QLineEdit(widget_3);
+        m_netmaskEdit->setObjectName(QString::fromUtf8("m_netmaskEdit"));
+        m_netmaskEdit->setAlignment(Qt::AlignCenter);
 
-        gridLayout->addWidget(lineEdit_2, 1, 0, 1, 1);
+        gridLayout->addWidget(m_netmaskEdit, 1, 0, 1, 1);
 
         label_4 = new QLabel(widget_3);
         label_4->setObjectName(QString::fromUtf8("label_4"));
@@ -226,11 +227,11 @@
 
         gridLayout->addWidget(label_4, 1, 1, 1, 1);
 
-        lineEdit_3 = new QLineEdit(widget_3);
-        lineEdit_3->setObjectName(QString::fromUtf8("lineEdit_3"));
-        lineEdit_3->setAlignment(Qt::AlignCenter);
+        m_gatewayEdit = new QLineEdit(widget_3);
+        m_gatewayEdit->setObjectName(QString::fromUtf8("m_gatewayEdit"));
+        m_gatewayEdit->setAlignment(Qt::AlignCenter);
 
-        gridLayout->addWidget(lineEdit_3, 2, 0, 1, 1);
+        gridLayout->addWidget(m_gatewayEdit, 2, 0, 1, 1);
 
         label_5 = new QLabel(widget_3);
         label_5->setObjectName(QString::fromUtf8("label_5"));
@@ -308,18 +309,19 @@
         label->setText(QApplication::translate("SetupNetwork", "Setup Network Card", 0, QApplication::UnicodeUTF8));
         topStrip->setStyleSheet(QApplication::translate("SetupNetwork", "background-color: rgb(48,48,48,);\n"
 "background-color: qlineargradient(spread:pad, x1:1, y1:0.5, x2:0, y2:0.5, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(48, 48, 48, 255));", 0, QApplication::UnicodeUTF8));
-        widget_2->setStyleSheet(QApplication::translate("SetupNetwork", "background-color: rgb(233, 233, 233);", 0, QApplication::UnicodeUTF8));
-        label_2->setText(QApplication::translate("SetupNetwork", "Please select you network device above, and then choose DHCP or enter a manual IP address.", 0, QApplication::UnicodeUTF8));
-        radioButton->setText(QApplication::translate("SetupNetwork", "Use DHCP", 0, QApplication::UnicodeUTF8));
-        radioButton_2->setText(QApplication::translate("SetupNetwork", "Manual IP", 0, QApplication::UnicodeUTF8));
-        lineEdit->setStyleSheet(QApplication::translate("SetupNetwork", "background-color: rgb(255, 255, 255);", 0, QApplication::UnicodeUTF8));
-        lineEdit->setInputMask(QApplication::translate("SetupNetwork", "###.###.###.###; ", 0, QApplication::UnicodeUTF8));
+        widget_2->setStyleSheet(QApplication::translate("SetupNetwork", "background-color: rgb(220, 226, 223);", 0, QApplication::UnicodeUTF8));
+        m_deviceCombo->setStyleSheet(QApplication::translate("SetupNetwork", "background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(140, 148, 144, 255))", 0, QApplication::UnicodeUTF8));
+        label_2->setText(QApplication::translate("SetupNetwork", "Please select your network device above, and then choose DHCP or enter a manual IP address.", 0, QApplication::UnicodeUTF8));
+        m_dhcpRadio->setText(QApplication::translate("SetupNetwork", "Use DHCP", 0, QApplication::UnicodeUTF8));
+        m_manualRadio->setText(QApplication::translate("SetupNetwork", "Manual IP", 0, QApplication::UnicodeUTF8));
+        m_ipaddrEdit->setStyleSheet(QApplication::translate("SetupNetwork", "background-color: rgb(255, 255, 255);", 0, QApplication::UnicodeUTF8));
+        m_ipaddrEdit->setInputMask(QApplication::translate("SetupNetwork", "###.###.###.###; ", 0, QApplication::UnicodeUTF8));
         label_3->setText(QApplication::translate("SetupNetwork", "IP Address", 0, QApplication::UnicodeUTF8));
-        lineEdit_2->setStyleSheet(QApplication::translate("SetupNetwork", "background-color: rgb(255, 255, 255);", 0, QApplication::UnicodeUTF8));
-        lineEdit_2->setInputMask(QApplication::translate("SetupNetwork", "###.###.###.###; ", 0, QApplication::UnicodeUTF8));
+        m_netmaskEdit->setStyleSheet(QApplication::translate("SetupNetwork", "background-color: rgb(255, 255, 255);", 0, QApplication::UnicodeUTF8));
+        m_netmaskEdit->setInputMask(QApplication::translate("SetupNetwork", "###.###.###.###; ", 0, QApplication::UnicodeUTF8));
         label_4->setText(QApplication::translate("SetupNetwork", "Netmask", 0, QApplication::UnicodeUTF8));
-        lineEdit_3->setStyleSheet(QApplication::translate("SetupNetwork", "background-color: rgb(255, 255, 255);", 0, QApplication::UnicodeUTF8));
-        lineEdit_3->setInputMask(QApplication::translate("SetupNetwork", "###.###.###.###; ", 0, QApplication::UnicodeUTF8));
+        m_gatewayEdit->setStyleSheet(QApplication::translate("SetupNetwork", "background-color: rgb(255, 255, 255);", 0, QApplication::UnicodeUTF8));
+        m_gatewayEdit->setInputMask(QApplication::translate("SetupNetwork", "###.###.###.###; ", 0, QApplication::UnicodeUTF8));
         label_5->setText(QApplication::translate("SetupNetwork", "Gateway", 0, QApplication::UnicodeUTF8));
         botStrip->setStyleSheet(QApplication::translate("SetupNetwork", "background-color: qlineargradient(spread:pad, x1:1, y1:0.5, x2:0, y2:0.5, stop:0 rgba(48,48,48, 255), stop:1 rgba(255, 255, 255, 255));", 0, QApplication::UnicodeUTF8));
         footer->setStyleSheet(QApplication::translate("SetupNetwork", "background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(150, 158, 154, 255), stop:1 rgba(255, 255, 255, 255));\n"

Modified: pcbsd/trunk-current/SysInstaller/ui_setupslices.h
===================================================================
--- pcbsd/trunk-current/SysInstaller/ui_setupslices.h	2009-06-17 18:09:03 UTC (rev 4115)
+++ pcbsd/trunk-current/SysInstaller/ui_setupslices.h	2009-06-17 18:57:11 UTC (rev 4116)
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading ui file 'setupslices.ui'
 **
-** Created: Sun Jun 7 15:39:35 2009
+** Created: Sat Jun 13 10:10:46 2009
 **      by: Qt User Interface Compiler version 4.5.1
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!
@@ -15,7 +15,7 @@
 #include <QtGui/QApplication>
 #include <QtGui/QButtonGroup>
 #include <QtGui/QCheckBox>
-#include <QtGui/QFrame>
+#include <QtGui/QComboBox>
 #include <QtGui/QGridLayout>
 #include <QtGui/QHBoxLayout>
 #include <QtGui/QHeaderView>
@@ -24,6 +24,7 @@
 #include <QtGui/QRadioButton>
 #include <QtGui/QSpacerItem>
 #include <QtGui/QStackedWidget>
+#include <QtGui/QTreeWidget>
 #include <QtGui/QVBoxLayout>
 #include <QtGui/QWidget>
 
@@ -35,65 +36,102 @@
     QVBoxLayout *verticalLayout;
     QHBoxLayout *horizontalLayout;
     QSpacerItem *horizontalSpacer;
-    QRadioButton *radioButton;
-    QRadioButton *radioButton_2;
+    QRadioButton *m_basicRadio;
+    QRadioButton *m_advancedRadio;
     QSpacerItem *horizontalSpacer_2;
     QStackedWidget *stackedWidget;
     QWidget *page;
-    QVBoxLayout *verticalLayout_6;
-    QGridLayout *gridLayout;
+    QHBoxLayout *horizontalLayout_4;
+    QSpacerItem *horizontalSpacer_7;
     QVBoxLayout *verticalLayout_2;
-    QLabel *label_24;
+    QSpacerItem *verticalSpacer_2;
+    QWidget *widget_7;
+    QHBoxLayout *horizontalLayout_9;
+    QLabel *label_11;
+    QVBoxLayout *verticalLayout_10;
+    QWidget *widget_8;
+    QHBoxLayout *horizontalLayout_10;
+    QLabel *label_6;
+    QLabel *label_14;
+    QListWidget *listWidget_7;
     QSpacerItem *verticalSpacer;
-    QFrame *frame;
+    QWidget *widget_9;
+    QHBoxLayout *horizontalLayout_11;
+    QLabel *label_16;
+    QVBoxLayout *verticalLayout_11;
+    QWidget *widget_10;
+    QHBoxLayout *horizontalLayout_12;
+    QLabel *label_7;
+    QLabel *label_17;
+    QListWidget *listWidget_8;
+    QSpacerItem *verticalSpacer_3;
+    QSpacerItem *horizontalSpacer_8;
+    QWidget *page_2;
+    QHBoxLayout *horizontalLayout_5;
+    QSpacerItem *horizontalSpacer_10;
+    QVBoxLayout *verticalLayout_5;
+    QSpacerItem *verticalSpacer_4;
+    QWidget *slicesWidget;
+    QHBoxLayout *horizontalLayout_6;
+    QLabel *label_10;
+    QVBoxLayout *verticalLayout_8;
+    QWidget *widget_5;
+    QHBoxLayout *horizontalLayout_7;
+    QLabel *label;
+    QLabel *label_12;
+    QLabel *label_2;
+    QHBoxLayout *horizontalLayout_14;
+    QTreeWidget *treeWidget;
+    QWidget *widget_3;
     QVBoxLayout *verticalLayout_3;
-    QLabel *label;
-    QListWidget *listWidget;
-    QGridLayout *gridLayout_2;
-    QVBoxLayout *verticalLayout_4;
-    QLabel *label_25;
-    QSpacerItem *verticalSpacer_2;
-    QFrame *frame_2;
-    QVBoxLayout *verticalLayout_5;
-    QLabel *label_4;
-    QListWidget *listWidget_2;
-    QWidget *page_2;
+    QWidget *toolbarWidget;
+    QVBoxLayout *verticalLayout_12;
+    QSpacerItem *verticalSpacer_8;
+    QSpacerItem *verticalSpacer_6;
+    QHBoxLayout *horizontalLayout_2;
+    QSpacerItem *horizontalSpacer_3;
+    QGridLayout *gridLayout_12;
+    QLabel *label_26;
+    QLabel *label_15;
+    QComboBox *m_fsCombo;
+    QLabel *label_5;
+    QSpacerItem *horizontalSpacer_6;
+    QSpacerItem *verticalSpacer_7;
+    QSpacerItem *horizontalSpacer_12;
     QWidget *widget;
     QHBoxLayout *horizontalLayout_3;
     QSpacerItem *horizontalSpacer_4;
-    QLabel *label_2;
     QCheckBox *checkBox;
-    QLabel *label_3;
     QSpacerItem *horizontalSpacer_5;
 
     void setupUi(QWidget *SetupSlices)
     {
         if (SetupSlices->objectName().isEmpty())
             SetupSlices->setObjectName(QString::fromUtf8("SetupSlices"));
-        SetupSlices->resize(542, 458);
+        SetupSlices->resize(543, 626);
         verticalLayout = new QVBoxLayout(SetupSlices);
         verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
-        verticalLayout->setContentsMargins(-1, -1, -1, 0);
+        verticalLayout->setContentsMargins(-1, -1, -1, 9);
         horizontalLayout = new QHBoxLayout();
         horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
         horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
 
         horizontalLayout->addItem(horizontalSpacer);
 
-        radioButton = new QRadioButton(SetupSlices);
-        radioButton->setObjectName(QString::fromUtf8("radioButton"));
+        m_basicRadio = new QRadioButton(SetupSlices);
+        m_basicRadio->setObjectName(QString::fromUtf8("m_basicRadio"));
         QFont font;
         font.setBold(true);
         font.setWeight(75);
-        radioButton->setFont(font);
+        m_basicRadio->setFont(font);
 
-        horizontalLayout->addWidget(radioButton);
+        horizontalLayout->addWidget(m_basicRadio);
 
-        radioButton_2 = new QRadioButton(SetupSlices);
-        radioButton_2->setObjectName(QString::fromUtf8("radioButton_2"));
-        radioButton_2->setFont(font);
+        m_advancedRadio = new QRadioButton(SetupSlices);
+        m_advancedRadio->setObjectName(QString::fromUtf8("m_advancedRadio"));
+        m_advancedRadio->setFont(font);
 
-        horizontalLayout->addWidget(radioButton_2);
+        horizontalLayout->addWidget(m_advancedRadio);
 
         horizontalSpacer_2 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
 
@@ -111,137 +149,361 @@
         stackedWidget->setSizePolicy(sizePolicy);
         page = new QWidget();
         page->setObjectName(QString::fromUtf8("page"));
-        verticalLayout_6 = new QVBoxLayout(page);
-        verticalLayout_6->setSpacing(40);
-        verticalLayout_6->setObjectName(QString::fromUtf8("verticalLayout_6"));
-        verticalLayout_6->setContentsMargins(60, 40, 60, 40);
-        gridLayout = new QGridLayout();
-        gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
-        gridLayout->setHorizontalSpacing(3);
+        horizontalLayout_4 = new QHBoxLayout(page);
+        horizontalLayout_4->setObjectName(QString::fromUtf8("horizontalLayout_4"));
+        horizontalSpacer_7 = new QSpacerItem(45, 20, QSizePolicy::Fixed, QSizePolicy::Minimum);
+
+        horizontalLayout_4->addItem(horizontalSpacer_7);
+
         verticalLayout_2 = new QVBoxLayout();
-        verticalLayout_2->setSpacing(3);
         verticalLayout_2->setObjectName(QString::fromUtf8("verticalLayout_2"));
-        label_24 = new QLabel(page);
-        label_24->setObjectName(QString::fromUtf8("label_24"));
-        QSizePolicy sizePolicy1(QSizePolicy::Fixed, QSizePolicy::Fixed);
+        verticalSpacer_2 = new QSpacerItem(20, 28, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        verticalLayout_2->addItem(verticalSpacer_2);
+
+        widget_7 = new QWidget(page);
+        widget_7->setObjectName(QString::fromUtf8("widget_7"));
+        widget_7->setMaximumSize(QSize(16777215, 200));
+        horizontalLayout_9 = new QHBoxLayout(widget_7);
+        horizontalLayout_9->setObjectName(QString::fromUtf8("horizontalLayout_9"));
+        horizontalLayout_9->setContentsMargins(-1, 0, 0, 0);
+        label_11 = new QLabel(widget_7);
+        label_11->setObjectName(QString::fromUtf8("label_11"));
+        QSizePolicy sizePolicy1(QSizePolicy::Fixed, QSizePolicy::Preferred);
         sizePolicy1.setHorizontalStretch(0);
         sizePolicy1.setVerticalStretch(0);
-        sizePolicy1.setHeightForWidth(label_24->sizePolicy().hasHeightForWidth());
-        label_24->setSizePolicy(sizePolicy1);
-        label_24->setMaximumSize(QSize(42, 42));
-        label_24->setPixmap(QPixmap(QString::fromUtf8(":/modules/images/language.png")));
-        label_24->setScaledContents(true);
+        sizePolicy1.setHeightForWidth(label_11->sizePolicy().hasHeightForWidth());
+        label_11->setSizePolicy(sizePolicy1);
+        label_11->setMaximumSize(QSize(16777215, 16777215));
+        label_11->setPixmap(QPixmap(QString::fromUtf8(":/modules/images/blockdevice.png")));
+        label_11->setScaledContents(false);
+        label_11->setAlignment(Qt::AlignHCenter|Qt::AlignTop);
 
-        verticalLayout_2->addWidget(label_24);
+        horizontalLayout_9->addWidget(label_11);
 
-        verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+        verticalLayout_10 = new QVBoxLayout();
+        verticalLayout_10->setSpacing(0);
+        verticalLayout_10->setObjectName(QString::fromUtf8("verticalLayout_10"));
+        widget_8 = new QWidget(widget_7);
+        widget_8->setObjectName(QString::fromUtf8("widget_8"));
+        horizontalLayout_10 = new QHBoxLayout(widget_8);
+        horizontalLayout_10->setObjectName(QString::fromUtf8("horizontalLayout_10"));
+        horizontalLayout_10->setContentsMargins(0, 0, -1, 0);
+        label_6 = new QLabel(widget_8);
+        label_6->setObjectName(QString::fromUtf8("label_6"));
+        sizePolicy1.setHeightForWidth(label_6->sizePolicy().hasHeightForWidth());
+        label_6->setSizePolicy(sizePolicy1);
+        label_6->setPixmap(QPixmap(QString::fromUtf8(":/fancyactionbar/images/botleft_corner.png")));
+        label_6->setAlignment(Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft);
 
-        verticalLayout_2->addItem(verticalSpacer);
+        horizontalLayout_10->addWidget(label_6);
 
-
-        gridLayout->addLayout(verticalLayout_2, 0, 0, 2, 1);
-
-        frame = new QFrame(page);
-        frame->setObjectName(QString::fromUtf8("frame"));
-        QSizePolicy sizePolicy2(QSizePolicy::Expanding, QSizePolicy::Expanding);
+        label_14 = new QLabel(widget_8);
+        label_14->setObjectName(QString::fromUtf8("label_14"));
+        QSizePolicy sizePolicy2(QSizePolicy::Preferred, QSizePolicy::Preferred);
         sizePolicy2.setHorizontalStretch(0);
         sizePolicy2.setVerticalStretch(0);
-        sizePolicy2.setHeightForWidth(frame->sizePolicy().hasHeightForWidth());
-        frame->setSizePolicy(sizePolicy2);
-        frame->setMinimumSize(QSize(50, 0));
-        frame->setFrameShape(QFrame::StyledPanel);
-        frame->setFrameShadow(QFrame::Raised);
-        verticalLayout_3 = new QVBoxLayout(frame);
-        verticalLayout_3->setSpacing(3);
-        verticalLayout_3->setMargin(3);
-        verticalLayout_3->setObjectName(QString::fromUtf8("verticalLayout_3"));
-        label = new QLabel(frame);
-        label->setObjectName(QString::fromUtf8("label"));
-        QSizePolicy sizePolicy3(QSizePolicy::Expanding, QSizePolicy::Fixed);
-        sizePolicy3.setHorizontalStretch(0);
-        sizePolicy3.setVerticalStretch(0);
-        sizePolicy3.setHeightForWidth(label->sizePolicy().hasHeightForWidth());
-        label->setSizePolicy(sizePolicy3);
+        sizePolicy2.setHeightForWidth(label_14->sizePolicy().hasHeightForWidth());
+        label_14->setSizePolicy(sizePolicy2);
+        label_14->setMinimumSize(QSize(0, 20));
+        label_14->setFont(font);
+        label_14->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter);
 
-        verticalLayout_3->addWidget(label);
+        horizontalLayout_10->addWidget(label_14);
 
-        listWidget = new QListWidget(frame);
-        listWidget->setObjectName(QString::fromUtf8("listWidget"));
-        listWidget->setFrameShadow(QFrame::Plain);
 
-        verticalLayout_3->addWidget(listWidget);
+        verticalLayout_10->addWidget(widget_8);
 
+        listWidget_7 = new QListWidget(widget_7);
+        listWidget_7->setObjectName(QString::fromUtf8("listWidget_7"));
+        listWidget_7->setFrameShape(QFrame::Box);
+        listWidget_7->setFrameShadow(QFrame::Plain);
 
-        gridLayout->addWidget(frame, 0, 1, 2, 1);
+        verticalLayout_10->addWidget(listWidget_7);
 
 
-        verticalLayout_6->addLayout(gridLayout);
+        horizontalLayout_9->addLayout(verticalLayout_10);
 
-        gridLayout_2 = new QGridLayout();
-        gridLayout_2->setObjectName(QString::fromUtf8("gridLayout_2"));
-        gridLayout_2->setHorizontalSpacing(3);
-        verticalLayout_4 = new QVBoxLayout();
-        verticalLayout_4->setSpacing(3);
-        verticalLayout_4->setObjectName(QString::fromUtf8("verticalLayout_4"));
-        label_25 = new QLabel(page);
-        label_25->setObjectName(QString::fromUtf8("label_25"));
-        sizePolicy1.setHeightForWidth(label_25->sizePolicy().hasHeightForWidth());
-        label_25->setSizePolicy(sizePolicy1);
-        label_25->setMaximumSize(QSize(42, 42));
-        label_25->setPixmap(QPixmap(QString::fromUtf8(":/modules/images/language.png")));
-        label_25->setScaledContents(true);
 
-        verticalLayout_4->addWidget(label_25);
+        verticalLayout_2->addWidget(widget_7);
 
-        verticalSpacer_2 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+        verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Fixed);
 
-        verticalLayout_4->addItem(verticalSpacer_2);
+        verticalLayout_2->addItem(verticalSpacer);
 
+        widget_9 = new QWidget(page);
+        widget_9->setObjectName(QString::fromUtf8("widget_9"));
+        widget_9->setMaximumSize(QSize(16777215, 200));
+        horizontalLayout_11 = new QHBoxLayout(widget_9);
+        horizontalLayout_11->setObjectName(QString::fromUtf8("horizontalLayout_11"));
+        horizontalLayout_11->setContentsMargins(-1, 0, 0, 0);
+        label_16 = new QLabel(widget_9);
+        label_16->setObjectName(QString::fromUtf8("label_16"));
+        sizePolicy1.setHeightForWidth(label_16->sizePolicy().hasHeightForWidth());
+        label_16->setSizePolicy(sizePolicy1);
+        label_16->setMaximumSize(QSize(16777215, 16777215));
+        label_16->setPixmap(QPixmap(QString::fromUtf8(":/modules/images/blockdevice.png")));
+        label_16->setScaledContents(false);
+        label_16->setAlignment(Qt::AlignHCenter|Qt::AlignTop);
 
-        gridLayout_2->addLayout(verticalLayout_4, 0, 0, 2, 1);
+        horizontalLayout_11->addWidget(label_16);
 
-        frame_2 = new QFrame(page);
-        frame_2->setObjectName(QString::fromUtf8("frame_2"));
-        sizePolicy2.setHeightForWidth(frame_2->sizePolicy().hasHeightForWidth());
-        frame_2->setSizePolicy(sizePolicy2);
-        frame_2->setMinimumSize(QSize(50, 0));
-        frame_2->setFrameShape(QFrame::StyledPanel);
-        frame_2->setFrameShadow(QFrame::Raised);
-        verticalLayout_5 = new QVBoxLayout(frame_2);
-        verticalLayout_5->setSpacing(3);
-        verticalLayout_5->setMargin(3);
-        verticalLayout_5->setObjectName(QString::fromUtf8("verticalLayout_5"));
-        label_4 = new QLabel(frame_2);
-        label_4->setObjectName(QString::fromUtf8("label_4"));
-        sizePolicy3.setHeightForWidth(label_4->sizePolicy().hasHeightForWidth());
-        label_4->setSizePolicy(sizePolicy3);
+        verticalLayout_11 = new QVBoxLayout();
+        verticalLayout_11->setSpacing(0);
+        verticalLayout_11->setObjectName(QString::fromUtf8("verticalLayout_11"));
+        widget_10 = new QWidget(widget_9);
+        widget_10->setObjectName(QString::fromUtf8("widget_10"));
+        horizontalLayout_12 = new QHBoxLayout(widget_10);
+        horizontalLayout_12->setObjectName(QString::fromUtf8("horizontalLayout_12"));
+        horizontalLayout_12->setContentsMargins(0, 0, -1, 0);
+        label_7 = new QLabel(widget_10);
+        label_7->setObjectName(QString::fromUtf8("label_7"));
+        sizePolicy1.setHeightForWidth(label_7->sizePolicy().hasHeightForWidth());
+        label_7->setSizePolicy(sizePolicy1);
+        label_7->setPixmap(QPixmap(QString::fromUtf8(":/fancyactionbar/images/botleft_corner.png")));
+        label_7->setAlignment(Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft);
 
-        verticalLayout_5->addWidget(label_4);
+        horizontalLayout_12->addWidget(label_7);
 
-        listWidget_2 = new QListWidget(frame_2);
-        listWidget_2->setObjectName(QString::fromUtf8("listWidget_2"));
-        listWidget_2->setFrameShadow(QFrame::Plain);
+        label_17 = new QLabel(widget_10);
+        label_17->setObjectName(QString::fromUtf8("label_17"));
+        sizePolicy2.setHeightForWidth(label_17->sizePolicy().hasHeightForWidth());
+        label_17->setSizePolicy(sizePolicy2);
+        label_17->setMinimumSize(QSize(0, 20));
+        label_17->setFont(font);
+        label_17->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter);
 
-        verticalLayout_5->addWidget(listWidget_2);
+        horizontalLayout_12->addWidget(label_17);
 
 
-        gridLayout_2->addWidget(frame_2, 0, 1, 2, 1);
+        verticalLayout_11->addWidget(widget_10);
 
+        listWidget_8 = new QListWidget(widget_9);
+        listWidget_8->setObjectName(QString::fromUtf8("listWidget_8"));
+        listWidget_8->setFrameShape(QFrame::Box);
+        listWidget_8->setFrameShadow(QFrame::Plain);
 
-        verticalLayout_6->addLayout(gridLayout_2);
+        verticalLayout_11->addWidget(listWidget_8);
 
+
+        horizontalLayout_11->addLayout(verticalLayout_11);
+
+
+        verticalLayout_2->addWidget(widget_9);
+
+        verticalSpacer_3 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        verticalLayout_2->addItem(verticalSpacer_3);
+
+
+        horizontalLayout_4->addLayout(verticalLayout_2);
+
+        horizontalSpacer_8 = new QSpacerItem(45, 20, QSizePolicy::Fixed, QSizePolicy::Minimum);
+
+        horizontalLayout_4->addItem(horizontalSpacer_8);
+
         stackedWidget->addWidget(page);
         page_2 = new QWidget();
         page_2->setObjectName(QString::fromUtf8("page_2"));
+        horizontalLayout_5 = new QHBoxLayout(page_2);
+        horizontalLayout_5->setObjectName(QString::fromUtf8("horizontalLayout_5"));
+        horizontalSpacer_10 = new QSpacerItem(45, 20, QSizePolicy::Fixed, QSizePolicy::Minimum);
+
+        horizontalLayout_5->addItem(horizontalSpacer_10);
+
+        verticalLayout_5 = new QVBoxLayout();
+        verticalLayout_5->setObjectName(QString::fromUtf8("verticalLayout_5"));
+        verticalSpacer_4 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        verticalLayout_5->addItem(verticalSpacer_4);
+
+        slicesWidget = new QWidget(page_2);
+        slicesWidget->setObjectName(QString::fromUtf8("slicesWidget"));
+        slicesWidget->setMaximumSize(QSize(16777215, 200));
+        horizontalLayout_6 = new QHBoxLayout(slicesWidget);
+        horizontalLayout_6->setSpacing(0);
+        horizontalLayout_6->setObjectName(QString::fromUtf8("horizontalLayout_6"));
+        horizontalLayout_6->setContentsMargins(-1, 0, 0, 0);
+        label_10 = new QLabel(slicesWidget);
+        label_10->setObjectName(QString::fromUtf8("label_10"));
+        sizePolicy1.setHeightForWidth(label_10->sizePolicy().hasHeightForWidth());
+        label_10->setSizePolicy(sizePolicy1);
+        label_10->setMaximumSize(QSize(16777215, 16777215));
+        label_10->setPixmap(QPixmap(QString::fromUtf8(":/modules/images/blockdevice.png")));
+        label_10->setScaledContents(false);
+        label_10->setAlignment(Qt::AlignHCenter|Qt::AlignTop);
+
+        horizontalLayout_6->addWidget(label_10);
+
+        verticalLayout_8 = new QVBoxLayout();
+        verticalLayout_8->setSpacing(0);
+        verticalLayout_8->setObjectName(QString::fromUtf8("verticalLayout_8"));
+        verticalLayout_8->setContentsMargins(-1, -1, -1, 0);
+        widget_5 = new QWidget(slicesWidget);
+        widget_5->setObjectName(QString::fromUtf8("widget_5"));
+        horizontalLayout_7 = new QHBoxLayout(widget_5);
+        horizontalLayout_7->setObjectName(QString::fromUtf8("horizontalLayout_7"));
+        horizontalLayout_7->setContentsMargins(0, 0, -1, 0);
+        label = new QLabel(widget_5);
+        label->setObjectName(QString::fromUtf8("label"));
+        sizePolicy1.setHeightForWidth(label->sizePolicy().hasHeightForWidth());
+        label->setSizePolicy(sizePolicy1);
+        label->setPixmap(QPixmap(QString::fromUtf8(":/fancyactionbar/images/botleft_corner.png")));
+        label->setAlignment(Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft);
+
+        horizontalLayout_7->addWidget(label);
+
+        label_12 = new QLabel(widget_5);
+        label_12->setObjectName(QString::fromUtf8("label_12"));
+        sizePolicy2.setHeightForWidth(label_12->sizePolicy().hasHeightForWidth());
+        label_12->setSizePolicy(sizePolicy2);
+        label_12->setMinimumSize(QSize(0, 20));
+        label_12->setFont(font);
+        label_12->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter);
+
+        horizontalLayout_7->addWidget(label_12);
+
+        label_2 = new QLabel(widget_5);
+        label_2->setObjectName(QString::fromUtf8("label_2"));
+        sizePolicy1.setHeightForWidth(label_2->sizePolicy().hasHeightForWidth());
+        label_2->setSizePolicy(sizePolicy1);
+
+        horizontalLayout_7->addWidget(label_2);
+
+
+        verticalLayout_8->addWidget(widget_5);
+
+        horizontalLayout_14 = new QHBoxLayout();
+        horizontalLayout_14->setSpacing(0);
+        horizontalLayout_14->setObjectName(QString::fromUtf8("horizontalLayout_14"));
+        horizontalLayout_14->setContentsMargins(0, -1, -1, 0);
+        treeWidget = new QTreeWidget(slicesWidget);
+        QTreeWidgetItem *__qtreewidgetitem = new QTreeWidgetItem();
+        __qtreewidgetitem->setBackground(3, QColor(220, 226, 223));
+        __qtreewidgetitem->setBackground(2, QColor(220, 226, 223));
+        __qtreewidgetitem->setBackground(1, QColor(220, 226, 223));
+        __qtreewidgetitem->setBackground(0, QColor(220, 226, 223));
+        treeWidget->setHeaderItem(__qtreewidgetitem);
+        treeWidget->setObjectName(QString::fromUtf8("treeWidget"));
+        treeWidget->setFrameShape(QFrame::Box);
+        treeWidget->setFrameShadow(QFrame::Plain);
+        treeWidget->setAlternatingRowColors(false);
+
+        horizontalLayout_14->addWidget(treeWidget);
+
+        widget_3 = new QWidget(slicesWidget);
+        widget_3->setObjectName(QString::fromUtf8("widget_3"));
+        verticalLayout_3 = new QVBoxLayout(widget_3);
+        verticalLayout_3->setMargin(0);
+        verticalLayout_3->setObjectName(QString::fromUtf8("verticalLayout_3"));
+        toolbarWidget = new QWidget(widget_3);
+        toolbarWidget->setObjectName(QString::fromUtf8("toolbarWidget"));
+        sizePolicy2.setHeightForWidth(toolbarWidget->sizePolicy().hasHeightForWidth());
+        toolbarWidget->setSizePolicy(sizePolicy2);
+        toolbarWidget->setMinimumSize(QSize(15, 0));
+        verticalLayout_12 = new QVBoxLayout(toolbarWidget);
+        verticalLayout_12->setMargin(0);
+        verticalLayout_12->setObjectName(QString::fromUtf8("verticalLayout_12"));
+
+        verticalLayout_3->addWidget(toolbarWidget);
+
+        verticalSpacer_8 = new QSpacerItem(20, 183, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        verticalLayout_3->addItem(verticalSpacer_8);
+
+
+        horizontalLayout_14->addWidget(widget_3);
+
+
+        verticalLayout_8->addLayout(horizontalLayout_14);
+
+
+        horizontalLayout_6->addLayout(verticalLayout_8);
+
+
+        verticalLayout_5->addWidget(slicesWidget);
+
+        verticalSpacer_6 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Fixed);
+
+        verticalLayout_5->addItem(verticalSpacer_6);
+
+        horizontalLayout_2 = new QHBoxLayout();
+        horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2"));
+        horizontalSpacer_3 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        horizontalLayout_2->addItem(horizontalSpacer_3);
+
+        gridLayout_12 = new QGridLayout();
+        gridLayout_12->setObjectName(QString::fromUtf8("gridLayout_12"));
+        gridLayout_12->setHorizontalSpacing(3);
+        gridLayout_12->setVerticalSpacing(1);
+        label_26 = new QLabel(page_2);
+        label_26->setObjectName(QString::fromUtf8("label_26"));
+        QSizePolicy sizePolicy3(QSizePolicy::Fixed, QSizePolicy::Fixed);
+        sizePolicy3.setHorizontalStretch(0);
+        sizePolicy3.setVerticalStretch(0);
+        sizePolicy3.setHeightForWidth(label_26->sizePolicy().hasHeightForWidth());
+        label_26->setSizePolicy(sizePolicy3);
+        label_26->setMaximumSize(QSize(42, 42));
+        label_26->setPixmap(QPixmap(QString::fromUtf8(":/modules/images/diskfilesystems.png")));
+        label_26->setScaledContents(true);
+
+        gridLayout_12->addWidget(label_26, 0, 0, 2, 1);
+
+        label_15 = new QLabel(page_2);
+        label_15->setObjectName(QString::fromUtf8("label_15"));
+        QSizePolicy sizePolicy4(QSizePolicy::Preferred, QSizePolicy::Fixed);
+        sizePolicy4.setHorizontalStretch(0);
+        sizePolicy4.setVerticalStretch(0);
+        sizePolicy4.setHeightForWidth(label_15->sizePolicy().hasHeightForWidth());
+        label_15->setSizePolicy(sizePolicy4);
+        label_15->setMinimumSize(QSize(182, 20));
+        label_15->setMaximumSize(QSize(200, 20));
+        label_15->setFont(font);
+        label_15->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter);
+
+        gridLayout_12->addWidget(label_15, 0, 1, 1, 1);
+
+        m_fsCombo = new QComboBox(page_2);
+        m_fsCombo->setObjectName(QString::fromUtf8("m_fsCombo"));
+        m_fsCombo->setMinimumSize(QSize(180, 0));
+        m_fsCombo->setMaximumSize(QSize(200, 16777215));
+        m_fsCombo->setStyleSheet(QString::fromUtf8("background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(140, 148, 144, 255))"));
+
+        gridLayout_12->addWidget(m_fsCombo, 1, 1, 1, 1);
+
+        label_5 = new QLabel(page_2);
+        label_5->setObjectName(QString::fromUtf8("label_5"));
+
+        gridLayout_12->addWidget(label_5, 1, 2, 1, 1);
+
+
+        horizontalLayout_2->addLayout(gridLayout_12);
+
+        horizontalSpacer_6 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        horizontalLayout_2->addItem(horizontalSpacer_6);
+
+
+        verticalLayout_5->addLayout(horizontalLayout_2);
+
+        verticalSpacer_7 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        verticalLayout_5->addItem(verticalSpacer_7);
+
+
+        horizontalLayout_5->addLayout(verticalLayout_5);
+
+        horizontalSpacer_12 = new QSpacerItem(45, 20, QSizePolicy::Fixed, QSizePolicy::Minimum);
+
+        horizontalLayout_5->addItem(horizontalSpacer_12);
+
         stackedWidget->addWidget(page_2);
 
         verticalLayout->addWidget(stackedWidget);
 
         widget = new QWidget(SetupSlices);
         widget->setObjectName(QString::fromUtf8("widget"));
-        QSizePolicy sizePolicy4(QSizePolicy::Preferred, QSizePolicy::Fixed);
-        sizePolicy4.setHorizontalStretch(0);
-        sizePolicy4.setVerticalStretch(0);
         sizePolicy4.setHeightForWidth(widget->sizePolicy().hasHeightForWidth());
         widget->setSizePolicy(sizePolicy4);
         horizontalLayout_3 = new QHBoxLayout(widget);
@@ -252,13 +514,6 @@
 
         horizontalLayout_3->addItem(horizontalSpacer_4);
 
-        label_2 = new QLabel(widget);
-        label_2->setObjectName(QString::fromUtf8("label_2"));
-        label_2->setPixmap(QPixmap(QString::fromUtf8(":/fancyactionbar/images/botright_corner.png")));
-        label_2->setAlignment(Qt::AlignBottom|Qt::AlignRight|Qt::AlignTrailing);
-
-        horizontalLayout_3->addWidget(label_2);
-
         checkBox = new QCheckBox(widget);
         checkBox->setObjectName(QString::fromUtf8("checkBox"));
         QSizePolicy sizePolicy5(QSizePolicy::Minimum, QSizePolicy::Expanding);
@@ -273,15 +528,8 @@
 
         horizontalLayout_3->addWidget(checkBox);
 
-        label_3 = new QLabel(widget);
-        label_3->setObjectName(QString::fromUtf8("label_3"));
-        label_3->setPixmap(QPixmap(QString::fromUtf8(":/fancyactionbar/images/botleft_corner.png")));
-        label_3->setAlignment(Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft);
+        horizontalSpacer_5 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
 
-        horizontalLayout_3->addWidget(label_3);
-
-        horizontalSpacer_5 = new QSpacerItem(202, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
-
         horizontalLayout_3->addItem(horizontalSpacer_5);
 
 
@@ -290,25 +538,47 @@
 
         retranslateUi(SetupSlices);
 
+        stackedWidget->setCurrentIndex(1);
+
+
         QMetaObject::connectSlotsByName(SetupSlices);
     } // setupUi
 
     void retranslateUi(QWidget *SetupSlices)
     {
         SetupSlices->setWindowTitle(QApplication::translate("SetupSlices", "Form", 0, QApplication::UnicodeUTF8));
-        radioButton->setText(QApplication::translate("SetupSlices", "Basic Configuration", 0, QApplication::UnicodeUTF8));
-        radioButton_2->setText(QApplication::translate("SetupSlices", "Advanced Configuration", 0, QApplication::UnicodeUTF8));
-        label_24->setText(QString());
-        label->setText(QApplication::translate("SetupSlices", "TextLabel", 0, QApplication::UnicodeUTF8));
-        listWidget->setStyleSheet(QApplication::translate("SetupSlices", "background-color: rgb(255, 255, 255);", 0, QApplication::UnicodeUTF8));
-        label_25->setText(QString());
-        label_4->setText(QApplication::translate("SetupSlices", "TextLabel", 0, QApplication::UnicodeUTF8));
-        listWidget_2->setStyleSheet(QApplication::translate("SetupSlices", "background-color: rgb(255, 255, 255);", 0, QApplication::UnicodeUTF8));
-        label_2->setText(QString());
-        checkBox->setStyleSheet(QApplication::translate("SetupSlices", "color: rgb(255, 255, 255);\n"
-"background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(190, 190, 190, 255), stop:1 rgba(48, 48, 48, 255))", 0, QApplication::UnicodeUTF8));
+        m_basicRadio->setText(QApplication::translate("SetupSlices", "Basic Configuration", 0, QApplication::UnicodeUTF8));
+        m_advancedRadio->setText(QApplication::translate("SetupSlices", "Advanced Configuration", 0, QApplication::UnicodeUTF8));
+        widget_7->setStyleSheet(QApplication::translate("SetupSlices", "background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(140, 148, 144, 255))", 0, QApplication::UnicodeUTF8));
+        label_11->setText(QString());
+        widget_8->setStyleSheet(QApplication::translate("SetupSlices", "background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(220, 226, 223, 255), stop:1 rgba(190, 198, 194, 255))", 0, QApplication::UnicodeUTF8));
+        label_6->setText(QString());
+        label_14->setText(QApplication::translate("SetupSlices", "Detected Hard Drives", 0, QApplication::UnicodeUTF8));
+        widget_9->setStyleSheet(QApplication::translate("SetupSlices", "background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(140, 148, 144, 255))", 0, QApplication::UnicodeUTF8));
+        label_16->setText(QString());
+        widget_10->setStyleSheet(QApplication::translate("SetupSlices", "background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(220, 226, 223, 255), stop:1 rgba(190, 198, 194, 255))", 0, QApplication::UnicodeUTF8));
+        label_7->setText(QString());
+        label_17->setText(QApplication::translate("SetupSlices", "Slice Selection", 0, QApplication::UnicodeUTF8));
+        slicesWidget->setStyleSheet(QApplication::translate("SetupSlices", "background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(140, 148, 144, 255))", 0, QApplication::UnicodeUTF8));
+        label_10->setText(QString());
+        widget_5->setStyleSheet(QApplication::translate("SetupSlices", "background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(220, 226, 223, 255), stop:1 rgba(190, 198, 194, 255))", 0, QApplication::UnicodeUTF8));
+        label->setText(QString());
+        label_12->setText(QApplication::translate("SetupSlices", "Disk Slice Setup", 0, QApplication::UnicodeUTF8));
+        label_2->setText(QApplication::translate("SetupSlices", "x of y available MB", 0, QApplication::UnicodeUTF8));
+        QTreeWidgetItem *___qtreewidgetitem = treeWidget->headerItem();
+        ___qtreewidgetitem->setText(3, QApplication::translate("SetupSlices", "Type", 0, QApplication::UnicodeUTF8));
+        ___qtreewidgetitem->setText(2, QApplication::translate("SetupSlices", "Size", 0, QApplication::UnicodeUTF8));
+        ___qtreewidgetitem->setText(1, QApplication::translate("SetupSlices", "Mount", 0, QApplication::UnicodeUTF8));
+        ___qtreewidgetitem->setText(0, QApplication::translate("SetupSlices", "Device", 0, QApplication::UnicodeUTF8));
+        widget_3->setStyleSheet(QApplication::translate("SetupSlices", "background-color: qlineargradient(spread:pad, x1:0.506, y1:0, x2:0.515789, y2:1, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(140, 148, 144, 255));\n"
+"\n"
+"background-color: qlineargradient(spread:pad, x1:1, y1:0.5, x2:0, y2:0.5, stop:0 rgba(220, 226, 223, 255), stop:1 rgba(190, 198, 194, 255));\n"
+"", 0, QApplication::UnicodeUTF8));
+        label_26->setText(QString());
+        label_15->setText(QApplication::translate("SetupSlices", "File System", 0, QApplication::UnicodeUTF8));
+        label_5->setStyleSheet(QApplication::translate("SetupSlices", "color: rgb(190, 0, 0);", 0, QApplication::UnicodeUTF8));
+        label_5->setText(QApplication::translate("SetupSlices", "Leave as default if unsure", 0, QApplication::UnicodeUTF8));
         checkBox->setText(QApplication::translate("SetupSlices", "Install the PC-BSD bootloader", 0, QApplication::UnicodeUTF8));
-        label_3->setText(QString());
         Q_UNUSED(SetupSlices);
     } // retranslateUi
 



More information about the Commits mailing list