[PC-BSD Commits] r6951 - in pcbsd: current/kcmPBSystem stable/kcmPBSystem
svn at pcbsd.org
svn at pcbsd.org
Mon Jun 14 09:32:47 PDT 2010
Author: kris
Date: 2010-06-14 09:32:47 -0700 (Mon, 14 Jun 2010)
New Revision: 6951
Modified:
pcbsd/current/kcmPBSystem/pbsystemtab.cpp
pcbsd/current/kcmPBSystem/pbsystemtab.h
pcbsd/current/kcmPBSystem/pbsystemtab.ui
pcbsd/stable/kcmPBSystem/pbsystemtab.cpp
pcbsd/stable/kcmPBSystem/pbsystemtab.h
pcbsd/stable/kcmPBSystem/pbsystemtab.ui
Log:
Cleanup System Tool a bit, don't need the kernel selection comboBox anymore, never been used and can cause issues if used incorrectly.
Modified: pcbsd/current/kcmPBSystem/pbsystemtab.cpp
===================================================================
--- pcbsd/current/kcmPBSystem/pbsystemtab.cpp 2010-06-14 09:03:43 UTC (rev 6950)
+++ pcbsd/current/kcmPBSystem/pbsystemtab.cpp 2010-06-14 16:32:47 UTC (rev 6951)
@@ -37,10 +37,9 @@
//Get & Set RAM
labelMemory->setText(Utils::bytesToHumanReadable(Utils::sysctlAsInt("hw.realmem")));
- // Load the available kernels into the list
- CheckKernels();
// Read any kernel settings
LoadKernSettings();
+
// Read any rc.conf settings
//loadServSettings();
//Load boot screen data
@@ -48,7 +47,6 @@
// Connect our various buttons
connect( buttonGenerate, SIGNAL(clicked()), this, SLOT(startGenerateSheet()) );
- connect(comboKernel, SIGNAL(activated(int)), this, SIGNAL(changed()));
connect(checkKernATAPI, SIGNAL(clicked()), this, SIGNAL(changed()));
connect(checkKernDelay, SIGNAL(valueChanged(int)), this, SIGNAL(changed()));
connect(showBootCheck, SIGNAL(clicked()), this, SIGNAL(changed()));
@@ -158,70 +156,6 @@
}
-void PBSystemTab::CheckKernels()
-{
- KernDefaultTag="";
-
- QSettings settings;
- QString value;
- bool check = TRUE;
-
- value = settings.readEntry("/PC-BSD/Kernel", value, &check);
-
- if ( check )
- {
- KernDefaultTag=value;
- }
-
-
-
- int i = -1;
-
- QFile file( "/PCBSD/kernels/kern.ini" );
- if ( file.open( IO_ReadOnly ) ) {
- QTextStream stream( &file );
- stream.setCodec("UTF-8");
- QString line;
-
- while ( !stream.atEnd() ) {
- line = stream.readLine(); // line of text excluding '\n'
- if (line.find("#" ) != 0)
- {
- if (line.find("[ Kernel ]" ) == 0 )
- {
- i++;
- }
- if ( line.find("FileName:") == 0)
- {
- KernFileName[i] = line.replace("FileName: ", "");
- }
- if ( line.find("Descr:") == 0)
- {
- KernDescr[i] = line.replace("Descr: ", "");
- }
- if ( line.find("Tag:") == 0)
- {
- KernTag[i] = line.replace("Tag: ", "");
- comboKernel->insertItem( KernTag[i] + " (" + KernDescr[i] + ")" );
-
- if ( KernTag[i] == KernDefaultTag )
- {
- comboKernel->setCurrentItem(i);
- }
-
-
- }
-
-
- }
-
- }
- file.close();
- }
-
-}
-
-
void PBSystemTab::saveKernScreen()
{
// Change Settings here
@@ -241,17 +175,8 @@
else { saveValue("/boot/loader.conf", "beastie_disable=", "beastie_disable=\"NO\""); }
saveValue("/boot/loader.conf", "autoboot_delay=", "autoboot_delay=\"" + QString::number(autobootDelay) + "\"");
- // Check if the Kernel needs to be changed
- if ( KernDefaultTag != KernTag[comboKernel->currentItem()] )
- {
- comboKernel->setEnabled(FALSE);
- InstallNewKernel();
- } else {
-
showRebootRequired();
- }
-
}
@@ -265,35 +190,6 @@
}
-void PBSystemTab::InstallNewKernel()
-{
- InstallKernel = new Q3Process( this );
- InstallKernel->addArgument( "/PCBSD/Scripts/System/InstallKernel.sh");
- InstallKernel->addArgument( "/PCBSD/kernels/" + KernFileName[comboKernel->currentItem()] );
- connect( InstallKernel, SIGNAL(processExited()), this, SLOT(finishedKernInstall()) );
-
- if ( !InstallKernel->start() ) {
-
- }
-}
-
-
-void PBSystemTab::finishedKernInstall()
-{
-
- // Save kernel as new default
- KernDefaultTag = KernTag[comboKernel->currentItem()];
-
-
- QSettings settings;
- bool check = TRUE;
-
- check = settings.writeEntry("/PC-BSD/Kernel", KernDefaultTag );
-
- showRebootRequired();
- comboKernel->setEnabled(TRUE);
-}
-
// Read the loader.conf, and load any settings we need
void PBSystemTab::LoadKernSettings()
{
Modified: pcbsd/current/kcmPBSystem/pbsystemtab.h
===================================================================
--- pcbsd/current/kcmPBSystem/pbsystemtab.h 2010-06-14 09:03:43 UTC (rev 6950)
+++ pcbsd/current/kcmPBSystem/pbsystemtab.h 2010-06-14 16:32:47 UTC (rev 6951)
@@ -33,7 +33,6 @@
void ReadUname();
void startGenerateSheet();
void finishedSheet();
- void finishedKernInstall();
void fetchSourcePressed();
void fetchPortsPressed();
void fetchPortsConsolePressed();
@@ -43,7 +42,6 @@
private:
CVSUpProgress *cvsUpUi;
- Q3Process *InstallKernel;
QString KernDescr[50];
QString KernDefaultTag;
QString KernTag[50];
@@ -60,9 +58,7 @@
void CheckUname();
void CheckPBVer();
void CreateSheetFile();
- void CheckKernels();
void showRebootRequired();
- void InstallNewKernel();
void LoadKernSettings();
QString getValue( QString File, QString Key );
Modified: pcbsd/current/kcmPBSystem/pbsystemtab.ui
===================================================================
--- pcbsd/current/kcmPBSystem/pbsystemtab.ui 2010-06-14 09:03:43 UTC (rev 6950)
+++ pcbsd/current/kcmPBSystem/pbsystemtab.ui 2010-06-14 16:32:47 UTC (rev 6951)
@@ -421,142 +421,64 @@
<attribute name="title">
<string>Kernel</string>
</attribute>
- <layout class="QGridLayout">
- <item row="0" column="0" colspan="4">
- <widget class="QLabel" name="textLabel5">
- <property name="text">
- <string>Selected PC-BSD Kernel</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- <property name="wordWrap">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="3" column="0" rowspan="2" colspan="4">
- <widget class="Line" name="line3">
- <property name="frameShape">
- <enum>QFrame::HLine</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Sunken</enum>
- </property>
- </widget>
- </item>
- <item row="2" column="0" colspan="4">
- <widget class="QLabel" name="textLabel6">
- <property name="text">
- <string><font size="-1"><font color="#ff0000">Warning!!! Changing the booted kernel can be dangerous. Use at your own risk!</font></font></string>
- </property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="1" column="0" colspan="4">
- <widget class="QComboBox" name="comboKernel"/>
- </item>
- <item row="5" column="0" colspan="2">
- <spacer name="spacer15">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>50</width>
- <height>21</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="4" column="2" rowspan="2">
- <widget class="QLabel" name="textLabel7">
- <property name="text">
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
<string>Kernel Options</string>
</property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- <property name="wordWrap">
- <bool>false</bool>
- </property>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="0" colspan="2">
+ <widget class="QCheckBox" name="checkKernATAPI">
+ <property name="text">
+ <string>Enable ATAPI DMA Mode</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QSpinBox" name="checkKernDelay">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="specialValueText">
+ <string>Off</string>
+ </property>
+ <property name="minimum">
+ <number>0</number>
+ </property>
+ <property name="maximum">
+ <number>60</number>
+ </property>
+ <property name="value">
+ <number>2</number>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLabel" name="checkKernDelayLbl">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="text">
+ <string>Boot delay (seconds)</string>
+ </property>
+ <property name="wordWrap">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
- <item row="5" column="3">
- <spacer name="spacer14">
+ <item row="1" column="0">
+ <spacer name="verticalSpacer">
<property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>51</width>
- <height>21</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="7" column="0" colspan="4">
- <widget class="QCheckBox" name="checkKernATAPI">
- <property name="text">
- <string>Enable ATAPI DMA Mode</string>
- </property>
- </widget>
- </item>
- <item row="8" column="1" colspan="3">
- <widget class="QLabel" name="checkKernDelayLbl">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="text">
- <string>Boot delay (seconds)</string>
- </property>
- <property name="wordWrap">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="8" column="0">
- <widget class="QSpinBox" name="checkKernDelay">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="specialValueText">
- <string>Off</string>
- </property>
- <property name="minimum">
- <number>0</number>
- </property>
- <property name="maximum">
- <number>60</number>
- </property>
- <property name="value">
- <number>2</number>
- </property>
- </widget>
- </item>
- <item row="12" column="2">
- <spacer name="spacer25">
- <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
<property name="sizeHint" stdset="0">
<size>
- <width>21</width>
- <height>31</height>
+ <width>20</width>
+ <height>290</height>
</size>
</property>
</spacer>
@@ -760,7 +682,6 @@
<tabstop>tabWidget</tabstop>
<tabstop>buttonGenerate</tabstop>
<tabstop>buttonOk</tabstop>
- <tabstop>comboKernel</tabstop>
<tabstop>checkKernATAPI</tabstop>
<tabstop>checkKernDelay</tabstop>
<tabstop>fetchSourceBut</tabstop>
Modified: pcbsd/stable/kcmPBSystem/pbsystemtab.cpp
===================================================================
--- pcbsd/stable/kcmPBSystem/pbsystemtab.cpp 2010-06-14 09:03:43 UTC (rev 6950)
+++ pcbsd/stable/kcmPBSystem/pbsystemtab.cpp 2010-06-14 16:32:47 UTC (rev 6951)
@@ -37,10 +37,9 @@
//Get & Set RAM
labelMemory->setText(Utils::bytesToHumanReadable(Utils::sysctlAsInt("hw.realmem")));
- // Load the available kernels into the list
- CheckKernels();
// Read any kernel settings
LoadKernSettings();
+
// Read any rc.conf settings
//loadServSettings();
//Load boot screen data
@@ -48,7 +47,6 @@
// Connect our various buttons
connect( buttonGenerate, SIGNAL(clicked()), this, SLOT(startGenerateSheet()) );
- connect(comboKernel, SIGNAL(activated(int)), this, SIGNAL(changed()));
connect(checkKernATAPI, SIGNAL(clicked()), this, SIGNAL(changed()));
connect(checkKernDelay, SIGNAL(valueChanged(int)), this, SIGNAL(changed()));
connect(showBootCheck, SIGNAL(clicked()), this, SIGNAL(changed()));
@@ -158,70 +156,6 @@
}
-void PBSystemTab::CheckKernels()
-{
- KernDefaultTag="";
-
- QSettings settings;
- QString value;
- bool check = TRUE;
-
- value = settings.readEntry("/PC-BSD/Kernel", value, &check);
-
- if ( check )
- {
- KernDefaultTag=value;
- }
-
-
-
- int i = -1;
-
- QFile file( "/PCBSD/kernels/kern.ini" );
- if ( file.open( IO_ReadOnly ) ) {
- QTextStream stream( &file );
- stream.setCodec("UTF-8");
- QString line;
-
- while ( !stream.atEnd() ) {
- line = stream.readLine(); // line of text excluding '\n'
- if (line.find("#" ) != 0)
- {
- if (line.find("[ Kernel ]" ) == 0 )
- {
- i++;
- }
- if ( line.find("FileName:") == 0)
- {
- KernFileName[i] = line.replace("FileName: ", "");
- }
- if ( line.find("Descr:") == 0)
- {
- KernDescr[i] = line.replace("Descr: ", "");
- }
- if ( line.find("Tag:") == 0)
- {
- KernTag[i] = line.replace("Tag: ", "");
- comboKernel->insertItem( KernTag[i] + " (" + KernDescr[i] + ")" );
-
- if ( KernTag[i] == KernDefaultTag )
- {
- comboKernel->setCurrentItem(i);
- }
-
-
- }
-
-
- }
-
- }
- file.close();
- }
-
-}
-
-
void PBSystemTab::saveKernScreen()
{
// Change Settings here
@@ -241,17 +175,8 @@
else { saveValue("/boot/loader.conf", "beastie_disable=", "beastie_disable=\"NO\""); }
saveValue("/boot/loader.conf", "autoboot_delay=", "autoboot_delay=\"" + QString::number(autobootDelay) + "\"");
- // Check if the Kernel needs to be changed
- if ( KernDefaultTag != KernTag[comboKernel->currentItem()] )
- {
- comboKernel->setEnabled(FALSE);
- InstallNewKernel();
- } else {
-
showRebootRequired();
- }
-
}
@@ -265,35 +190,6 @@
}
-void PBSystemTab::InstallNewKernel()
-{
- InstallKernel = new Q3Process( this );
- InstallKernel->addArgument( "/PCBSD/Scripts/System/InstallKernel.sh");
- InstallKernel->addArgument( "/PCBSD/kernels/" + KernFileName[comboKernel->currentItem()] );
- connect( InstallKernel, SIGNAL(processExited()), this, SLOT(finishedKernInstall()) );
-
- if ( !InstallKernel->start() ) {
-
- }
-}
-
-
-void PBSystemTab::finishedKernInstall()
-{
-
- // Save kernel as new default
- KernDefaultTag = KernTag[comboKernel->currentItem()];
-
-
- QSettings settings;
- bool check = TRUE;
-
- check = settings.writeEntry("/PC-BSD/Kernel", KernDefaultTag );
-
- showRebootRequired();
- comboKernel->setEnabled(TRUE);
-}
-
// Read the loader.conf, and load any settings we need
void PBSystemTab::LoadKernSettings()
{
Modified: pcbsd/stable/kcmPBSystem/pbsystemtab.h
===================================================================
--- pcbsd/stable/kcmPBSystem/pbsystemtab.h 2010-06-14 09:03:43 UTC (rev 6950)
+++ pcbsd/stable/kcmPBSystem/pbsystemtab.h 2010-06-14 16:32:47 UTC (rev 6951)
@@ -33,7 +33,6 @@
void ReadUname();
void startGenerateSheet();
void finishedSheet();
- void finishedKernInstall();
void fetchSourcePressed();
void fetchPortsPressed();
void fetchPortsConsolePressed();
@@ -43,7 +42,6 @@
private:
CVSUpProgress *cvsUpUi;
- Q3Process *InstallKernel;
QString KernDescr[50];
QString KernDefaultTag;
QString KernTag[50];
@@ -60,9 +58,7 @@
void CheckUname();
void CheckPBVer();
void CreateSheetFile();
- void CheckKernels();
void showRebootRequired();
- void InstallNewKernel();
void LoadKernSettings();
QString getValue( QString File, QString Key );
Modified: pcbsd/stable/kcmPBSystem/pbsystemtab.ui
===================================================================
--- pcbsd/stable/kcmPBSystem/pbsystemtab.ui 2010-06-14 09:03:43 UTC (rev 6950)
+++ pcbsd/stable/kcmPBSystem/pbsystemtab.ui 2010-06-14 16:32:47 UTC (rev 6951)
@@ -421,142 +421,64 @@
<attribute name="title">
<string>Kernel</string>
</attribute>
- <layout class="QGridLayout">
- <item row="0" column="0" colspan="4">
- <widget class="QLabel" name="textLabel5">
- <property name="text">
- <string>Selected PC-BSD Kernel</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- <property name="wordWrap">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="3" column="0" rowspan="2" colspan="4">
- <widget class="Line" name="line3">
- <property name="frameShape">
- <enum>QFrame::HLine</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Sunken</enum>
- </property>
- </widget>
- </item>
- <item row="2" column="0" colspan="4">
- <widget class="QLabel" name="textLabel6">
- <property name="text">
- <string><font size="-1"><font color="#ff0000">Warning!!! Changing the booted kernel can be dangerous. Use at your own risk!</font></font></string>
- </property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="1" column="0" colspan="4">
- <widget class="QComboBox" name="comboKernel"/>
- </item>
- <item row="5" column="0" colspan="2">
- <spacer name="spacer15">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>50</width>
- <height>21</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="4" column="2" rowspan="2">
- <widget class="QLabel" name="textLabel7">
- <property name="text">
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="0" column="0">
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
<string>Kernel Options</string>
</property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- <property name="wordWrap">
- <bool>false</bool>
- </property>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="0" colspan="2">
+ <widget class="QCheckBox" name="checkKernATAPI">
+ <property name="text">
+ <string>Enable ATAPI DMA Mode</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QSpinBox" name="checkKernDelay">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="specialValueText">
+ <string>Off</string>
+ </property>
+ <property name="minimum">
+ <number>0</number>
+ </property>
+ <property name="maximum">
+ <number>60</number>
+ </property>
+ <property name="value">
+ <number>2</number>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLabel" name="checkKernDelayLbl">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="text">
+ <string>Boot delay (seconds)</string>
+ </property>
+ <property name="wordWrap">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
- <item row="5" column="3">
- <spacer name="spacer14">
+ <item row="1" column="0">
+ <spacer name="verticalSpacer">
<property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>51</width>
- <height>21</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="7" column="0" colspan="4">
- <widget class="QCheckBox" name="checkKernATAPI">
- <property name="text">
- <string>Enable ATAPI DMA Mode</string>
- </property>
- </widget>
- </item>
- <item row="8" column="1" colspan="3">
- <widget class="QLabel" name="checkKernDelayLbl">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="text">
- <string>Boot delay (seconds)</string>
- </property>
- <property name="wordWrap">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="8" column="0">
- <widget class="QSpinBox" name="checkKernDelay">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="specialValueText">
- <string>Off</string>
- </property>
- <property name="minimum">
- <number>0</number>
- </property>
- <property name="maximum">
- <number>60</number>
- </property>
- <property name="value">
- <number>2</number>
- </property>
- </widget>
- </item>
- <item row="12" column="2">
- <spacer name="spacer25">
- <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
<property name="sizeHint" stdset="0">
<size>
- <width>21</width>
- <height>31</height>
+ <width>20</width>
+ <height>290</height>
</size>
</property>
</spacer>
@@ -760,7 +682,6 @@
<tabstop>tabWidget</tabstop>
<tabstop>buttonGenerate</tabstop>
<tabstop>buttonOk</tabstop>
- <tabstop>comboKernel</tabstop>
<tabstop>checkKernATAPI</tabstop>
<tabstop>checkKernDelay</tabstop>
<tabstop>fetchSourceBut</tabstop>
More information about the Commits
mailing list