Permalink
Browse files

Fix a small UI bug in the installer, and while here check for and enable

vboxguest services during the install if running in VirtualBox
  • Loading branch information...
1 parent 59416d4 commit fe78043e74d99e29affb8ac5b0fed18c486fb12a @kmoore134 kmoore134 committed Sep 6, 2013
Showing with 396 additions and 388 deletions.
  1. +7 −0 overlays/install-overlay/root/PCBSDStart.sh
  2. +389 −388 src-qt4/pc-installgui/installer.ui
View
7 overlays/install-overlay/root/PCBSDStart.sh
@@ -38,6 +38,13 @@ fi
# Enable the debug version of pc-sysinstall
/root/debugpcsysinstall.sh
+# Check if we are running in a VM and enable guest services
+case "$(kenv smbios.system.product)" in
+VirtualBox) /usr/local/etc/rc.d/vboxguest onestart ;;
+VMware*) ;;
+ *) ;;
+esac
+
# Set all NICS to DHCP
NICS=`ifconfig -l`
for i in $NICS
View
777 src-qt4/pc-installgui/installer.ui
@@ -30,251 +30,6 @@
<property name="spacing">
<number>0</number>
</property>
- <item row="1" column="0">
- <widget class="QWidget" name="footerWidget" native="true">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="autoFillBackground">
- <bool>false</bool>
- </property>
- <property name="styleSheet">
- <string notr="true">background-color: qlineargradient(spread:pad, x1:1, y1:1, x2:1, y2:0, stop:0 rgba(0, 70, 175, 255), stop:1 rgba(255, 240, 240, 240));</string>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <property name="spacing">
- <number>10</number>
- </property>
- <property name="leftMargin">
- <number>5</number>
- </property>
- <property name="topMargin">
- <number>10</number>
- </property>
- <property name="rightMargin">
- <number>10</number>
- </property>
- <property name="bottomMargin">
- <number>5</number>
- </property>
- <item>
- <widget class="QPushButton" name="pushHardware">
- <property name="minimumSize">
- <size>
- <width>32</width>
- <height>32</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>32</width>
- <height>32</height>
- </size>
- </property>
- <property name="toolTip">
- <string/>
- </property>
- <property name="statusTip">
- <string>Display hardware compatibility diagnostic</string>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset resource="sysinstaller.qrc">
- <normaloff>:/modules/images/systemsettings.png</normaloff>:/modules/images/systemsettings.png</iconset>
- </property>
- <property name="iconSize">
- <size>
- <width>32</width>
- <height>32</height>
- </size>
- </property>
- <property name="flat">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pushNetwork">
- <property name="statusTip">
- <string>Manage network connectivity</string>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset resource="sysinstaller.qrc">
- <normaloff>:/modules/images/networkwired.png</normaloff>:/modules/images/networkwired.png</iconset>
- </property>
- <property name="iconSize">
- <size>
- <width>32</width>
- <height>32</height>
- </size>
- </property>
- <property name="flat">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="helpButton">
- <property name="statusTip">
- <string>Display help for the current screen</string>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset resource="sysinstaller.qrc">
- <normaloff>:/modules/images/help-hint.png</normaloff>:/modules/images/help-hint.png</iconset>
- </property>
- <property name="iconSize">
- <size>
- <width>32</width>
- <height>32</height>
- </size>
- </property>
- <property name="flat">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pushTouchKeyboard">
- <property name="toolTip">
- <string/>
- </property>
- <property name="statusTip">
- <string>Launch the on-screen keyboard</string>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset resource="sysinstaller.qrc">
- <normaloff>:/PCBSD/images/input-keyboard.png</normaloff>:/PCBSD/images/input-keyboard.png</iconset>
- </property>
- <property name="iconSize">
- <size>
- <width>32</width>
- <height>32</height>
- </size>
- </property>
- <property name="flat">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="pushChangeKeyLayout">
- <property name="toolTip">
- <string/>
- </property>
- <property name="statusTip">
- <string>Switch between US layout and user selected layout</string>
- </property>
- <property name="text">
- <string/>
- </property>
- <property name="icon">
- <iconset resource="sysinstaller.qrc">
- <normaloff>:/modules/images/keyboard.png</normaloff>:/modules/images/keyboard.png</iconset>
- </property>
- <property name="iconSize">
- <size>
- <width>32</width>
- <height>32</height>
- </size>
- </property>
- <property name="autoDefault">
- <bool>false</bool>
- </property>
- <property name="default">
- <bool>false</bool>
- </property>
- <property name="flat">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>532</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QPushButton" name="abortButton">
- <property name="statusTip">
- <string>Cancel the installation</string>
- </property>
- <property name="styleSheet">
- <string notr="true">background-color: rgb(255, 255, 255);</string>
- </property>
- <property name="text">
- <string>Ab&amp;ort</string>
- </property>
- <property name="iconSize">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="backButton">
- <property name="statusTip">
- <string/>
- </property>
- <property name="styleSheet">
- <string notr="true">background-color: rgb(255, 255, 255);</string>
- </property>
- <property name="text">
- <string>&amp;Back</string>
- </property>
- <property name="iconSize">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="nextButton">
- <property name="statusTip">
- <string/>
- </property>
- <property name="styleSheet">
- <string notr="true">background-color: rgb(255, 255, 255);</string>
- </property>
- <property name="text">
- <string>&amp;Next</string>
- </property>
- <property name="iconSize">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
<item row="0" column="0">
<widget class="QStackedWidget" name="installStackWidget">
<property name="autoFillBackground">
@@ -531,37 +286,6 @@ background: transparent;</string>
</widget>
<widget class="QWidget" name="page_2">
<layout class="QGridLayout" name="gridLayout_14">
- <item row="6" column="1" colspan="2">
- <widget class="QGroupBox" name="groupDeskSummary">
- <property name="autoFillBackground">
- <bool>false</bool>
- </property>
- <property name="styleSheet">
- <string notr="true">background: transparent;</string>
- </property>
- <property name="title">
- <string>Summary</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- <layout class="QGridLayout" name="gridLayout_4">
- <item row="1" column="0">
- <widget class="QTextEdit" name="textDeskSummary">
- <property name="autoFillBackground">
- <bool>false</bool>
- </property>
- <property name="horizontalScrollBarPolicy">
- <enum>Qt::ScrollBarAlwaysOff</enum>
- </property>
- <property name="readOnly">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
<item row="0" column="2">
<spacer name="verticalSpacer_4">
<property name="orientation">
@@ -607,70 +331,81 @@ background: transparent;</string>
</property>
</spacer>
</item>
- <item row="4" column="2">
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <item>
- <spacer name="horizontalSpacer_6">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QPushButton" name="pushDeskCustomize">
- <property name="statusTip">
- <string>Customize the selected system</string>
- </property>
- <property name="autoFillBackground">
- <bool>false</bool>
- </property>
- <property name="styleSheet">
- <string notr="true"/>
- </property>
- <property name="text">
- <string>&amp;Customize</string>
- </property>
- <property name="icon">
- <iconset resource="sysinstaller.qrc">
- <normaloff>:/modules/images/configure.png</normaloff>:/modules/images/configure.png</iconset>
- </property>
- <property name="iconSize">
- <size>
- <width>21</width>
- <height>21</height>
- </size>
- </property>
- <property name="autoDefault">
- <bool>false</bool>
- </property>
- <property name="default">
- <bool>false</bool>
- </property>
- <property name="flat">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_7">
- <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 row="7" column="1" colspan="2">
+ <spacer name="verticalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>248</width>
+ <height>18</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="5" column="1" colspan="2">
+ <spacer name="verticalSpacer_11">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>5</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="2" column="1" colspan="2">
+ <spacer name="verticalSpacer_12">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>5</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="6" column="1" colspan="2">
+ <widget class="QGroupBox" name="groupDeskSummary">
+ <property name="autoFillBackground">
+ <bool>false</bool>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">background: transparent;</string>
+ </property>
+ <property name="title">
+ <string>Summary</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_4">
+ <item row="1" column="0">
+ <widget class="QTextEdit" name="textDeskSummary">
+ <property name="autoFillBackground">
+ <bool>false</bool>
+ </property>
+ <property name="horizontalScrollBarPolicy">
+ <enum>Qt::ScrollBarAlwaysOff</enum>
+ </property>
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
</item>
<item row="1" column="1" colspan="2">
<widget class="QGroupBox" name="groupSystemSelect">
@@ -757,61 +492,82 @@ background: transparent;</string>
</layout>
</widget>
</item>
- <item row="3" column="1" rowspan="2" colspan="2">
+ <item row="3" column="2">
<widget class="QGroupBox" name="groupBox_4">
<property name="styleSheet">
<string notr="true">background: transparent;</string>
</property>
<property name="title">
<string/>
</property>
- <layout class="QGridLayout" name="gridLayout_12"/>
- </widget>
- </item>
- <item row="7" column="1" colspan="2">
- <spacer name="verticalSpacer_3">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>248</width>
- <height>18</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="5" column="1" colspan="2">
- <spacer name="verticalSpacer_11">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>5</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="2" column="1" colspan="2">
- <spacer name="verticalSpacer_12">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>5</height>
- </size>
- </property>
- </spacer>
+ <layout class="QGridLayout" name="gridLayout_12">
+ <item row="0" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <spacer name="horizontalSpacer_6">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushDeskCustomize">
+ <property name="statusTip">
+ <string>Customize the selected system</string>
+ </property>
+ <property name="autoFillBackground">
+ <bool>false</bool>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">background-color: rgb(238, 238, 238);</string>
+ </property>
+ <property name="text">
+ <string>&amp;Customize</string>
+ </property>
+ <property name="icon">
+ <iconset resource="sysinstaller.qrc">
+ <normaloff>:/modules/images/configure.png</normaloff>:/modules/images/configure.png</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>21</width>
+ <height>21</height>
+ </size>
+ </property>
+ <property name="autoDefault">
+ <bool>false</bool>
+ </property>
+ <property name="default">
+ <bool>false</bool>
+ </property>
+ <property name="flat">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_7">
+ <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>
+ </layout>
+ </widget>
</item>
</layout>
</widget>
@@ -1406,6 +1162,251 @@ background: transparent;</string>
</widget>
</widget>
</item>
+ <item row="1" column="0">
+ <widget class="QWidget" name="footerWidget" native="true">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="autoFillBackground">
+ <bool>false</bool>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">background-color: qlineargradient(spread:pad, x1:1, y1:1, x2:1, y2:0, stop:0 rgba(0, 70, 175, 255), stop:1 rgba(255, 240, 240, 240));</string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <property name="spacing">
+ <number>10</number>
+ </property>
+ <property name="leftMargin">
+ <number>5</number>
+ </property>
+ <property name="topMargin">
+ <number>10</number>
+ </property>
+ <property name="rightMargin">
+ <number>10</number>
+ </property>
+ <property name="bottomMargin">
+ <number>5</number>
+ </property>
+ <item>
+ <widget class="QPushButton" name="pushHardware">
+ <property name="minimumSize">
+ <size>
+ <width>32</width>
+ <height>32</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>32</width>
+ <height>32</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string/>
+ </property>
+ <property name="statusTip">
+ <string>Display hardware compatibility diagnostic</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="sysinstaller.qrc">
+ <normaloff>:/modules/images/systemsettings.png</normaloff>:/modules/images/systemsettings.png</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>32</width>
+ <height>32</height>
+ </size>
+ </property>
+ <property name="flat">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushNetwork">
+ <property name="statusTip">
+ <string>Manage network connectivity</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="sysinstaller.qrc">
+ <normaloff>:/modules/images/networkwired.png</normaloff>:/modules/images/networkwired.png</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>32</width>
+ <height>32</height>
+ </size>
+ </property>
+ <property name="flat">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="helpButton">
+ <property name="statusTip">
+ <string>Display help for the current screen</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="sysinstaller.qrc">
+ <normaloff>:/modules/images/help-hint.png</normaloff>:/modules/images/help-hint.png</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>32</width>
+ <height>32</height>
+ </size>
+ </property>
+ <property name="flat">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushTouchKeyboard">
+ <property name="toolTip">
+ <string/>
+ </property>
+ <property name="statusTip">
+ <string>Launch the on-screen keyboard</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="sysinstaller.qrc">
+ <normaloff>:/PCBSD/images/input-keyboard.png</normaloff>:/PCBSD/images/input-keyboard.png</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>32</width>
+ <height>32</height>
+ </size>
+ </property>
+ <property name="flat">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushChangeKeyLayout">
+ <property name="toolTip">
+ <string/>
+ </property>
+ <property name="statusTip">
+ <string>Switch between US layout and user selected layout</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="icon">
+ <iconset resource="sysinstaller.qrc">
+ <normaloff>:/modules/images/keyboard.png</normaloff>:/modules/images/keyboard.png</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>32</width>
+ <height>32</height>
+ </size>
+ </property>
+ <property name="autoDefault">
+ <bool>false</bool>
+ </property>
+ <property name="default">
+ <bool>false</bool>
+ </property>
+ <property name="flat">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>532</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="abortButton">
+ <property name="statusTip">
+ <string>Cancel the installation</string>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">background-color: rgb(255, 255, 255);</string>
+ </property>
+ <property name="text">
+ <string>Ab&amp;ort</string>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="backButton">
+ <property name="statusTip">
+ <string/>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">background-color: rgb(255, 255, 255);</string>
+ </property>
+ <property name="text">
+ <string>&amp;Back</string>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="nextButton">
+ <property name="statusTip">
+ <string/>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">background-color: rgb(255, 255, 255);</string>
+ </property>
+ <property name="text">
+ <string>&amp;Next</string>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
</layout>
</widget>
<widget class="QStatusBar" name="statusbar">

0 comments on commit fe78043

Please sign in to comment.