[PC-BSD Commits] r293 - pcbsd/trunk/PCInstall
svn at pcbsd.org
svn at pcbsd.org
Thu Jun 7 14:01:07 PDT 2007
Author: kris
Date: 2007-06-07 22:01:04 +0100 (Thu, 07 Jun 2007)
New Revision: 293
Added:
pcbsd/trunk/PCInstall/kpackage.png
pcbsd/trunk/PCInstall/next.png
pcbsd/trunk/PCInstall/previous.png
Modified:
pcbsd/trunk/PCInstall/pcinstall.ui
pcbsd/trunk/PCInstall/pcinstall.ui.h
Log:
Added the updated PC-BSD Installer for 1.4
Added: pcbsd/trunk/PCInstall/kpackage.png
Property changes on: pcbsd/trunk/PCInstall/kpackage.png
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Added: pcbsd/trunk/PCInstall/next.png
Property changes on: pcbsd/trunk/PCInstall/next.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: pcbsd/trunk/PCInstall/pcinstall.ui
===================================================================
--- pcbsd/trunk/PCInstall/pcinstall.ui 2007-06-07 20:57:10 UTC (rev 292)
+++ pcbsd/trunk/PCInstall/pcinstall.ui 2007-06-07 21:01:04 UTC (rev 293)
@@ -42,6 +42,51 @@
<attribute name="title">
<string>Select Language and Keyboard</string>
</attribute>
+ <widget class="QGroupBox">
+ <property name="name">
+ <cstring>groupBox1_3</cstring>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>450</y>
+ <width>860</width>
+ <height>140</height>
+ </rect>
+ </property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
+ <property name="title">
+ <string>Quick Tips</string>
+ </property>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>textLabel1_8</cstring>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>20</y>
+ <width>840</width>
+ <height>110</height>
+ </rect>
+ </property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
+ <property name="text">
+ <string>Welcome to PC-BSD! PC-BSD has been designed with the "casual" computer user in mind. Installing the system is simply a matter of a few clicks and a few minutes for the installation process to finish. Hardware such as video, sound, network and other devices will be auto-detected and available at the first system startup. Home users will immediately feel comfortable using PC-BSD's desktop interface with the popular KDE desktop manager included.
+
+Please select your language, keyboard layout and timezone, then click "Next" to continue.</string>
+ </property>
+ <property name="alignment">
+ <set>WordBreak|AlignTop</set>
+ </property>
+ </widget>
+ </widget>
<widget class="QLabel">
<property name="name">
<cstring>pixmapLabel1</cstring>
@@ -68,7 +113,7 @@
<enum>Plain</enum>
</property>
<property name="pixmap">
- <pixmap>pcbsd-logo-24bits.png</pixmap>
+ <pixmap>image0</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@@ -76,22 +121,36 @@
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>pixmapLabel1_2</cstring>
+ <cstring>pixmapLabel2</cstring>
</property>
<property name="geometry">
<rect>
<x>220</x>
- <y>250</y>
+ <y>90</y>
<width>64</width>
<height>64</height>
</rect>
</property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>0</hsizetype>
+ <vsizetype>0</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>64</width>
+ <height>64</height>
+ </size>
+ </property>
<property name="font">
<font>
</font>
</property>
<property name="pixmap">
- <pixmap>keyboard_layout.png</pixmap>
+ <pixmap>image1</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@@ -99,12 +158,12 @@
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>pixmapLabel9</cstring>
+ <cstring>pixmapLabel1_2</cstring>
</property>
<property name="geometry">
<rect>
<x>220</x>
- <y>370</y>
+ <y>220</y>
<width>64</width>
<height>64</height>
</rect>
@@ -114,7 +173,7 @@
</font>
</property>
<property name="pixmap">
- <pixmap>kworldclock.png</pixmap>
+ <pixmap>image2</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@@ -122,14 +181,14 @@
</widget>
<widget class="QGroupBox">
<property name="name">
- <cstring>groupBox16</cstring>
+ <cstring>groupBox31</cstring>
</property>
<property name="geometry">
<rect>
<x>290</x>
- <y>370</y>
+ <y>220</y>
<width>580</width>
- <height>60</height>
+ <height>100</height>
</rect>
</property>
<property name="font">
@@ -137,18 +196,18 @@
</font>
</property>
<property name="title">
- <string>Timezone</string>
+ <string>Keyboard Layout</string>
</property>
- <widget class="QComboBox">
+ <widget class="QListBox">
<property name="name">
- <cstring>comboTZone</cstring>
+ <cstring>listBoxKeyLayout</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
<y>20</y>
- <width>260</width>
- <height>30</height>
+ <width>560</width>
+ <height>76</height>
</rect>
</property>
<property name="font">
@@ -156,60 +215,42 @@
</font>
</property>
</widget>
- <widget class="QCheckBox">
- <property name="name">
- <cstring>checkTimeSync</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>290</x>
- <y>20</y>
- <width>280</width>
- <height>30</height>
- </rect>
- </property>
- <property name="font">
- <font>
- </font>
- </property>
- <property name="text">
- <string>Automatic syncronization with internet
-Network Time Servers (NTP)</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
</widget>
<widget class="QGroupBox">
<property name="name">
- <cstring>groupBox31</cstring>
+ <cstring>groupBox30</cstring>
</property>
<property name="geometry">
<rect>
<x>290</x>
- <y>240</y>
+ <y>90</y>
<width>580</width>
- <height>120</height>
+ <height>100</height>
</rect>
</property>
<property name="font">
<font>
</font>
</property>
+ <property name="frameShape">
+ <enum>GroupBoxPanel</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>Sunken</enum>
+ </property>
<property name="title">
- <string>Keyboard Layout</string>
+ <string>System Language</string>
</property>
<widget class="QListBox">
<property name="name">
- <cstring>listBoxKeyLayout</cstring>
+ <cstring>listBoxLang</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
<y>20</y>
<width>560</width>
- <height>90</height>
+ <height>76</height>
</rect>
</property>
<property name="font">
@@ -218,16 +259,39 @@
</property>
</widget>
</widget>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>pixmapLabel9</cstring>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>220</x>
+ <y>340</y>
+ <width>64</width>
+ <height>64</height>
+ </rect>
+ </property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
+ <property name="pixmap">
+ <pixmap>image3</pixmap>
+ </property>
+ <property name="scaledContents">
+ <bool>true</bool>
+ </property>
+ </widget>
<widget class="QGroupBox">
<property name="name">
- <cstring>groupBox1_3</cstring>
+ <cstring>groupBox16</cstring>
</property>
<property name="geometry">
<rect>
- <x>10</x>
- <y>450</y>
- <width>860</width>
- <height>140</height>
+ <x>290</x>
+ <y>340</y>
+ <width>580</width>
+ <height>60</height>
</rect>
</property>
<property name="font">
@@ -235,68 +299,66 @@
</font>
</property>
<property name="title">
- <string>Quick Tips</string>
+ <string>Timezone</string>
</property>
- <widget class="QLabel">
+ <widget class="QComboBox">
<property name="name">
- <cstring>textLabel1_8</cstring>
+ <cstring>comboTZone</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
<y>20</y>
- <width>840</width>
- <height>110</height>
+ <width>260</width>
+ <height>30</height>
</rect>
</property>
<property name="font">
<font>
</font>
</property>
+ </widget>
+ <widget class="QCheckBox">
+ <property name="name">
+ <cstring>checkTimeSync</cstring>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>290</x>
+ <y>20</y>
+ <width>280</width>
+ <height>30</height>
+ </rect>
+ </property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
<property name="text">
- <string>Welcome to PC-BSD! PC-BSD has been designed with the "casual" computer user in mind. Installing the system is simply a matter of a few clicks and a few minutes for the installation process to finish. Hardware such as video, sound, network and other devices will be auto-detected and available at the first system startup. Home users will immediately feel comfortable using PC-BSD's desktop interface with the popular KDE desktop manager included.
-
-Please select your language, keyboard layout and timezone, then click "Next" to continue.</string>
+ <string>Automatic syncronization with internet
+Network Time Servers (NTP)</string>
</property>
- <property name="alignment">
- <set>WordBreak|AlignTop</set>
+ <property name="checked">
+ <bool>true</bool>
</property>
</widget>
</widget>
- <widget class="QLabel">
+ <widget class="QCheckBox">
<property name="name">
- <cstring>pixmapLabel2</cstring>
+ <cstring>checkAllowBSDSTATS</cstring>
</property>
<property name="geometry">
<rect>
- <x>220</x>
- <y>90</y>
- <width>64</width>
- <height>64</height>
+ <x>291</x>
+ <y>410</y>
+ <width>580</width>
+ <height>30</height>
</rect>
</property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>0</hsizetype>
- <vsizetype>0</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <property name="text">
+ <string>Allow submitting anonymous usage statistics. (bsdstats.org)</string>
</property>
- <property name="maximumSize">
- <size>
- <width>64</width>
- <height>64</height>
- </size>
- </property>
- <property name="font">
- <font>
- </font>
- </property>
- <property name="pixmap">
- <pixmap>edu_languages.png</pixmap>
- </property>
- <property name="scaledContents">
+ <property name="checked">
<bool>true</bool>
</property>
</widget>
@@ -321,35 +383,38 @@
</property>
<widget class="QLabel">
<property name="name">
- <cstring>pixmapLabel1_4</cstring>
+ <cstring>textLabel1_3_3_3_2_3</cstring>
</property>
<property name="geometry">
<rect>
- <x>8</x>
- <y>24</y>
- <width>16</width>
- <height>16</height>
+ <x>30</x>
+ <y>200</y>
+ <width>140</width>
+ <height>21</height>
</rect>
</property>
<property name="font">
<font>
</font>
</property>
- <property name="pixmap">
- <pixmap>1rightarrow.png</pixmap>
+ <property name="frameShape">
+ <enum>NoFrame</enum>
</property>
- <property name="scaledContents">
- <bool>true</bool>
+ <property name="frameShadow">
+ <enum>Plain</enum>
</property>
+ <property name="text">
+ <string>Install PC-BSD</string>
+ </property>
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>pixmapLabel2_2_4</cstring>
+ <cstring>pixmapLabel1_4</cstring>
</property>
<property name="geometry">
<rect>
- <x>10</x>
- <y>140</y>
+ <x>8</x>
+ <y>24</y>
<width>16</width>
<height>16</height>
</rect>
@@ -359,7 +424,7 @@
</font>
</property>
<property name="pixmap">
- <pixmap>1downarrow.png</pixmap>
+ <pixmap>image4</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@@ -367,12 +432,12 @@
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>pixmapLabel2_2_5</cstring>
+ <cstring>pixmapLabel2_2</cstring>
</property>
<property name="geometry">
<rect>
- <x>10</x>
- <y>170</y>
+ <x>8</x>
+ <y>51</y>
<width>16</width>
<height>16</height>
</rect>
@@ -381,8 +446,14 @@
<font>
</font>
</property>
+ <property name="frameShape">
+ <enum>NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>Plain</enum>
+ </property>
<property name="pixmap">
- <pixmap>1downarrow.png</pixmap>
+ <pixmap>image5</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@@ -390,12 +461,12 @@
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>pixmapLabel2_2</cstring>
+ <cstring>pixmapLabel2_2_2</cstring>
</property>
<property name="geometry">
<rect>
- <x>8</x>
- <y>51</y>
+ <x>9</x>
+ <y>82</y>
<width>16</width>
<height>16</height>
</rect>
@@ -404,14 +475,8 @@
<font>
</font>
</property>
- <property name="frameShape">
- <enum>NoFrame</enum>
- </property>
- <property name="frameShadow">
- <enum>Plain</enum>
- </property>
<property name="pixmap">
- <pixmap>1downarrow.png</pixmap>
+ <pixmap>image5</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@@ -419,12 +484,12 @@
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>pixmapLabel2_2_2</cstring>
+ <cstring>pixmapLabel2_2_3</cstring>
</property>
<property name="geometry">
<rect>
- <x>9</x>
- <y>82</y>
+ <x>10</x>
+ <y>111</y>
<width>16</width>
<height>16</height>
</rect>
@@ -434,7 +499,7 @@
</font>
</property>
<property name="pixmap">
- <pixmap>1downarrow.png</pixmap>
+ <pixmap>image5</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@@ -442,12 +507,12 @@
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>pixmapLabel2_2_3</cstring>
+ <cstring>pixmapLabel2_2_4</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
- <y>111</y>
+ <y>140</y>
<width>16</width>
<height>16</height>
</rect>
@@ -457,7 +522,7 @@
</font>
</property>
<property name="pixmap">
- <pixmap>1downarrow.png</pixmap>
+ <pixmap>image5</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@@ -465,12 +530,12 @@
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>pixmapLabel2_2_6</cstring>
+ <cstring>pixmapLabel2_2_5</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
- <y>200</y>
+ <y>170</y>
<width>16</width>
<height>16</height>
</rect>
@@ -480,7 +545,7 @@
</font>
</property>
<property name="pixmap">
- <pixmap>1downarrow.png</pixmap>
+ <pixmap>image5</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@@ -488,27 +553,30 @@
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel1</cstring>
+ <cstring>pixmapLabel2_2_6</cstring>
</property>
<property name="geometry">
<rect>
- <x>30</x>
- <y>20</y>
- <width>140</width>
- <height>22</height>
+ <x>10</x>
+ <y>200</y>
+ <width>16</width>
+ <height>16</height>
</rect>
</property>
<property name="font">
<font>
</font>
</property>
- <property name="text">
- <string><b>Select Language</b></string>
+ <property name="pixmap">
+ <pixmap>image5</pixmap>
</property>
+ <property name="scaledContents">
+ <bool>true</bool>
+ </property>
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel1_3</cstring>
+ <cstring>textLabel1_3_3_3</cstring>
</property>
<property name="geometry">
<rect>
@@ -529,12 +597,12 @@
<enum>Plain</enum>
</property>
<property name="text">
- <string>Install or Update</string>
+ <string>License agreement</string>
</property>
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel1_3_3</cstring>
+ <cstring>textLabel1_3</cstring>
</property>
<property name="geometry">
<rect>
@@ -555,12 +623,12 @@
<enum>Plain</enum>
</property>
<property name="text">
- <string>System variant</string>
+ <string>Install or Update</string>
</property>
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel1_3_3_3</cstring>
+ <cstring>textLabel1_3_3_3_2</cstring>
</property>
<property name="geometry">
<rect>
@@ -581,12 +649,12 @@
<enum>Plain</enum>
</property>
<property name="text">
- <string>License agreement</string>
+ <string>User accounts</string>
</property>
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel1_3_3_3_2</cstring>
+ <cstring>textLabel1_3_3_3_2_2</cstring>
</property>
<property name="geometry">
<rect>
@@ -607,18 +675,18 @@
<enum>Plain</enum>
</property>
<property name="text">
- <string>System accounts</string>
+ <string>Drive selection</string>
</property>
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel1_3_3_3_2_3</cstring>
+ <cstring>textLabel1_10</cstring>
</property>
<property name="geometry">
<rect>
- <x>30</x>
- <y>200</y>
- <width>140</width>
+ <x>4</x>
+ <y>399</y>
+ <width>171</width>
<height>21</height>
</rect>
</property>
@@ -626,19 +694,16 @@
<font>
</font>
</property>
- <property name="frameShape">
- <enum>NoFrame</enum>
- </property>
- <property name="frameShadow">
- <enum>Plain</enum>
- </property>
<property name="text">
- <string>Install PC-BSD</string>
+ <string>Version 1.4</string>
</property>
+ <property name="alignment">
+ <set>AlignCenter</set>
+ </property>
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel1_3_3_3_2_2</cstring>
+ <cstring>textLabel1_3_3</cstring>
</property>
<property name="geometry">
<rect>
@@ -659,19 +724,19 @@
<enum>Plain</enum>
</property>
<property name="text">
- <string>Drive selection</string>
+ <string>Components</string>
</property>
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel1_10</cstring>
+ <cstring>textLabel1</cstring>
</property>
<property name="geometry">
<rect>
- <x>4</x>
- <y>399</y>
- <width>171</width>
- <height>21</height>
+ <x>30</x>
+ <y>20</y>
+ <width>140</width>
+ <height>22</height>
</rect>
</property>
<property name="font">
@@ -679,90 +744,56 @@
</font>
</property>
<property name="text">
- <string>Version 1.3</string>
+ <string>Select Language</string>
</property>
- <property name="alignment">
- <set>AlignCenter</set>
- </property>
</widget>
</widget>
+ </widget>
+ <widget class="QWidget">
+ <property name="name">
+ <cstring>WizardPage</cstring>
+ </property>
+ <attribute name="title">
+ <string>License</string>
+ </attribute>
<widget class="QGroupBox">
<property name="name">
- <cstring>groupBox30</cstring>
+ <cstring>groupBox1_2_2</cstring>
</property>
<property name="geometry">
<rect>
- <x>290</x>
- <y>90</y>
- <width>580</width>
+ <x>10</x>
+ <y>450</y>
+ <width>860</width>
<height>140</height>
</rect>
</property>
- <property name="font">
- <font>
- </font>
- </property>
- <property name="frameShape">
- <enum>GroupBoxPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>Sunken</enum>
- </property>
<property name="title">
- <string>System Language</string>
+ <string>Quick Tips</string>
</property>
- <widget class="QListBox">
+ <widget class="QLabel">
<property name="name">
- <cstring>listBoxLang</cstring>
+ <cstring>textLabel4</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
<y>20</y>
- <width>560</width>
+ <width>841</width>
<height>110</height>
</rect>
</property>
- <property name="font">
- <font>
- </font>
+ <property name="text">
+ <string>BSD licenses represent a family of a permissive free software licenses. The original was used for the Berkeley Software Distribution, a Unix-like operating system for which the license is named. The original owners of BSD were the Regents of the University of California because BSD was first written at the University of California, Berkeley. The first version of the license was revised, and the resulting licenses are more properly called modified BSD licenses. For complete license details visit: http://www.pcbsd.org/?p=license</string>
</property>
+ <property name="alignment">
+ <set>WordBreak|AlignTop</set>
+ </property>
</widget>
</widget>
- </widget>
- <widget class="QWidget">
- <property name="name">
- <cstring>WizardPage</cstring>
- </property>
- <attribute name="title">
- <string>Install or Update</string>
- </attribute>
- <widget class="QLabel">
- <property name="name">
- <cstring>textLabel2_2</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>210</x>
- <y>0</y>
- <width>680</width>
- <height>50</height>
- </rect>
- </property>
- <property name="font">
- <font>
- </font>
- </property>
- <property name="text">
- <string><h1>Select installation choice</h1></string>
- </property>
- <property name="alignment">
- <set>WordBreak|AlignTop|AlignLeft</set>
- </property>
- </widget>
<widget class="QGroupBox">
<property name="name">
- <cstring>groupBox35_2</cstring>
+ <cstring>groupBox35_4</cstring>
</property>
<property name="geometry">
<rect>
@@ -772,61 +803,57 @@
<height>430</height>
</rect>
</property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
<property name="title">
<string>PC-BSD Installer</string>
</property>
<widget class="QLabel">
<property name="name">
- <cstring>pixmapLabel2_2_4_2</cstring>
+ <cstring>textLabel1_3_3_3_2_3_2</cstring>
</property>
<property name="geometry">
<rect>
- <x>10</x>
- <y>140</y>
- <width>16</width>
- <height>16</height>
+ <x>30</x>
+ <y>200</y>
+ <width>140</width>
+ <height>21</height>
</rect>
</property>
- <property name="pixmap">
- <pixmap>1downarrow.png</pixmap>
+ <property name="font">
+ <font>
+ </font>
</property>
- <property name="scaledContents">
- <bool>true</bool>
+ <property name="frameShape">
+ <enum>NoFrame</enum>
</property>
- </widget>
- <widget class="QLabel">
- <property name="name">
- <cstring>pixmapLabel2_2_5_2</cstring>
+ <property name="frameShadow">
+ <enum>Plain</enum>
</property>
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>170</y>
- <width>16</width>
- <height>16</height>
- </rect>
+ <property name="text">
+ <string>Install PC-BSD</string>
</property>
- <property name="pixmap">
- <pixmap>1downarrow.png</pixmap>
- </property>
- <property name="scaledContents">
- <bool>true</bool>
- </property>
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>pixmapLabel2_2_6_2</cstring>
+ <cstring>pixmapLabel2_2_2_4</cstring>
</property>
<property name="geometry">
<rect>
- <x>10</x>
- <y>200</y>
+ <x>9</x>
+ <y>82</y>
<width>16</width>
<height>16</height>
</rect>
</property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
<property name="pixmap">
- <pixmap>1downarrow.png</pixmap>
+ <pixmap>image5</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@@ -834,18 +861,22 @@
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>pixmapLabel2_2_2_2</cstring>
+ <cstring>pixmapLabel2_2_3_4</cstring>
</property>
<property name="geometry">
<rect>
- <x>9</x>
- <y>82</y>
+ <x>10</x>
+ <y>111</y>
<width>16</width>
<height>16</height>
</rect>
</property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
<property name="pixmap">
- <pixmap>1downarrow.png</pixmap>
+ <pixmap>image5</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@@ -853,18 +884,22 @@
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>pixmapLabel2_2_3_2</cstring>
+ <cstring>pixmapLabel2_2_4_4</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
- <y>111</y>
+ <y>140</y>
<width>16</width>
<height>16</height>
</rect>
</property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
<property name="pixmap">
- <pixmap>1downarrow.png</pixmap>
+ <pixmap>image5</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@@ -872,18 +907,22 @@
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>pixmapLabel1_4_3</cstring>
+ <cstring>pixmapLabel2_2_5_4</cstring>
</property>
<property name="geometry">
<rect>
- <x>8</x>
- <y>24</y>
+ <x>10</x>
+ <y>170</y>
<width>16</width>
<height>16</height>
</rect>
</property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
<property name="pixmap">
- <pixmap>ok.png</pixmap>
+ <pixmap>image5</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@@ -891,18 +930,22 @@
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>pixmapLabel2_2_8</cstring>
+ <cstring>pixmapLabel2_2_6_4</cstring>
</property>
<property name="geometry">
<rect>
- <x>8</x>
- <y>51</y>
+ <x>10</x>
+ <y>200</y>
<width>16</width>
<height>16</height>
</rect>
</property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
<property name="pixmap">
- <pixmap>1rightarrow.png</pixmap>
+ <pixmap>image5</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@@ -910,32 +953,20 @@
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel1_6</cstring>
+ <cstring>textLabel1_3_3_3_3</cstring>
</property>
<property name="geometry">
<rect>
<x>30</x>
- <y>20</y>
- <width>140</width>
- <height>22</height>
- </rect>
- </property>
- <property name="text">
- <string>Select Language</string>
- </property>
- </widget>
- <widget class="QLabel">
- <property name="name">
- <cstring>textLabel1_3_5</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>30</x>
<y>50</y>
<width>140</width>
<height>21</height>
</rect>
</property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
<property name="frameShape">
<enum>NoFrame</enum>
</property>
@@ -943,12 +974,12 @@
<enum>Plain</enum>
</property>
<property name="text">
- <string><b>Install or Update</b></string>
+ <string>License agreement</string>
</property>
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel1_3_3_5</cstring>
+ <cstring>textLabel1_3_2</cstring>
</property>
<property name="geometry">
<rect>
@@ -958,6 +989,10 @@
<height>21</height>
</rect>
</property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
<property name="frameShape">
<enum>NoFrame</enum>
</property>
@@ -965,12 +1000,12 @@
<enum>Plain</enum>
</property>
<property name="text">
- <string>System variant</string>
+ <string>Install or Update</string>
</property>
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel1_3_3_3_4</cstring>
+ <cstring>textLabel1_3_3_3_2_4</cstring>
</property>
<property name="geometry">
<rect>
@@ -980,6 +1015,10 @@
<height>21</height>
</rect>
</property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
<property name="frameShape">
<enum>NoFrame</enum>
</property>
@@ -987,12 +1026,12 @@
<enum>Plain</enum>
</property>
<property name="text">
- <string>License agreement</string>
+ <string>User accounts</string>
</property>
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel1_3_3_3_2_5</cstring>
+ <cstring>textLabel1_3_3_3_2_2_2</cstring>
</property>
<property name="geometry">
<rect>
@@ -1002,6 +1041,10 @@
<height>21</height>
</rect>
</property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
<property name="frameShape">
<enum>NoFrame</enum>
</property>
@@ -1009,12 +1052,12 @@
<enum>Plain</enum>
</property>
<property name="text">
- <string>System accounts</string>
+ <string>Drive selection</string>
</property>
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel1_3_3_3_2_2_3</cstring>
+ <cstring>textLabel1_3_3_4</cstring>
</property>
<property name="geometry">
<rect>
@@ -1024,6 +1067,10 @@
<height>21</height>
</rect>
</property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
<property name="frameShape">
<enum>NoFrame</enum>
</property>
@@ -1031,61 +1078,47 @@
<enum>Plain</enum>
</property>
<property name="text">
- <string>Drive selection</string>
+ <string>Components</string>
</property>
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel1_3_3_3_2_3_3</cstring>
+ <cstring>textLabel1_7</cstring>
</property>
<property name="geometry">
<rect>
<x>30</x>
- <y>200</y>
- <width>130</width>
- <height>21</height>
+ <y>20</y>
+ <width>140</width>
+ <height>22</height>
</rect>
</property>
- <property name="frameShape">
- <enum>NoFrame</enum>
+ <property name="font">
+ <font>
+ </font>
</property>
- <property name="frameShadow">
- <enum>Plain</enum>
- </property>
<property name="text">
- <string>Install PC-BSD</string>
+ <string>Select Language</string>
</property>
</widget>
- </widget>
- <widget class="QButtonGroup">
- <property name="name">
- <cstring>buttonGroup1</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>210</x>
- <y>60</y>
- <width>660</width>
- <height>190</height>
- </rect>
- </property>
- <property name="title">
- <string>Install type</string>
- </property>
<widget class="QLabel">
<property name="name">
- <cstring>pixmapLabel4</cstring>
+ <cstring>pixmapLabel1_4_2</cstring>
</property>
<property name="geometry">
<rect>
- <x>16</x>
- <y>20</y>
- <width>64</width>
- <height>64</height>
+ <x>8</x>
+ <y>24</y>
+ <width>16</width>
+ <height>16</height>
</rect>
</property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
<property name="pixmap">
- <pixmap>kcmpartitions.png</pixmap>
+ <pixmap>image6</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@@ -1093,59 +1126,180 @@
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>pixmapLabel3</cstring>
+ <cstring>pixmapLabel2_2_7</cstring>
</property>
<property name="geometry">
<rect>
- <x>16</x>
- <y>110</y>
- <width>64</width>
- <height>64</height>
+ <x>8</x>
+ <y>51</y>
+ <width>16</width>
+ <height>16</height>
</rect>
</property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
+ <property name="frameShape">
+ <enum>NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>Plain</enum>
+ </property>
<property name="pixmap">
- <pixmap>kdisknav.png</pixmap>
+ <pixmap>image4</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
</widget>
- <widget class="QRadioButton">
+ </widget>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>textLabel2_2_2_2</cstring>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>210</x>
+ <y>0</y>
+ <width>570</width>
+ <height>50</height>
+ </rect>
+ </property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
+ <property name="text">
+ <string><h1>License agreement</h1></string>
+ </property>
+ <property name="alignment">
+ <set>WordBreak|AlignTop|AlignLeft</set>
+ </property>
+ </widget>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>pixmapLabel1_3</cstring>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>200</x>
+ <y>60</y>
+ <width>64</width>
+ <height>64</height>
+ </rect>
+ </property>
+ <property name="pixmap">
+ <pixmap>image7</pixmap>
+ </property>
+ <property name="scaledContents">
+ <bool>true</bool>
+ </property>
+ </widget>
+ <widget class="QGroupBox">
+ <property name="name">
+ <cstring>groupBox6</cstring>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>270</x>
+ <y>50</y>
+ <width>600</width>
+ <height>390</height>
+ </rect>
+ </property>
+ <property name="title">
+ <string>License Agreement</string>
+ </property>
+ <widget class="QCheckBox">
<property name="name">
- <cstring>radioUpdate</cstring>
+ <cstring>checkLicAgree</cstring>
</property>
<property name="geometry">
<rect>
- <x>106</x>
- <y>120</y>
- <width>520</width>
- <height>40</height>
+ <x>10</x>
+ <y>360</y>
+ <width>550</width>
+ <height>21</height>
</rect>
</property>
<property name="text">
- <string>System Update / Repair</string>
+ <string>I agree</string>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="QTextEdit">
<property name="name">
- <cstring>radioFreshInstall</cstring>
+ <cstring>textEdit4</cstring>
</property>
<property name="geometry">
<rect>
- <x>106</x>
+ <x>10</x>
<y>30</y>
- <width>530</width>
- <height>40</height>
+ <width>580</width>
+ <height>320</height>
</rect>
</property>
<property name="text">
- <string>Fresh Install</string>
+ <string>PC-BSD and its related source code is released under the BSD license. Components of the base system are released under their respective license(s).
+
+BSD LICENSE
+----------------------------------------------------------------------------------------------------------------
+Copyright (c) 1998, Regents of the University of California
+All rights reserved.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+ Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ Neither the name of the University of California, Berkeley nor the
+ names of its contributors may be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AN ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</string>
</property>
- <property name="checked">
+ <property name="wordWrap">
+ <enum>WidgetWidth</enum>
+ </property>
+ <property name="readOnly">
<bool>true</bool>
</property>
</widget>
</widget>
+ </widget>
+ <widget class="QWidget">
+ <property name="name">
+ <cstring>WizardPage</cstring>
+ </property>
+ <attribute name="title">
+ <string>Install or Update</string>
+ </attribute>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>textLabel2_2</cstring>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>210</x>
+ <y>0</y>
+ <width>680</width>
+ <height>50</height>
+ </rect>
+ </property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
+ <property name="text">
+ <string><h1>Select installation choice</h1></string>
+ </property>
+ <property name="alignment">
+ <set>WordBreak|AlignTop|AlignLeft</set>
+ </property>
+ </widget>
<widget class="QGroupBox">
<property name="name">
<cstring>groupBox1</cstring>
@@ -1183,40 +1337,9 @@
</property>
</widget>
</widget>
- </widget>
- <widget class="QWidget">
- <property name="name">
- <cstring>WizardPage</cstring>
- </property>
- <attribute name="title">
- <string>Installation Type</string>
- </attribute>
- <widget class="QLabel">
- <property name="name">
- <cstring>textLabel2_2_2</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>210</x>
- <y>20</y>
- <width>660</width>
- <height>50</height>
- </rect>
- </property>
- <property name="font">
- <font>
- </font>
- </property>
- <property name="text">
- <string><h1>System installation type</h1></string>
- </property>
- <property name="alignment">
- <set>WordBreak|AlignTop|AlignLeft</set>
- </property>
- </widget>
<widget class="QGroupBox">
<property name="name">
- <cstring>groupBox35_3</cstring>
+ <cstring>groupBox35_4_3</cstring>
</property>
<property name="geometry">
<rect>
@@ -1226,21 +1349,29 @@
<height>430</height>
</rect>
</property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
<property name="title">
<string>PC-BSD Installer</string>
</property>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel1_3_3_3_5</cstring>
+ <cstring>textLabel1_3_3_3_2_3_2_2</cstring>
</property>
<property name="geometry">
<rect>
<x>30</x>
- <y>110</y>
- <width>120</width>
+ <y>200</y>
+ <width>140</width>
<height>21</height>
</rect>
</property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
<property name="frameShape">
<enum>NoFrame</enum>
</property>
@@ -1248,23 +1379,27 @@
<enum>Plain</enum>
</property>
<property name="text">
- <string>License agreement</string>
+ <string>Install PC-BSD</string>
</property>
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>pixmapLabel2_2_4_3</cstring>
+ <cstring>pixmapLabel2_2_3_4_3</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
- <y>140</y>
+ <y>111</y>
<width>16</width>
<height>16</height>
</rect>
</property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
<property name="pixmap">
- <pixmap>1downarrow.png</pixmap>
+ <pixmap>image5</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@@ -1272,18 +1407,22 @@
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>pixmapLabel2_2_5_3</cstring>
+ <cstring>pixmapLabel2_2_4_4_3</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
- <y>170</y>
+ <y>140</y>
<width>16</width>
<height>16</height>
</rect>
</property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
<property name="pixmap">
- <pixmap>1downarrow.png</pixmap>
+ <pixmap>image5</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@@ -1291,18 +1430,22 @@
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>pixmapLabel2_2_6_3</cstring>
+ <cstring>pixmapLabel2_2_5_4_3</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
- <y>200</y>
+ <y>170</y>
<width>16</width>
<height>16</height>
</rect>
</property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
<property name="pixmap">
- <pixmap>1downarrow.png</pixmap>
+ <pixmap>image5</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@@ -1310,18 +1453,22 @@
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>pixmapLabel2_2_3_3</cstring>
+ <cstring>pixmapLabel2_2_6_4_3</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
- <y>111</y>
+ <y>200</y>
<width>16</width>
<height>16</height>
</rect>
</property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
<property name="pixmap">
- <pixmap>1downarrow.png</pixmap>
+ <pixmap>image5</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@@ -1329,73 +1476,72 @@
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>pixmapLabel1_4_4</cstring>
+ <cstring>textLabel1_3_3_3_3_2</cstring>
</property>
<property name="geometry">
<rect>
- <x>8</x>
- <y>24</y>
- <width>16</width>
- <height>16</height>
+ <x>30</x>
+ <y>50</y>
+ <width>140</width>
+ <height>21</height>
</rect>
</property>
- <property name="pixmap">
- <pixmap>ok.png</pixmap>
+ <property name="font">
+ <font>
+ </font>
</property>
- <property name="scaledContents">
- <bool>true</bool>
+ <property name="frameShape">
+ <enum>NoFrame</enum>
</property>
- </widget>
- <widget class="QLabel">
- <property name="name">
- <cstring>pixmapLabel2_2_9</cstring>
+ <property name="frameShadow">
+ <enum>Plain</enum>
</property>
- <property name="geometry">
- <rect>
- <x>8</x>
- <y>51</y>
- <width>16</width>
- <height>16</height>
- </rect>
+ <property name="text">
+ <string>License agreement</string>
</property>
- <property name="pixmap">
- <pixmap>ok.png</pixmap>
- </property>
- <property name="scaledContents">
- <bool>true</bool>
- </property>
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>pixmapLabel2_2_2_3</cstring>
+ <cstring>textLabel1_3_2_2</cstring>
</property>
<property name="geometry">
<rect>
- <x>9</x>
- <y>82</y>
- <width>16</width>
- <height>16</height>
+ <x>30</x>
+ <y>80</y>
+ <width>140</width>
+ <height>21</height>
</rect>
</property>
- <property name="pixmap">
- <pixmap>1rightarrow.png</pixmap>
+ <property name="font">
+ <font>
+ </font>
</property>
- <property name="scaledContents">
- <bool>true</bool>
+ <property name="frameShape">
+ <enum>NoFrame</enum>
</property>
+ <property name="frameShadow">
+ <enum>Plain</enum>
+ </property>
+ <property name="text">
+ <string>Install or Update</string>
+ </property>
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel1_3_3_3_2_6</cstring>
+ <cstring>textLabel1_3_3_3_2_4_2</cstring>
</property>
<property name="geometry">
<rect>
<x>30</x>
- <y>140</y>
- <width>120</width>
+ <y>110</y>
+ <width>140</width>
<height>21</height>
</rect>
</property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
<property name="frameShape">
<enum>NoFrame</enum>
</property>
@@ -1403,21 +1549,25 @@
<enum>Plain</enum>
</property>
<property name="text">
- <string>System accounts</string>
+ <string>User accounts</string>
</property>
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel1_3_3_3_2_2_4</cstring>
+ <cstring>textLabel1_3_3_3_2_2_2_2</cstring>
</property>
<property name="geometry">
<rect>
<x>30</x>
- <y>170</y>
- <width>120</width>
+ <y>140</y>
+ <width>140</width>
<height>21</height>
</rect>
</property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
<property name="frameShape">
<enum>NoFrame</enum>
</property>
@@ -1430,16 +1580,20 @@
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel1_3_3_3_2_3_4</cstring>
+ <cstring>textLabel1_3_3_4_2</cstring>
</property>
<property name="geometry">
<rect>
<x>30</x>
- <y>200</y>
- <width>129</width>
+ <y>170</y>
+ <width>140</width>
<height>21</height>
</rect>
</property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
<property name="frameShape">
<enum>NoFrame</enum>
</property>
@@ -1447,88 +1601,139 @@
<enum>Plain</enum>
</property>
<property name="text">
- <string>Install PC-BSD</string>
+ <string>Components</string>
</property>
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel1_5</cstring>
+ <cstring>textLabel1_7_3</cstring>
</property>
<property name="geometry">
<rect>
<x>30</x>
<y>20</y>
- <width>120</width>
+ <width>140</width>
<height>22</height>
</rect>
</property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
<property name="text">
<string>Select Language</string>
</property>
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel1_3_4</cstring>
+ <cstring>pixmapLabel1_4_2_2</cstring>
</property>
<property name="geometry">
<rect>
- <x>30</x>
- <y>50</y>
- <width>120</width>
- <height>21</height>
+ <x>8</x>
+ <y>24</y>
+ <width>16</width>
+ <height>16</height>
</rect>
</property>
- <property name="frameShape">
- <enum>NoFrame</enum>
+ <property name="font">
+ <font>
+ </font>
</property>
- <property name="frameShadow">
- <enum>Plain</enum>
+ <property name="pixmap">
+ <pixmap>image6</pixmap>
</property>
- <property name="text">
- <string>Install or Update</string>
+ <property name="scaledContents">
+ <bool>true</bool>
</property>
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel1_3_3_2</cstring>
+ <cstring>pixmapLabel2_2_7_2</cstring>
</property>
<property name="geometry">
<rect>
- <x>30</x>
- <y>80</y>
- <width>120</width>
- <height>21</height>
+ <x>8</x>
+ <y>51</y>
+ <width>16</width>
+ <height>16</height>
</rect>
</property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
<property name="frameShape">
<enum>NoFrame</enum>
</property>
<property name="frameShadow">
<enum>Plain</enum>
</property>
- <property name="text">
- <string><b>System variant</b></string>
+ <property name="pixmap">
+ <pixmap>image6</pixmap>
</property>
+ <property name="scaledContents">
+ <bool>true</bool>
+ </property>
</widget>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>pixmapLabel2_2_2_4_3</cstring>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>9</x>
+ <y>82</y>
+ <width>16</width>
+ <height>16</height>
+ </rect>
+ </property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
+ <property name="pixmap">
+ <pixmap>image4</pixmap>
+ </property>
+ <property name="scaledContents">
+ <bool>true</bool>
+ </property>
+ </widget>
</widget>
<widget class="QButtonGroup">
<property name="name">
- <cstring>buttonGroup2</cstring>
+ <cstring>buttonGroup1</cstring>
</property>
<property name="geometry">
<rect>
<x>210</x>
- <y>80</y>
+ <y>60</y>
<width>660</width>
<height>190</height>
</rect>
</property>
<property name="title">
- <string>System Type</string>
+ <string>Install type</string>
</property>
+ <widget class="QRadioButton">
+ <property name="name">
+ <cstring>radioUpdate</cstring>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>106</x>
+ <y>120</y>
+ <width>520</width>
+ <height>40</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>System Update / Repair</string>
+ </property>
+ </widget>
<widget class="QLabel">
<property name="name">
- <cstring>pixmapLabel4_2</cstring>
+ <cstring>pixmapLabel4</cstring>
</property>
<property name="geometry">
<rect>
@@ -1539,7 +1744,7 @@
</rect>
</property>
<property name="pixmap">
- <pixmap>mycomputer.png</pixmap>
+ <pixmap>image8</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@@ -1547,18 +1752,18 @@
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>pixmapHDLab</cstring>
+ <cstring>pixmapLabel3</cstring>
</property>
<property name="geometry">
<rect>
- <x>10</x>
- <y>100</y>
+ <x>16</x>
+ <y>110</y>
<width>64</width>
<height>64</height>
</rect>
</property>
<property name="pixmap">
- <pixmap>server.png</pixmap>
+ <pixmap>image9</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@@ -1566,65 +1771,57 @@
</widget>
<widget class="QRadioButton">
<property name="name">
- <cstring>radioServer</cstring>
+ <cstring>radioFreshInstall</cstring>
</property>
<property name="geometry">
<rect>
- <x>100</x>
- <y>110</y>
- <width>500</width>
- <height>40</height>
- </rect>
- </property>
- <property name="text">
- <string>Server (Optimized for running services)</string>
- </property>
- </widget>
- <widget class="QRadioButton">
- <property name="name">
- <cstring>radioDesktop</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>100</x>
+ <x>106</x>
<y>30</y>
- <width>510</width>
+ <width>530</width>
<height>40</height>
</rect>
</property>
<property name="text">
- <string>Workstation (Desktop or Laptop users)</string>
+ <string>Fresh Install</string>
</property>
- <property name="accel">
- <string></string>
- </property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</widget>
- <widget class="QCheckBox">
+ </widget>
+ <widget class="QWidget">
+ <property name="name">
+ <cstring>WizardPage</cstring>
+ </property>
+ <attribute name="title">
+ <string>User Accounts</string>
+ </attribute>
+ <widget class="QLabel">
<property name="name">
- <cstring>checkAllowBSDSTATS</cstring>
+ <cstring>pixmapLabel2_2_6_4_2_2_3_2_2_5</cstring>
</property>
<property name="geometry">
<rect>
- <x>210</x>
- <y>280</y>
- <width>651</width>
- <height>30</height>
+ <x>20</x>
+ <y>243</y>
+ <width>16</width>
+ <height>16</height>
</rect>
</property>
- <property name="text">
- <string>Allow submitting anonymous usage statistics. (bsdstats.org)</string>
+ <property name="frameShape">
+ <enum>NoFrame</enum>
</property>
- <property name="checked">
+ <property name="frameShadow">
+ <enum>Plain</enum>
+ </property>
+ <property name="scaledContents">
<bool>true</bool>
</property>
</widget>
<widget class="QGroupBox">
<property name="name">
- <cstring>groupBox1_2</cstring>
+ <cstring>groupBox1_2_2_2</cstring>
</property>
<property name="geometry">
<rect>
@@ -1639,56 +1836,29 @@
</property>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel3_4</cstring>
+ <cstring>textLabel5_3</cstring>
</property>
<property name="geometry">
<rect>
- <x>10</x>
- <y>20</y>
- <width>841</width>
+ <x>14</x>
+ <y>19</y>
+ <width>831</width>
<height>110</height>
</rect>
</property>
<property name="text">
- <string>Please select the type of system that best describes what this PC-BSD install will be intended for. The installer will customize certain options and packages to best fit your needs.
+ <string>The user accounts you setup will be used to run the PC-BSD desktop interface and most programs. Your root (administrator) password lets you perform low level system tasks, as well as installing and removing PBIs (PC-BSD Installer applications). Your user password can be used to protect your account and restrict access to your system.
-You may also select if you wish this system to upload anonymous usage statistics to the BSDStats project. This information cannot be used to identify you in any way.</string>
+NOTE: When adding users, you will have a choice of the default "shell". If you are unsure what this is, leave it set to the default (/bin/csh).</string>
</property>
<property name="alignment">
- <set>WordBreak|AlignTop|AlignLeft</set>
+ <set>WordBreak|AlignTop</set>
</property>
</widget>
</widget>
- </widget>
- <widget class="QWidget">
- <property name="name">
- <cstring>WizardPage</cstring>
- </property>
- <attribute name="title">
- <string>License</string>
- </attribute>
- <widget class="QLabel">
- <property name="name">
- <cstring>pixmapLabel1_3</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>210</x>
- <y>90</y>
- <width>64</width>
- <height>64</height>
- </rect>
- </property>
- <property name="pixmap">
- <pixmap>readme.png</pixmap>
- </property>
- <property name="scaledContents">
- <bool>true</bool>
- </property>
- </widget>
<widget class="QGroupBox">
<property name="name">
- <cstring>groupBox35_4</cstring>
+ <cstring>groupBox35_4_3_2</cstring>
</property>
<property name="geometry">
<rect>
@@ -1698,43 +1868,29 @@
<height>430</height>
</rect>
</property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
<property name="title">
<string>PC-BSD Installer</string>
</property>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel1_3_6</cstring>
+ <cstring>textLabel1_3_3_3_2_3_2_2_2</cstring>
</property>
<property name="geometry">
<rect>
<x>30</x>
- <y>50</y>
- <width>120</width>
+ <y>200</y>
+ <width>140</width>
<height>21</height>
</rect>
</property>
- <property name="frameShape">
- <enum>NoFrame</enum>
+ <property name="font">
+ <font>
+ </font>
</property>
- <property name="frameShadow">
- <enum>Plain</enum>
- </property>
- <property name="text">
- <string>Install or Update</string>
- </property>
- </widget>
- <widget class="QLabel">
- <property name="name">
- <cstring>textLabel1_3_3_6</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>30</x>
- <y>80</y>
- <width>120</width>
- <height>21</height>
- </rect>
- </property>
<property name="frameShape">
<enum>NoFrame</enum>
</property>
@@ -1742,58 +1898,27 @@
<enum>Plain</enum>
</property>
<property name="text">
- <string>System variant</string>
+ <string>Install PC-BSD</string>
</property>
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel1_7</cstring>
+ <cstring>pixmapLabel2_2_4_4_3_2</cstring>
</property>
<property name="geometry">
<rect>
- <x>30</x>
- <y>20</y>
- <width>120</width>
- <height>22</height>
- </rect>
- </property>
- <property name="text">
- <string>Select Language</string>
- </property>
- </widget>
- <widget class="QLabel">
- <property name="name">
- <cstring>pixmapLabel1_4_5</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>8</x>
- <y>24</y>
+ <x>10</x>
+ <y>140</y>
<width>16</width>
<height>16</height>
</rect>
</property>
- <property name="pixmap">
- <pixmap>ok.png</pixmap>
+ <property name="font">
+ <font>
+ </font>
</property>
- <property name="scaledContents">
- <bool>true</bool>
- </property>
- </widget>
- <widget class="QLabel">
- <property name="name">
- <cstring>pixmapLabel2_2_10</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>8</x>
- <y>51</y>
- <width>16</width>
- <height>16</height>
- </rect>
- </property>
<property name="pixmap">
- <pixmap>ok.png</pixmap>
+ <pixmap>image5</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@@ -1801,56 +1926,22 @@
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>pixmapLabel2_2_2_4</cstring>
+ <cstring>pixmapLabel2_2_5_4_3_2</cstring>
</property>
<property name="geometry">
<rect>
- <x>9</x>
- <y>82</y>
- <width>16</width>
- <height>16</height>
- </rect>
- </property>
- <property name="pixmap">
- <pixmap>ok.png</pixmap>
- </property>
- <property name="scaledContents">
- <bool>true</bool>
- </property>
- </widget>
- <widget class="QLabel">
- <property name="name">
- <cstring>pixmapLabel2_2_3_4</cstring>
- </property>
- <property name="geometry">
- <rect>
<x>10</x>
- <y>111</y>
+ <y>170</y>
<width>16</width>
<height>16</height>
</rect>
</property>
- <property name="pixmap">
- <pixmap>1rightarrow.png</pixmap>
+ <property name="font">
+ <font>
+ </font>
</property>
- <property name="scaledContents">
- <bool>true</bool>
- </property>
- </widget>
- <widget class="QLabel">
- <property name="name">
- <cstring>pixmapLabel2_2_6_4</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>202</y>
- <width>16</width>
- <height>16</height>
- </rect>
- </property>
<property name="pixmap">
- <pixmap>1downarrow.png</pixmap>
+ <pixmap>image5</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@@ -1858,37 +1949,22 @@
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>pixmapLabel2_2_5_4</cstring>
+ <cstring>pixmapLabel2_2_6_4_3_2</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
- <y>171</y>
+ <y>200</y>
<width>16</width>
<height>16</height>
</rect>
</property>
- <property name="pixmap">
- <pixmap>1downarrow.png</pixmap>
+ <property name="font">
+ <font>
+ </font>
</property>
- <property name="scaledContents">
- <bool>true</bool>
- </property>
- </widget>
- <widget class="QLabel">
- <property name="name">
- <cstring>pixmapLabel2_2_4_4</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>141</y>
- <width>16</width>
- <height>16</height>
- </rect>
- </property>
<property name="pixmap">
- <pixmap>1downarrow.png</pixmap>
+ <pixmap>image5</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
@@ -1896,38 +1972,20 @@
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel1_3_3_3_2_7</cstring>
+ <cstring>textLabel1_3_3_3_3_2_2</cstring>
</property>
<property name="geometry">
<rect>
<x>30</x>
- <y>140</y>
- <width>120</width>
+ <y>50</y>
+ <width>140</width>
<height>21</height>
</rect>
</property>
- <property name="frameShape">
- <enum>NoFrame</enum>
+ <property name="font">
+ <font>
+ </font>
</property>
- <property name="frameShadow">
- <enum>Plain</enum>
- </property>
- <property name="text">
- <string>System accounts</string>
- </property>
- </widget>
- <widget class="QLabel">
- <property name="name">
- <cstring>textLabel1_3_3_3_2_2_5</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>30</x>
- <y>170</y>
- <width>120</width>
- <height>21</height>
- </rect>
- </property>
<property name="frameShape">
<enum>NoFrame</enum>
</property>
@@ -1935,21 +1993,25 @@
<enum>Plain</enum>
</property>
<property name="text">
- <string>Drive selection</string>
+ <string>License agreement</string>
</property>
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel1_3_3_3_2_3_5</cstring>
+ <cstring>textLabel1_3_2_2_2</cstring>
</property>
<property name="geometry">
<rect>
<x>30</x>
- <y>200</y>
- <width>129</width>
+ <y>80</y>
+ <width>140</width>
<height>21</height>
</rect>
</property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
<property name="frameShape">
<enum>NoFrame</enum>
</property>
@@ -1957,21 +2019,25 @@
<enum>Plain</enum>
</property>
<property name="text">
- <string>Install PC-BSD</string>
+ <string>Install or Update</string>
</property>
</widget>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel1_3_3_3_6</cstring>
+ <cstring>textLabel1_3_3_3_2_4_2_2</cstring>
</property>
<property name="geometry">
<rect>
<x>30</x>
<y>110</y>
<width>140</width>
- <height>22</height>
+ <height>21</height>
</rect>
</property>
+ <property name="font">
+ <font>
+ </font>
+ </property>
<property name="frameShape">
<enum>NoFrame</enum>
</property>
@@ -1979,223 +2045,25 @@
<enum>Plain</enum>
</property>
<property name="text">
- <string><b>License agreement</b></string>
+ <string>User accounts</string>
</property>
</widget>
- </widget>
- <widget class="QLabel">
- <property name="name">
- <cstring>textLabel2_2_2_2</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>300</x>
- <y>20</y>
- <width>280</width>
- <height>50</height>
- </rect>
- </property>
- <property name="font">
- <font>
- </font>
- </property>
- <property name="text">
- <string><h1>License agreement</h1></string>
- </property>
- <property name="alignment">
- <set>WordBreak|AlignTop|AlignLeft</set>
- </property>
- </widget>
- <widget class="QGroupBox">
- <property name="name">
- <cstring>groupBox6</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>280</x>
- <y>80</y>
- <width>590</width>
- <height>360</height>
- </rect>
- </property>
- <property name="title">
- <string>License Agreement</string>
- </property>
- <widget class="QCheckBox">
- <property name="name">
- <cstring>checkLicAgree</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>330</y>
- <width>550</width>
- <height>21</height>
- </rect>
- </property>
- <property name="text">
- <string>I agree</string>
- </property>
- </widget>
- <widget class="QTextEdit">
- <property name="name">
- <cstring>textEdit4</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>30</y>
- <width>570</width>
- <height>290</height>
- </rect>
- </property>
- <property name="text">
- <string>PC-BSD and its related source code is released under the BSD license. Components of the base system are released under their respective license(s).
-
-BSD LICENSE
-----------------------------------------------------------------------------------------------------------------
-Copyright (c) 1998, Regents of the University of California
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- Neither the name of the University of California, Berkeley nor the
- names of its contributors may be used to endorse or promote products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AN ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</string>
- </property>
- <property name="wordWrap">
- <enum>WidgetWidth</enum>
- </property>
- <property name="readOnly">
- <bool>true</bool>
- </property>
- </widget>
- </widget>
- <widget class="QGroupBox">
- <property na