[PC-BSD Commits] r4872 - pcbsd/trunk/kcmPBSystem
svn at pcbsd.org
svn at pcbsd.org
Wed Nov 4 11:51:42 PST 2009
Author: kris
Date: 2009-11-04 11:51:42 -0800 (Wed, 04 Nov 2009)
New Revision: 4872
Modified:
pcbsd/trunk/kcmPBSystem/pbsystemtab.cpp
pcbsd/trunk/kcmPBSystem/pbsystemtab.h
pcbsd/trunk/kcmPBSystem/pbsystemtab.ui
pcbsd/trunk/kcmPBSystem/portsnapprogress.cpp
pcbsd/trunk/kcmPBSystem/portsnapprogress.h
pcbsd/trunk/kcmPBSystem/portsnapprogress.ui
Log:
Updated the System Tool, allow fetching of ports into the port jail, along
with the system as well in another button. Cleanup the portsnap UI, fixing
a crash bug at the same time
Modified: pcbsd/trunk/kcmPBSystem/pbsystemtab.cpp
===================================================================
--- pcbsd/trunk/kcmPBSystem/pbsystemtab.cpp 2009-11-04 19:42:59 UTC (rev 4871)
+++ pcbsd/trunk/kcmPBSystem/pbsystemtab.cpp 2009-11-04 19:51:42 UTC (rev 4872)
@@ -388,11 +388,17 @@
cvsUpUi->show();
}
+void PBSystemTab::fetchPortsConsolePressed()
+{
+ portsnapUI = new PortsnapProgress();
+ portsnapUI->init(true);
+ portsnapUI->show();
+}
void PBSystemTab::fetchPortsPressed()
{
portsnapUI = new PortsnapProgress();
- portsnapUI->init();
+ portsnapUI->init(false);
portsnapUI->show();
}
Modified: pcbsd/trunk/kcmPBSystem/pbsystemtab.h
===================================================================
--- pcbsd/trunk/kcmPBSystem/pbsystemtab.h 2009-11-04 19:42:59 UTC (rev 4871)
+++ pcbsd/trunk/kcmPBSystem/pbsystemtab.h 2009-11-04 19:51:42 UTC (rev 4872)
@@ -36,6 +36,7 @@
void finishedKernInstall();
void fetchSourcePressed();
void fetchPortsPressed();
+ void fetchPortsConsolePressed();
void customSplashPressed();
void showSplashChecked( int newState );
void loadBootData();
Modified: pcbsd/trunk/kcmPBSystem/pbsystemtab.ui
===================================================================
--- pcbsd/trunk/kcmPBSystem/pbsystemtab.ui 2009-11-04 19:42:59 UTC (rev 4871)
+++ pcbsd/trunk/kcmPBSystem/pbsystemtab.ui 2009-11-04 19:51:42 UTC (rev 4872)
@@ -1,7 +1,8 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>PBSystemTab</class>
- <widget class="QDialog" name="PBSystemTab" >
- <property name="geometry" >
+ <widget class="QDialog" name="PBSystemTab">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -9,62 +10,54 @@
<height>465</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>PC-BSD System Configuration</string>
</property>
- <property name="sizeGripEnabled" >
+ <property name="sizeGripEnabled">
<bool>true</bool>
</property>
- <layout class="QGridLayout" >
- <property name="margin" >
+ <layout class="QGridLayout">
+ <property name="margin">
<number>11</number>
</property>
- <property name="spacing" >
+ <property name="spacing">
<number>6</number>
</property>
- <item row="1" column="1" >
- <widget class="QPushButton" name="buttonOk" >
- <property name="text" >
+ <item row="1" column="1">
+ <widget class="QPushButton" name="buttonOk">
+ <property name="text">
<string>&Close</string>
</property>
- <property name="shortcut" >
+ <property name="shortcut">
<string>Alt+C</string>
</property>
- <property name="autoDefault" >
+ <property name="autoDefault">
<bool>true</bool>
</property>
- <property name="default" >
+ <property name="default">
<bool>true</bool>
</property>
</widget>
</item>
- <item row="0" column="0" colspan="2" >
- <widget class="QTabWidget" name="tabWidget" >
- <property name="currentIndex" >
+ <item row="0" column="0" colspan="2">
+ <widget class="QTabWidget" name="tabWidget">
+ <property name="currentIndex">
<number>0</number>
</property>
- <widget class="QWidget" name="Widget8" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>410</width>
- <height>369</height>
- </rect>
- </property>
- <attribute name="title" >
+ <widget class="QWidget" name="Widget8">
+ <attribute name="title">
<string>General</string>
</attribute>
- <layout class="QGridLayout" >
- <item row="6" column="2" >
- <spacer name="spacer11" >
- <property name="orientation" >
+ <layout class="QGridLayout">
+ <item row="6" column="2">
+ <spacer name="spacer11">
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>30</width>
<height>60</height>
@@ -72,15 +65,15 @@
</property>
</spacer>
</item>
- <item row="5" column="3" colspan="2" >
- <spacer name="spacer4" >
- <property name="orientation" >
+ <item row="5" column="3" colspan="2">
+ <spacer name="spacer4">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>102</width>
<height>21</height>
@@ -88,38 +81,38 @@
</property>
</spacer>
</item>
- <item row="3" column="0" colspan="5" >
- <widget class="Line" name="line2" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+ <item row="3" column="0" colspan="5">
+ <widget class="Line" name="line2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="frameShape" >
+ <property name="frameShape">
<enum>QFrame::HLine</enum>
</property>
- <property name="frameShadow" >
+ <property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
</widget>
</item>
- <item row="5" column="2" >
- <widget class="QPushButton" name="buttonGenerate" >
- <property name="text" >
+ <item row="5" column="2">
+ <widget class="QPushButton" name="buttonGenerate">
+ <property name="text">
<string>Generate</string>
</property>
</widget>
</item>
- <item row="5" column="0" colspan="2" >
- <spacer name="spacer5" >
- <property name="orientation" >
+ <item row="5" column="0" colspan="2">
+ <spacer name="spacer5">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>92</width>
<height>21</height>
@@ -127,107 +120,107 @@
</property>
</spacer>
</item>
- <item row="4" column="0" colspan="5" >
- <widget class="QLabel" name="textLabel4" >
- <property name="text" >
+ <item row="4" column="0" colspan="5">
+ <widget class="QLabel" name="textLabel4">
+ <property name="text">
<string>You may also generate a diagnostic sheet, with information about your system. This sheet can be used by technicans for troubleshooting purposes.</string>
</property>
- <property name="alignment" >
+ <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
- <item row="2" column="1" colspan="3" >
- <layout class="QHBoxLayout" >
+ <item row="2" column="1" colspan="3">
+ <layout class="QHBoxLayout">
<item>
- <layout class="QVBoxLayout" >
+ <layout class="QVBoxLayout">
<item>
- <widget class="QLabel" name="textLabel2" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+ <widget class="QLabel" name="textLabel2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text" >
+ <property name="text">
<string>PC-BSD Version:</string>
</property>
- <property name="alignment" >
+ <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item>
- <widget class="QLabel" name="textLabel2_2" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+ <widget class="QLabel" name="textLabel2_2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="frameShape" >
+ <property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
- <property name="frameShadow" >
+ <property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
- <property name="text" >
+ <property name="text">
<string>Base Version:</string>
</property>
- <property name="alignment" >
+ <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item>
- <widget class="QLabel" name="textLabel2_2_2" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+ <widget class="QLabel" name="textLabel2_2_2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text" >
+ <property name="text">
<string>CPU Type:</string>
</property>
- <property name="alignment" >
+ <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item>
- <widget class="QLabel" name="textLabel2_2_3" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+ <widget class="QLabel" name="textLabel2_2_3">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize" >
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="text" >
+ <property name="text">
<string>System Memory:</string>
</property>
- <property name="alignment" >
+ <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
@@ -235,79 +228,79 @@
</layout>
</item>
<item>
- <layout class="QVBoxLayout" >
+ <layout class="QVBoxLayout">
<item>
- <widget class="QLabel" name="labelPCBSD" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+ <widget class="QLabel" name="labelPCBSD">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text" >
+ <property name="text">
<string/>
</property>
- <property name="alignment" >
+ <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item>
- <widget class="QLabel" name="labelBASEVer" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+ <widget class="QLabel" name="labelBASEVer">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text" >
+ <property name="text">
<string/>
</property>
- <property name="alignment" >
+ <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item>
- <widget class="QLabel" name="labelCPU" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+ <widget class="QLabel" name="labelCPU">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text" >
+ <property name="text">
<string/>
</property>
- <property name="alignment" >
+ <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item>
- <widget class="QLabel" name="labelMemory" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+ <widget class="QLabel" name="labelMemory">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text" >
+ <property name="text">
<string/>
</property>
- <property name="alignment" >
+ <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
@@ -316,15 +309,15 @@
</item>
</layout>
</item>
- <item row="2" column="0" >
- <spacer name="spacer17" >
- <property name="orientation" >
+ <item row="2" column="0">
+ <spacer name="spacer17">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>91</width>
<height>21</height>
@@ -332,15 +325,15 @@
</property>
</spacer>
</item>
- <item row="2" column="4" >
- <spacer name="spacer18" >
- <property name="orientation" >
+ <item row="2" column="4">
+ <spacer name="spacer18">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>111</width>
<height>21</height>
@@ -348,33 +341,33 @@
</property>
</spacer>
</item>
- <item row="1" column="0" colspan="5" >
- <widget class="Line" name="line1" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
+ <item row="1" column="0" colspan="5">
+ <widget class="Line" name="line1">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="frameShape" >
+ <property name="frameShape">
<enum>QFrame::HLine</enum>
</property>
- <property name="frameShadow" >
+ <property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
</widget>
</item>
- <item row="0" column="0" colspan="5" >
- <layout class="QHBoxLayout" >
+ <item row="0" column="0" colspan="5">
+ <layout class="QHBoxLayout">
<item>
- <spacer name="spacer7" >
- <property name="orientation" >
+ <spacer name="spacer7">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>51</width>
<height>21</height>
@@ -383,36 +376,36 @@
</spacer>
</item>
<item>
- <widget class="QLabel" name="pixmapLabel3" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+ <widget class="QLabel" name="pixmapLabel3">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="pixmap" >
- <pixmap resource="PBSystem.qrc" >:/NewLogoSmall.png</pixmap>
+ <property name="pixmap">
+ <pixmap resource="PBSystem.qrc">:/NewLogoSmall.png</pixmap>
</property>
- <property name="scaledContents" >
+ <property name="scaledContents">
<bool>true</bool>
</property>
- <property name="alignment" >
+ <property name="alignment">
<set>Qt::AlignCenter</set>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item>
- <spacer name="spacer8" >
- <property name="orientation" >
+ <spacer name="spacer8">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>61</width>
<height>21</height>
@@ -424,67 +417,59 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="Widget9" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>410</width>
- <height>369</height>
- </rect>
- </property>
- <attribute name="title" >
+ <widget class="QWidget" name="Widget9">
+ <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" >
+ <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" >
+ <property name="alignment">
<set>Qt::AlignCenter</set>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
- <item rowspan="2" row="3" column="0" colspan="4" >
- <widget class="Line" name="line3" >
- <property name="frameShape" >
+ <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" >
+ <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>
+ <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" >
+ <property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
- <item row="1" column="0" colspan="4" >
- <widget class="QComboBox" name="comboKernel" />
+ <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" >
+ <item row="5" column="0" colspan="2">
+ <spacer name="spacer15">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>50</width>
<height>21</height>
@@ -492,28 +477,28 @@
</property>
</spacer>
</item>
- <item rowspan="2" row="4" column="2" >
- <widget class="QLabel" name="textLabel7" >
- <property name="text" >
+ <item row="4" column="2" rowspan="2">
+ <widget class="QLabel" name="textLabel7">
+ <property name="text">
<string>Kernel Options</string>
</property>
- <property name="alignment" >
+ <property name="alignment">
<set>Qt::AlignCenter</set>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
- <item row="5" column="3" >
- <spacer name="spacer14" >
- <property name="orientation" >
+ <item row="5" column="3">
+ <spacer name="spacer14">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>51</width>
<height>21</height>
@@ -521,54 +506,54 @@
</property>
</spacer>
</item>
- <item row="7" column="0" colspan="4" >
- <widget class="QCheckBox" name="checkKernATAPI" >
- <property name="text" >
+ <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" >
+ <item row="8" column="1" colspan="3">
+ <widget class="QLabel" name="checkKernDelayLbl">
+ <property name="enabled">
<bool>true</bool>
</property>
- <property name="text" >
+ <property name="text">
<string>Boot delay (seconds)</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
- <item row="8" column="0" >
- <widget class="QSpinBox" name="checkKernDelay" >
- <property name="enabled" >
+ <item row="8" column="0">
+ <widget class="QSpinBox" name="checkKernDelay">
+ <property name="enabled">
<bool>true</bool>
</property>
- <property name="specialValueText" >
+ <property name="specialValueText">
<string>Off</string>
</property>
- <property name="minimum" >
+ <property name="minimum">
<number>0</number>
</property>
- <property name="maximum" >
+ <property name="maximum">
<number>60</number>
</property>
- <property name="value" >
+ <property name="value">
<number>2</number>
</property>
</widget>
</item>
- <item row="12" column="2" >
- <spacer name="spacer25" >
- <property name="orientation" >
+ <item row="12" column="2">
+ <spacer name="spacer25">
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>21</width>
<height>31</height>
@@ -578,66 +563,42 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="TabPage" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>410</width>
- <height>369</height>
- </rect>
- </property>
- <attribute name="title" >
+ <widget class="QWidget" name="TabPage">
+ <attribute name="title">
<string>Tasks</string>
</attribute>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="Q3ButtonGroup" name="cvsupBGrp" >
- <property name="title" >
- <string>CSup</string>
+ <layout class="QGridLayout">
+ <item row="1" column="0">
+ <widget class="Q3ButtonGroup" name="portsnapBGrp">
+ <property name="title">
+ <string>Ports Console</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QPushButton" name="fetchSourceBut" >
- <property name="text" >
- <string>Fetch &System Source</string>
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="QPushButton" name="fetchPortsConsoleBut">
+ <property name="text">
+ <string>Fetch &Ports Tree</string>
</property>
- <property name="shortcut" >
- <string>Alt+S</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="1" column="0" >
- <widget class="Q3ButtonGroup" name="portsnapBGrp" >
- <property name="title" >
- <string>Portsnap</string>
- </property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QPushButton" name="fetchPortsBut" >
- <property name="text" >
- <string>Fetch &Ports</string>
- </property>
- <property name="shortcut" >
+ <property name="shortcut">
<string>Alt+P</string>
</property>
+ <attribute name="buttonGroup">
+ <string/>
+ </attribute>
</widget>
</item>
</layout>
</widget>
</item>
- <item row="2" column="0" >
- <spacer name="spacer27" >
- <property name="orientation" >
+ <item row="5" column="0">
+ <spacer name="spacer27">
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>31</width>
<height>110</height>
@@ -645,62 +606,92 @@
</property>
</spacer>
</item>
+ <item row="2" column="0">
+ <widget class="Q3ButtonGroup" name="cvsupBGrp">
+ <property name="title">
+ <string>System Tasks - Advanced Users Only</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QPushButton" name="fetchSourceBut">
+ <property name="text">
+ <string>Fetch &System Source</string>
+ </property>
+ <property name="shortcut">
+ <string>Alt+S</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string/>
+ </attribute>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QPushButton" name="fetchPortsBut">
+ <property name="text">
+ <string>Fetch System P&orts Tree</string>
+ </property>
+ <attribute name="buttonGroup">
+ <string/>
+ </attribute>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
</layout>
</widget>
- <widget class="QWidget" name="TabPage" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>410</width>
- <height>369</height>
- </rect>
- </property>
- <attribute name="title" >
+ <widget class="QWidget" name="TabPage">
+ <attribute name="title">
<string>Misc</string>
</attribute>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="Q3ButtonGroup" name="splashGroup" >
- <property name="title" >
+ <layout class="QGridLayout">
+ <item row="0" column="0">
+ <widget class="Q3ButtonGroup" name="splashGroup">
+ <property name="title">
<string>Boot Screen</string>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" colspan="2" >
- <widget class="QCheckBox" name="showBootCheck" >
- <property name="text" >
+ <layout class="QGridLayout">
+ <item row="0" column="0" colspan="2">
+ <widget class="QCheckBox" name="showBootCheck">
+ <property name="text">
<string>S&how splash image on boot</string>
</property>
- <property name="shortcut" >
+ <property name="shortcut">
<string>Alt+H</string>
</property>
- <property name="checked" >
+ <property name="checked">
<bool>true</bool>
</property>
+ <attribute name="buttonGroup">
+ <string/>
+ </attribute>
</widget>
</item>
- <item row="2" column="1" >
- <widget class="QPushButton" name="customBut" >
- <property name="text" >
+ <item row="2" column="1">
+ <widget class="QPushButton" name="customBut">
+ <property name="text">
<string>&Custom...</string>
</property>
- <property name="shortcut" >
+ <property name="shortcut">
<string>Alt+C</string>
</property>
+ <attribute name="buttonGroup">
+ <string/>
+ </attribute>
</widget>
</item>
- <item row="1" column="0" colspan="2" >
- <widget class="QComboBox" name="splashSelect" />
+ <item row="1" column="0" colspan="2">
+ <widget class="QComboBox" name="splashSelect"/>
</item>
- <item row="2" column="0" >
- <spacer name="spacer39" >
- <property name="orientation" >
+ <item row="2" column="0">
+ <spacer name="spacer39">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>251</width>
<height>31</height>
@@ -711,15 +702,15 @@
</layout>
</widget>
</item>
- <item row="1" column="0" >
- <spacer name="spacer37" >
- <property name="orientation" >
+ <item row="1" column="0">
+ <spacer name="spacer37">
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>30</width>
<height>190</height>
@@ -731,15 +722,15 @@
</widget>
</widget>
</item>
- <item row="1" column="0" >
- <spacer name="Horizontal Spacing2" >
- <property name="orientation" >
+ <item row="1" column="0">
+ <spacer name="Horizontal Spacing2">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
@@ -749,10 +740,16 @@
</item>
</layout>
</widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
<customwidgets>
<customwidget>
+ <class>Q3GroupBox</class>
+ <extends>QGroupBox</extends>
+ <header>Qt3Support/Q3GroupBox</header>
+ <container>1</container>
+ </customwidget>
+ <customwidget>
<class>Q3ButtonGroup</class>
<extends>Q3GroupBox</extends>
<header>Qt3Support/Q3ButtonGroup</header>
@@ -767,30 +764,30 @@
<tabstop>checkKernATAPI</tabstop>
<tabstop>checkKernDelay</tabstop>
<tabstop>fetchSourceBut</tabstop>
- <tabstop>fetchPortsBut</tabstop>
+ <tabstop>fetchPortsConsoleBut</tabstop>
<tabstop>showBootCheck</tabstop>
<tabstop>splashSelect</tabstop>
<tabstop>customBut</tabstop>
</tabstops>
<includes>
- <include location="local" >q3process.h</include>
- <include location="local" >q3filedialog.h</include>
- <include location="local" >qmessagebox.h</include>
- <include location="local" >qfile.h</include>
- <include location="local" >qsettings.h</include>
- <include location="local" >cvsupprogress.h</include>
- <include location="local" >portsnapprogress.h</include>
- <include location="local" >kgenericfactory.h</include>
- <include location="local" >kcmodule.h</include>
- <include location="local" >kglobal.h</include>
- <include location="global" >qregexp.h</include>
- <include location="global" >kio/job.h</include>
- <include location="global" >kfiledialog.h</include>
- <include location="global" >kimageio.h</include>
- <include location="global" >pcbsd-utils.h</include>
+ <include location="local">q3process.h</include>
+ <include location="local">q3filedialog.h</include>
+ <include location="local">qmessagebox.h</include>
+ <include location="local">qfile.h</include>
+ <include location="local">qsettings.h</include>
+ <include location="local">cvsupprogress.h</include>
+ <include location="local">portsnapprogress.h</include>
+ <include location="local">kgenericfactory.h</include>
+ <include location="local">kcmodule.h</include>
+ <include location="local">kglobal.h</include>
+ <include location="global">qregexp.h</include>
+ <include location="global">kio/job.h</include>
+ <include location="global">kfiledialog.h</include>
+ <include location="global">kimageio.h</include>
+ <include location="global">pcbsd-utils.h</include>
</includes>
<resources>
- <include location="PBSystem.qrc" />
+ <include location="PBSystem.qrc"/>
</resources>
<connections>
<connection>
@@ -799,11 +796,11 @@
<receiver>PBSystemTab</receiver>
<slot>accept()</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>20</x>
<y>20</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>20</x>
<y>20</y>
</hint>
@@ -815,27 +812,43 @@
<receiver>PBSystemTab</receiver>
<slot>fetchPortsPressed()</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>20</x>
<y>20</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>20</x>
<y>20</y>
</hint>
</hints>
</connection>
<connection>
+ <sender>fetchPortsConsoleBut</sender>
+ <signal>clicked()</signal>
+ <receiver>PBSystemTab</receiver>
+ <slot>fetchPortsConsolePressed()</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>fetchSourceBut</sender>
<signal>clicked()</signal>
<receiver>PBSystemTab</receiver>
<slot>fetchSourcePressed()</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>20</x>
<y>20</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>20</x>
<y>20</y>
</hint>
@@ -847,11 +860,11 @@
<receiver>PBSystemTab</receiver>
<slot>customSplashPressed()</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>20</x>
<y>20</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>20</x>
<y>20</y>
</hint>
@@ -863,11 +876,11 @@
<receiver>PBSystemTab</receiver>
<slot>showSplashChecked(int)</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>20</x>
<y>20</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>20</x>
<y>20</y>
</hint>
Modified: pcbsd/trunk/kcmPBSystem/portsnapprogress.cpp
===================================================================
--- pcbsd/trunk/kcmPBSystem/portsnapprogress.cpp 2009-11-04 19:42:59 UTC (rev 4871)
+++ pcbsd/trunk/kcmPBSystem/portsnapprogress.cpp 2009-11-04 19:51:42 UTC (rev 4872)
@@ -11,8 +11,10 @@
*****************************************************************************/
#include "portsnapprogress.h"
#include <qtextstream.h>
+#include <QProcess>
+#include <QDir>
-void PortsnapProgress::init()
+void PortsnapProgress::init(bool usingPortConsole)
{
//Check our modified portsnap program is installed
QFile newsnap("/PCBSD/Scripts/System/portsnap.sh");
@@ -46,104 +48,47 @@
//Init vars
workdir = "/var/db/portsnap";
- portsdir = "/usr/ports";
+ if (usingPortConsole)
+ portsdir = "/usr/portjail/usr/ports";
+ else
+ portsdir = "/usr/ports";
+
+ QDir checkdir;
+ if ( ! checkdir.exists(portsdir) )
+ checkdir.mkdir(portsdir);
+
displayString = "";
- firstRun = true;
- steppedOp = false;
- //barWidget->raiseWidget(0);
numberSteps = 0;
- //We need to get some preferences from portsnap.conf
- QFile conf("/etc/portsnap.conf");
- if (conf.open(IO_ReadOnly)) {
- QTextStream stream(&conf);
- stream.setCodec("UTF-8");
- QString line;
- while (!stream.atEnd()) {
- line = stream.readLine();
- //Find the WORKDIR declaration, check it isn't a comment
- if ((line.find("WORKDIR") != -1) && (line.find("#") == -1)) {
- line.remove(0, 8);
- workdir = line;
- }
- //Find the PORTSDIR declaration, check it isn't a comment
- else if ((line.find("PORTSDIR") != -1) && (line.find("#") == -1)) {
- line.remove(0, 9);
- portsdir = line;
- }
- }
- conf.close();
- }
//Else, just use defaults defined earlier
- //See if portsnap has been run before
- if (QFile::exists(portsdir + "/.portsnap.INDEX")) {
- totalProgress->setTotalSteps(12);
- firstRun = false;
- }
-
- portsnap = new Q3Process(this);
- portsnap->addArgument("/PCBSD/Scripts/System/portsnap.sh");
- portsnap->addArgument("fetch");
- connect(portsnap, SIGNAL(readyReadStdout()), this, SLOT(parseFetch()));
- connect(portsnap, SIGNAL(processExited()), this, SLOT(fetchDone()));
- portsnap->start();
+ QStringList args;
+ QString prog;
+ prog = "/PCBSD/Scripts/System/portsnap.sh";
+ args << "fetch";
+ portsnap = new QProcess(this);
+ portsnap->setProcessChannelMode(QProcess::MergedChannels);
+ connect(portsnap, SIGNAL(readyReadStandardOutput()), this, SLOT(parseFetch()));
+ connect(portsnap, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(fetchDone()));
+ portsnap->start(prog, args);
}
void PortsnapProgress::parseFetch()
{
- QString output = portsnap->readStdout();
+ while (portsnap->canReadLine() )
+ {
+ QString output = portsnap->readLine();
qDebug("Portsnap Fetch: " + output);
- //If there is nothing to fetch, get us ready to run an update
- if (output.find("No updates needed") != -1) {
- totalProgress->setProgress(totalProgress->totalSteps() - 3);
- }
- else if (output.find("done") != -1) {
- taskProgress->setProgress(100);
- steppedOp = false;
-// barWidget->raiseWidget(0);
- }
- else if (steppedOp) {
- taskProgress->setProgress(taskProgress->progress() + 2);
- }
- else {
- displayString += output;
- if ( output.indexOf(" ") != -1)
- {
- QStringList outputSplit = QStringList::split(" ", output);
- bool ok;
- outputSplit[1].toInt(&ok);
- if (ok)
- {
- numberSteps += outputSplit[1].toInt();
- }
- }
- //Detect 'fetching n patches' condition
- if ((output.find("patches") != -1) && (output.find("Applying") == -1)) {
- taskProgress->setTotalSteps(numberSteps);
- //steppedOp = true;
- //barWidget->raiseWidget(1);
- }
- //Check for other special cases
- else if (output.find("portsnap") == -1) {
- totalProgress->setProgress(totalProgress->progress() + 1);
- taskProgressLbl->setText(displayString);
- displayString = "";
- }
- taskProgress->setProgress(0);
-
- }
-
+ taskProgressLbl->setText(displayString);
+ }
}
void PortsnapProgress::finish()
{
- taskProgress->setProgress(taskProgress->totalSteps());
- totalProgress->setProgress(totalProgress->totalSteps());
taskProgressLbl->setText("Finished!");
cancelBut->setText("&Close");
}
@@ -167,43 +112,28 @@
}
else
{
- QString args = "update";
- if (firstRun) {
- args = "first";
- numberSteps = 0;
- }
- portsnap = new Q3Process(this);
- portsnap->addArgument("/PCBSD/Scripts/System/changes.sh");
- portsnap->addArgument(args);
- portsnap->addArgument(workdir);
- portsnap->addArgument(portsdir);
- connect(portsnap, SIGNAL(readyReadStdout()), this, SLOT(parseChanges()));
- connect(portsnap, SIGNAL(processExited()), this, SLOT(changesDone()));
- portsnap->start();
+ QStringList args;
+ QString prog;
+ prog = "/PCBSD/Scripts/System/portsnap.sh";
+ args << "extract" << "update" << "-p" << portsdir ;
+ portsnap = new QProcess(this);
+ portsnap->setProcessChannelMode(QProcess::MergedChannels);
+ connect(portsnap, SIGNAL(readyReadStandardOutput()), this, SLOT(parseUpdate()));
+ connect(portsnap, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(updateDone()));
+ portsnap->start(prog, args);
}
}
void PortsnapProgress::parseUpdate()
{
- QString output = portsnap->readLineStdout();
+ while( portsnap->canReadLine() )
+ {
+ QString output = portsnap->readLine();
qDebug("Portsnap Update: " + output);
- if (output.find("/usr/ports") != -1) {
- taskProgress->setProgress(taskProgress->progress() + 1);
- taskProgressLbl->setText(output);
- }
- else if (output.find("done") != -1) {
- totalProgress->setProgress(totalProgress->progress() + 1);
- }
- else {
- //barWidget->raiseWidget(0);
- if (output.find("Extracting") != -1) {
- //barWidget->raiseWidget(1);
- totalProgress->setProgress(totalProgress->progress() + 1);
- }
- taskProgressLbl->setText(output);
- }
+ taskProgressLbl->setText(output);
+ }
}
@@ -212,30 +142,3 @@
finish();
}
-
-
-
-void PortsnapProgress::changesDone()
-{
- taskProgress->setProgress(0);
- taskProgress->setTotalSteps(numberSteps);
-
- portsnap = new Q3Process(this);
- portsnap->addArgument("/PCBSD/Scripts/System/portsnap.sh");
- if (firstRun) {
- portsnap->addArgument("extract");
- }
- else {
- portsnap->addArgument("update");
- }
- connect(portsnap, SIGNAL(readyReadStdout()), this, SLOT(parseUpdate()));
- connect(portsnap, SIGNAL(processExited()), this, SLOT(updateDone()));
- portsnap->start();
-}
-
-
-void PortsnapProgress::parseChanges()
-{
- QString output = portsnap->readLineStdout();
- numberSteps++;
-}
Modified: pcbsd/trunk/kcmPBSystem/portsnapprogress.h
===================================================================
--- pcbsd/trunk/kcmPBSystem/portsnapprogress.h 2009-11-04 19:42:59 UTC (rev 4871)
+++ pcbsd/trunk/kcmPBSystem/portsnapprogress.h 2009-11-04 19:51:42 UTC (rev 4872)
@@ -4,6 +4,7 @@
#include <qfile.h>
#include <qmessagebox.h>
#include <qdialog.h>
+#include <QProcess>
#include "ui_portsnapprogress.h"
class PortsnapProgress : public QDialog, private Ui::PortsnapProgress
@@ -16,7 +17,7 @@
setupUi(this);
}
- void init();
+ void init(bool usingPortConsole);
public slots:
@@ -26,15 +27,11 @@
void fetchDone();
void parseUpdate();
void updateDone();
- void changesDone();
- void parseChanges();
private:
- Q3Process *portsnap;
+ QProcess *portsnap;
QString workdir;
QString portsdir;
- bool firstRun;
- bool steppedOp;
QString displayString;
int numberSteps;
void finish();
Modified: pcbsd/trunk/kcmPBSystem/portsnapprogress.ui
===================================================================
--- pcbsd/trunk/kcmPBSystem/portsnapprogress.ui 2009-11-04 19:42:59 UTC (rev 4871)
+++ pcbsd/trunk/kcmPBSystem/portsnapprogress.ui 2009-11-04 19:51:42 UTC (rev 4872)
@@ -1,187 +1,88 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>PortsnapProgress</class>
- <widget class="QDialog" name="PortsnapProgress" >
- <property name="geometry" >
+ <widget class="QDialog" name="PortsnapProgress">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>614</width>
- <height>161</height>
+ <width>508</width>
+ <height>122</height>
</rect>
</property>
- <property name="windowTitle" >
+ <property name="windowTitle">
<string>Portsnap Progress</string>
</property>
- <property name="windowIcon" >
- <iconset resource="PBSystem.qrc" >
+ <property name="windowIcon">
+ <iconset resource="PBSystem.qrc">
<normaloff>:/system.png</normaloff>:/system.png</iconset>
</property>
- <property name="modal" >
+ <property name="modal">
<bool>true</bool>
</property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="QLabel" name="totalProgressLbl" >
- <property name="frameShape" >
- <enum>QFrame::NoFrame</enum>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Fetching Ports, this may take a while...</string>
</property>
- <property name="frameShadow" >
- <enum>QFrame::Plain</enum>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
</property>
- <property name="text" >
- <string>Total Progress</string>
- </property>
- <property name="wordWrap" >
- <bool>false</bool>
- </property>
</widget>
</item>
- <item row="1" column="0" colspan="4" >
- <widget class="Q3ProgressBar" name="totalProgress" >
- <property name="totalSteps" >
- <number>18</number>
- </property>
- <property name="progress" >
- <number>0</number>
- </property>
- </widget>
- </item>
- <item row="3" column="3" >
- <widget class="QPushButton" name="cancelBut" >
- <property name="text" >
- <string>&Cancel</string>
- </property>
- <property name="shortcut" >
- <string>Alt+C</string>
- </property>
- </widget>
- </item>
- <item row="3" column="0" colspan="3" >
- <spacer name="spacer40" >
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>491</width>
- <height>31</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="2" column="2" colspan="2" >
- <widget class="Q3WidgetStack" name="barWidget" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="MinimumExpanding" hsizetype="Minimum" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <widget class="QWidget" name="BarOff" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>158</width>
- <height>66</height>
- </rect>
- </property>
- </widget>
- <widget class="QWidget" name="BarOn" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>100</width>
- <height>30</height>
- </rect>
- </property>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="Q3ProgressBar" name="taskProgress" >
- <property name="minimumSize" >
- <size>
- <width>150</width>
- <height>0</height>
- </size>
- </property>
- <property name="font" >
- <font>
- <pointsize>8</pointsize>
- </font>
- </property>
- <property name="frameShape" >
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="totalSteps" >
- <number>100</number>
- </property>
- <property name="progress" >
- <number>0</number>
- </property>
- <property name="percentageVisible" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </widget>
- </item>
- <item row="2" column="1" >
- <spacer name="spacer41" >
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>220</width>
- <height>21</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="2" column="0" >
- <widget class="QLabel" name="taskProgressLbl" >
- <property name="text" >
+ <item row="1" column="0">
+ <widget class="QLabel" name="taskProgressLbl">
+ <property name="text">
<string>Task Progress...</string>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
+ <item row="2" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <spacer name="spacer40">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>491</width>
+ <height>31</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="cancelBut">
+ <property name="text">
+ <string>&Cancel</string>
+ </property>
+ <property name="shortcut">
+ <string>Alt+C</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
</layout>
</widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
- <customwidget>
- <class>Q3WidgetStack</class>
- <extends>Q3WidgetStack</extends>
- <header>q3widgetstack.h</header>
- <container>1</container>
- </customwidget>
- <customwidget>
- <class>Q3ProgressBar</class>
- <extends>QFrame</extends>
- <header>Qt3Support/Q3ProgressBar</header>
- </customwidget>
- </customwidgets>
<includes>
- <include location="global" >q3process.h</include>
- <include location="global" >sys/types.h</include>
- <include location="global" >sys/stat.h</include>
- <include location="global" >qmessagebox.h</include>
+ <include location="global">q3process.h</include>
+ <include location="global">sys/types.h</include>
+ <include location="global">sys/stat.h</include>
+ <include location="global">qmessagebox.h</include>
</includes>
<resources>
- <include location="PBSystem.qrc" />
+ <include location="PBSystem.qrc"/>
</resources>
<connections>
<connection>
@@ -190,11 +91,11 @@
<receiver>PortsnapProgress</receiver>
<slot>cancel()</slot>
<hints>
- <hint type="sourcelabel" >
+ <hint type="sourcelabel">
<x>20</x>
<y>20</y>
</hint>
- <hint type="destinationlabel" >
+ <hint type="destinationlabel">
<x>20</x>
<y>20</y>
</hint>
More information about the Commits
mailing list