[PC-BSD Commits] r2464 - pcbsd/trunk/PCInstall
svn at pcbsd.org
svn at pcbsd.org
Mon Jul 28 14:09:17 PDT 2008
Author: kris
Date: 2008-07-28 14:09:17 -0700 (Mon, 28 Jul 2008)
New Revision: 2464
Added:
pcbsd/trunk/PCInstall/editnetworkdialog.cpp
pcbsd/trunk/PCInstall/editnetworkdialog.h
pcbsd/trunk/PCInstall/selectnetserver.cpp
pcbsd/trunk/PCInstall/selectnetserver.h
pcbsd/trunk/PCInstall/selectnetserver.ui
pcbsd/trunk/PCInstall/workingdialog.cpp
pcbsd/trunk/PCInstall/workingdialog.h
pcbsd/trunk/PCInstall/workingdialog.ui
Removed:
pcbsd/trunk/PCInstall/editnetworkdialog.ui.h
Modified:
pcbsd/trunk/PCInstall/PCInstall.pro
pcbsd/trunk/PCInstall/editnetworkdialog.ui
pcbsd/trunk/PCInstall/pcinstall.cpp
pcbsd/trunk/PCInstall/pcinstall.h
pcbsd/trunk/PCInstall/pcinstall.ui
Log:
Added a large update to the PCInstall program, which adds the begining of
network installation support. Will be refined a bit more in coming days, but
does seem to work here on my test system
Modified: pcbsd/trunk/PCInstall/PCInstall.pro
===================================================================
--- pcbsd/trunk/PCInstall/PCInstall.pro 2008-07-28 20:29:23 UTC (rev 2463)
+++ pcbsd/trunk/PCInstall/PCInstall.pro 2008-07-28 21:09:17 UTC (rev 2464)
@@ -3,15 +3,18 @@
CONFIG += qt warn_on release
-SOURCES += main.cpp pcinstall.cpp addpartitiondialog.cpp dialogkeyboard.cpp
+SOURCES += main.cpp pcinstall.cpp addpartitiondialog.cpp dialogkeyboard.cpp editnetworkdialog.cpp workingdialog.cpp selectnetserver.cpp
FORMS = pcinstall.ui \
addpartitiondialog.ui \
- dialogkeyboard.ui
+ dialogkeyboard.ui \
+ editnetworkdialog.ui \
+ workingdialog.ui \
+ selectnetserver.ui
LIBS += -lkdecore -lkdeui -lkio -Ikdelibs
-HEADERS += dialogkeyboard.h pcinstall.h addpartitiondialog.h
+HEADERS += dialogkeyboard.h pcinstall.h addpartitiondialog.h editnetworkdialog.h workingdialog.h selectnetserver.h
RESOURCES += PCInstall.qrc
Modified: pcbsd/trunk/PCInstall/editnetworkdialog.ui
===================================================================
--- pcbsd/trunk/PCInstall/editnetworkdialog.ui 2008-07-28 20:29:23 UTC (rev 2463)
+++ pcbsd/trunk/PCInstall/editnetworkdialog.ui 2008-07-28 21:09:17 UTC (rev 2464)
@@ -1,243 +1,204 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>EditNetworkDialog</class>
-<widget class="QDialog">
- <property name="name">
- <cstring>EditNetworkDialog</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>341</width>
- <height>282</height>
- </rect>
- </property>
- <property name="caption">
- <string>Network Settings</string>
- </property>
- <widget class="QButtonGroup">
- <property name="name">
- <cstring>buttonGroup3</cstring>
+<ui version="4.0" >
+ <class>EditNetworkDialog</class>
+ <widget class="QDialog" name="EditNetworkDialog" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>322</width>
+ <height>451</height>
+ </rect>
+ </property>
+ <property name="minimumSize" >
+ <size>
+ <width>322</width>
+ <height>451</height>
+ </size>
+ </property>
+ <property name="windowTitle" >
+ <string>Network Settings</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_3" >
+ <item row="0" column="0" colspan="2" >
+ <widget class="Q3ButtonGroup" name="buttonGroup3" >
+ <property name="title" >
+ <string>Network Card Configuration</string>
+ </property>
+ <property name="frameShape" >
+ <enum>Q3GroupBox::GroupBoxPanel</enum>
+ </property>
+ <property name="frameShadow" >
+ <enum>Q3GroupBox::Sunken</enum>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_2" >
+ <item row="0" column="0" >
+ <widget class="QComboBox" name="comboNIC" />
+ </item>
+ <item row="1" column="0" >
+ <widget class="QLabel" name="label" >
+ <property name="text" >
+ <string>Please select your network device above, and then choose DHCP or enter a manual IP address.</string>
</property>
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>10</y>
- <width>321</width>
- <height>220</height>
- </rect>
+ <property name="wordWrap" >
+ <bool>true</bool>
</property>
- <property name="frameShape">
- <enum>GroupBoxPanel</enum>
+ </widget>
+ </item>
+ <item row="2" column="0" >
+ <spacer name="verticalSpacer" >
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
</property>
- <property name="frameShadow">
- <enum>Sunken</enum>
+ <property name="sizeType" >
+ <enum>QSizePolicy::Fixed</enum>
</property>
- <property name="title">
- <string>Network Config</string>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
</property>
- <widget class="QLabel">
- <property name="name">
- <cstring>textLabel1</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>190</x>
- <y>80</y>
- <width>120</width>
- <height>31</height>
- </rect>
- </property>
- <property name="text">
- <string>IP Address</string>
- </property>
- </widget>
- <widget class="QLabel">
- <property name="name">
- <cstring>textLabel1_2</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>190</x>
- <y>120</y>
- <width>120</width>
- <height>31</height>
- </rect>
- </property>
- <property name="text">
- <string>Netmask</string>
- </property>
- </widget>
- <widget class="QLabel">
- <property name="name">
- <cstring>textLabel1_3</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>190</x>
- <y>160</y>
- <width>120</width>
- <height>31</height>
- </rect>
- </property>
- <property name="text">
- <string>Gateway</string>
- </property>
- </widget>
- <widget class="QLineEdit">
- <property name="name">
- <cstring>lineGateway</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>160</y>
- <width>171</width>
- <height>31</height>
- </rect>
- </property>
- <property name="alignment">
- <set>AlignHCenter</set>
- </property>
- <property name="inputMask">
- <string>000.000.000.000; </string>
- </property>
- </widget>
- <widget class="QLineEdit">
- <property name="name">
- <cstring>lineNM</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>120</y>
- <width>171</width>
- <height>31</height>
- </rect>
- </property>
- <property name="alignment">
- <set>AlignHCenter</set>
- </property>
- <property name="inputMask">
- <string>000.000.000.000; </string>
- </property>
- </widget>
- <widget class="QRadioButton">
- <property name="name">
- <cstring>radioDHCP</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>20</y>
- <width>300</width>
- <height>20</height>
- </rect>
- </property>
- <property name="text">
- <string>Use DHCP</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- <widget class="QRadioButton">
- <property name="name">
- <cstring>radioManual</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>50</y>
- <width>300</width>
- <height>20</height>
- </rect>
- </property>
- <property name="text">
- <string>Manual Setup</string>
- </property>
- </widget>
- <widget class="QLineEdit">
- <property name="name">
- <cstring>lineIP</cstring>
- </property>
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>80</y>
- <width>171</width>
- <height>31</height>
- </rect>
- </property>
- <property name="alignment">
- <set>AlignHCenter</set>
- </property>
- <property name="inputMask">
- <string>000.000.000.000; </string>
- </property>
- </widget>
- </widget>
- <widget class="QPushButton">
- <property name="name">
- <cstring>pushCancel</cstring>
+ </spacer>
+ </item>
+ <item row="3" column="0" >
+ <widget class="QRadioButton" name="radioDHCP" >
+ <property name="text" >
+ <string>Use DHCP</string>
</property>
- <property name="geometry">
- <rect>
- <x>200</x>
- <y>240</y>
- <width>111</width>
- <height>31</height>
- </rect>
+ <property name="checked" >
+ <bool>true</bool>
</property>
- <property name="text">
- <string>Cancel</string>
+ </widget>
+ </item>
+ <item row="4" column="0" >
+ <widget class="QRadioButton" name="radioManual" >
+ <property name="text" >
+ <string>Manual Setup</string>
</property>
+ </widget>
+ </item>
+ <item row="5" column="0" >
+ <layout class="QGridLayout" name="gridLayout" >
+ <item row="0" column="0" >
+ <widget class="QLineEdit" name="lineIP" >
+ <property name="enabled" >
+ <bool>true</bool>
+ </property>
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="inputMask" >
+ <string>000.000.000.000; </string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignHCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1" >
+ <widget class="QLabel" name="textLabel1" >
+ <property name="text" >
+ <string>IP Address</string>
+ </property>
+ <property name="wordWrap" >
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0" >
+ <widget class="QLineEdit" name="lineNM" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="inputMask" >
+ <string>000.000.000.000; </string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignHCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" >
+ <widget class="QLabel" name="textLabel1_2" >
+ <property name="text" >
+ <string>Netmask</string>
+ </property>
+ <property name="wordWrap" >
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" >
+ <widget class="QLineEdit" name="lineGateway" >
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="inputMask" >
+ <string>000.000.000.000; </string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignHCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" >
+ <widget class="QLabel" name="textLabel1_3" >
+ <property name="text" >
+ <string>Gateway</string>
+ </property>
+ <property name="wordWrap" >
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
</widget>
- <widget class="QPushButton">
- <property name="name">
- <cstring>pushSave</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>20</x>
- <y>240</y>
- <width>111</width>
- <height>31</height>
- </rect>
- </property>
- <property name="text">
- <string>Save</string>
- </property>
+ </item>
+ <item row="1" column="0" >
+ <widget class="QPushButton" name="pushConfirm" >
+ <property name="text" >
+ <string>Confirm</string>
+ </property>
</widget>
-</widget>
-<tabstops>
- <tabstop>radioDHCP</tabstop>
- <tabstop>lineIP</tabstop>
- <tabstop>lineNM</tabstop>
- <tabstop>lineGateway</tabstop>
- <tabstop>pushSave</tabstop>
- <tabstop>pushCancel</tabstop>
-</tabstops>
-<includes>
- <include location="local" impldecl="in implementation">editnetworkdialog.ui.h</include>
-</includes>
-<signals>
- <signal>saved(QString, QString, QString)</signal>
-</signals>
-<slots>
- <slot access="private">checkRadioSlot()</slot>
- <slot access="private">saveSlot()</slot>
- <slot access="private">cancelSlot()</slot>
- <slot access="private">checkValues()</slot>
- <slot access="private">fieldTextChanged( const QString & text )</slot>
-</slots>
-<functions>
- <function>ProgramInit()</function>
- <function>setEditValues( QString IP, QString NM, QString Gate )</function>
-</functions>
-<pixmapinproject/>
-<layoutdefaults spacing="6" margin="11"/>
-</UI>
+ </item>
+ <item row="1" column="1" >
+ <widget class="QPushButton" name="pushCancel" >
+ <property name="text" >
+ <string>Cancel</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+ <customwidget>
+ <class>Q3ButtonGroup</class>
+ <extends>Q3GroupBox</extends>
+ <header>Qt3Support/Q3ButtonGroup</header>
+ <container>1</container>
+ </customwidget>
+ </customwidgets>
+ <tabstops>
+ <tabstop>radioDHCP</tabstop>
+ <tabstop>lineIP</tabstop>
+ <tabstop>lineNM</tabstop>
+ <tabstop>lineGateway</tabstop>
+ <tabstop>pushConfirm</tabstop>
+ <tabstop>pushCancel</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
Modified: pcbsd/trunk/PCInstall/pcinstall.cpp
===================================================================
--- pcbsd/trunk/PCInstall/pcinstall.cpp 2008-07-28 20:29:23 UTC (rev 2463)
+++ pcbsd/trunk/PCInstall/pcinstall.cpp 2008-07-28 21:09:17 UTC (rev 2464)
@@ -14,9 +14,12 @@
#include <stdlib.h>
#include <qtextstream.h>
#include <Q3ListViewItem>
+#include <kio/job.h>
#include "pcinstall.h"
#include "addpartitiondialog.h"
#include "dialogkeyboard.h"
+#include "editnetworkdialog.h"
+#include "selectnetserver.h"
#include "ui_pcinstall.h"
void PCInstall::ProgramInit()
@@ -28,6 +31,9 @@
// Default us to cd instead of DVD
usingDVDmedia = 0;
+ // Set our flag that we are not using a network install
+ networkInstall = false;
+
// Setup Translations
nextButton()->setText(tr("Next"));
backButton()->setText(tr("Back"));
@@ -338,10 +344,31 @@
// Display the promo ads
PromoAd = 1;
- changePromoAd();
+ changePromoAd();
- startMountCD();
+ // Setup the length of our progress bars
+ calcProgressBarSize();
+
+ // If we are on a network install, skip the CD mount and format the drive first
+ if ( networkInstall) {
+ usingDVDmedia = 1;
+
+
+ // Now start the install / update
+ if ( radioFreshInstall->isChecked() )
+ {
+ // Skip the CD mount, will download direct from net instead
+ startFreshInstall();
+ } else {
+ startUpdateProcess();
+ }
+
+ } else {
+ // Using a CD / DVD / USB, so mount it first
+ startMountCD();
+ }
+
}
if ( Page == tr("Installation Finished!") )
@@ -1276,11 +1303,7 @@
void PCInstall::finishedMountSlot()
{
-
-
- startTarExtractSlot();
-
-
+ startTarExtractSlot();
}
@@ -1400,10 +1423,7 @@
void PCInstall::startMountCD()
{
- // Figure out the progress bar steps
- calcProgressBarSize();
-
textFileProgress->setText(tr("Mounting CD..."));
//Setup Process to mount the root partition
@@ -1424,6 +1444,7 @@
TarProc = new Q3Process( this );
TarProc->addArgument( "/usr/local/pcbsd/scripts/PCBSD.InstallCD1.sh" );
+
connect( TarProc, SIGNAL(readyReadStdout() ), this, SLOT(readTarStdoutSlot() ) );
connect( TarProc, SIGNAL(processExited()), this, SLOT(TarFinishedSlot() ) );
@@ -2031,8 +2052,6 @@
void PCInstall::startUpgradeMount()
{
- // Setup the length of our progress bars
- calcProgressBarSize();
textFileProgressUpgrade->setText(tr("Mounting CD..."));
@@ -2686,8 +2705,12 @@
{
if ( radioNetworkInstall->isChecked() )
{
- // Insert some sort of modal dialog here soon, which brings up the network interface and chooses a mirror / server to use
-
+ // Bring up the network dialog NIC selector
+ networkDialog = new EditNetworkDialog();
+ connect(networkDialog, SIGNAL(saved(QString, QString, QString, QString)), this, SLOT(nicSavedSlot(QString, QString, QString, QString)) );
+ networkDialog->ProgramInit();
+ networkDialog->exec();
+ return;
}
@@ -2901,7 +2924,7 @@
break;
}
- // Insert a new item here, KPM!!!!!!
+ // Insert a new item here,
QImage *Icon = new QImage("/usr/local/pcbsd/Components/" + ComponentDir[i] + "/component.png");
QPixmap PixmapIcon;
PixmapIcon.convertFromImage(Icon->smoothScale(40,40));
@@ -3355,3 +3378,86 @@
slotRunFinalScriptUpgrade();
}
}
+
+
+// Slot which is called when a user selects the NIC configuration he wants
+// to use to install PCBSD
+void PCInstall::nicSavedSlot(QString NIC, QString IP, QString NM, QString Gate)
+{
+ // Apply the network configuration, and display a popup letting the user know what we are
+ // doing
+ workDialog = new WorkingDialog();
+ workDialog->setModal(true);
+ workDialog->setText(tr("Enabling NIC"));
+ workDialog->setTitle(tr("Network Setup"));
+ workDialog->show();
+
+ // Create our process now and start it
+ enableNICproc = new QProcess(this);
+ QString program = "/usr/local/pcbsd/scripts/PCBSD.SetNic.sh";
+ QStringList arguments;
+ arguments << NIC << IP << NM << Gate;
+ connect( enableNICproc, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(nicFinishedSlot(int, QProcess::ExitStatus) ) );
+ enableNICproc->start(program, arguments);
+
+}
+
+
+// Get the results from our NIC enable process
+void PCInstall::nicFinishedSlot(int exitCode, QProcess::ExitStatus exitStatus)
+{
+ if ( exitCode != 0 )
+ {
+ QMessageBox::warning( this, tr("Network Setup"), tr("Failed to setup a network connection!") );
+ radioCDInstall->setChecked(true);
+ workDialog->doClose();
+ } else {
+ // Close the working dialog
+ workDialog->doClose();
+
+ // Now bring up the dialog which asks for the source media of this install
+ selectNetDialog = new dialogSelectNetServer();
+ selectNetDialog->setModal(true);
+ selectNetDialog->programInit();
+ connect( selectNetDialog, SIGNAL(saved(bool, QString)), this, SLOT(netDialogSlot(bool, QString) ) );
+ selectNetDialog->show();
+ }
+
+}
+
+void PCInstall::netDialogSlot(bool internet, QString ServerURL)
+{
+ QString tmp;
+
+ networkInstall = true;
+ networkServerURL = ServerURL;
+ usingInternetInstall = internet;
+
+ if ( networkServerURL.lastIndexOf("/") != networkServerURL.size() )
+ {
+ networkServerURL = networkServerURL + "/";
+ }
+
+ // Save our tmp file with the URL of the images we want to use
+ QFile file2( "/tmp/networkURL" );
+ if ( file2.open( IO_WriteOnly ) ) {
+ QTextStream stream2( &file2 );
+ stream2 << networkServerURL;
+ file2.close();
+ }
+
+ // Now move us to the next wizard page, the network setup is complete.
+ // If the user wanted to upgrade, jump to that screen
+ if ( ! radioFreshInstall->isChecked() )
+ {
+ showPage(page(6));
+ return;
+ } else {
+ showPage(page(3));
+ return;
+ }
+
+
+
+}
+
Modified: pcbsd/trunk/PCInstall/pcinstall.h
===================================================================
--- pcbsd/trunk/PCInstall/pcinstall.h 2008-07-28 20:29:23 UTC (rev 2463)
+++ pcbsd/trunk/PCInstall/pcinstall.h 2008-07-28 21:09:17 UTC (rev 2464)
@@ -9,9 +9,13 @@
#include <qmessagebox.h>
#include <qtimer.h>
#include <qfiledialog.h>
+#include <kio/jobclasses.h>
#include "ui_pcinstall.h"
#include "dialogkeyboard.h"
#include "addpartitiondialog.h"
+#include "editnetworkdialog.h"
+#include "workingdialog.h"
+#include "selectnetserver.h"
class PCInstall : public Q3Wizard, private Ui::PCInstall
{
@@ -40,6 +44,8 @@
private slots:
+ void nicSavedSlot(QString NIC, QString IP, QString NM, QString Gate);
+ void nicFinishedSlot(int exitCode, QProcess::ExitStatus exitStatus);
void addUserButton();
void removeUserButton();
void refreshUsers();
@@ -96,9 +102,9 @@
void slotStartMountCD3();
void slotFinishedMountCD3();
void slotFinishedInstallCD3();
+ void netDialogSlot(bool internet, QString ServerURL);
-
private:
QColor colourWhite;
QColor colourRed;
@@ -153,21 +159,33 @@
QString ComponentDir[100];
QString ComponentName[100];
QString ComponentDescr[100];
+ unsigned long speed;
+ KIO::filesize_t totalSize;
+ KIO::filesize_t processedSize;
int ComponentSelected[100];
int usingDVDmedia;
+ bool networkInstall;
+ bool usingInternetInstall;
+ QString networkServerURL;
Q3Process *InstallComponentsProc;
int installComponents;
int regenCustomSlices;
dialogKeyboard *keyboardDialog;
+ EditNetworkDialog *networkDialog;
+ WorkingDialog *workDialog;
+ dialogSelectNetServer *selectNetDialog;
Q3Process *installCD2proc;
Q3Process *findCD3proc;
+ QProcess *enableNICproc;
+ QProcess *mountNetISOproc;
+ KIO::FileCopyJob *copyJob;
+ QString Sanitize_Bios_Geom( QString cyl, QString head, QString sec, QString block );
+ QString BlocksToMB( QString Blocks );
void loadLangs();
void loadTZone();
void runFindDisk();
void startFreshInstall();
- QString Sanitize_Bios_Geom( QString cyl, QString head, QString sec, QString block );
void populateSlices();
- QString BlocksToMB( QString Blocks );
void setupInitialSlices();
void detectRAIDMirror();
void loadComponents();
Modified: pcbsd/trunk/PCInstall/pcinstall.ui
===================================================================
--- pcbsd/trunk/PCInstall/pcinstall.ui 2008-07-28 20:29:23 UTC (rev 2463)
+++ pcbsd/trunk/PCInstall/pcinstall.ui 2008-07-28 21:09:17 UTC (rev 2464)
@@ -1276,14 +1276,6 @@
</widget>
</widget>
<widget class="QWidget" name="WizardPage" >
- <property name="geometry" >
- <rect>
- <x>6</x>
- <y>36</y>
- <width>988</width>
- <height>647</height>
- </rect>
- </property>
<attribute name="title" >
<string>Install or Update</string>
</attribute>
@@ -1908,7 +1900,7 @@
</rect>
</property>
<property name="text" >
- <string>Install from CD/DVD</string>
+ <string>Install from CD/DVD/USB</string>
</property>
<property name="checked" >
<bool>true</bool>
@@ -1916,7 +1908,7 @@
</widget>
<widget class="QRadioButton" name="radioNetworkInstall" >
<property name="enabled" >
- <bool>false</bool>
+ <bool>true</bool>
</property>
<property name="geometry" >
<rect>
@@ -6492,6 +6484,14 @@
</widget>
</widget>
<widget class="QWidget" name="WizardPage" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>100</width>
+ <height>30</height>
+ </rect>
+ </property>
<attribute name="title" >
<string>Upgrading PC-BSD</string>
</attribute>
More information about the Commits
mailing list