[PC-BSD Commits] r7429 - pcbsd/current/SysInstaller

[svn at pcbsd.org]

Author: kris
Date: 2010-08-24 10:16:20 -0700 (Tue, 24 Aug 2010)
New Revision: 7429

Modified:
   pcbsd/current/SysInstaller/backend.cpp
   pcbsd/current/SysInstaller/sysinstaller.ui
Log:

Added treewidget box, and check to backend if we support packages for the installation



Modified: pcbsd/current/SysInstaller/backend.cpp
===================================================================
--- pcbsd/current/SysInstaller/backend.cpp	2010-08-24 16:18:50 UTC (rev 7428)
+++ pcbsd/current/SysInstaller/backend.cpp	2010-08-24 17:16:20 UTC (rev 7429)
@@ -287,13 +287,6 @@
    kbp.waitForFinished();
 }
 
-// Function which checks for our GUI package schema data, and sets found if its located
-QStringList Backend::getPackageData(bool &found)
-{
-  found=false;
-  return QStringList();
-}
-
 QList<QStringList> Backend::availComponents()
 {
    QList<QStringList> components;
@@ -434,3 +427,15 @@
     }
     return drives;
 }
+
+// Function which checks for our GUI package schema data, and sets found if its located
+QStringList Backend::getPackageData(bool &found)
+{
+  QDir pkgDir = QDir("/usr/local/share/pcbsd/base-ports"); 
+  if (! pkgDir.exists() ) {
+    found=false;
+    return QStringList();
+  }
+
+}
+

Modified: pcbsd/current/SysInstaller/sysinstaller.ui
===================================================================
--- pcbsd/current/SysInstaller/sysinstaller.ui	2010-08-24 16:18:50 UTC (rev 7428)
+++ pcbsd/current/SysInstaller/sysinstaller.ui	2010-08-24 17:16:20 UTC (rev 7429)
@@ -996,7 +996,7 @@
                 </palette>
                </property>
                <property name="currentIndex">
-                <number>0</number>
+                <number>5</number>
                </property>
                <widget class="QWidget" name="aiStep0">
                 <property name="palette">
@@ -8724,7 +8724,7 @@
                 </layout>
                </widget>
                <widget class="QWidget" name="aiStep5">
-                <layout class="QGridLayout" name="gridLayout_16">
+                <layout class="QGridLayout" name="gridLayout_29">
                  <item row="0" column="0" rowspan="3">
                   <spacer name="horizontalSpacer_25">
                    <property name="orientation">
@@ -8751,7 +8751,7 @@
                    </property>
                   </spacer>
                  </item>
-                 <item row="0" column="2" rowspan="3">
+                 <item row="0" column="2" rowspan="2">
                   <spacer name="horizontalSpacer_26">
                    <property name="orientation">
                     <enum>Qt::Horizontal</enum>
@@ -8764,6 +8764,34 @@
                    </property>
                   </spacer>
                  </item>
+                 <item row="1" column="1">
+                  <widget class="QGroupBox" name="groupBox_7">
+                   <property name="title">
+                    <string>Desktop Configuration</string>
+                   </property>
+                   <layout class="QGridLayout" name="gridLayout_16">
+                    <item row="0" column="0">
+                     <widget class="QTreeWidget" name="treeWidgetDesktopPackages">
+                      <column>
+                       <property name="text">
+                        <string>Available Desktops</string>
+                       </property>
+                      </column>
+                     </widget>
+                    </item>
+                    <item row="1" column="0">
+                     <widget class="QLabel" name="label_25">
+                      <property name="text">
+                       <string>Please select the desktop software you wish to have installed. At least one desktop must be selected, and changes may be made after installation.</string>
+                      </property>
+                      <property name="wordWrap">
+                       <bool>true</bool>
+                      </property>
+                     </widget>
+                    </item>
+                   </layout>
+                  </widget>
+                 </item>
                  <item row="2" column="1">
                   <spacer name="verticalSpacer_11">
                    <property name="orientation">
@@ -8777,13 +8805,6 @@
                    </property>
                   </spacer>
                  </item>
-                 <item row="1" column="1">
-                  <widget class="QGroupBox" name="groupBox_7">
-                   <property name="title">
-                    <string>Package Set Configuration</string>
-                   </property>
-                  </widget>
-                 </item>
                 </layout>
                </widget>
                <widget class="QWidget" name="aiStep6">