[PC-BSD Commits] r5093 - pcbsd/trunk/SysInstaller
svn at pcbsd.org
svn at pcbsd.org
Thu Nov 19 12:39:43 PST 2009
Author: kris
Date: 2009-11-19 12:39:43 -0800 (Thu, 19 Nov 2009)
New Revision: 5093
Modified:
pcbsd/trunk/SysInstaller/sysinstaller.cpp
pcbsd/trunk/SysInstaller/sysinstaller.h
pcbsd/trunk/SysInstaller/sysinstaller.qrc
pcbsd/trunk/SysInstaller/sysinstaller.ui
Log:
Added few extra widgets for add users, and date/time setup to the main aiSteps, which will be used in most cases, piSteps
will be used when doing scripted OEM installs
Modified: pcbsd/trunk/SysInstaller/sysinstaller.cpp
===================================================================
--- pcbsd/trunk/SysInstaller/sysinstaller.cpp 2009-11-19 20:08:52 UTC (rev 5092)
+++ pcbsd/trunk/SysInstaller/sysinstaller.cpp 2009-11-19 20:39:43 UTC (rev 5093)
@@ -32,8 +32,10 @@
steps.append(Step(tr("Keyboard"), path + "keyboard.png", tr("Keyboard setup") ) );
steps.append(Step(tr("System"), path + "install.png", tr("Select installation type") ) );
steps.append(Step(tr("Disk"), path + "slices.png", tr("Disk setup") ) );
+ steps.append(Step(tr("Users"), path + "add_user.png", tr("User Creation") ) );
+ steps.append(Step(tr("Time"), path + "timezone.png", tr("Date & Time") ) );
steps.append(Step(tr("Components"), path + "components.png", tr("Optional components") ) );
- steps.append(Step(tr("Summary"), path + "summary.png", tr("Pre-Install Summary") ) );
+ steps.append(Step(tr("Summary"), path + "systemsettings.png", tr("Pre-Install Summary") ) );
steps.append(Step(tr("Installation"), path + "pcbsd.png", tr("Installation Progress") ) );
} else {
@@ -111,6 +113,8 @@
connect(comboSelectNic,SIGNAL(currentIndexChanged(int)), this, SLOT(slotChangedNic()));
connect(comboDiskList,SIGNAL(currentIndexChanged(int)), this, SLOT(slotChangedDisk()));
connect(checkUseEntireDisk,SIGNAL(clicked()), this, SLOT(slotUseEntireDiskClicked()));
+ connect(radioCustomDisk,SIGNAL(toggled(bool)), this, SLOT(slotChangeRadioCustomDisk()));
+ connect(radioAutoPartition,SIGNAL(toggled(bool)), this, SLOT(slotChangeRadioCustomDisk()));
setKbDefaults();
@@ -126,6 +130,15 @@
}
+// Slot which switches between basic / advanced disk setup
+void SysInstaller::slotChangeRadioCustomDisk()
+{
+ if ( radioAutoPartition->isChecked())
+ stackedWidgetDiskSetup->setCurrentIndex(0);
+ else
+ stackedWidgetDiskSetup->setCurrentIndex(1);
+}
+
// Slot which checks any disk requirements before procceding to the next page
bool SysInstaller::checkDiskRequirements()
{
Modified: pcbsd/trunk/SysInstaller/sysinstaller.h
===================================================================
--- pcbsd/trunk/SysInstaller/sysinstaller.h 2009-11-19 20:08:52 UTC (rev 5092)
+++ pcbsd/trunk/SysInstaller/sysinstaller.h 2009-11-19 20:39:43 UTC (rev 5093)
@@ -72,6 +72,7 @@
void slotChangedNic();
void slotChangedDisk();
void slotUseEntireDiskClicked();
+ void slotChangeRadioCustomDisk();
private:
void initSteps();
Modified: pcbsd/trunk/SysInstaller/sysinstaller.qrc
===================================================================
--- pcbsd/trunk/SysInstaller/sysinstaller.qrc 2009-11-19 20:08:52 UTC (rev 5092)
+++ pcbsd/trunk/SysInstaller/sysinstaller.qrc 2009-11-19 20:39:43 UTC (rev 5093)
@@ -11,6 +11,9 @@
<file>images/cdrom_mount.png</file>
<file>images/network.png</file>
<file>images/freebsd.png</file>
+ <file>images/timezone.png</file>
+ <file>images/add_user.png</file>
+ <file>images/systemsettings.png</file>
</qresource>
<qresource prefix="/PCBSD" >
<file>images/edit_add.png</file>
Modified: pcbsd/trunk/SysInstaller/sysinstaller.ui
===================================================================
--- pcbsd/trunk/SysInstaller/sysinstaller.ui 2009-11-19 20:08:52 UTC (rev 5092)
+++ pcbsd/trunk/SysInstaller/sysinstaller.ui 2009-11-19 20:39:43 UTC (rev 5093)
@@ -303,64 +303,74 @@
<number>3</number>
</property>
<widget class="QWidget" name="aiStep0">
- <layout class="QVBoxLayout" name="verticalLayout_6">
- <property name="spacing">
- <number>50</number>
- </property>
- <property name="leftMargin">
- <number>40</number>
- </property>
- <property name="topMargin">
- <number>40</number>
- </property>
- <property name="rightMargin">
- <number>40</number>
- </property>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_6">
- <item>
- <spacer name="horizontalSpacer_3">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QComboBox" name="comboLanguage">
- <property name="font">
- <font>
- <weight>75</weight>
- <bold>true</bold>
- </font>
- </property>
- <property name="styleSheet">
- <string>background-color: rgb(250, 250, 250);
+ <layout class="QGridLayout" name="gridLayout_10">
+ <item row="0" column="1">
+ <widget class="QLabel" name="label_8">
+ <property name="text">
+ <string>Language Selection</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <spacer name="horizontalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>310</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="comboLanguage">
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string>background-color: rgb(250, 250, 250);
color: rgb(79, 79, 79);</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_4">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
+ </property>
+ </widget>
</item>
- <item>
+ <item row="1" column="2">
+ <spacer name="horizontalSpacer_4">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>309</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="2" column="0" colspan="3">
+ <spacer name="verticalSpacer_4">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>668</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="3" column="0" colspan="3">
<layout class="QVBoxLayout" name="verticalLayout_8">
<item>
<widget class="QLabel" name="label_2">
@@ -1433,7 +1443,7 @@
</widget>
</item>
<item>
- <widget class="QStackedWidget" name="stackedWidget">
+ <widget class="QStackedWidget" name="stackedWidgetDiskSetup">
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
@@ -1679,7 +1689,9 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="aiStep4">
+ <widget class="QWidget" name="aiStep4"/>
+ <widget class="QWidget" name="aiStep5"/>
+ <widget class="QWidget" name="aiStep6">
<layout class="QVBoxLayout" name="verticalLayout_11">
<property name="spacing">
<number>0</number>
@@ -1733,8 +1745,8 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="aiStep5"/>
- <widget class="QWidget" name="aiStep6"/>
+ <widget class="QWidget" name="aiStep7"/>
+ <widget class="QWidget" name="aiStep8"/>
</widget>
</item>
</layout>
More information about the Commits
mailing list