From: Kern Sibbald <kern@sibbald.com>
Date: Sun, 11 Feb 2007 18:21:43 +0000 (+0000)
Subject: Update bat
X-Git-Tag: Release-2.2.0~1058
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e7958d60e3c4faebe434103ad65f711c7b705794;hp=ed0e0ed3cd047fc2b30d05517ac31d9592359fa6;p=bacula%2Fbacula

Update bat

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

diff --git a/bacula/src/qt-console/Makefile b/bacula/src/qt-console/Makefile
index dd1c6bf11d..be35e827d5 100644
--- a/bacula/src/qt-console/Makefile
+++ b/bacula/src/qt-console/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: bat
-# Generated by qmake (2.01a) (Qt 4.2.1) on: Fri Feb 9 23:20:13 2007
+# Generated by qmake (2.01a) (Qt 4.2.1) on: Sun Feb 11 17:11:46 2007
 # Project:  bat.pro
 # Template: app
 # Command: /usr/bin/qmake -unix -o Makefile bat.pro
diff --git a/bacula/src/qt-console/console/console.ui b/bacula/src/qt-console/console/console.ui
index 7386c26073..2a0521e976 100644
--- a/bacula/src/qt-console/console/console.ui
+++ b/bacula/src/qt-console/console/console.ui
@@ -21,6 +21,9 @@
    </property>
    <item row="0" column="0" >
     <widget class="QDockWidget" name="dockWidget" >
+     <property name="allowedAreas" >
+      <set>Qt::AllDockWidgetAreas</set>
+     </property>
      <widget class="QWidget" name="dockWidgetContents" >
       <layout class="QGridLayout" >
        <property name="margin" >
diff --git a/bacula/src/qt-console/main.ui b/bacula/src/qt-console/main.ui
index 33e7cf90ea..57cc9a6fcc 100644
--- a/bacula/src/qt-console/main.ui
+++ b/bacula/src/qt-console/main.ui
@@ -51,7 +51,7 @@
         </size>
        </property>
        <property name="focusPolicy" >
-        <enum>Qt::ClickFocus</enum>
+        <enum>Qt::StrongFocus</enum>
        </property>
        <property name="windowTitle" >
         <string>Page Selector</string>
@@ -86,6 +86,9 @@
              <height>0</height>
             </size>
            </property>
+           <property name="focusPolicy" >
+            <enum>Qt::StrongFocus</enum>
+           </property>
            <property name="toolTip" >
             <string>Selects right panel</string>
            </property>
@@ -113,7 +116,7 @@
         </size>
        </property>
        <property name="focusPolicy" >
-        <enum>Qt::ClickFocus</enum>
+        <enum>Qt::StrongFocus</enum>
        </property>
        <property name="currentIndex" >
         <number>-1</number>
diff --git a/bacula/src/qt-console/restore/brestore.cpp b/bacula/src/qt-console/restore/brestore.cpp
index 0f47d69524..3c43fbdf0d 100644
--- a/bacula/src/qt-console/restore/brestore.cpp
+++ b/bacula/src/qt-console/restore/brestore.cpp
@@ -42,4 +42,3 @@ bRestore::bRestore(QStackedWidget *parent)
    setupUi(this);
    parent->addWidget(this);
 }
-
diff --git a/bacula/src/qt-console/restore/restore-select.ui b/bacula/src/qt-console/restore/restore-select.ui
new file mode 100644
index 0000000000..d9f3efabc9
--- /dev/null
+++ b/bacula/src/qt-console/restore/restore-select.ui
@@ -0,0 +1,190 @@
+<ui version="4.0" >
+ <class>restoreFileForm</class>
+ <widget class="QWidget" name="restoreFileForm" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Restore Files Dialog</string>
+  </property>
+  <layout class="QVBoxLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
+   <item>
+    <layout class="QGridLayout" >
+     <property name="margin" >
+      <number>8</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item row="2" column="0" >
+      <widget class="QLabel" name="label_3" >
+       <property name="text" >
+        <string>File Set:</string>
+       </property>
+       <property name="buddy" >
+        <cstring>filesetCombo</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1" >
+      <widget class="QComboBox" name="poolCombo" />
+     </item>
+     <item row="0" column="1" >
+      <widget class="QComboBox" name="jobCombo" >
+       <property name="sizePolicy" >
+        <sizepolicy>
+         <hsizetype>7</hsizetype>
+         <vsizetype>0</vsizetype>
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0" >
+      <widget class="QLabel" name="label_2" >
+       <property name="text" >
+        <string>Client:</string>
+       </property>
+       <property name="buddy" >
+        <cstring>clientCombo</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="0" >
+      <widget class="QLabel" name="label_6" >
+       <property name="text" >
+        <string>Before:</string>
+       </property>
+       <property name="buddy" >
+        <cstring>dateTimeEdit</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="0" >
+      <widget class="QLabel" name="label_5" >
+       <property name="text" >
+        <string>Storage:</string>
+       </property>
+       <property name="buddy" >
+        <cstring>storageCombo</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1" >
+      <widget class="QComboBox" name="storageCombo" />
+     </item>
+     <item row="3" column="0" >
+      <widget class="QLabel" name="label_4" >
+       <property name="text" >
+        <string>Pool:</string>
+       </property>
+       <property name="buddy" >
+        <cstring>poolCombo</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1" >
+      <widget class="QComboBox" name="clientCombo" />
+     </item>
+     <item row="5" column="1" >
+      <widget class="QDateTimeEdit" name="dateTimeEdit" >
+       <property name="minimumDate" >
+        <date>
+         <year>2000</year>
+         <month>1</month>
+         <day>1</day>
+        </date>
+       </property>
+       <property name="displayFormat" >
+        <string>yyyy-mm-dd h:mm:ss</string>
+       </property>
+       <property name="calendarPopup" >
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0" >
+      <widget class="QLabel" name="label" >
+       <property name="text" >
+        <string>Job:</string>
+       </property>
+       <property name="buddy" >
+        <cstring>jobCombo</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1" >
+      <widget class="QComboBox" name="filesetCombo" />
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" >
+     <property name="margin" >
+      <number>8</number>
+     </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
+     <item>
+      <spacer>
+       <property name="orientation" >
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" >
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="nextButton" >
+       <property name="text" >
+        <string>Next</string>
+       </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>16</width>
+         <height>21</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="cancelButton" >
+       <property name="text" >
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>