[PC-BSD Commits] r5162 - pcbsd/trunk/SysInstaller

[svn at pcbsd.org]

Author: kris
Date: 2009-11-30 06:28:52 -0800 (Mon, 30 Nov 2009)
New Revision: 5162

Added:
   pcbsd/trunk/SysInstaller/selectnetserver.cpp
   pcbsd/trunk/SysInstaller/selectnetserver.h
   pcbsd/trunk/SysInstaller/selectnetserver.ui
Modified:
   pcbsd/trunk/SysInstaller/SysInstaller.pro
   pcbsd/trunk/SysInstaller/backend.cpp
   pcbsd/trunk/SysInstaller/backend.h
   pcbsd/trunk/SysInstaller/sysinstaller.ui
Log:

Started adding UI and backend guts for our mirror / network install dialog



Modified: pcbsd/trunk/SysInstaller/SysInstaller.pro
===================================================================
--- pcbsd/trunk/SysInstaller/SysInstaller.pro	2009-11-30 14:22:23 UTC (rev 5161)
+++ pcbsd/trunk/SysInstaller/SysInstaller.pro	2009-11-30 14:28:52 UTC (rev 5162)
@@ -7,6 +7,7 @@
 TARGET = SysInstaller
 TEMPLATE = app
 SOURCES += main.cpp \
+    selectnetserver.cpp \
     sysinstaller.cpp \
     sys-componentwidget.cpp \
     sys-diskwidget.cpp \
@@ -16,6 +17,7 @@
     backend.cpp
 HEADERS += sysinstaller.h \
     dialogFileSystem.h \
+    selectnetserver.h \
     backend.h
 TRANSLATIONS =  i18n/SysInstaller_af.ts \
 		i18n/SysInstaller_ar.ts \
@@ -85,5 +87,5 @@
 
 INSTALLS += dotrans
 
-FORMS += sysinstaller.ui dialogFileSystem.ui
+FORMS += sysinstaller.ui dialogFileSystem.ui selectnetserver.ui
 RESOURCES += sysinstaller.qrc

Modified: pcbsd/trunk/SysInstaller/backend.cpp
===================================================================
--- pcbsd/trunk/SysInstaller/backend.cpp	2009-11-30 14:22:23 UTC (rev 5161)
+++ pcbsd/trunk/SysInstaller/backend.cpp	2009-11-30 14:28:52 UTC (rev 5162)
@@ -2,6 +2,20 @@
 
 using namespace Scripts;
 
+void Backend::enableNic(QString Nic, QString IP, QString NetMask, QString DNS, QString Gate, bool fetchMirrors)
+{
+    QString line;
+    QString Mirrors;
+    if ( fetchMirrors )
+      Mirrors = "ON";
+    else
+      Mirrors = "OFF";
+
+    Process p(QStringList() << "enable-net" << IP << NetMask << DNS << Gate << Mirrors);
+    if (p.waitForFinished()) {
+    }
+}
+
 QStringList Backend::timezones()
 {
     QStringList _zones;

Modified: pcbsd/trunk/SysInstaller/backend.h
===================================================================
--- pcbsd/trunk/SysInstaller/backend.h	2009-11-30 14:22:23 UTC (rev 5161)
+++ pcbsd/trunk/SysInstaller/backend.h	2009-11-30 14:28:52 UTC (rev 5162)
@@ -37,6 +37,7 @@
 
 class Backend {
 public:
+    static void enableNic(QString Nic, QString IP, QString NetMask, QString DNS, QString Gate, bool fetchMirrors);
     static QStringList languages();
     static QStringList keyLayouts();
     static QStringList keyModels();

Modified: pcbsd/trunk/SysInstaller/sysinstaller.ui
===================================================================
--- pcbsd/trunk/SysInstaller/sysinstaller.ui	2009-11-30 14:22:23 UTC (rev 5161)
+++ pcbsd/trunk/SysInstaller/sysinstaller.ui	2009-11-30 14:28:52 UTC (rev 5162)
@@ -300,7 +300,7 @@
              <item>
               <widget class="QStackedWidget" name="anteInstallStack">
                <property name="currentIndex">
-                <number>1</number>
+                <number>2</number>
                </property>
                <widget class="QWidget" name="aiStep0">
                 <layout class="QGridLayout" name="gridLayout_10">
@@ -1280,13 +1280,7 @@
                              <widget class="QLineEdit" name="lineDefaultRouter"/>
                             </item>
                             <item row="0" column="1" colspan="2">
-                             <widget class="QComboBox" name="comboSelectNic">
-                              <item>
-                               <property name="text">
-                                <string>AUTO-DHCP</string>
-                               </property>
-                              </item>
-                             </widget>
+                             <widget class="QComboBox" name="comboSelectNic"/>
                             </item>
                            </layout>
                           </widget>