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

svn at pcbsd.org svn at pcbsd.org
Mon Jun 8 06:41:00 PDT 2009


Author: kris
Date: 2009-06-08 06:40:59 -0700 (Mon, 08 Jun 2009)
New Revision: 4046

Added:
   pcbsd/trunk-current/SysInstaller/layoutdesign.cpp
   pcbsd/trunk-current/SysInstaller/layoutdesign.h
   pcbsd/trunk-current/SysInstaller/layoutdesign.ui
   pcbsd/trunk-current/SysInstaller/setupinstallation.cpp
   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/ui_layoutdesign.h
   pcbsd/trunk-current/SysInstaller/ui_setupinstallation.h
   pcbsd/trunk-current/SysInstaller/ui_setupnetwork.h
Modified:
   pcbsd/trunk-current/SysInstaller/installer.cpp
   pcbsd/trunk-current/SysInstaller/installer.h
   pcbsd/trunk-current/SysInstaller/installer.qrc
   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_setuplanguage.h
   pcbsd/trunk-current/SysInstaller/ui_setupslices.h
Log:

Update from Ken to the new SysInstaller



Modified: pcbsd/trunk-current/SysInstaller/installer.cpp
===================================================================
--- pcbsd/trunk-current/SysInstaller/installer.cpp	2009-06-08 00:17:32 UTC (rev 4045)
+++ pcbsd/trunk-current/SysInstaller/installer.cpp	2009-06-08 13:40:59 UTC (rev 4046)
@@ -5,6 +5,7 @@
 
 #include "installer.h"
 #include "ui_installer.h"
+#include "setupnetwork.h"
 
 using namespace Core::Internal;
 
@@ -14,17 +15,27 @@
 
 	m_setupLanguage = new SetupLanguage(this);
 
-	//m_setupSlices = new SetupSlices(this);
-	//ui->stackedWidget_5->addWidget(m_setupSlices);
-	//FancyTabWidget *ftw = new FancyTabWidget(this);
 
-	//ftw->insertTab(0, m_setupLanguage, QIcon(":/modules/images/install.png"), "Install");
-	//ftw->insertTab(1, m_setupLanguage, QIcon(":/modules/images/update.png"), "Repair");
-	//ftw->insertTab(2, m_setupLanguage, QIcon(":/modules/images/upgrade.png"), "Upgrade");
 
 	ui->stackedWidget->addWidget(m_setupLanguage);
 	ui->stackedWidget->setCurrentIndex(ui->stackedWidget->count() - 1);
 
+	m_setupInstallation = new SetupInstallation(this);
+	//ui->stackedWidget->addWidget(m_setupInstallation);
+	//ui->stackedWidget->setCurrentIndex(ui->stackedWidget->count() - 1);
+
+	//FancyTabWidget *ftw = new FancyTabWidget(this);
+	//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);
+
+	m_setupSlices = new SetupSlices(this);
+	ui->stackedWidget->addWidget(m_setupSlices);
+	ui->stackedWidget->setCurrentIndex(ui->stackedWidget->count() - 1);
+
+
 	m_lblStatus = new QLabel(this);
 	m_lblStatus->setText("Status");
 
@@ -43,8 +54,13 @@
 	statusBar->insertPermanentWidget(1, bb);
 	statusBar->setSizeGripEnabled(false);
 
-	ui->verticalLayout->layout()->addWidget(statusBar);
+	ui->statusWidget->layout()->addWidget(statusBar);
+
+	//ui->verticalLayout->layout()->addWidget(statusBar);
 	//ui->stackedWidget_5->setCurrentIndex(ui->stackedWidget_5->count() - 1);
+
+	SetupNetwork *sn = new SetupNetwork(this);
+	sn->show();
 }
 
 Installer::~Installer()

Modified: pcbsd/trunk-current/SysInstaller/installer.h
===================================================================
--- pcbsd/trunk-current/SysInstaller/installer.h	2009-06-08 00:17:32 UTC (rev 4045)
+++ pcbsd/trunk-current/SysInstaller/installer.h	2009-06-08 13:40:59 UTC (rev 4046)
@@ -5,9 +5,11 @@
 #include <QtGui/QLabel>
 #include <QtGui/QPushButton>
 
+#include "setupinstallation.h"
+#include "setuplanguage.h"
 #include "setupslices.h"
-#include "setuplanguage.h"
 
+
 namespace Ui
 {
     class InstallerClass;
@@ -31,8 +33,8 @@
 	QPushButton *m_btnNext;
 
 	SetupLanguage *m_setupLanguage;
+	SetupInstallation *m_setupInstallation;
 	SetupSlices *m_setupSlices;
-
 };
 
 #endif // INSTALLER_H

Modified: pcbsd/trunk-current/SysInstaller/installer.qrc
===================================================================
--- pcbsd/trunk-current/SysInstaller/installer.qrc	2009-06-08 00:17:32 UTC (rev 4045)
+++ pcbsd/trunk-current/SysInstaller/installer.qrc	2009-06-08 13:40:59 UTC (rev 4046)
@@ -6,6 +6,16 @@
         <file>images/keyboard.png</file>
         <file>images/language.png</file>
         <file>images/system-config-keyboard.png</file>
