Make bad Storage check in is_on_same_storage non-fatal

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

diff --git a/bacula/src/qt-console/prefs.ui b/bacula/src/qt-console/prefs.ui
index a0b0bc2aa9589940c55a93be535d92bd83211338..27c7dd107bf52ace1631a67696cef9893a117b7b 100644 (file)
--- a/bacula/src/qt-console/prefs.ui
+++ b/bacula/src/qt-console/prefs.ui
@@ -107,67 +107,6 @@
         </property>
        </widget>
       </widget>
-      <widget class="QGroupBox" name="groupBox_8" >
-       <property name="geometry" >
-        <rect>
-         <x>60</x>
-         <y>200</y>
-         <width>180</width>
-         <height>106</height>
-        </rect>
-       </property>
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="title" >
-        <string>Status Dir</string>
-       </property>
-       <widget class="QLabel" name="checkLabel_2" >
-        <property name="geometry" >
-         <rect>
-          <x>11</x>
-          <y>81</y>
-          <width>158</width>
-          <height>16</height>
-         </rect>
-        </property>
-        <property name="text" >
-         <string>Refresh Status Dir Interval</string>
-        </property>
-       </widget>
-       <widget class="QCheckBox" name="refreshStatusDir" >
-        <property name="geometry" >
-         <rect>
-          <x>11</x>
-          <y>25</y>
-          <width>158</width>
-          <height>20</height>
-         </rect>
-        </property>
-        <property name="text" >
-         <string>Refresh Status Dir</string>
-        </property>
-       </widget>
-       <widget class="QSpinBox" name="refreshStatusDirSpin" >
-        <property name="geometry" >
-         <rect>
-          <x>11</x>
-          <y>51</y>
-          <width>158</width>
-          <height>24</height>
-         </rect>
-        </property>
-        <property name="minimum" >
-         <number>20</number>
-        </property>
-        <property name="maximum" >
-         <number>3600</number>
-        </property>
-       </widget>
-      </widget>
      </widget>
      <widget class="QWidget" name="tab_2" >
       <attribute name="title" >
@@ -201,7 +140,7 @@
           </sizepolicy>
          </property>
          <property name="title" >
-          <string>Jolist Limit Options</string>
+          <string>Joblist Limit Options</string>
          </property>
          <layout class="QGridLayout" >
           <property name="leftMargin" >
@@ -328,7 +267,7 @@
          </rect>
         </property>
         <property name="text" >
-         <string>Convert Bytes with IEC 1000B = KB</string>
+         <string>Display Bytes using IEC units (1024B = 1 KiB)</string>
         </property>
        </widget>
        <widget class="QRadioButton" name="radioConvertStandard" >
@@ -341,7 +280,7 @@
          </rect>
         </property>
         <property name="text" >
-         <string>Convert Bytes with 1024B = KB</string>
+         <string>Display Bytes using SI units (1000B = 1KB)</string>
         </property>
        </widget>
       </widget>
@@ -473,80 +412,47 @@
           <string>Debugging Options</string>
          </property>
          <layout class="QGridLayout" >
-          <property name="leftMargin" >
-           <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" >
-           <number>6</number>
-          </property>
-          <property name="verticalSpacing" >
-           <number>6</number>
-          </property>
           <item row="0" column="0" >
-           <layout class="QGridLayout" >
-            <property name="leftMargin" >
-             <number>0</number>
+           <widget class="QCheckBox" name="commDebug" >
+            <property name="text" >
+             <string>Debug comm</string>
             </property>
-            <property name="topMargin" >
-             <number>0</number>
+           </widget>
+          </item>
+          <item row="1" column="0" colspan="2" >
+           <widget class="QCheckBox" name="connDebug" >
+            <property name="text" >
+             <string>Debug multiple connection</string>
             </property>
-            <property name="rightMargin" >
-             <number>0</number>
+           </widget>
+          </item>
+          <item row="2" column="0" >
+           <widget class="QCheckBox" name="displayAll" >
+            <property name="text" >
+             <string>Display all messages in console</string>
             </property>
-            <property name="bottomMargin" >
-             <number>0</number>
+           </widget>
+          </item>
+          <item row="3" column="0" >
+           <widget class="QCheckBox" name="sqlDebug" >
+            <property name="text" >
+             <string>Debug Sql queries</string>
             </property>
-            <property name="horizontalSpacing" >
-             <number>6</number>
+           </widget>
+          </item>
+          <item row="4" column="0" >
+           <widget class="QCheckBox" name="commandDebug" >
+            <property name="text" >
+             <string>Debug Commands</string>
             </property>
-            <property name="verticalSpacing" >
-             <number>6</number>
+           </widget>
+          </item>
+          <item row="5" column="0" >
+           <widget class="QCheckBox" name="miscDebug" >
+            <property name="text" >
+             <string>Debug Miscelaneous Items</string>
             </property>
-            <item row="0" column="0" >
-             <widget class="QCheckBox" name="commDebug" >
-              <property name="text" >
-               <string>Debug comm</string>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="0" >
-             <widget class="QCheckBox" name="displayAll" >
-              <property name="text" >
-               <string>Display all messages in console</string>
-              </property>
-             </widget>
-            </item>
-            <item row="3" column="0" >
-             <widget class="QCheckBox" name="commandDebug" >
-              <property name="text" >
-               <string>Debug Commands</string>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="0" >
-             <widget class="QCheckBox" name="sqlDebug" >
-              <property name="text" >
-               <string>Debug Sql queries</string>
-              </property>
-             </widget>
-            </item>
-            <item row="4" column="0" >
-             <widget class="QCheckBox" name="miscDebug" >
-              <property name="text" >
-               <string>Debug Miscelaneous Items</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
+           </widget>
           </item>
          </layout>
         </widget>