From: Kern Sibbald <kern@sibbald.com>
Date: Tue, 13 May 2008 06:16:38 +0000 (+0000)
Subject: Rework restore dialog layout
X-Git-Tag: Release-3.0.0~1437
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=24900ceb454ac12f3849e3c05bdad6b78044ebb5;p=bacula%2Fbacula

Rework restore dialog layout

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6961 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/src/qt-console/restore/restore.ui b/bacula/src/qt-console/restore/restore.ui
index f8603c1c8c..968e9e8ce3 100644
--- a/bacula/src/qt-console/restore/restore.ui
+++ b/bacula/src/qt-console/restore/restore.ui
@@ -6,446 +6,376 @@
     <x>0</x>
     <y>0</y>
     <width>796</width>
-    <height>582</height>
+    <height>597</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Form</string>
   </property>
-  <widget class="QSplitter" name="splitter" >
-   <property name="geometry" >
-    <rect>
-     <x>9</x>
-     <y>45</y>
-     <width>778</width>
-     <height>462</height>
-    </rect>
-   </property>
-   <property name="sizePolicy" >
-    <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
-     <horstretch>0</horstretch>
-     <verstretch>0</verstretch>
-    </sizepolicy>
-   </property>
-   <property name="orientation" >
-    <enum>Qt::Horizontal</enum>
-   </property>
-   <widget class="QTreeWidget" name="directoryWidget" >
-    <property name="sizePolicy" >
-     <sizepolicy vsizetype="Expanding" hsizetype="Fixed" >
-      <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>
+  <layout class="QGridLayout" >
+   <item row="0" column="0" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
      </property>
-    </column>
-   </widget>
-   <widget class="QTreeWidget" name="fileWidget" >
-    <property name="sizePolicy" >
-     <sizepolicy vsizetype="Expanding" hsizetype="Fixed" >
-      <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>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
      </property>
-    </column>
-    <column>
-     <property name="text" >
-      <string>1</string>
+     <property name="sizeHint" >
+      <size>
+       <width>81</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="1" >
+    <widget class="QLabel" name="label_5" >
+     <property name="maximumSize" >
+      <size>
+       <width>16777215</width>
+       <height>41</height>
+      </size>
      </property>
-    </column>
-    <column>
      <property name="text" >
-      <string>2</string>
+      <string>&lt;h3>Restore Select&lt;/h3></string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="2" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>51</width>
+       <height>21</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="3" >
+    <widget class="QPushButton" name="upButton" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize" >
+      <size>
+       <width>35</width>
+       <height>0</height>
+      </size>
      </property>
-    </column>
-    <column>
      <property name="text" >
-      <string>3</string>
+      <string>Up</string>
+     </property>
+     <property name="icon" >
+      <iconset resource="../main.qrc" >:/images/up.png</iconset>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="4" >
+    <widget class="QPushButton" name="markButton" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize" >
+      <size>
+       <width>35</width>
+       <height>0</height>
+      </size>
      </property>
-    </column>
-    <column>
      <property name="text" >
-      <string>4</string>
+      <string>Mark</string>
+     </property>
+     <property name="icon" >
+      <iconset resource="../main.qrc" >:/images/check.png</iconset>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="5" >
+    <widget class="QPushButton" name="unmarkButton" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize" >
+      <size>
+       <width>50</width>
+       <height>0</height>
+      </size>
      </property>
-    </column>
-    <column>
      <property name="text" >
-      <string>5</string>
+      <string>Unmark</string>
+     </property>
+     <property name="icon" >
+      <iconset resource="../main.qrc" >:/images/unchecked.png</iconset>
      </property>
-    </column>
-    <column>
+    </widget>
+   </item>
+   <item row="0" column="6" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>81</width>
+       <height>21</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="7" >
+    <widget class="QLabel" name="label_2" >
      <property name="text" >
-      <string>6</string>
+      <string>&lt;h2>Files&lt;/h2></string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="8" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>71</width>
+       <height>21</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="0" colspan="9" >
+    <widget class="QSplitter" name="splitter" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
      </property>
-    </column>
-   </widget>
-  </widget>
-  <widget class="QWidget" name="" >
-   <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="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <widget class="QTreeWidget" name="directoryWidget" >
       <property name="sizePolicy" >
-       <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
+       <sizepolicy vsizetype="Expanding" hsizetype="Fixed" >
+        <horstretch>1</horstretch>
+        <verstretch>1</verstretch>
        </sizepolicy>
       </property>
-      <property name="text" >
-       <string>Current Dir:</string>
-      </property>
-      <property name="buddy" >
-       <cstring>lineEdit</cstring>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <widget class="QLineEdit" name="lineEdit" >
       <property name="minimumSize" >
        <size>
-        <width>100</width>
+        <width>200</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" >
-      <property name="text" >
-       <string>OK</string>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <widget class="QPushButton" name="cancelButton" >
-      <property name="text" >
-       <string>Cancel</string>
-      </property>
-     </widget>
-    </item>
-   </layout>
-  </widget>
-  <widget class="QWidget" name="" >
-   <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_4" >
-      <property name="sizePolicy" >
-       <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="text" >
-       <string>Status:</string>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <widget class="QLabel" name="statusLine" >
-      <property name="sizePolicy" >
-       <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="text" >
-       <string/>
-      </property>
-     </widget>
-    </item>
-   </layout>
-  </widget>
-  <widget class="QWidget" name="" >
-   <property name="geometry" >
-    <rect>
-     <x>9</x>
-     <y>9</y>
-     <width>761</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <layout class="QHBoxLayout" >
-    <item>
-     <spacer>
-      <property name="orientation" >
-       <enum>Qt::Horizontal</enum>
-      </property>
-      <property name="sizeType" >
-       <enum>QSizePolicy::Preferred</enum>
-      </property>
-      <property name="sizeHint" >
-       <size>
-        <width>50</width>
-        <height>30</height>
-       </size>
-      </property>
-     </spacer>
-    </item>
-    <item>
-     <widget class="QLabel" name="label_3" >
-      <property name="text" >
-       <string>&lt;h2>Directories&lt;/h2></string>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <spacer>
-      <property name="orientation" >
-       <enum>Qt::Horizontal</enum>
-      </property>
-      <property name="sizeType" >
-       <enum>QSizePolicy::Expanding</enum>
-      </property>
-      <property name="sizeHint" >
-       <size>
-        <width>16</width>
-        <height>30</height>
-       </size>
-      </property>
-     </spacer>
-    </item>
-    <item>
-     <widget class="QLabel" name="label_5" >
       <property name="maximumSize" >
        <size>
         <width>16777215</width>