+        <file>images/freebsd.png</file>
+        <file>images/server.png</file>
+        <file>images/pbidiricon.png</file>
+        <file>images/desktop.png</file>
+        <file>images/cdrom_mount.png</file>
+        <file>images/network_local.png</file>
+        <file>images/network.png</file>
+        <file>images/diskfilesystems.png</file>
+        <file>images/hdd_mount.png</file>
+        <file>images/blockdevice.png</file>
     </qresource>
     <qresource prefix="/PCBSD" >
         <file>images/NewLogoSmall2.png</file>

Modified: pcbsd/trunk-current/SysInstaller/setupslices.cpp
===================================================================
--- pcbsd/trunk-current/SysInstaller/setupslices.cpp	2009-06-08 00:17:32 UTC (rev 4045)
+++ pcbsd/trunk-current/SysInstaller/setupslices.cpp	2009-06-08 13:40:59 UTC (rev 4046)
@@ -1,7 +1,7 @@
 #include "setupslices.h"
 
 SetupSlices::SetupSlices(QWidget *parent) :
-    QStackedWidget(parent){
+    QWidget(parent){
     setupUi(this);
 }
 

Modified: pcbsd/trunk-current/SysInstaller/setupslices.h
===================================================================
--- pcbsd/trunk-current/SysInstaller/setupslices.h	2009-06-08 00:17:32 UTC (rev 4045)
+++ pcbsd/trunk-current/SysInstaller/setupslices.h	2009-06-08 13:40:59 UTC (rev 4046)
@@ -3,7 +3,7 @@
 
 #include "ui_setupslices.h"
 
-class SetupSlices : public QStackedWidget, private Ui::SetupSlices {
+class SetupSlices : public QWidget, private Ui::SetupSlices {
     Q_OBJECT
     Q_DISABLE_COPY(SetupSlices)
 public:

Modified: pcbsd/trunk-current/SysInstaller/setupslices.ui
===================================================================
--- pcbsd/trunk-current/SysInstaller/setupslices.ui	2009-06-08 00:17:32 UTC (rev 4045)
+++ pcbsd/trunk-current/SysInstaller/setupslices.ui	2009-06-08 13:40:59 UTC (rev 4046)
@@ -1,221 +1,419 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>SetupSlices</class>
- <widget class="QStackedWidget" name="SetupSlices">
+ <widget class="QWidget" name="SetupSlices">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>560</width>
-    <height>300</height>
+    <width>542</width>
+    <height>458</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>StackedWidget</string>
+   <string>Form</string>
   </property>
-  <property name="styleSheet">
-   <string/>
-  </property>
-  <widget class="QWidget" name="page1">
-   <layout class="QVBoxLayout" name="verticalLayout">
-    <property name="spacing">
-     <number>20</number>
-    </property>
-    <item>
-     <layout class="QGridLayout" name="gridLayout_7">
-      <property name="horizontalSpacing">
-       <number>3</number>
-      </property>
-      <property name="verticalSpacing">
-       <number>1</number>
-      </property>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_48">
-        <property name="maximumSize">
-         <size>
-          <width>47</width>
-          <height>47</height>
-         </size>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="pixmap">
-         <pixmap resource="fancyactionbar.qrc">:/fancyactionbar/images/kcmdevices.png</pixmap>
-        </property>
-        <property name="scaledContents">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1" rowspan="2">
-       <widget class="QFrame" name="frame_10">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>400</width>
-          <height>100</height>
-         </size>
-        </property>
-        <property name="maximumSize">
-         <size>
-          <width>16777215</width>
-          <height>16777215</height>
-         </size>
-        </property>
-        <property name="frameShape">
-         <enum>QFrame::StyledPanel</enum>
-        </property>
-        <property name="frameShadow">
-         <enum>QFrame::Plain</enum>
-        </property>
-        <layout class="QVBoxLayout" name="verticalLayout_14">
-         <property name="spacing">
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QRadioButton" name="radioButton">
+       <property name="font">
+        <font>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Basic Configuration</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QRadioButton" name="radioButton_2">
+       <property name="font">
+        <font>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Advanced Configuration</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QStackedWidget" name="stackedWidget">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </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>
+       <item>
+        <layout class="QGridLayout" name="gridLayout">
+         <property name="horizontalSpacing">
           <number>3</number>
          </property>
-         <property name="margin">
-          <number>3</number>
-         </property>
-         <item>
-          <widget class="QLabel" name="label_17">
-           <property name="font">
-            <font>
-             <weight>75</weight>
-             <bold>true</bold>
-            </font>
+         <item row="0" column="0" rowspan="2">
+          <layout class="QVBoxLayout" name="verticalLayout_2">
+           <property name="spacing">
+            <number>3</number>
            </property>
-           <property name="text">
-            <string>Detected Hard Drives</string>
-           </property>
-          </widget>
+           <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>
          </item>
-         <item>
-          <widget class="QListView" name="listDetectedDrives_2">
-           <property name="styleSheet">
-            <string notr="true">background-color: rgb(255, 255, 255);selection-background-color: rgb(2, 46, 115);selection-color: rgb(255, 255, 255);</string>
-           </property>
-           <property name="frameShadow">
-            <enum>QFrame::Plain</enum>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QFrame" name="frame_11">
+         <item row="0" column="1" rowspan="2">
+          <widget class="QFrame" name="frame">
            <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
            <property name="minimumSize">
             <size>
-             <width>400</width>
-             <height>100</height>
+             <width>50</width>
+             <height>0</height>
             </size>
            </property>
-           <property name="maximumSize">
-            <size>
-             <width>16777215</width>
-             <height>16777215</height>
-            </size>
-           </property>
            <property name="frameShape">
-            <enum>QFrame::NoFrame</enum>
+            <enum>QFrame::StyledPanel</enum>
            </property>
            <property name="frameShadow">
-            <enum>QFrame::Plain</enum>
+            <enum>QFrame::Raised</enum>
            </property>
-           <layout class="QGridLayout" name="gridLayout_10">
-            <property name="margin">
+           <layout class="QVBoxLayout" name="verticalLayout_3">
+            <property name="spacing">
              <number>3</number>
             </property>
-            <property name="spacing">
+            <property name="margin">
              <number>3</number>
             </property>
-            <item row="0" column="0">
-             <widget class="QLabel" name="label_18">
-              <property name="font">
-               <font>
-                <weight>75</weight>
-                <bold>true</bold>
-               </font>
-              </property>
-              <property name="text">
-               <string>Slice Selection</string>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="1">
-             <widget class="QCheckBox" name="useEntireDisk_2">
+            <item>
+             <widget class="QLabel" name="label">
               <property name="sizePolicy">
-               <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+               <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="text">
-               <string>Use entire Disk</string>
+               <string>TextLabel</string>
               </property>
              </widget>
             </item>
-            <item row="1" column="0" colspan="2">
-             <widget class="QListView" name="listSelectedSlices_2">
+            <item>
+             <widget class="QListWidget" name="listWidget">
               <property name="styleSheet">
-               <string notr="true">background-color: rgb(255, 255, 255);selection-background-color: rgb(2, 46, 115);selection-color: rgb(255, 255, 255);</string>
+               <string>background-color: rgb(255, 255, 255);</string>
               </property>
               <property name="frameShadow">
                <enum>QFrame::Plain</enum>
               </property>
              </widget>
             </item>
-            <item row="2" column="0" colspan="2">
-             <layout class="QHBoxLayout" name="horizontalLayout_2"/>
-            </item>
            </layout>
           </widget>
          </item>
-         <item>
-          <widget class="QCheckBox" name="installBootLoader_2">
+        </layout>
+       </item>
+       <item>
+        <layout class="QGridLayout" name="gridLayout_2">
+         <property name="horizontalSpacing">
+          <number>3</number>
+         </property>
+         <item row="0" column="0" rowspan="2">
+          <layout class="QVBoxLayout" name="verticalLayout_4">
+           <property name="spacing">
+            <number>3</number>
+           </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>
+         </item>
+         <item row="0" column="1" rowspan="2">
+          <widget class="QFrame" name="frame_2">
            <property name="sizePolicy">
-            <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+            <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
              <horstretch>0</horstretch>
              <verstretch>0</verstretch>
             </sizepolicy>
            </property>
-           <property name="text">
-            <string>Install the PC-BSD bootloader</string>
+           <property name="minimumSize">
+            <size>
+             <width>50</width>
+             <height>0</height>
+            </size>
            </property>
+           <property name="frameShape">
+            <enum>QFrame::StyledPanel</enum>
+           </property>
+           <property name="frameShadow">
+            <enum>QFrame::Raised</enum>
+           </property>
+           <layout class="QVBoxLayout" name="verticalLayout_5">
+            <property name="spacing">
+             <number>3</number>
+            </property>
+            <property name="margin">
+             <number>3</number>
+            </property>
+            <item>
+             <widget class="QLabel" name="label_4">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>TextLabel</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QListWidget" name="listWidget_2">
+              <property name="styleSheet">
+               <string>background-color: rgb(255, 255, 255);</string>
+              </property>
+              <property name="frameShadow">
+               <enum>QFrame::Plain</enum>
+              </property>
+             </widget>
+            </item>
+           </layout>
           </widget>
          </item>
         </layout>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="page_2"/>
+    </widget>
+   </item>
+   <item>
+    <widget class="QWidget" name="widget" native="true">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout_3">
+      <property name="spacing">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <spacer name="horizontalSpacer_4">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="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 row="1" column="0">
-       <spacer name="verticalSpacer_16">
+      <item>
+       <widget class="QCheckBox" name="checkBox">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="font">
+         <font>
+          <weight>50</weight>
+          <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::Vertical</enum>
+         <enum>Qt::Horizontal</enum>
         </property>
         <property name="sizeHint" stdset="0">
          <size>
-          <width>20</width>
-          <height>40</height>
+          <width>202</width>
+          <height>20</height>
          </size>
         </property>
        </spacer>
       </item>
      </layout>
-    </item>
-   </layout>
-  </widget>
-  <widget class="QWidget" name="page2"/>
+    </widget>
+   </item>
+  </layout>
  </widget>
  <resources>
   <include location="fancyactionbar.qrc"/>
+  <include location="installer.qrc"/>
  </resources>
  <connections/>
 </ui>

Modified: pcbsd/trunk-current/SysInstaller/ui_installer.h
===================================================================
--- pcbsd/trunk-current/SysInstaller/ui_installer.h	2009-06-08 00:17:32 UTC (rev 4045)
+++ pcbsd/trunk-current/SysInstaller/ui_installer.h	2009-06-08 13:40:59 UTC (rev 4046)
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading ui file 'installer.ui'
 **
-** Created: Tue Jun 2 23:21:06 2009
+** Created: Sat Jun 6 23:47:00 2009
 **      by: Qt User Interface Compiler version 4.5.1
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!
@@ -34,7 +34,7 @@
     QLabel *lblPcbsd;
     QSpacerItem *horizontalSpacer;
     QLabel *label_32;
-    QWidget *widget;
+    QWidget *titleWidget;
     QHBoxLayout *horizontalLayout_3;
     QLabel *label_33;
     QLabel *lblQuote;
@@ -45,17 +45,16 @@
     QStackedWidget *stackedWidget;
     QWidget *page_2;
     QHBoxLayout *horizontalLayout_8;
+    QWidget *statusWidget;
+    QHBoxLayout *horizontalLayout_4;
     QVBoxLayout *verticalLayout_10;
     QWidget *botStrip;
-    QWidget *widget_6;
-    QHBoxLayout *horizontalLayout_9;
-    QLabel *lblQuote_2;
-    QSpacerItem *horizontalSpacer_12;
-    QLabel *label_36;
     QWidget *footer;
     QHBoxLayout *horizontalLayout_2;
     QLabel *label_35;
+    QLabel *lblQuote_2;
     QTextEdit *txtInfo;
+    QLabel *label_36;
 
     void setupUi(QWidget *InstallerClass)
     {
@@ -102,23 +101,23 @@
 
         verticalLayout->addWidget(header);
 
-        widget = new QWidget(InstallerClass);
-        widget->setObjectName(QString::fromUtf8("widget"));
-        sizePolicy.setHeightForWidth(widget->sizePolicy().hasHeightForWidth());
-        widget->setSizePolicy(sizePolicy);
-        horizontalLayout_3 = new QHBoxLayout(widget);
+        titleWidget = new QWidget(InstallerClass);
+        titleWidget->setObjectName(QString::fromUtf8("titleWidget"));
+        sizePolicy.setHeightForWidth(titleWidget->sizePolicy().hasHeightForWidth());
+        titleWidget->setSizePolicy(sizePolicy);
+        horizontalLayout_3 = new QHBoxLayout(titleWidget);
         horizontalLayout_3->setSpacing(6);
         horizontalLayout_3->setMargin(11);
         horizontalLayout_3->setObjectName(QString::fromUtf8("horizontalLayout_3"));
         horizontalLayout_3->setContentsMargins(0, 0, 5, 0);
-        label_33 = new QLabel(widget);
+        label_33 = new QLabel(titleWidget);
         label_33->setObjectName(QString::fromUtf8("label_33"));
         label_33->setPixmap(QPixmap(QString::fromUtf8(":/fancyactionbar/images/botleft_corner.png")));
         label_33->setAlignment(Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft);
 
         horizontalLayout_3->addWidget(label_33);
 
-        lblQuote = new QLabel(widget);
+        lblQuote = new QLabel(titleWidget);
         lblQuote->setObjectName(QString::fromUtf8("lblQuote"));
 
         horizontalLayout_3->addWidget(lblQuote);
@@ -127,7 +126,7 @@
 
         horizontalLayout_3->addItem(horizontalSpacer_5);
 
-        label = new QLabel(widget);
+        label = new QLabel(titleWidget);
         label->setObjectName(QString::fromUtf8("label"));
         QFont font;
         font.setFamily(QString::fromUtf8("Utopia"));
@@ -138,7 +137,7 @@
 
         horizontalLayout_3->addWidget(label);
 
-        label_11 = new QLabel(widget);
+        label_11 = new QLabel(titleWidget);
         label_11->setObjectName(QString::fromUtf8("label_11"));
         QSizePolicy sizePolicy1(QSizePolicy::Fixed, QSizePolicy::Fixed);
         sizePolicy1.setHorizontalStretch(0);
@@ -154,7 +153,7 @@
         horizontalLayout_3->addWidget(label_11);
 
 
-        verticalLayout->addWidget(widget);
+        verticalLayout->addWidget(titleWidget);
 
         topStrip = new QWidget(InstallerClass);
         topStrip->setObjectName(QString::fromUtf8("topStrip"));
@@ -180,6 +179,16 @@
 
         verticalLayout->addWidget(stackedWidget);
 
+        statusWidget = new QWidget(InstallerClass);
+        statusWidget->setObjectName(QString::fromUtf8("statusWidget"));
+        statusWidget->setMinimumSize(QSize(0, 0));
+        horizontalLayout_4 = new QHBoxLayout(statusWidget);
+        horizontalLayout_4->setSpacing(6);
+        horizontalLayout_4->setMargin(0);
+        horizontalLayout_4->setObjectName(QString::fromUtf8("horizontalLayout_4"));
+
+        verticalLayout->addWidget(statusWidget);
+
         verticalLayout_10 = new QVBoxLayout();
         verticalLayout_10->setSpacing(0);
         verticalLayout_10->setObjectName(QString::fromUtf8("verticalLayout_10"));
@@ -193,40 +202,6 @@
 
         verticalLayout_10->addWidget(botStrip);
 
-        widget_6 = new QWidget(InstallerClass);
-        widget_6->setObjectName(QString::fromUtf8("widget_6"));
-        sizePolicy.setHeightForWidth(widget_6->sizePolicy().hasHeightForWidth());
-        widget_6->setSizePolicy(sizePolicy);
-        horizontalLayout_9 = new QHBoxLayout(widget_6);
-        horizontalLayout_9->setSpacing(3);
-        horizontalLayout_9->setMargin(11);
-        horizontalLayout_9->setObjectName(QString::fromUtf8("horizontalLayout_9"));
-        horizontalLayout_9->setContentsMargins(26, 0, 0, 0);
-        lblQuote_2 = new QLabel(widget_6);
-        lblQuote_2->setObjectName(QString::fromUtf8("lblQuote_2"));
-        QFont font1;
-        font1.setFamily(QString::fromUtf8("Utopia"));
-        font1.setPointSize(10);
-        font1.setBold(true);
-        font1.setWeight(75);
-        lblQuote_2->setFont(font1);
-
-        horizontalLayout_9->addWidget(lblQuote_2);
-
-        horizontalSpacer_12 = new QSpacerItem(288, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
-
-        horizontalLayout_9->addItem(horizontalSpacer_12);
-
-        label_36 = new QLabel(widget_6);
-        label_36->setObjectName(QString::fromUtf8("label_36"));
-        label_36->setPixmap(QPixmap(QString::fromUtf8(":/fancyactionbar/images/topright_corner.png")));
-        label_36->setAlignment(Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing);
-
-        horizontalLayout_9->addWidget(label_36);
-
-
-        verticalLayout_10->addWidget(widget_6);
-
         footer = new QWidget(InstallerClass);
         footer->setObjectName(QString::fromUtf8("footer"));
         sizePolicy.setHeightForWidth(footer->sizePolicy().hasHeightForWidth());
@@ -244,6 +219,17 @@
 
         horizontalLayout_2->addWidget(label_35);
 
+        lblQuote_2 = new QLabel(footer);
+        lblQuote_2->setObjectName(QString::fromUtf8("lblQuote_2"));
+        QFont font1;
+        font1.setFamily(QString::fromUtf8("Utopia"));
+        font1.setPointSize(10);
+        font1.setBold(true);
+        font1.setWeight(75);
+        lblQuote_2->setFont(font1);
+
+        horizontalLayout_2->addWidget(lblQuote_2);
+
         txtInfo = new QTextEdit(footer);
         txtInfo->setObjectName(QString::fromUtf8("txtInfo"));
         txtInfo->setAutoFillBackground(false);
@@ -255,7 +241,14 @@
 
         horizontalLayout_2->addWidget(txtInfo);
 
+        label_36 = new QLabel(footer);
+        label_36->setObjectName(QString::fromUtf8("label_36"));
+        label_36->setPixmap(QPixmap(QString::fromUtf8(":/fancyactionbar/images/topright_corner.png")));
+        label_36->setAlignment(Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing);
 
+        horizontalLayout_2->addWidget(label_36);
+
+
         verticalLayout_10->addWidget(footer);
 
 
@@ -276,7 +269,7 @@
         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());
         label_32->setText(QString());
-        widget->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("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));
         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));
@@ -284,16 +277,15 @@
         label->setText(QApplication::translate("InstallerClass", "Current Module Title", 0, QApplication::UnicodeUTF8));
         topStrip->setStyleSheet(QApplication::translate("InstallerClass", "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(220, 220, 220);", 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));
-        widget_6->setStyleSheet(QApplication::translate("InstallerClass", "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))", 0, QApplication::UnicodeUTF8));
-        lblQuote_2->setStyleSheet(QApplication::translate("InstallerClass", "color: rgb(148,148,148);", 0, QApplication::UnicodeUTF8));
-        lblQuote_2->setText(QApplication::translate("InstallerClass", "Tips", 0, QApplication::UnicodeUTF8));
-        label_36->setText(QString());
         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"
 "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(245, 245, 245, 255), stop:1 rgba(180, 188, 184, 255))", 0, QApplication::UnicodeUTF8));
+"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"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><title>Hints:</title><style type=\"text/css\">\n"
@@ -304,6 +296,7 @@
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"></p>\n"
 "<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);
     } // retranslateUi
 

