This change of the regular expressions should fix any restoretree issues

[bacula/bacula] / bacula / src / qt-console / restore / restore.ui

diff --git a/bacula/src/qt-console/restore/restore.ui b/bacula/src/qt-console/restore/restore.ui
index ed4af5bcbcdd67f1bb9966c451a59065348fdfb6..0429324889c2dd5403dc782bf148fae2799c370b 100644 (file)
--- a/bacula/src/qt-console/restore/restore.ui
+++ b/bacula/src/qt-console/restore/restore.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>689</width>
-    <height>504</height>
+    <width>796</width>
+    <height>582</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -239,26 +239,10 @@
         <string>Up</string>
        </property>
        <property name="icon" >
-        <iconset>:images/up.png</iconset>
+        <iconset resource="../main.qrc" >:/images/up.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" >
-        <size>
-         <width>16</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
      <item>
       <widget class="QPushButton" name="markButton" >
        <property name="sizePolicy" >
@@ -279,26 +263,10 @@
         <string>Mark</string>
        </property>
        <property name="icon" >
-        <iconset>:images/mark.png</iconset>
+        <iconset resource="../main.qrc" >:/images/check.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" >
-        <size>
-         <width>16</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
      <item>
       <widget class="QPushButton" name="unmarkButton" >
        <property name="sizePolicy" >
@@ -319,7 +287,7 @@
         <string>Unmark</string>
        </property>
        <property name="icon" >
-        <iconset>:images/unmark.png</iconset>
+        <iconset resource="../main.qrc" >:/images/unchecked.png</iconset>
        </property>
       </widget>
      </item>
@@ -454,23 +422,41 @@
       </spacer>
      </item>
      <item>
-      <widget class="QPushButton" name="cancelButton" >
+      <widget class="QPushButton" name="okButton" >
        <property name="text" >
-        <string>Cancel</string>
+        <string>OK</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QPushButton" name="okButton" >
+      <widget class="QPushButton" name="cancelButton" >
        <property name="text" >
-        <string>OK</string>
+        <string>Cancel</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
   </layout>
+  <action name="actionMark" >
+   <property name="icon" >
+    <iconset resource="../main.qrc" >:/images/check.png</iconset>
+   </property>
+   <property name="text" >
+    <string>Mark</string>
+   </property>
+  </action>
+  <action name="actionUnMark" >
+   <property name="icon" >
+    <iconset resource="../main.qrc" >:/images/unchecked.png</iconset>
+   </property>
+   <property name="text" >
+    <string>UnMark</string>
+   </property>
+  </action>
  </widget>
- <resources/>
+ <resources>
+  <include location="../main.qrc" />
+ </resources>
  <connections/>
 </ui>