[PC-BSD Commits] r9852 - pcbsd/current/src-qt4/pc-sysmanager
svn at pcbsd.org
svn at pcbsd.org
Thu Mar 31 10:59:55 PDT 2011
Author: kris
Date: 2011-03-31 10:59:55 -0700 (Thu, 31 Mar 2011)
New Revision: 9852
Modified:
pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.cpp
pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.h
pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.ui
Log:
Cleanup the System Manager UI a bit further
Modified: pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.cpp 2011-03-31 17:42:04 UTC (rev 9851)
+++ pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.cpp 2011-03-31 17:59:55 UTC (rev 9852)
@@ -57,9 +57,9 @@
connect(showBootCheck, SIGNAL(clicked()), this, SIGNAL(changed()));
connect(splashSelect, SIGNAL(activated(int)), this, SIGNAL(changed()));
connect(pushRefreshList, SIGNAL( clicked() ), this, SLOT( slotUpdateMirrorList() ) );
- connect(pushSave, SIGNAL( clicked() ), this, SLOT( slotSave() ) );
+ connect(pushMirrorSave, SIGNAL( clicked() ), this, SLOT( slotMirrorSave() ) );
+ connect(pushMiscSave, SIGNAL( clicked() ), this, SLOT( slotMiscSave() ) );
connect(pushApplyMeta, SIGNAL( clicked() ), this, SLOT( slotApplyMetaChanges() ) );
- connect(pushClose, SIGNAL( clicked() ), this, SLOT( slotClose() ) );
// Connect the mirror radio buttons, so we can enable disable objects based on status
connect(radioSelectMirror, SIGNAL( clicked() ), this, SLOT( slotCheckMirrorRadio() ) );
@@ -534,9 +534,12 @@
}
}
-void PBSystemTab::slotSave() {
+void PBSystemTab::slotMiscSave() {
miscSavePressed();
saveKernScreen();
+}
+
+void PBSystemTab::slotMirrorSave() {
saveMirrorConfig();
}
Modified: pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.h
===================================================================
--- pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.h 2011-03-31 17:42:04 UTC (rev 9851)
+++ pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.h 2011-03-31 17:59:55 UTC (rev 9852)
@@ -71,7 +71,8 @@
void slotGetMirrorData();
void slotRefreshMirrorDone();
void slotCheckMirrorRadio();
- void slotSave();
+ void slotMirrorSave();
+ void slotMiscSave();
void slotClose();
// System Update Slots
Modified: pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.ui
===================================================================
--- pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.ui 2011-03-31 17:42:04 UTC (rev 9851)
+++ pcbsd/current/src-qt4/pc-sysmanager/pbsystemtab.ui 2011-03-31 17:59:55 UTC (rev 9852)
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>537</width>
- <height>425</height>
+ <width>533</width>
+ <height>397</height>
</rect>
</property>
<property name="windowTitle">
@@ -23,46 +23,7 @@
<property name="spacing">
<number>6</number>
</property>
- <item row="1" column="2">
- <widget class="QPushButton" name="pushClose">
- <property name="text">
- <string>&Close</string>
- </property>
- <property name="shortcut">
- <string>Alt+C</string>
- </property>
- <property name="autoDefault">
- <bool>true</bool>
- </property>
- <property name="default">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <spacer name="Horizontal Spacing2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="1">
- <widget class="QPushButton" name="pushSave">
- <property name="text">
- <string>&Save</string>
- </property>
- </widget>
- </item>
- <item row="0" column="0" colspan="3">
+ <item row="0" column="0" colspan="2">
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>0</number>
@@ -599,7 +560,7 @@
<string>Mirrors</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_9">
- <item row="0" column="0">
+ <item row="0" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox_5">
<property name="title">
<string>Mirror Configuration</string>
@@ -688,7 +649,7 @@
</layout>
</widget>
</item>
- <item row="2" column="0">
+ <item row="2" column="0" colspan="2">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -701,7 +662,7 @@
</property>
</spacer>
</item>
- <item row="1" column="0">
+ <item row="1" column="0" colspan="2">
<widget class="QLabel" name="label">
<property name="text">
<string>The selected mirror above will be used for fetching system updates and new system packages. If you experience download failures, or slow performace, please try another mirror.</string>
@@ -711,6 +672,26 @@
</property>
</widget>
</item>
+ <item row="3" column="1">
+ <widget class="QPushButton" name="pushMirrorSave">
+ <property name="text">
+ <string>&Save</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <spacer name="horizontalSpacer_8">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
</widget>
<widget class="QWidget" name="tab_2">
@@ -872,7 +853,7 @@
<string>Misc</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_3">
- <item row="0" column="0" colspan="2">
+ <item row="0" column="0" colspan="3">
<widget class="QGroupBox" name="groupBox_4">
<property name="title">
<string>Boot Screen</string>
@@ -957,7 +938,7 @@
</layout>
</widget>
</item>
- <item row="1" column="0">
+ <item row="1" column="0" colspan="2">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Kernel Options</string>
@@ -1039,7 +1020,7 @@
</layout>
</widget>
</item>
- <item row="3" column="1">
+ <item row="3" column="0" colspan="3">
<spacer name="spacer37">
<property name="orientation">
<enum>Qt::Vertical</enum>
@@ -1055,7 +1036,7 @@
</property>
</spacer>
</item>
- <item row="2" column="0" colspan="2">
+ <item row="2" column="0" colspan="3">
<widget class="QGroupBox" name="groupBox_6">
<property name="title">
<string>Other Options</string>
@@ -1071,6 +1052,26 @@
</layout>
</widget>
</item>
+ <item row="4" column="1">
+ <widget class="QPushButton" name="pushMiscSave">
+ <property name="text">
+ <string>&Save</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0">
+ <spacer name="horizontalSpacer_9">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
</widget>
</widget>
@@ -1081,7 +1082,6 @@
<tabstops>
<tabstop>tabWidget</tabstop>
<tabstop>buttonGenerate</tabstop>
- <tabstop>pushClose</tabstop>
</tabstops>
<includes>
<include location="local">qmessagebox.h</include>
@@ -1098,22 +1098,6 @@
</resources>
<connections>
<connection>
- <sender>pushClose</sender>
- <signal>clicked()</signal>
- <receiver>PBSystemTab</receiver>
- <slot>accept()</slot>
- <hints>
- <hint type="sourcelabel">
- <x>20</x>
- <y>20</y>
- </hint>
- <hint type="destinationlabel">
- <x>20</x>
- <y>20</y>
- </hint>
- </hints>
- </connection>
- <connection>
<sender>customBut</sender>
<signal>clicked()</signal>
<receiver>PBSystemTab</receiver>
More information about the Commits
mailing list