[PC-BSD Commits] r7448 - pcbsd/current/SysInstaller
svn at pcbsd.org
svn at pcbsd.org
Thu Aug 26 13:08:54 PDT 2010
Author: kris
Date: 2010-08-26 13:08:54 -0700 (Thu, 26 Aug 2010)
New Revision: 7448
Added:
pcbsd/current/SysInstaller/sys-pkgmgmt.cpp
Modified:
pcbsd/current/SysInstaller/SysInstaller.pro
pcbsd/current/SysInstaller/backend.cpp
pcbsd/current/SysInstaller/sysinstaller.cpp
pcbsd/current/SysInstaller/sysinstaller.h
pcbsd/current/SysInstaller/sysinstaller.ui
Log:
Added all the UI functionality for selecting various desktop packages we want to install
Modified: pcbsd/current/SysInstaller/SysInstaller.pro
===================================================================
--- pcbsd/current/SysInstaller/SysInstaller.pro 2010-08-26 19:44:34 UTC (rev 7447)
+++ pcbsd/current/SysInstaller/SysInstaller.pro 2010-08-26 20:08:54 UTC (rev 7448)
@@ -12,6 +12,7 @@
sys-diskwidget.cpp \
sys-installwidget.cpp \
sys-keyboardwidget.cpp \
+ sys-pkgmgmt.cpp \
sys-userwidget.cpp \
dialogFileSystem.cpp \
dialogSelectNet.cpp \
Modified: pcbsd/current/SysInstaller/backend.cpp
===================================================================
--- pcbsd/current/SysInstaller/backend.cpp 2010-08-26 19:44:34 UTC (rev 7447)
+++ pcbsd/current/SysInstaller/backend.cpp 2010-08-26 20:08:54 UTC (rev 7448)
@@ -468,6 +468,7 @@
package << mName << mDesc << mIcon << mParent;
metaPkgs.append(package);
found = true;
+ mName=""; mDesc=""; mIcon=""; mParent="";
}
}
}
Modified: pcbsd/current/SysInstaller/sysinstaller.cpp
===================================================================
--- pcbsd/current/SysInstaller/sysinstaller.cpp 2010-08-26 19:44:34 UTC (rev 7447)
+++ pcbsd/current/SysInstaller/sysinstaller.cpp 2010-08-26 20:08:54 UTC (rev 7448)
@@ -97,7 +97,9 @@
connect(comboLanguage, SIGNAL(currentIndexChanged(QString)), this, SLOT(slotChangeLanguage()));
// Load any package scheme data
- Scripts::Backend::getPackageData(availPackageData);
+ listDeskPkgs = Scripts::Backend::getPackageData(availPackageData);
+ if (availPackageData)
+ initDesktopPkgs();
// Load up the keyboard information
connectKeyboardSlots();
Modified: pcbsd/current/SysInstaller/sysinstaller.h
===================================================================
--- pcbsd/current/SysInstaller/sysinstaller.h 2010-08-26 19:44:34 UTC (rev 7447)
+++ pcbsd/current/SysInstaller/sysinstaller.h 2010-08-26 20:08:54 UTC (rev 7448)
@@ -114,6 +114,9 @@
void slotInstallProcFinished( int exitCode, QProcess::ExitStatus status);
void slotReadInstallerOutput();
+ // Desktop Packages Slot
+ void slotDeskPkgsChanged(QTreeWidgetItem *aItem, int aCol);
+
private:
void initSteps();
void initAnteInstall();
@@ -149,7 +152,6 @@
QStringList getDiskCfgSettings(QStringList &summaryList);
QStringList getComponentCfgSettings(QStringList &summaryList);
QStringList getUsersCfgSettings(QStringList &summaryList);
-
void startConfigGen(); // Function which takes pieces of cfg, and assembles
@@ -157,6 +159,12 @@
bool isInstalled();
bool checkDiskRequirements();
+ void initDesktopPkgs();
+ bool allChildrenPkgsChecked(QString parent);
+ bool allChildrenPkgsUnchecked(QString parent);
+ void checkAllChildrenPkgs(QString parent);
+ void uncheckAllChildrenPkgs(QString parent);
+
QStackedWidget *stackWidget;
dialogFileSystem *dfs;
dialogSelectNetServer *dsn;
@@ -178,6 +186,7 @@
bool installFoundFetchOutput;
QString fetchDownloadFile;
bool availPackageData;
+ QList<QStringList> listDeskPkgs; // QStringList for our available desktop pkgs
};
Modified: pcbsd/current/SysInstaller/sysinstaller.ui
===================================================================
--- pcbsd/current/SysInstaller/sysinstaller.ui 2010-08-26 19:44:34 UTC (rev 7447)
+++ pcbsd/current/SysInstaller/sysinstaller.ui 2010-08-26 20:08:54 UTC (rev 7448)
@@ -8463,6 +8463,12 @@
</item>
<item row="0" column="1">
<widget class="QGroupBox" name="groupBox">
+ <property name="font">
+ <font>
+ <weight>50</weight>
+ <bold>false</bold>
+ </font>
+ </property>
<property name="title">
<string>Administrator Password (root)</string>
</property>
@@ -8674,6 +8680,12 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
+ <property name="font">
+ <font>
+ <weight>50</weight>
+ <bold>false</bold>
+ </font>
+ </property>
<property name="title">
<string>User Accounts</string>
</property>
@@ -8725,53 +8737,64 @@
</widget>
<widget class="QWidget" name="aiStep5">
<layout class="QGridLayout" name="gridLayout_29">
- <item row="0" column="0" rowspan="3">
- <spacer name="horizontalSpacer_25">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>161</width>
- <height>388</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="0" column="1">
+ <item row="0" column="0" colspan="3">
<spacer name="verticalSpacer_10">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Minimum</enum>
+ </property>
<property name="sizeHint" stdset="0">
<size>
- <width>418</width>
- <height>184</height>
+ <width>728</width>
+ <height>25</height>
</size>
</property>
</spacer>
</item>
- <item row="0" column="2" rowspan="2">
- <spacer name="horizontalSpacer_26">
+ <item row="1" column="0">
+ <spacer name="horizontalSpacer_25">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Minimum</enum>
+ </property>
<property name="sizeHint" stdset="0">
<size>
- <width>160</width>
- <height>368</height>
+ <width>50</width>
+ <height>208</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="1">
<widget class="QGroupBox" name="groupBox_7">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
<property name="title">
<string>Desktop Configuration</string>
</property>
<layout class="QGridLayout" name="gridLayout_16">
<item row="0" column="0">
<widget class="QTreeWidget" name="treeWidgetDesktopPackages">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>42</width>
+ <height>42</height>
+ </size>
+ </property>
<column>
<property name="text">
<string>Available Desktops</string>
@@ -8792,15 +8815,34 @@
</layout>
</widget>
</item>
- <item row="2" column="1">
+ <item row="1" column="2">
+ <spacer name="horizontalSpacer_26">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Minimum</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>50</width>
+ <height>248</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="2" column="0" colspan="3">
<spacer name="verticalSpacer_11">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Minimum</enum>
+ </property>
<property name="sizeHint" stdset="0">
<size>
- <width>418</width>
- <height>183</height>
+ <width>708</width>
+ <height>25</height>
</size>
</property>
</spacer>
More information about the Commits
mailing list