-        <height>41</height>
-       </size>
-      </property>
-      <property name="text" >
-       <string>&lt;h3>Restore Select&lt;/h3></string>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <spacer>
-      <property name="orientation" >
-       <enum>Qt::Horizontal</enum>
-      </property>
-      <property name="sizeType" >
-       <enum>QSizePolicy::Expanding</enum>
-      </property>
-      <property name="sizeHint" >
-       <size>
-        <width>16</width>
-        <height>20</height>
+        <height>16777215</height>
        </size>
       </property>
-     </spacer>
-    </item>
-    <item>
-     <widget class="QPushButton" name="upButton" >
-      <property name="sizePolicy" >
-       <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="minimumSize" >
+      <property name="sizeIncrement" >
        <size>
-        <width>35</width>
+        <width>1</width>
         <height>0</height>
        </size>
       </property>
-      <property name="text" >
-       <string>Up</string>
-      </property>
-      <property name="icon" >
-       <iconset resource="../main.qrc" >:/images/up.png</iconset>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <widget class="QPushButton" name="markButton" >
-      <property name="sizePolicy" >
-       <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <property name="minimumSize" >
+      <property name="baseSize" >
        <size>
-        <width>35</width>
+        <width>50</width>
         <height>0</height>
        </size>
       </property>
-      <property name="text" >
-       <string>Mark</string>
+      <property name="whatsThis" >
+       <string>Select a Directory</string>
+      </property>
+      <property name="alternatingRowColors" >
+       <bool>true</bool>
       </property>
-      <property name="icon" >
-       <iconset resource="../main.qrc" >:/images/check.png</iconset>
+      <property name="columnCount" >
+       <number>1</number>
       </property>
+      <column>
+       <property name="text" >
+        <string>Directories</string>
+       </property>
+      </column>
      </widget>
-    </item>
-    <item>
-     <widget class="QPushButton" name="unmarkButton" >
+     <widget class="QTreeWidget" name="fileWidget" >
       <property name="sizePolicy" >
-       <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
+       <sizepolicy vsizetype="Expanding" hsizetype="Fixed" >
+        <horstretch>144</horstretch>
+        <verstretch>1</verstretch>
        </sizepolicy>
       </property>
       <property name="minimumSize" >
        <size>
-        <width>50</width>
+        <width>400</width>
         <height>0</height>
        </size>
       </property>
-      <property name="text" >
-       <string>Unmark</string>
-      </property>
-      <property name="icon" >
-       <iconset resource="../main.qrc" >:/images/unchecked.png</iconset>
-      </property>
-     </widget>
-    </item>
-    <item>
-     <spacer>
-      <property name="orientation" >
-       <enum>Qt::Horizontal</enum>
-      </property>
-      <property name="sizeType" >
-       <enum>QSizePolicy::Expanding</enum>
-      </property>
-      <property name="sizeHint" >
+      <property name="sizeIncrement" >
        <size>
-        <width>61</width>
-        <height>20</height>
+        <width>0</width>
+        <height>0</height>
        </size>
       </property>
-     </spacer>
-    </item>
-    <item>
-     <widget class="QLabel" name="label_2" >
-      <property name="text" >
-       <string>&lt;h2>Files&lt;/h2></string>
-      </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>
+       </property>
+      </column>
+      <column>
+       <property name="text" >
+        <string>1</string>
+       </property>
+      </column>
+      <column>
+       <property name="text" >
+        <string>2</string>
+       </property>
+      </column>
+      <column>
+       <property name="text" >
+        <string>3</string>
+       </property>
+      </column>
+      <column>
+       <property name="text" >
+        <string>4</string>
+       </property>
+      </column>
+      <column>
+       <property name="text" >
+        <string>5</string>
+       </property>
+      </column>
+      <column>
+       <property name="text" >
+        <string>6</string>
+       </property>
+      </column>
      </widget>
-    </item>
-    <item>
-     <spacer>
-      <property name="orientation" >
-       <enum>Qt::Horizontal</enum>
-      </property>
-      <property name="sizeHint" >
-       <size>
-        <width>100</width>
-        <height>30</height>
-       </size>
-      </property>
-     </spacer>
-    </item>
-   </layout>
-  </widget>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="9" >
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="QLabel" name="label" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text" >
+        <string>Current Dir:</string>
+       </property>
+       <property name="buddy" >
+        <cstring>lineEdit</cstring>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="statusLine" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text" >
+        <string/>
+       </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" >
+       <property name="text" >
+        <string>OK</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="cancelButton" >
+       <property name="text" >
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="3" column="0" >
+    <widget class="QLabel" name="label_4" >
+     <property name="sizePolicy" >
+      <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text" >
+      <string>Status:</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
   <action name="actionMark" >
    <property name="icon" >
     <iconset resource="../main.qrc" >:/images/check.png</iconset>