[PC-BSD Commits] r5489 - pcbsd/trunk/SysInstaller
svn at pcbsd.org
svn at pcbsd.org
Tue Dec 8 14:21:44 PST 2009
Author: kris
Date: 2009-12-08 14:21:44 -0800 (Tue, 08 Dec 2009)
New Revision: 5489
Modified:
pcbsd/trunk/SysInstaller/sysinstaller.ui
Log:
Updated the SysInstaller layout to be more pleasing
Modified: pcbsd/trunk/SysInstaller/sysinstaller.ui
===================================================================
--- pcbsd/trunk/SysInstaller/sysinstaller.ui 2009-12-08 21:27:43 UTC (rev 5488)
+++ pcbsd/trunk/SysInstaller/sysinstaller.ui 2009-12-08 22:21:44 UTC (rev 5489)
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>800</width>
- <height>652</height>
+ <height>600</height>
</rect>
</property>
<property name="minimumSize">
@@ -146,6 +146,13 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
@@ -156,7 +163,7 @@
<string>TextLabel</string>
</property>
<property name="alignment">
- <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>
@@ -300,7 +307,7 @@
<item>
<widget class="QStackedWidget" name="anteInstallStack">
<property name="currentIndex">
- <number>2</number>
+ <number>3</number>
</property>
<widget class="QWidget" name="aiStep0">
<layout class="QGridLayout" name="gridLayout_10">
@@ -718,159 +725,172 @@
<widget class="QWidget" name="aiStep2">
<layout class="QGridLayout" name="gridLayout_9">
<item row="0" column="0" colspan="3">
- <widget class="QWidget" name="widget_3" native="true">
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>26</height>
- </size>
+ <widget class="QLabel" name="label_21">
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
</property>
- <property name="styleSheet">
- <string notr="true"/>
+ <property name="text">
+ <string>Please select the type of installation you wish to perform:</string>
</property>
- <layout class="QHBoxLayout" name="horizontalLayout_10">
- <property name="spacing">
- <number>50</number>
- </property>
- <property name="leftMargin">
- <number>10</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>10</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
- <item>
- <spacer name="horizontalSpacer_17">
- <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="radioInstall">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="font">
- <font>
- <pointsize>9</pointsize>
- <weight>75</weight>
- <bold>true</bold>
- </font>
- </property>
- <property name="text">
- <string>Install</string>
- </property>
- <property name="icon">
- <iconset resource="sysinstaller.qrc">
- <normaloff>:/modules/images/install.png</normaloff>:/modules/images/install.png</iconset>
- </property>
- <property name="iconSize">
- <size>
- <width>25</width>
- <height>25</height>
- </size>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="radioUpgrade">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="font">
- <font>
- <pointsize>9</pointsize>
- <weight>75</weight>
- <bold>true</bold>
- </font>
- </property>
- <property name="text">
- <string>Upgrade</string>
- </property>
- <property name="icon">
- <iconset resource="sysinstaller.qrc">
- <normaloff>:/modules/images/install.png</normaloff>:/modules/images/install.png</iconset>
- </property>
- <property name="iconSize">
- <size>
- <width>25</width>
- <height>25</height>
- </size>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QVBoxLayout" name="verticalLayout_13">
- <item>
- <widget class="QRadioButton" name="radioRestore">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="font">
- <font>
- <pointsize>9</pointsize>
- <weight>75</weight>
- <bold>true</bold>
- </font>
- </property>
- <property name="text">
- <string>Restore</string>
- </property>
- <property name="icon">
- <iconset resource="sysinstaller.qrc">
- <normaloff>:/modules/images/install.png</normaloff>:/modules/images/install.png</iconset>
- </property>
- <property name="iconSize">
- <size>
- <width>25</width>
- <height>25</height>
- </size>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <spacer name="horizontalSpacer_18">
- <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>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
</widget>
</item>
- <item row="1" column="0" rowspan="3">
+ <item row="1" column="0" colspan="3">
+ <layout class="QHBoxLayout" name="horizontalLayout_6">
+ <item>
+ <spacer name="horizontalSpacer_35">
+ <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="radioInstall">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>9</pointsize>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text">
+ <string>Fresh Install</string>
+ </property>
+ <property name="icon">
+ <iconset resource="sysinstaller.qrc">
+ <normaloff>:/modules/images/install.png</normaloff>:/modules/images/install.png</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>25</width>
+ <height>25</height>
+ </size>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_17">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>18</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="radioUpgrade">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>9</pointsize>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text">
+ <string>Upgrade</string>
+ </property>
+ <property name="icon">
+ <iconset resource="sysinstaller.qrc">
+ <normaloff>:/modules/images/install.png</normaloff>:/modules/images/install.png</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>25</width>
+ <height>25</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_18">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>13</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="radioRestore">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="font">
+ <font>
+ <pointsize>9</pointsize>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text">
+ <string>Restore from backup</string>
+ </property>
+ <property name="icon">
+ <iconset resource="sysinstaller.qrc">
+ <normaloff>:/modules/images/install.png</normaloff>:/modules/images/install.png</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>25</width>
+ <height>25</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_36">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>18</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item row="2" column="0" rowspan="2">
<spacer name="horizontalSpacer_9">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -883,39 +903,10 @@
</property>
</spacer>
</item>
- <item row="1" column="1">
- <spacer name="verticalSpacer_5">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Minimum</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>378</width>
- <height>13</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="2" rowspan="3">
- <spacer name="horizontalSpacer_10">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>182</width>
- <height>245</height>
- </size>
- </property>
- </spacer>
- </item>
<item row="2" column="1">
<widget class="QStackedWidget" name="stackedWidgetInstallBox">
<property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@@ -934,7 +925,7 @@
</property>
<widget class="QWidget" name="stackedWidgetInstallBoxPage1">
<layout class="QGridLayout" name="gridLayout_3">
- <item row="4" column="0" colspan="4">
+ <item row="5" column="0" colspan="4">
<widget class="QLabel" name="label_9">
<property name="text">
<string>Tip: PC-BSD is designed for the desktop, while FreeBSD makes a great choice for servers</string>
@@ -944,7 +935,7 @@
</property>
</widget>
</item>
- <item row="2" column="1">
+ <item row="3" column="1">
<widget class="QRadioButton" name="radioInstallPCBSD">
<property name="text">
<string>PC-BSD</string>
@@ -964,7 +955,7 @@
</property>
</widget>
</item>
- <item row="2" column="2">
+ <item row="3" column="2">
<widget class="QRadioButton" name="radioInstallFreeBSD">
<property name="text">
<string>FreeBSD</string>
@@ -981,7 +972,7 @@
</property>
</widget>
</item>
- <item row="2" column="3">
+ <item row="3" column="3">
<spacer name="horizontalSpacer_20">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -994,7 +985,7 @@
</property>
</spacer>
</item>
- <item row="2" column="0">
+ <item row="3" column="0">
<spacer name="horizontalSpacer_21">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -1007,13 +998,13 @@
</property>
</spacer>
</item>
- <item row="5" column="0" colspan="4">
+ <item row="6" column="0" colspan="4">
<spacer name="verticalSpacer_7">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::MinimumExpanding</enum>
+ <enum>QSizePolicy::Minimum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -1023,7 +1014,7 @@
</property>
</spacer>
</item>
- <item row="1" column="0" colspan="4">
+ <item row="2" column="0" colspan="4">
<widget class="QLabel" name="label_3">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
@@ -1038,18 +1029,47 @@
</font>
</property>
<property name="text">
- <string>System Type</string>
+ <string>Select the system to install:</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
+ <item row="1" column="0" colspan="4">
+ <spacer name="verticalSpacer_24">
+ <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>
</widget>
<widget class="QWidget" name="page_5">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
+ <spacer name="verticalSpacer_5">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::MinimumExpanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>258</width>
+ <height>17</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="1" column="0">
<widget class="QLabel" name="labelUpgradePartitions">
<property name="font">
<font>
@@ -1058,14 +1078,14 @@
</font>
</property>
<property name="text">
- <string>Available Partitions</string>
+ <string>Select the system to upgrade:</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
- <item row="1" column="0">
+ <item row="2" column="0">
<widget class="QListWidget" name="listUpgrades">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Minimum">
@@ -1079,7 +1099,7 @@
</widget>
<widget class="QWidget" name="page_6">
<layout class="QGridLayout" name="gridLayout_7">
- <item row="0" column="0" colspan="3">
+ <item row="1" column="0" colspan="3">
<widget class="QLabel" name="label_13">
<property name="font">
<font>
@@ -1088,7 +1108,7 @@
</font>
</property>
<property name="text">
- <string>Life Preserver Restore</string>
+ <string>Enter your Life-Preserver settings:</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -1098,34 +1118,34 @@
</property>
</widget>
</item>
- <item row="1" column="0">
+ <item row="2" column="0">
<widget class="QLabel" name="label_14">
<property name="text">
<string>Hostname</string>
</property>
</widget>
</item>
- <item row="1" column="1" colspan="2">
+ <item row="2" column="1" colspan="2">
<widget class="QLineEdit" name="lineRsyncHost"/>
</item>
- <item row="2" column="0">
+ <item row="3" column="0">
<widget class="QLabel" name="label_15">
<property name="text">
<string>Username</string>
</property>
</widget>
</item>
- <item row="2" column="1" rowspan="2" colspan="2">
+ <item row="3" column="1" rowspan="2" colspan="2">
<widget class="QLineEdit" name="lineRsyncUser"/>
</item>
- <item row="4" column="0">
+ <item row="5" column="0">
<widget class="QLabel" name="label_16">
<property name="text">
<string>Port</string>
</property>
</widget>
</item>
- <item row="4" column="1">
+ <item row="5" column="1">
<spacer name="horizontalSpacer_23">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -1138,7 +1158,7 @@
</property>
</spacer>
</item>
- <item row="3" column="2" rowspan="2">
+ <item row="4" column="2" rowspan="2">
<widget class="QSpinBox" name="spinRsyncPort">
<property name="maximum">
<number>99999</number>
@@ -1148,13 +1168,13 @@
</property>
</widget>
</item>
- <item row="5" column="0" colspan="3">
+ <item row="6" column="0" colspan="3">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
- <enum>QSizePolicy::MinimumExpanding</enum>
+ <enum>QSizePolicy::Preferred</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
@@ -1164,10 +1184,36 @@
</property>
</spacer>
</item>
+ <item row="0" column="0" colspan="3">
+ <spacer name="verticalSpacer_25">
+ <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>
</widget>
</widget>
</item>
+ <item row="2" column="2" rowspan="2">
+ <spacer name="horizontalSpacer_10">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>182</width>
+ <height>245</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
<item row="3" column="1" rowspan="2">
<widget class="QStackedWidget" name="stackedWidgetSourceBox">
<property name="sizePolicy">
@@ -1190,7 +1236,7 @@
</font>
</property>
<property name="text">
- <string>Installation Source</string>
+ <string>Select your Installation Source:</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
@@ -1351,366 +1397,460 @@
</layout>
</widget>
<widget class="QWidget" name="aiStep3">
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <property name="spacing">
- <number>50</number>
- </property>
- <property name="margin">
- <number>40</number>
- </property>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_12">
+ <layout class="QGridLayout" name="gridLayout_28">
+ <item row="0" column="0" rowspan="5">
+ <spacer name="horizontalSpacer_15">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>43</width>
+ <height>435</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="0" column="1">
+ <layout class="QVBoxLayout" name="verticalLayout_2">
<item>
- <spacer name="horizontalSpacer_6">
+ <spacer name="verticalSpacer_29">
<property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>40</width>
- <height>20</height>
+ <width>528</width>
+ <height>17</height>
</size>
</property>
</spacer>
</item>
<item>
- <widget class="QComboBox" name="comboDiskList">
- <property name="font">
- <font>
- <weight>75</weight>
- <bold>true</bold>
- </font>
- </property>
- <property name="styleSheet">
- <string>background-color: rgb(250, 250, 250);</string>
- </property>
- <item>
- <property name="text">
- <string>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</string>
- </property>
+ <layout class="QGridLayout" name="gridLayout_26">
+ <item row="0" column="0" rowspan="2">
+ <spacer name="horizontalSpacer_6">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>28</height>
+ </size>
+ </property>
+ </spacer>
</item>
- </widget>
+ <item row="0" column="1">
+ <widget class="QLabel" name="label_22">
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text">
+ <string>Please select the disk drive you wish to use:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="comboDiskList">
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string>background-color: rgb(250, 250, 250);</string>
+ </property>
+ <item>
+ <property name="text">
+ <string>/dev/ad0 -- 400GB | Seagate ST340015A 3.01 | ATA/ID Device</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="1" column="2">
+ <spacer name="horizontalSpacer_13">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
</item>
<item>
- <spacer name="horizontalSpacer_13">
+ <spacer name="verticalSpacer_28">
<property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>40</width>
- <height>20</height>
+ <width>658</width>
+ <height>13</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
- <item>
- <layout class="QVBoxLayout" name="verticalLayout_9">
- <property name="spacing">
- <number>0</number>
+ <item row="0" column="2" rowspan="5">
+ <spacer name="horizontalSpacer_37">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
</property>
- <property name="bottomMargin">
- <number>0</number>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>43</width>
+ <height>435</height>
+ </size>
</property>
- <item>
- <widget class="QWidget" name="widget_4" native="true">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>26</height>
- </size>
- </property>
- <property name="styleSheet">
- <string notr="true"/>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout">
+ </spacer>
+ </item>
+ <item row="2" column="1">
+ <widget class="QGroupBox" name="groupBox_6">
+ <property name="title">
+ <string>Disk Layout Settings</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_27">
+ <item row="0" column="0">
+ <layout class="QVBoxLayout" name="verticalLayout_9">
<property name="spacing">
- <number>50</number>
- </property>
- <property name="topMargin">
<number>0</number>
</property>
- <property name="rightMargin">
- <number>9</number>
- </property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
- <spacer name="horizontalSpacer_15">
- <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="radioAutoPartition">
+ <widget class="QWidget" name="widget_4" native="true">
<property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text">
- <string>Auto Partition</string>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>26</height>
+ </size>
</property>
- <property name="checked">
- <bool>true</bool>
+ <property name="styleSheet">
+ <string notr="true"/>
</property>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <property name="spacing">
+ <number>50</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>9</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <spacer name="horizontalSpacer_38">
+ <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="radioAutoPartition">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Auto Partition</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="radioCustomDisk">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="layoutDirection">
+ <enum>Qt::LeftToRight</enum>
+ </property>
+ <property name="text">
+ <string>Customize Disk Partitions (Advanced)</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_14">
+ <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>
</widget>
</item>
<item>
- <widget class="QRadioButton" name="radioCustomDisk">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <widget class="QStackedWidget" name="stackedWidgetDiskSetup">
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
</property>
- <property name="layoutDirection">
- <enum>Qt::LeftToRight</enum>
+ <property name="frameShadow">
+ <enum>QFrame::Sunken</enum>
</property>
- <property name="text">
- <string>Customize Disk Setup (Advanced)</string>
+ <property name="currentIndex">
+ <number>0</number>
</property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_14">
- <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>
- </widget>
- </item>
- <item>
- <widget class="QStackedWidget" name="stackedWidgetDiskSetup">
- <property name="frameShape">
- <enum>QFrame::StyledPanel</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Sunken</enum>
- </property>
- <property name="currentIndex">
- <number>0</number>
- </property>
- <widget class="QWidget" name="page">
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="0" column="0">
- <widget class="QCheckBox" name="checkUseEntireDisk">
- <property name="styleSheet">
- <string notr="true"/>
- </property>
- <property name="text">
- <string>Use Entire Disk</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QListWidget" name="listDiskSlices">
- <property name="styleSheet">
- <string notr="true">selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
-selection-color: rgb(255, 255, 255);</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <spacer name="verticalSpacer_2">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>528</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="page_2">
- <layout class="QVBoxLayout" name="verticalLayout_19">
- <property name="spacing">
- <number>0</number>
- </property>
- <item>
- <widget class="QWidget" name="widget_5" native="true">
- <property name="styleSheet">
- <string>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</string>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout_9">
- <property name="topMargin">
- <number>5</number>
- </property>
- <property name="bottomMargin">
- <number>5</number>
- </property>
- <item>
- <widget class="QPushButton" name="pushAddMount">
+ <widget class="QWidget" name="page">
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="1" column="0">
+ <widget class="QCheckBox" name="checkUseEntireDisk">
<property name="styleSheet">
- <string>background-color: rgb(250, 250, 250);</string>
+ <string notr="true"/>
</property>
- <property name="icon">
- <iconset resource="sysinstaller.qrc">
- <normaloff>:/PCBSD/images/edit_add.png</normaloff>:/PCBSD/images/edit_add.png</iconset>
+ <property name="text">
+ <string>Use Entire Disk</string>
</property>
- <property name="iconSize">
- <size>
- <width>16</width>
- <height>16</height>
- </size>
- </property>
</widget>
</item>
- <item>
- <widget class="QPushButton" name="pushEditMount">
+ <item row="2" column="0">
+ <widget class="QListWidget" name="listDiskSlices">
<property name="styleSheet">
- <string>background-color: rgb(250, 250, 250);</string>
+ <string notr="true">selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
+selection-color: rgb(255, 255, 255);</string>
</property>
- <property name="icon">
- <iconset resource="sysinstaller.qrc">
- <normaloff>:/PCBSD/images/edit.png</normaloff>:/PCBSD/images/edit.png</iconset>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <spacer name="verticalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
</property>
- <property name="iconSize">
+ <property name="sizeHint" stdset="0">
<size>
- <width>16</width>
- <height>16</height>
+ <width>528</width>
+ <height>20</height>
</size>
</property>
+ </spacer>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_23">
+ <property name="text">
+ <string>Select the slice you wish to install to, or check "Use Entire Disk"</string>
+ </property>
</widget>
</item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="page_2">
+ <layout class="QVBoxLayout" name="verticalLayout_19">
+ <property name="spacing">
+ <number>0</number>
+ </property>
<item>
- <widget class="QPushButton" name="pushRemoveMount">
- <property name="styleSheet">
- <string>background-color: rgb(250, 250, 250);</string>
+ <widget class="QLabel" name="label_24">
+ <property name="text">
+ <string>The following partitions will be created during the installation:</string>
</property>
- <property name="icon">
- <iconset resource="sysinstaller.qrc">
- <normaloff>:/PCBSD/images/edit_remove.png</normaloff>:/PCBSD/images/edit_remove.png</iconset>
- </property>
- <property name="iconSize">
- <size>
- <width>16</width>
- <height>16</height>
- </size>
- </property>
</widget>
</item>
<item>
- <widget class="Line" name="line_2">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
+ <widget class="QWidget" name="widget_5" native="true">
+ <property name="styleSheet">
+ <string>background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0.7, stop:0 rgba(217, 230, 235, 230), stop:1 rgba(255, 255, 255, 255));</string>
</property>
+ <layout class="QHBoxLayout" name="horizontalLayout_9">
+ <property name="topMargin">
+ <number>5</number>
+ </property>
+ <property name="bottomMargin">
+ <number>5</number>
+ </property>
+ <item>
+ <widget class="QPushButton" name="pushAddMount">
+ <property name="styleSheet">
+ <string>background-color: rgb(250, 250, 250);</string>
+ </property>
+ <property name="icon">
+ <iconset resource="sysinstaller.qrc">
+ <normaloff>:/PCBSD/images/edit_add.png</normaloff>:/PCBSD/images/edit_add.png</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>16</width>
+ <height>16</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushEditMount">
+ <property name="styleSheet">
+ <string>background-color: rgb(250, 250, 250);</string>
+ </property>
+ <property name="icon">
+ <iconset resource="sysinstaller.qrc">
+ <normaloff>:/PCBSD/images/edit.png</normaloff>:/PCBSD/images/edit.png</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>16</width>
+ <height>16</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushRemoveMount">
+ <property name="styleSheet">
+ <string>background-color: rgb(250, 250, 250);</string>
+ </property>
+ <property name="icon">
+ <iconset resource="sysinstaller.qrc">
+ <normaloff>:/PCBSD/images/edit_remove.png</normaloff>:/PCBSD/images/edit_remove.png</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>16</width>
+ <height>16</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="Line" name="line_2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushAutoMount">
+ <property name="styleSheet">
+ <string>background-color: rgb(250, 250, 250);</string>
+ </property>
+ <property name="text">
+ <string>Auto Setup</string>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>16</width>
+ <height>16</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_16">
+ <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>
</widget>
</item>
<item>
- <widget class="QPushButton" name="pushAutoMount">
+ <widget class="QTreeWidget" name="treeWidgetCustomPartition">
<property name="styleSheet">
- <string>background-color: rgb(250, 250, 250);</string>
+ <string>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
+selection-color: rgb(255, 255, 255);</string>
</property>
- <property name="text">
- <string>Auto Setup</string>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
</property>
- <property name="iconSize">
- <size>
- <width>16</width>
- <height>16</height>
- </size>
+ <property name="uniformRowHeights">
+ <bool>true</bool>
</property>
+ <column>
+ <property name="text">
+ <string>ID</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Slice</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Mount</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Size</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Type</string>
+ </property>
+ </column>
</widget>
</item>
<item>
- <spacer name="horizontalSpacer_16">
+ <widget class="Line" name="line_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
+ </widget>
</item>
</layout>
</widget>
- </item>
- <item>
- <widget class="QTreeWidget" name="treeWidgetCustomPartition">
- <property name="styleSheet">
- <string>selection-background-color: qlineargradient(spread:pad, x1:0.5, y1:1, x2:0.5, y2:0, stop:0 rgba(86, 130, 150, 255), stop:1 rgba(199, 199, 199, 255));
-selection-color: rgb(255, 255, 255);</string>
- </property>
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="uniformRowHeights">
- <bool>true</bool>
- </property>
- <column>
- <property name="text">
- <string>ID</string>
- </property>
- </column>
- <column>
- <property name="text">
- <string>Slice</string>
- </property>
- </column>
- <column>
- <property name="text">
- <string>Mount</string>
- </property>
- </column>
- <column>
- <property name="text">
- <string>Size</string>
- </property>
- </column>
- <column>
- <property name="text">
- <string>Type</string>
- </property>
- </column>
- </widget>
- </item>
- <item>
- <widget class="Line" name="line_3">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </widget>
- </item>
- </layout>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ <zorder></zorder>
+ <zorder>stackedWidgetDiskSetup</zorder>
+ <zorder>stackedWidgetDiskSetup</zorder>
+ <zorder></zorder>
+ </widget>
</item>
- <item>
+ <item row="4" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
<spacer name="horizontalSpacer_12">
@@ -1760,6 +1900,45 @@
</item>
</layout>
</item>
+ <item row="5" column="1">
+ <spacer name="verticalSpacer_26">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="1" column="1">
+ <spacer name="verticalSpacer_27">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="3" column="1">
+ <spacer name="verticalSpacer_30">
+ <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>
</widget>
<widget class="QWidget" name="aiStep4">
More information about the Commits
mailing list