Modified: pcbsd/trunk-current/SysInstaller/ui_setuplanguage.h
===================================================================
--- pcbsd/trunk-current/SysInstaller/ui_setuplanguage.h	2009-06-08 00:17:32 UTC (rev 4045)
+++ pcbsd/trunk-current/SysInstaller/ui_setuplanguage.h	2009-06-08 13:40:59 UTC (rev 4046)
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading ui file 'setuplanguage.ui'
 **
-** Created: Mon Jun 1 17:54:23 2009
+** Created: Sat Jun 6 20:33:07 2009
 **      by: Qt User Interface Compiler version 4.5.1
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!

Modified: pcbsd/trunk-current/SysInstaller/ui_setupslices.h
===================================================================
--- pcbsd/trunk-current/SysInstaller/ui_setupslices.h	2009-06-08 00:17:32 UTC (rev 4045)
+++ pcbsd/trunk-current/SysInstaller/ui_setupslices.h	2009-06-08 13:40:59 UTC (rev 4046)
@@ -1,7 +1,7 @@
 /********************************************************************************
 ** Form generated from reading ui file 'setupslices.ui'
 **
-** Created: Mon Jun 1 17:28:16 2009
+** Created: Sun Jun 7 15:39:35 2009
 **      by: Qt User Interface Compiler version 4.5.1
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!
@@ -20,7 +20,8 @@
 #include <QtGui/QHBoxLayout>
 #include <QtGui/QHeaderView>
 #include <QtGui/QLabel>
-#include <QtGui/QListView>
+#include <QtGui/QListWidget>
+#include <QtGui/QRadioButton>
 #include <QtGui/QSpacerItem>
 #include <QtGui/QStackedWidget>
 #include <QtGui/QVBoxLayout>
@@ -31,159 +32,283 @@
 class Ui_SetupSlices
 {
 public:
-    QWidget *page1;
     QVBoxLayout *verticalLayout;
-    QGridLayout *gridLayout_7;
-    QLabel *label_48;
-    QFrame *frame_10;
-    QVBoxLayout *verticalLayout_14;
-    QLabel *label_17;
-    QListView *listDetectedDrives_2;
-    QFrame *frame_11;
-    QGridLayout *gridLayout_10;
-    QLabel *label_18;
-    QCheckBox *useEntireDisk_2;
-    QListView *listSelectedSlices_2;
-    QHBoxLayout *horizontalLayout_2;
-    QCheckBox *installBootLoader_2;
-    QSpacerItem *verticalSpacer_16;
-    QWidget *page2;
+    QHBoxLayout *horizontalLayout;
+    QSpacerItem *horizontalSpacer;
+    QRadioButton *radioButton;
+    QRadioButton *radioButton_2;
+    QSpacerItem *horizontalSpacer_2;
+    QStackedWidget *stackedWidget;
+    QWidget *page;
+    QVBoxLayout *verticalLayout_6;
+    QGridLayout *gridLayout;
+    QVBoxLayout *verticalLayout_2;
+    QLabel *label_24;
+    QSpacerItem *verticalSpacer;
+    QFrame *frame;
+    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 *widget;
+    QHBoxLayout *horizontalLayout_3;
+    QSpacerItem *horizontalSpacer_4;
+    QLabel *label_2;
+    QCheckBox *checkBox;
+    QLabel *label_3;
+    QSpacerItem *horizontalSpacer_5;
 
-    void setupUi(QStackedWidget *SetupSlices)
+    void setupUi(QWidget *SetupSlices)
     {
         if (SetupSlices->objectName().isEmpty())
             SetupSlices->setObjectName(QString::fromUtf8("SetupSlices"));
-        SetupSlices->resize(560, 300);
-        page1 = new QWidget();
-        page1->setObjectName(QString::fromUtf8("page1"));
-        verticalLayout = new QVBoxLayout(page1);
-        verticalLayout->setSpacing(20);
+        SetupSlices->resize(542, 458);
+        verticalLayout = new QVBoxLayout(SetupSlices);
         verticalLayout->setObjectName(QString::fromUtf8("verticalLayout"));
-        gridLayout_7 = new QGridLayout();
-        gridLayout_7->setObjectName(QString::fromUtf8("gridLayout_7"));
-        gridLayout_7->setHorizontalSpacing(3);
-        gridLayout_7->setVerticalSpacing(1);
-        label_48 = new QLabel(page1);
-        label_48->setObjectName(QString::fromUtf8("label_48"));
-        label_48->setMaximumSize(QSize(47, 47));
-        label_48->setPixmap(QPixmap(QString::fromUtf8(":/fancyactionbar/images/kcmdevices.png")));
-        label_48->setScaledContents(true);
+        verticalLayout->setContentsMargins(-1, -1, -1, 0);
+        horizontalLayout = new QHBoxLayout();
+        horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout"));
+        horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
 
-        gridLayout_7->addWidget(label_48, 0, 0, 1, 1);
+        horizontalLayout->addItem(horizontalSpacer);
 
-        frame_10 = new QFrame(page1);
-        frame_10->setObjectName(QString::fromUtf8("frame_10"));
-        QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
-        sizePolicy.setHorizontalStretch(0);
-        sizePolicy.setVerticalStretch(0);
-        sizePolicy.setHeightForWidth(frame_10->sizePolicy().hasHeightForWidth());
-        frame_10->setSizePolicy(sizePolicy);
-        frame_10->setMinimumSize(QSize(400, 100));
-        frame_10->setMaximumSize(QSize(16777215, 16777215));
-        frame_10->setFrameShape(QFrame::StyledPanel);
-        frame_10->setFrameShadow(QFrame::Plain);
-        verticalLayout_14 = new QVBoxLayout(frame_10);
-        verticalLayout_14->setSpacing(3);
-        verticalLayout_14->setMargin(3);
-        verticalLayout_14->setObjectName(QString::fromUtf8("verticalLayout_14"));
-        label_17 = new QLabel(frame_10);
-        label_17->setObjectName(QString::fromUtf8("label_17"));
+        radioButton = new QRadioButton(SetupSlices);
+        radioButton->setObjectName(QString::fromUtf8("radioButton"));
         QFont font;
         font.setBold(true);
         font.setWeight(75);
-        label_17->setFont(font);
+        radioButton->setFont(font);
 
-        verticalLayout_14->addWidget(label_17);
+        horizontalLayout->addWidget(radioButton);
 
-        listDetectedDrives_2 = new QListView(frame_10);
-        listDetectedDrives_2->setObjectName(QString::fromUtf8("listDetectedDrives_2"));
-        listDetectedDrives_2->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 255);selection-background-color: rgb(2, 46, 115);selection-color: rgb(255, 255, 255);"));
-        listDetectedDrives_2->setFrameShadow(QFrame::Plain);
+        radioButton_2 = new QRadioButton(SetupSlices);
+        radioButton_2->setObjectName(QString::fromUtf8("radioButton_2"));
+        radioButton_2->setFont(font);
 
-        verticalLayout_14->addWidget(listDetectedDrives_2);
+        horizontalLayout->addWidget(radioButton_2);
 
-        frame_11 = new QFrame(frame_10);
-        frame_11->setObjectName(QString::fromUtf8("frame_11"));
-        sizePolicy.setHeightForWidth(frame_11->sizePolicy().hasHeightForWidth());
-        frame_11->setSizePolicy(sizePolicy);
-        frame_11->setMinimumSize(QSize(400, 100));
-        frame_11->setMaximumSize(QSize(16777215, 16777215));
-        frame_11->setFrameShape(QFrame::NoFrame);
-        frame_11->setFrameShadow(QFrame::Plain);
-        gridLayout_10 = new QGridLayout(frame_11);
-        gridLayout_10->setSpacing(3);
-        gridLayout_10->setMargin(3);
-        gridLayout_10->setObjectName(QString::fromUtf8("gridLayout_10"));
-        label_18 = new QLabel(frame_11);
-        label_18->setObjectName(QString::fromUtf8("label_18"));
-        label_18->setFont(font);
+        horizontalSpacer_2 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
 
-        gridLayout_10->addWidget(label_18, 0, 0, 1, 1);
+        horizontalLayout->addItem(horizontalSpacer_2);
 
-        useEntireDisk_2 = new QCheckBox(frame_11);
-        useEntireDisk_2->setObjectName(QString::fromUtf8("useEntireDisk_2"));
+
+        verticalLayout->addLayout(horizontalLayout);
+
+        stackedWidget = new QStackedWidget(SetupSlices);
+        stackedWidget->setObjectName(QString::fromUtf8("stackedWidget"));
+        QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
+        sizePolicy.setHorizontalStretch(0);
+        sizePolicy.setVerticalStretch(0);
+        sizePolicy.setHeightForWidth(stackedWidget->sizePolicy().hasHeightForWidth());
+        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);
+        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);
         sizePolicy1.setHorizontalStretch(0);
         sizePolicy1.setVerticalStretch(0);
-        sizePolicy1.setHeightForWidth(useEntireDisk_2->sizePolicy().hasHeightForWidth());
-        useEntireDisk_2->setSizePolicy(sizePolicy1);
+        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);
 
-        gridLayout_10->addWidget(useEntireDisk_2, 0, 1, 1, 1);
+        verticalLayout_2->addWidget(label_24);
 
-        listSelectedSlices_2 = new QListView(frame_11);
-        listSelectedSlices_2->setObjectName(QString::fromUtf8("listSelectedSlices_2"));
-        listSelectedSlices_2->setStyleSheet(QString::fromUtf8("background-color: rgb(255, 255, 255);selection-background-color: rgb(2, 46, 115);selection-color: rgb(255, 255, 255);"));
-        listSelectedSlices_2->setFrameShadow(QFrame::Plain);
+        verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
 
-        gridLayout_10->addWidget(listSelectedSlices_2, 1, 0, 1, 2);
+        verticalLayout_2->addItem(verticalSpacer);
 
-        horizontalLayout_2 = new QHBoxLayout();
-        horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2"));
 
-        gridLayout_10->addLayout(horizontalLayout_2, 2, 0, 1, 2);
+        gridLayout->addLayout(verticalLayout_2, 0, 0, 2, 1);
 
-
-        verticalLayout_14->addWidget(frame_11);
-
-        installBootLoader_2 = new QCheckBox(frame_10);
-        installBootLoader_2->setObjectName(QString::fromUtf8("installBootLoader_2"));
-        QSizePolicy sizePolicy2(QSizePolicy::Expanding, QSizePolicy::Fixed);
+        frame = new QFrame(page);
+        frame->setObjectName(QString::fromUtf8("frame"));
+        QSizePolicy sizePolicy2(QSizePolicy::Expanding, QSizePolicy::Expanding);
         sizePolicy2.setHorizontalStretch(0);
         sizePolicy2.setVerticalStretch(0);
-        sizePolicy2.setHeightForWidth(installBootLoader_2->sizePolicy().hasHeightForWidth());
-        installBootLoader_2->setSizePolicy(sizePolicy2);
+        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);
 
-        verticalLayout_14->addWidget(installBootLoader_2);
+        verticalLayout_3->addWidget(label);
 
+        listWidget = new QListWidget(frame);
+        listWidget->setObjectName(QString::fromUtf8("listWidget"));
+        listWidget->setFrameShadow(QFrame::Plain);
 
-        gridLayout_7->addWidget(frame_10, 0, 1, 2, 1);
+        verticalLayout_3->addWidget(listWidget);
 
-        verticalSpacer_16 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
 
-        gridLayout_7->addItem(verticalSpacer_16, 1, 0, 1, 1);
+        gridLayout->addWidget(frame, 0, 1, 2, 1);
 
 
-        verticalLayout->addLayout(gridLayout_7);
+        verticalLayout_6->addLayout(gridLayout);
 
-        SetupSlices->addWidget(page1);
-        page2 = new QWidget();
-        page2->setObjectName(QString::fromUtf8("page2"));
-        SetupSlices->addWidget(page2);
+        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);
+
+        verticalSpacer_2 = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+        verticalLayout_4->addItem(verticalSpacer_2);
+
+
+        gridLayout_2->addLayout(verticalLayout_4, 0, 0, 2, 1);
+
+        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_5->addWidget(label_4);
+
+        listWidget_2 = new QListWidget(frame_2);
+        listWidget_2->setObjectName(QString::fromUtf8("listWidget_2"));
+        listWidget_2->setFrameShadow(QFrame::Plain);
+
+        verticalLayout_5->addWidget(listWidget_2);
+
+
+        gridLayout_2->addWidget(frame_2, 0, 1, 2, 1);
+
+
+        verticalLayout_6->addLayout(gridLayout_2);
+
+        stackedWidget->addWidget(page);
+        page_2 = new QWidget();
+        page_2->setObjectName(QString::fromUtf8("page_2"));
+        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);
+        horizontalLayout_3->setSpacing(0);
+        horizontalLayout_3->setObjectName(QString::fromUtf8("horizontalLayout_3"));
+        horizontalLayout_3->setContentsMargins(-1, 0, -1, 0);
+        horizontalSpacer_4 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        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);
+        sizePolicy5.setHorizontalStretch(0);
+        sizePolicy5.setVerticalStretch(0);
+        sizePolicy5.setHeightForWidth(checkBox->sizePolicy().hasHeightForWidth());
+        checkBox->setSizePolicy(sizePolicy5);
+        QFont font1;
+        font1.setBold(false);
+        font1.setWeight(50);
+        checkBox->setFont(font1);
+
+        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);
+
+        horizontalLayout_3->addWidget(label_3);
+
+        horizontalSpacer_5 = new QSpacerItem(202, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
+
+        horizontalLayout_3->addItem(horizontalSpacer_5);
+
+
+        verticalLayout->addWidget(widget);
+
+
         retranslateUi(SetupSlices);
 
         QMetaObject::connectSlotsByName(SetupSlices);
     } // setupUi
 
-    void retranslateUi(QStackedWidget *SetupSlices)
+    void retranslateUi(QWidget *SetupSlices)
     {
-        SetupSlices->setWindowTitle(QApplication::translate("SetupSlices", "StackedWidget", 0, QApplication::UnicodeUTF8));
-        SetupSlices->setStyleSheet(QString());
-        label_48->setText(QString());
-        label_17->setText(QApplication::translate("SetupSlices", "Detected Hard Drives", 0, QApplication::UnicodeUTF8));
-        label_18->setText(QApplication::translate("SetupSlices", "Slice Selection", 0, QApplication::UnicodeUTF8));
-        useEntireDisk_2->setText(QApplication::translate("SetupSlices", "Use entire Disk", 0, QApplication::UnicodeUTF8));
-        installBootLoader_2->setText(QApplication::translate("SetupSlices", "Install the PC-BSD bootloader", 0, QApplication::UnicodeUTF8));
+        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));
+        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