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

svn at pcbsd.org svn at pcbsd.org
Wed Nov 25 06:31:26 PST 2009


Author: kris
Date: 2009-11-25 06:31:26 -0800 (Wed, 25 Nov 2009)
New Revision: 5141

Added:
   pcbsd/trunk/SysInstaller/sys-userwidget.cpp
Modified:
   pcbsd/trunk/SysInstaller/SysInstaller.pro
   pcbsd/trunk/SysInstaller/sys-diskwidget.cpp
   pcbsd/trunk/SysInstaller/sysinstaller.cpp
   pcbsd/trunk/SysInstaller/sysinstaller.h
Log:

Started adding user management functions / new .cpp file to keep them in



Modified: pcbsd/trunk/SysInstaller/SysInstaller.pro
===================================================================
--- pcbsd/trunk/SysInstaller/SysInstaller.pro	2009-11-24 20:41:31 UTC (rev 5140)
+++ pcbsd/trunk/SysInstaller/SysInstaller.pro	2009-11-25 14:31:26 UTC (rev 5141)
@@ -9,6 +9,7 @@
 SOURCES += main.cpp \
     sysinstaller.cpp \
     sys-diskwidget.cpp \
+    sys-userwidget.cpp \
     dialogFileSystem.cpp \
     backend.cpp
 HEADERS += sysinstaller.h \

Modified: pcbsd/trunk/SysInstaller/sys-diskwidget.cpp
===================================================================
--- pcbsd/trunk/SysInstaller/sys-diskwidget.cpp	2009-11-24 20:41:31 UTC (rev 5140)
+++ pcbsd/trunk/SysInstaller/sys-diskwidget.cpp	2009-11-25 14:31:26 UTC (rev 5141)
@@ -1,5 +1,22 @@
 #include "sysinstaller.h"
 
+
+// Connect all the disk-related slots
+void SysInstaller::connectDiskSlots()
+{
+  connect(comboDiskList,SIGNAL(currentIndexChanged(int)), this, SLOT(slotChangedDisk()));
+  connect(checkUseEntireDisk,SIGNAL(clicked()), this, SLOT(slotUseEntireDiskClicked()));
+  connect(radioCustomDisk,SIGNAL(toggled(bool)), this, SLOT(slotChangeRadioCustomDisk()));
+  connect(radioAutoPartition,SIGNAL(toggled(bool)), this, SLOT(slotChangeRadioCustomDisk()));
+  connect(pushAutoMount,SIGNAL(clicked()), this, SLOT(slotPushAutoMountClicked()));
+  connect(pushAddMount,SIGNAL(clicked()), this, SLOT(slotAddNewFileSystem()));
+  connect(pushEditMount,SIGNAL(clicked()), this, SLOT(slotEditFileSystem()));
+  connect(pushRemoveMount,SIGNAL(clicked()), this, SLOT(slotRemoveFileSystem()));
+
+  // Hide the ID part of our custom treeWidget
+  treeWidgetCustomPartition->setColumnHidden(0, true);
+}
+
 // Slot which switches between basic / advanced disk setup
 void SysInstaller::slotChangeRadioCustomDisk()
 {

Modified: pcbsd/trunk/SysInstaller/sysinstaller.cpp
===================================================================
--- pcbsd/trunk/SysInstaller/sysinstaller.cpp	2009-11-24 20:41:31 UTC (rev 5140)
+++ pcbsd/trunk/SysInstaller/sysinstaller.cpp	2009-11-25 14:31:26 UTC (rev 5141)
@@ -123,19 +123,14 @@
     connect(radioDVDUSBInstall,SIGNAL(toggled(bool)), this, SLOT(slotChangedInstallSource()));
     connect(radioNetworkInstall,SIGNAL(toggled(bool)), this, SLOT(slotChangedInstallSource()));
     connect(comboSelectNic,SIGNAL(currentIndexChanged(int)), this, SLOT(slotChangedNic()));
-    connect(comboDiskList,SIGNAL(currentIndexChanged(int)), this, SLOT(slotChangedDisk()));
-    connect(checkUseEntireDisk,SIGNAL(clicked()), this, SLOT(slotUseEntireDiskClicked()));
-    connect(radioCustomDisk,SIGNAL(toggled(bool)), this, SLOT(slotChangeRadioCustomDisk()));
-    connect(radioAutoPartition,SIGNAL(toggled(bool)), this, SLOT(slotChangeRadioCustomDisk()));
-    connect(pushAutoMount,SIGNAL(clicked()), this, SLOT(slotPushAutoMountClicked()));
-    connect(pushAddMount,SIGNAL(clicked()), this, SLOT(slotAddNewFileSystem()));
-    connect(pushEditMount,SIGNAL(clicked()), this, SLOT(slotEditFileSystem()));
-    connect(pushRemoveMount,SIGNAL(clicked()), this, SLOT(slotRemoveFileSystem()));
 
+    // Connect the disk slots
+    connectDiskSlots();
 
-    // Hide the ID part of our custom treeWidget
-    treeWidgetCustomPartition->setColumnHidden(0, true);
+    // Connect our user management slots
+    connectUserSlots();
 
+    // Set the default keyboard stuff
     setKbDefaults();
 
     // Hide the network options until the user selects it

Modified: pcbsd/trunk/SysInstaller/sysinstaller.h
===================================================================
--- pcbsd/trunk/SysInstaller/sysinstaller.h	2009-11-24 20:41:31 UTC (rev 5140)
+++ pcbsd/trunk/SysInstaller/sysinstaller.h	2009-11-25 14:31:26 UTC (rev 5141)
@@ -81,6 +81,16 @@
     void slotRemoveFileSystem();
     void slotUpdateFileSystemLayout(QList<QStringList> newFileSystemLayout);
 
+    // User Management Slots
+    void slotPasswordTextChanged();
+    void slotRootPasswordLineEditLostFocus();
+    void slotCheckUserLinesChanged(const QString & );
+    void slotUserPasswordLineEditLostFocus();
+    void slotListWidgetUsersChanged();
+    void slotAddUserButton();
+    void slotRemoveUserButton();
+    void slotApplyUserButton();
+
 private:
     void initSteps();
     void initAnteInstall();
@@ -93,6 +103,9 @@
     void setKbVariants(const QString &);
     void setKbDefaults();
     bool autoGenPartitionLayout(QString target, bool isDisk);
+    void connectDiskSlots(); // Function to connect disk-related slots
+    
+    void connectUserSlots(); // Function to connect user slots
 
     void proceed(bool);
     bool isInstalled();



More information about the Commits mailing list