From: <bar...@us...> - 2008-02-18 03:22:17
|
Revision: 6441 http://bacula.svn.sourceforge.net/bacula/?rev=6441&view=rev Author: bartleyd2 Date: 2008-02-17 19:22:21 -0800 (Sun, 17 Feb 2008) Log Message: ----------- I could not get a few files to compile until I opened and saved these two ui files. Modified Paths: -------------- trunk/bacula/src/qt-console/prefs.ui trunk/bacula/src/qt-console/restore/restore.ui Modified: trunk/bacula/src/qt-console/prefs.ui =================================================================== --- trunk/bacula/src/qt-console/prefs.ui 2008-02-17 15:24:00 UTC (rev 6440) +++ trunk/bacula/src/qt-console/prefs.ui 2008-02-18 03:22:21 UTC (rev 6441) @@ -10,7 +10,9 @@ </rect> </property> <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Fixed" > + <sizepolicy> + <hsizetype>0</hsizetype> + <vsizetype>0</vsizetype> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -22,56 +24,34 @@ <iconset>images/bat.png</iconset> </property> <layout class="QGridLayout" > - <property name="leftMargin" > + <property name="margin" > <number>9</number> </property> - <property name="topMargin" > - <number>9</number> - </property> - <property name="rightMargin" > - <number>9</number> - </property> - <property name="bottomMargin" > - <number>9</number> - </property> - <property name="horizontalSpacing" > + <property name="spacing" > <number>6</number> </property> - <property name="verticalSpacing" > - <number>6</number> - </property> <item row="1" column="0" > <widget class="QTabWidget" name="tabWidget" > <property name="currentIndex" > - <number>4</number> + <number>2</number> </property> <widget class="QWidget" name="tab" > <attribute name="title" > <string>Messages</string> </attribute> <layout class="QGridLayout" > - <property name="leftMargin" > + <property name="margin" > <number>9</number> </property> - <property name="topMargin" > - <number>9</number> - </property> - <property name="rightMargin" > - <number>9</number> - </property> - <property name="bottomMargin" > - <number>9</number> - </property> - <property name="horizontalSpacing" > + <property name="spacing" > <number>6</number> </property> - <property name="verticalSpacing" > - <number>6</number> - </property> <item row="0" column="0" > <widget class="QGroupBox" name="groupBox" > <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > + <sizepolicy> + <hsizetype>0</hsizetype> + <vsizetype>0</vsizetype> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -80,24 +60,12 @@ <string>Messages Options</string> </property> <layout class="QGridLayout" > - <property name="leftMargin" > + <property name="margin" > <number>9</number> </property> - <property name="topMargin" > - <number>9</number> - </property> - <property name="rightMargin" > - <number>9</number> - </property> - <property name="bottomMargin" > - <number>9</number> - </property> - <property name="horizontalSpacing" > + <property name="spacing" > <number>6</number> </property> - <property name="verticalSpacing" > - <number>6</number> - </property> <item row="2" column="0" > <widget class="QLabel" name="checkLabel" > <property name="text" > @@ -129,28 +97,18 @@ <string>Joblist</string> </attribute> <layout class="QGridLayout" > - <property name="leftMargin" > + <property name="margin" > <number>9</number> </property> - <property name="topMargin" > - <number>9</number> - </property> - <property name="rightMargin" > - <number>9</number> - </property> - <property name="bottomMargin" > - <number>9</number> - </property> - <property name="horizontalSpacing" > + <property name="spacing" > <number>6</number> </property> - <property name="verticalSpacing" > - <number>6</number> - </property> <item row="0" column="0" > <widget class="QGroupBox" name="groupBox_2" > <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > + <sizepolicy> + <hsizetype>0</hsizetype> + <vsizetype>0</vsizetype> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -159,44 +117,20 @@ <string>Jolist Limit Options</string> </property> <layout class="QGridLayout" > - <property name="leftMargin" > + <property name="margin" > <number>9</number> </property> - <property name="topMargin" > - <number>9</number> - </property> - <property name="rightMargin" > - <number>9</number> - </property> - <property name="bottomMargin" > - <number>9</number> - </property> - <property name="horizontalSpacing" > + <property name="spacing" > <number>6</number> </property> - <property name="verticalSpacing" > - <number>6</number> - </property> <item row="0" column="0" > <layout class="QGridLayout" > - <property name="leftMargin" > + <property name="margin" > <number>0</number> </property> - <property name="topMargin" > - <number>0</number> - </property> - <property name="rightMargin" > - <number>0</number> - </property> - <property name="bottomMargin" > - <number>0</number> - </property> - <property name="horizontalSpacing" > + <property name="spacing" > <number>6</number> </property> - <property name="verticalSpacing" > - <number>6</number> - </property> <item row="2" column="0" > <widget class="QCheckBox" name="daysLimit" > <property name="text" > @@ -206,12 +140,12 @@ </item> <item row="3" column="0" > <widget class="QSpinBox" name="daysSpinBox" > - <property name="minimum" > - <number>1</number> - </property> <property name="maximum" > <number>10000</number> </property> + <property name="minimum" > + <number>1</number> + </property> <property name="singleStep" > <number>7</number> </property> @@ -219,12 +153,12 @@ </item> <item row="1" column="0" > <widget class="QSpinBox" name="recordSpinBox" > - <property name="minimum" > - <number>1</number> - </property> <property name="maximum" > <number>10000</number> </property> + <property name="minimum" > + <number>1</number> + </property> <property name="singleStep" > <number>25</number> </property> @@ -313,24 +247,12 @@ <string>Context Sensitive List Commands</string> </property> <layout class="QGridLayout" > - <property name="leftMargin" > + <property name="margin" > <number>9</number> </property> - <property name="topMargin" > - <number>9</number> - </property> - <property name="rightMargin" > - <number>9</number> - </property> - <property name="bottomMargin" > - <number>9</number> - </property> - <property name="horizontalSpacing" > + <property name="spacing" > <number>6</number> </property> - <property name="verticalSpacing" > - <number>6</number> - </property> <item row="0" column="0" > <widget class="QCheckBox" name="executeLongCheckBox" > <property name="text" > @@ -398,28 +320,18 @@ <string>Debug</string> </attribute> <layout class="QGridLayout" > - <property name="leftMargin" > + <property name="margin" > <number>9</number> </property> - <property name="topMargin" > - <number>9</number> - </property> - <property name="rightMargin" > - <number>9</number> - </property> - <property name="bottomMargin" > - <number>9</number> - </property> - <property name="horizontalSpacing" > + <property name="spacing" > <number>6</number> </property> - <property name="verticalSpacing" > - <number>6</number> - </property> <item row="0" column="0" > <widget class="QGroupBox" name="groupBox_3" > <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > + <sizepolicy> + <hsizetype>0</hsizetype> + <vsizetype>0</vsizetype> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -428,44 +340,20 @@ <string>Debugging Options</string> </property> <layout class="QGridLayout" > - <property name="leftMargin" > + <property name="margin" > <number>9</number> </property> - <property name="topMargin" > - <number>9</number> - </property> - <property name="rightMargin" > - <number>9</number> - </property> - <property name="bottomMargin" > - <number>9</number> - </property> - <property name="horizontalSpacing" > + <property name="spacing" > <number>6</number> </property> - <property name="verticalSpacing" > - <number>6</number> - </property> <item row="0" column="0" > <layout class="QGridLayout" > - <property name="leftMargin" > + <property name="margin" > <number>0</number> </property> - <property name="topMargin" > - <number>0</number> - </property> - <property name="rightMargin" > - <number>0</number> - </property> - <property name="bottomMargin" > - <number>0</number> - </property> - <property name="horizontalSpacing" > + <property name="spacing" > <number>6</number> </property> - <property name="verticalSpacing" > - <number>6</number> - </property> <item row="0" column="0" > <widget class="QCheckBox" name="commDebug" > <property name="text" > @@ -513,28 +401,18 @@ <string>RestoreTree</string> </attribute> <layout class="QGridLayout" > - <property name="leftMargin" > + <property name="margin" > <number>9</number> </property> - <property name="topMargin" > - <number>9</number> - </property> - <property name="rightMargin" > - <number>9</number> - </property> - <property name="bottomMargin" > - <number>9</number> - </property> - <property name="horizontalSpacing" > + <property name="spacing" > <number>6</number> </property> - <property name="verticalSpacing" > - <number>6</number> - </property> <item row="0" column="0" > <widget class="QGroupBox" name="groupBox_5" > <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > + <sizepolicy> + <hsizetype>0</hsizetype> + <vsizetype>0</vsizetype> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -543,44 +421,20 @@ <string>Debugging Options</string> </property> <layout class="QGridLayout" > - <property name="leftMargin" > + <property name="margin" > <number>9</number> </property> - <property name="topMargin" > - <number>9</number> - </property> - <property name="rightMargin" > - <number>9</number> - </property> - <property name="bottomMargin" > - <number>9</number> - </property> - <property name="horizontalSpacing" > + <property name="spacing" > <number>6</number> </property> - <property name="verticalSpacing" > - <number>6</number> - </property> <item row="0" column="0" > <layout class="QGridLayout" > - <property name="leftMargin" > + <property name="margin" > <number>0</number> </property> - <property name="topMargin" > - <number>0</number> - </property> - <property name="rightMargin" > - <number>0</number> - </property> - <property name="bottomMargin" > - <number>0</number> - </property> - <property name="horizontalSpacing" > + <property name="spacing" > <number>6</number> </property> - <property name="verticalSpacing" > - <number>6</number> - </property> <item row="10" column="0" > <widget class="QCheckBox" name="rtRestore2CheckBox" > <property name="text" > @@ -686,21 +540,12 @@ </item> <item row="0" column="0" > <layout class="QHBoxLayout" > + <property name="margin" > + <number>0</number> + </property> <property name="spacing" > <number>6</number> </property> - <property name="leftMargin" > - <number>0</number> - </property> - <property name="topMargin" > - <number>0</number> - </property> - <property name="rightMargin" > - <number>0</number> - </property> - <property name="bottomMargin" > - <number>0</number> - </property> <item> <spacer> <property name="orientation" > @@ -717,7 +562,9 @@ <item> <widget class="QLabel" name="headingLabel" > <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > + <sizepolicy> + <hsizetype>0</hsizetype> + <vsizetype>0</vsizetype> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> Modified: trunk/bacula/src/qt-console/restore/restore.ui =================================================================== --- trunk/bacula/src/qt-console/restore/restore.ui 2008-02-17 15:24:00 UTC (rev 6440) +++ trunk/bacula/src/qt-console/restore/restore.ui 2008-02-18 03:22:21 UTC (rev 6441) @@ -13,161 +13,128 @@ <string>Form</string> </property> <layout class="QGridLayout" > - <property name="leftMargin" > + <property name="margin" > <number>9</number> </property> - <property name="topMargin" > - <number>9</number> - </property> - <property name="rightMargin" > - <number>9</number> - </property> - <property name="bottomMargin" > - <number>9</number> - </property> - <property name="horizontalSpacing" > + <property name="spacing" > <number>6</number> </property> - <property name="verticalSpacing" > - <number>6</number> - </property> - <item row="1" column="0" > - <widget class="QSplitter" name="splitter" > - <property name="orientation" > - <enum>Qt::Horizontal</enum> + <item row="2" column="0" > + <layout class="QHBoxLayout" > + <property name="margin" > + <number>0</number> </property> - <widget class="QTreeWidget" name="directoryWidget" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Expanding" hsizetype="Preferred" > - <horstretch>1</horstretch> - <verstretch>1</verstretch> - </sizepolicy> - </property> - <property name="minimumSize" > - <size> - <width>200</width> - <height>0</height> - </size> - </property> - <property name="maximumSize" > - <size> - <width>16777215</width> - <height>16777215</height> - </size> - </property> - <property name="sizeIncrement" > - <size> - <width>1</width> - <height>0</height> - </size> - </property> - <property name="baseSize" > - <size> - <width>50</width> - <height>0</height> - </size> - </property> - <property name="alternatingRowColors" > - <bool>true</bool> - </property> - <property name="columnCount" > - <number>1</number> - </property> - <column> - <property name="text" > - <string>1</string> + <property name="spacing" > + <number>6</number> + </property> + <item> + <widget class="QLabel" name="label" > + <property name="sizePolicy" > + <sizepolicy> + <hsizetype>0</hsizetype> + <vsizetype>0</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - </column> - </widget> - <widget class="QTreeWidget" name="fileWidget" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Preferred" hsizetype="Expanding" > - <horstretch>144</horstretch> - <verstretch>1</verstretch> - </sizepolicy> - </property> - <property name="minimumSize" > - <size> - <width>400</width> - <height>0</height> - </size> - </property> - <property name="sizeIncrement" > - <size> - <width>0</width> - <height>0</height> - </size> - </property> - <property name="alternatingRowColors" > - <bool>true</bool> - </property> - <property name="selectionMode" > - <enum>QAbstractItemView::ExtendedSelection</enum> - </property> - <property name="horizontalScrollMode" > - <enum>QAbstractItemView::ScrollPerItem</enum> - </property> - <property name="uniformRowHeights" > - <bool>true</bool> - </property> - <property name="columnCount" > - <number>7</number> - </property> - <column> <property name="text" > - <string>1</string> + <string>Current Dir:</string> </property> - </column> - <column> - <property name="text" > - <string>1</string> + <property name="buddy" > + <cstring>lineEdit</cstring> </property> - </column> - <column> - <property name="text" > - <string>2</string> + </widget> + </item> + <item> + <widget class="QLineEdit" name="lineEdit" > + <property name="minimumSize" > + <size> + <width>100</width> + <height>0</height> + </size> </property> - </column> - <column> + </widget> + </item> + <item> + <spacer> + <property name="orientation" > + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeType" > + <enum>QSizePolicy::Fixed</enum> + </property> + <property name="sizeHint" > + <size> + <width>30</width> + <height>32</height> + </size> + </property> + </spacer> + </item> + <item> + <widget class="QPushButton" name="okButton" > <property name="text" > - <string>3</string> + <string>OK</string> </property> - </column> - <column> + </widget> + </item> + <item> + <widget class="QPushButton" name="cancelButton" > <property name="text" > - <string>4</string> + <string>Cancel</string> </property> - </column> - <column> + </widget> + </item> + </layout> + </item> + <item row="3" column="0" > + <layout class="QHBoxLayout" > + <property name="margin" > + <number>0</number> + </property> + <property name="spacing" > + <number>6</number> + </property> + <item> + <widget class="QLabel" name="label_4" > + <property name="sizePolicy" > + <sizepolicy> + <hsizetype>0</hsizetype> + <vsizetype>0</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="text" > - <string>5</string> + <string>Status:</string> </property> - </column> - <column> + </widget> + </item> + <item> + <widget class="QLabel" name="statusLine" > + <property name="sizePolicy" > + <sizepolicy> + <hsizetype>0</hsizetype> + <vsizetype>0</vsizetype> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> <property name="text" > - <string>6</string> + <string/> </property> - </column> - </widget> - </widget> + </widget> + </item> + </layout> </item> <item row="0" column="0" > <layout class="QHBoxLayout" > + <property name="margin" > + <number>0</number> + </property> <property name="spacing" > <number>6</number> </property> - <property name="leftMargin" > - <number>0</number> - </property> - <property name="topMargin" > - <number>0</number> - </property> - <property name="rightMargin" > - <number>0</number> - </property> - <property name="bottomMargin" > - <number>0</number> - </property> <item> <spacer> <property name="orientation" > @@ -239,7 +206,9 @@ <item> <widget class="QPushButton" name="upButton" > <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > + <sizepolicy> + <hsizetype>0</hsizetype> + <vsizetype>0</vsizetype> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -261,7 +230,9 @@ <item> <widget class="QPushButton" name="markButton" > <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > + <sizepolicy> + <hsizetype>0</hsizetype> + <vsizetype>0</vsizetype> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -283,7 +254,9 @@ <item> <widget class="QPushButton" name="unmarkButton" > <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > + <sizepolicy> + <hsizetype>0</hsizetype> + <vsizetype>0</vsizetype> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> @@ -340,125 +313,129 @@ </item> </layout> </item> - <item row="3" column="0" > - <layout class="QHBoxLayout" > - <property name="spacing" > - <number>6</number> + <item row="1" column="0" > + <widget class="QSplitter" name="splitter" > + <property name="orientation" > + <enum>Qt::Horizontal</enum> </property> - <property name="leftMargin" > - <number>0</number> - </property> - <property name="topMargin" > - <number>0</number> - </property> - <property name="rightMargin" > - <number>0</number> - </property> - <property name="bottomMargin" > - <number>0</number> - </property> - <item> - <widget class="QLabel" name="label_4" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Fixed" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <widget class="QTreeWidget" name="directoryWidget" > + <property name="sizePolicy" > + <sizepolicy> + <hsizetype>0</hsizetype> + <vsizetype>0</vsizetype> + <horstretch>1</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> + <property name="minimumSize" > + <size> + <width>200</width> + <height>0</height> + </size> + </property> + <property name="maximumSize" > + <size> + <width>16777215</width> + <height>16777215</height> + </size> + </property> + <property name="sizeIncrement" > + <size> + <width>1</width> + <height>0</height> + </size> + </property> + <property name="baseSize" > + <size> + <width>50</width> + <height>0</height> + </size> + </property> + <property name="alternatingRowColors" > + <bool>true</bool> + </property> + <property name="columnCount" > + <number>1</number> + </property> + <column> + <property name="text" > + <string>1</string> </property> + </column> + </widget> + <widget class="QTreeWidget" name="fileWidget" > + <property name="sizePolicy" > + <sizepolicy> + <hsizetype>0</hsizetype> + <vsizetype>0</vsizetype> + <horstretch>144</horstretch> + <verstretch>1</verstretch> + </sizepolicy> + </property> + <property name="minimumSize" > + <size> + <width>400</width> + <height>0</height> + </size> + </property> + <property name="sizeIncrement" > + <size> + <width>0</width> + <height>0</height> + </size> + </property> + <property name="alternatingRowColors" > + <bool>true</bool> + </property> + <property name="selectionMode" > + <enum>QAbstractItemView::ExtendedSelection</enum> + </property> + <property name="horizontalScrollMode" > + <enum>QAbstractItemView::ScrollPerItem</enum> + </property> + <property name="uniformRowHeights" > + <bool>true</bool> + </property> + <property name="columnCount" > + <number>7</number> + </property> + <column> <property name="text" > - <string>Status:</string> + <string>1</string> </property> - </widget> - </item> - <item> - <widget class="QLabel" name="statusLine" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Preferred" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + </column> + <column> + <property name="text" > + <string>1</string> </property> + </column> + <column> <property name="text" > - <string/> + <string>2</string> </property> - </widget> - </item> - </layout> - </item> - <item row="2" column="0" > - <layout class="QHBoxLayout" > - <property name="spacing" > - <number>6</number> - </property> - <property name="leftMargin" > - <number>0</number> - </property> - <property name="topMargin" > - <number>0</number> - </property> - <property name="rightMargin" > - <number>0</number> - </property> - <property name="bottomMargin" > - <number>0</number> - </property> - <item> - <widget class="QLabel" name="label" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Preferred" hsizetype="Fixed" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + </column> + <column> + <property name="text" > + <string>3</string> </property> + </column> + <column> <property name="text" > - <string>Current Dir:</string> + <string>4</string> </property> - <property name="buddy" > - <cstring>lineEdit</cstring> - </property> - </widget> - </item> - <item> - <widget class="QLineEdit" name="lineEdit" > - <property name="minimumSize" > - <size> - <width>100</width> - <height>0</height> - </size> - </property> - </widget> - </item> - <item> - <spacer> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeType" > - <enum>QSizePolicy::Fixed</enum> - </property> - <property name="sizeHint" > - <size> - <width>30</width> - <height>32</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QPushButton" name="okButton" > + </column> + <column> <property name="text" > - <string>OK</string> + <string>5</string> </property> - </widget> - </item> - <item> - <widget class="QPushButton" name="cancelButton" > + </column> + <column> <property name="text" > - <string>Cancel</string> + <string>6</string> </property> - </widget> - </item> - </layout> + </column> + </widget> + </widget> </item> </layout> <action name="actionMark" > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |