Index: bacula/src/qt-console/status/dirstat.ui
===================================================================
--- bacula/src/qt-console/status/dirstat.ui	(revision 6893)
+++ bacula/src/qt-console/status/dirstat.ui	(working copy)
@@ -13,24 +13,12 @@
    <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="0" column="0" >
     <widget class="QSplitter" name="splitter" >
      <property name="orientation" >
@@ -100,18 +88,9 @@
        <property name="spacing" >
         <number>6</number>
        </property>
-       <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>
        <item>
         <widget class="QLabel" name="scheduledLabel" >
          <property name="layoutDirection" >
@@ -138,18 +117,9 @@
        <property name="spacing" >
         <number>6</number>
        </property>
-       <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>
        <item>
         <widget class="QLabel" name="runningLabel" >
          <property name="layoutDirection" >
@@ -176,18 +146,9 @@
        <property name="spacing" >
         <number>6</number>
        </property>
-       <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>
        <item>
         <widget class="QLabel" name="terminatedLabel" >
          <property name="layoutDirection" >
Index: bacula/src/qt-console/storage/storage.ui
===================================================================
--- bacula/src/qt-console/storage/storage.ui	(revision 6893)
+++ bacula/src/qt-console/storage/storage.ui	(working copy)
@@ -13,24 +13,12 @@
    <string>Storage Tree</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="QTreeWidget" name="mp_treeWidget" >
      <column>
Index: bacula/src/qt-console/joblist/joblist.ui
===================================================================
--- bacula/src/qt-console/joblist/joblist.ui	(revision 6893)
+++ bacula/src/qt-console/joblist/joblist.ui	(working copy)
@@ -44,44 +44,20 @@
     <enum>QFrame::Raised</enum>
    </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="4" >
      <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="1" column="1" >
        <spacer>
         <property name="orientation" >
@@ -100,24 +76,12 @@
       </item>
       <item row="1" column="0" >
        <layout class="QGridLayout" >
-        <property name="leftMargin" >
+        <property name="margin" >
          <number>3</number>
         </property>
-        <property name="topMargin" >
+        <property name="spacing" >
          <number>3</number>
         </property>
-        <property name="rightMargin" >
-         <number>3</number>
-        </property>
-        <property name="bottomMargin" >
-         <number>3</number>
-        </property>
-        <property name="horizontalSpacing" >
-         <number>3</number>
-        </property>
-        <property name="verticalSpacing" >
-         <number>3</number>
-        </property>
         <item row="0" column="0" >
          <widget class="QPushButton" name="refreshButton" >
           <property name="text" >
@@ -145,18 +109,9 @@
         <property name="spacing" >
          <number>6</number>
         </property>
-        <property name="leftMargin" >
+        <property name="margin" >
          <number>3</number>
         </property>
-        <property name="topMargin" >
-         <number>3</number>
-        </property>
-        <property name="rightMargin" >
-         <number>3</number>
-        </property>
-        <property name="bottomMargin" >
-         <number>3</number>
-        </property>
         <item>
          <widget class="QLabel" name="fileSetLabel" >
           <property name="maximumSize" >
@@ -182,35 +137,17 @@
       <property name="spacing" >
        <number>6</number>
       </property>
-      <property name="leftMargin" >
+      <property name="margin" >
        <number>3</number>
       </property>
-      <property name="topMargin" >
-       <number>3</number>
-      </property>
-      <property name="rightMargin" >
-       <number>3</number>
-      </property>
-      <property name="bottomMargin" >
-       <number>3</number>
-      </property>
       <item>
        <layout class="QVBoxLayout" >
         <property name="spacing" >
          <number>6</number>
         </property>
-        <property name="leftMargin" >
+        <property name="margin" >
          <number>3</number>
         </property>
-        <property name="topMargin" >
-         <number>3</number>
-        </property>
-        <property name="rightMargin" >
-         <number>3</number>
-        </property>
-        <property name="bottomMargin" >
-         <number>3</number>
-        </property>
         <item>
          <widget class="QLabel" name="statusLabel" >
           <property name="text" >
@@ -228,18 +165,9 @@
         <property name="spacing" >
          <number>6</number>
         </property>
-        <property name="leftMargin" >
+        <property name="margin" >
          <number>3</number>
         </property>
-        <property name="topMargin" >
-         <number>3</number>
-        </property>
-        <property name="rightMargin" >
-         <number>3</number>
-        </property>
-        <property name="bottomMargin" >
-         <number>3</number>
-        </property>
         <item>
          <widget class="QLabel" name="purgedLabel" >
           <property name="text" >
@@ -259,35 +187,17 @@
       <property name="spacing" >
        <number>6</number>
       </property>
-      <property name="leftMargin" >
+      <property name="margin" >
        <number>3</number>
       </property>
-      <property name="topMargin" >
-       <number>3</number>
-      </property>
-      <property name="rightMargin" >
-       <number>3</number>
-      </property>
-      <property name="bottomMargin" >
-       <number>3</number>
-      </property>
       <item>
        <layout class="QVBoxLayout" >
         <property name="spacing" >
          <number>6</number>
         </property>
-        <property name="leftMargin" >
+        <property name="margin" >
          <number>3</number>
         </property>
-        <property name="topMargin" >
-         <number>3</number>
-        </property>
-        <property name="rightMargin" >
-         <number>3</number>
-        </property>
-        <property name="bottomMargin" >
-         <number>3</number>
-        </property>
         <item>
          <widget class="QCheckBox" name="limitCheckBox" >
           <property name="text" >
@@ -315,18 +225,9 @@
         <property name="spacing" >
          <number>6</number>
         </property>
-        <property name="leftMargin" >
+        <property name="margin" >
          <number>3</number>
         </property>
-        <property name="topMargin" >
-         <number>3</number>
-        </property>
-        <property name="rightMargin" >
-         <number>3</number>
-        </property>
-        <property name="bottomMargin" >
-         <number>3</number>
-        </property>
         <item>
          <widget class="QCheckBox" name="daysCheckBox" >
           <property name="text" >
@@ -350,35 +251,17 @@
       <property name="spacing" >
        <number>6</number>
       </property>
-      <property name="leftMargin" >
+      <property name="margin" >
        <number>3</number>
       </property>
-      <property name="topMargin" >
-       <number>3</number>
-      </property>
-      <property name="rightMargin" >
-       <number>3</number>
-      </property>
-      <property name="bottomMargin" >
-       <number>3</number>
-      </property>
       <item>
        <layout class="QVBoxLayout" >
         <property name="spacing" >
          <number>6</number>
         </property>
-        <property name="leftMargin" >
+        <property name="margin" >
          <number>3</number>
         </property>
-        <property name="topMargin" >
-         <number>3</number>
-        </property>
-        <property name="rightMargin" >
-         <number>3</number>
-        </property>
-        <property name="bottomMargin" >
-         <number>3</number>
-        </property>
         <item>
          <widget class="QLabel" name="clientsLabel" >
           <property name="text" >
@@ -396,18 +279,9 @@
         <property name="spacing" >
          <number>6</number>
         </property>
-        <property name="leftMargin" >
+        <property name="margin" >
          <number>3</number>
         </property>
-        <property name="topMargin" >
-         <number>3</number>
-        </property>
-        <property name="rightMargin" >
-         <number>3</number>
-        </property>
-        <property name="bottomMargin" >
-         <number>3</number>
-        </property>
         <item>
          <widget class="QLabel" name="volumeLabel" >
           <property name="text" >
@@ -427,35 +301,17 @@
       <property name="spacing" >
        <number>6</number>
       </property>
-      <property name="leftMargin" >
+      <property name="margin" >
        <number>3</number>
       </property>
-      <property name="topMargin" >
-       <number>3</number>
-      </property>
-      <property name="rightMargin" >
-       <number>3</number>
-      </property>
-      <property name="bottomMargin" >
-       <number>3</number>
-      </property>
       <item>
        <layout class="QVBoxLayout" >
         <property name="spacing" >
          <number>6</number>
         </property>
-        <property name="leftMargin" >
+        <property name="margin" >
          <number>3</number>
         </property>
-        <property name="topMargin" >
-         <number>3</number>
-        </property>
-        <property name="rightMargin" >
-         <number>3</number>
-        </property>
-        <property name="bottomMargin" >
-         <number>3</number>
-        </property>
         <item>
          <widget class="QLabel" name="jobLabel" >
           <property name="text" >
@@ -473,18 +329,9 @@
         <property name="spacing" >
          <number>6</number>
         </property>
-        <property name="leftMargin" >
+        <property name="margin" >
          <number>3</number>
         </property>
-        <property name="topMargin" >
-         <number>3</number>
-        </property>
-        <property name="rightMargin" >
-         <number>3</number>
-        </property>
-        <property name="bottomMargin" >
-         <number>3</number>
-        </property>
         <item>
          <widget class="QLabel" name="levelLabel" >
           <property name="text" >