Save precious vertical space by removing some redundant heading labels

Change-Id: I6aaa7602f57f6cb2d0f9bc3ee897a9c3576d47d3
Reviewed-on: https://gerrit.libreoffice.org/12012Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>
Tested-by: Samuel Mehrbrodt <s.mehrbrodt@gmail.com>

cui/uiconfig/ui/effectspage.ui

 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
 <interface>
-  <!-- interface-requires LibreOffice 1.0 -->
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.0"/>
+  <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkListStore" id="liststore1">
     <columns>
       <!-- column-name gchararray1 -->
@@ -203,20 +204,6 @@
     <property name="border_width">6</property>
     <property name="orientation">vertical</property>
     <property name="spacing">6</property>
-    <child>
-      <object class="GtkFrame" id="frame15">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="hexpand">True</property>
-        <property name="label_xalign">0</property>
-        <property name="shadow_type">none</property>
-        <child>
-          <object class="GtkAlignment" id="alignment15">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="hexpand">True</property>
-            <property name="top_padding">6</property>
-            <property name="left_padding">12</property>
     <child>
       <object class="GtkGrid" id="grid8">
         <property name="visible">True</property>
@@ -229,13 +216,11 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Font color</property>
+            <property name="label" translatable="yes">Font color:</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -243,13 +228,11 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Effects</property>
+            <property name="label" translatable="yes">Effects:</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">2</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -257,13 +240,11 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Relief</property>
+            <property name="label" translatable="yes">Relief:</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">4</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -271,13 +252,11 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Overlining</property>
+            <property name="label" translatable="yes">Overlining:</property>
           </object>
           <packing>
             <property name="left_attach">2</property>
             <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -285,13 +264,11 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Strikethrough</property>
+            <property name="label" translatable="yes">Strikethrough:</property>
           </object>
           <packing>
             <property name="left_attach">2</property>
             <property name="top_attach">2</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -299,13 +276,11 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Underlining</property>
+            <property name="label" translatable="yes">Underlining:</property>
           </object>
           <packing>
             <property name="left_attach">2</property>
             <property name="top_attach">4</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -313,13 +288,11 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Overline color</property>
+            <property name="label" translatable="yes">Overline color:</property>
           </object>
           <packing>
             <property name="left_attach">3</property>
             <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -327,13 +300,11 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Underline color</property>
+            <property name="label" translatable="yes">Underline color:</property>
           </object>
           <packing>
             <property name="left_attach">3</property>
             <property name="top_attach">4</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -344,8 +315,6 @@
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">1</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -357,8 +326,6 @@
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">3</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -370,8 +337,6 @@
           <packing>
             <property name="left_attach">2</property>
             <property name="top_attach">1</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -383,8 +348,6 @@
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">5</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -396,8 +359,6 @@
           <packing>
             <property name="left_attach">2</property>
             <property name="top_attach">5</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -409,8 +370,6 @@
           <packing>
             <property name="left_attach">2</property>
             <property name="top_attach">3</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -421,8 +380,6 @@
           <packing>
             <property name="left_attach">3</property>
             <property name="top_attach">5</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -433,8 +390,6 @@
           <packing>
             <property name="left_attach">3</property>
             <property name="top_attach">1</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -450,8 +405,6 @@
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">6</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -467,8 +420,6 @@
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">8</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -484,8 +435,6 @@
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">9</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -500,8 +449,6 @@
           <packing>
             <property name="left_attach">2</property>
             <property name="top_attach">6</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -513,8 +460,6 @@
           <packing>
             <property name="left_attach">2</property>
             <property name="top_attach">9</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -526,8 +471,6 @@
           <packing>
             <property name="left_attach">3</property>
             <property name="top_attach">9</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -535,13 +478,11 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Position</property>
+            <property name="label" translatable="yes">Position:</property>
           </object>
           <packing>
             <property name="left_attach">3</property>
             <property name="top_attach">8</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -549,13 +490,11 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Emphasis mark</property>
+            <property name="label" translatable="yes">Emphasis mark:</property>
           </object>
           <packing>
             <property name="left_attach">2</property>
             <property name="top_attach">8</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -571,8 +510,6 @@
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">7</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -584,7 +521,6 @@
           <packing>
             <property name="left_attach">1</property>
             <property name="top_attach">0</property>
-                    <property name="width">1</property>
             <property name="height">10</property>
           </packing>
         </child>
@@ -597,7 +533,6 @@
           <packing>
             <property name="left_attach">4</property>
             <property name="top_attach">0</property>
-                    <property name="width">1</property>
             <property name="height">10</property>
           </packing>
         </child>
@@ -617,20 +552,6 @@
           <placeholder/>
         </child>
       </object>
-            </child>
-          </object>
-        </child>
-        <child type="label">
-          <object class="GtkLabel" id="label42">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">Options</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-        </child>
-      </object>
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>

cui/uiconfig/ui/select_persona_dialog.ui

 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="SelectPersonaDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes">Select Firefox Theme</property>
+    <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -31,23 +32,6 @@
                     <property name="can_focus">False</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="label1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Search keyword:</property>
-                        <property name="use_underline">True</property>
-                        <property name="wrap">True</property>
-                        <property name="mnemonic_widget">search_term</property>
-                        <property name="max_width_chars">54</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
                     <child>
                       <object class="GtkBox" id="box4">
                         <property name="visible">True</property>
@@ -250,8 +234,6 @@
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -265,8 +247,6 @@
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -280,8 +260,6 @@
                           <packing>
                             <property name="left_attach">2</property>
                             <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -295,8 +273,6 @@
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -310,8 +286,6 @@
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -325,8 +299,6 @@
                           <packing>
                             <property name="left_attach">2</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -340,8 +312,6 @@
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">2</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -355,8 +325,6 @@
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">2</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -370,8 +338,6 @@
                           <packing>
                             <property name="left_attach">2</property>
                             <property name="top_attach">2</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                       </object>
@@ -460,6 +426,7 @@
                 <property name="expand">False</property>
                 <property name="fill">False</property>
                 <property name="position">2</property>
+                <property name="secondary">True</property>
               </packing>
             </child>
           </object>

dbaccess/uiconfig/ui/sqlexception.ui

 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
+  <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkDialog" id="SQLExceptionDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
-    <property name="title" translatable="yes">%PRODUCTNAME Base</property>
+    <property name="title" translatable="yes">Error Details</property>
+    <property name="resizable">False</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -40,22 +42,6 @@
             <property name="position">0</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkFrame" id="frame1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
-            <child>
-              <object class="GtkAlignment" id="alignment1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
-                <property name="top_padding">6</property>
-                <property name="left_padding">12</property>
         <child>
           <object class="GtkGrid" id="grid1">
             <property name="visible">True</property>
@@ -76,8 +62,6 @@
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -92,8 +76,6 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -117,8 +99,6 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -127,29 +107,16 @@
                 <property name="can_focus">True</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
+                <child internal-child="selection">
+                  <object class="GtkTreeSelection" id="Tree List-selection1"/>
+                </child>
               </object>
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
               </packing>
             </child>
           </object>
-                </child>
-              </object>
-            </child>
-            <child type="label">
-              <object class="GtkLabel" id="label1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Details</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
-              </object>
-            </child>
-          </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>

sd/uiconfig/sdraw/ui/vectorize.ui

@@ -2,7 +2,6 @@
 <!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
-  <requires lib="LibreOffice" version="1.0"/>
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">8</property>
     <property name="upper">32</property>
@@ -26,6 +25,7 @@
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes">Convert to Polygon</property>
+    <property name="resizable">False</property>
     <property name="window_position">mouse</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
@@ -33,24 +33,81 @@
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">12</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area1">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
             <child>
-          <object class="GtkFrame" id="frame1">
+              <object class="GtkButton" id="ok">
+                <property name="label">gtk-ok</property>
                 <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
+                <property name="can_focus">True</property>
+                <property name="can_default">True</property>
+                <property name="has_default">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
             <child>
-              <object class="GtkAlignment" id="alignment1">
+              <object class="GtkButton" id="cancel">
+                <property name="label">gtk-cancel</property>
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="top_padding">6</property>
-                <property name="left_padding">12</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="preview">
+                <property name="label" translatable="yes">Preview</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_underline">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="help">
+                <property name="label">gtk-help</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">3</property>
+                <property name="secondary">True</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkGrid" id="grid2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="vexpand">True</property>
             <property name="row_spacing">6</property>
             <property name="column_spacing">12</property>
             <child>
@@ -111,6 +168,7 @@
                 <property name="can_focus">False</property>
                 <property name="margin_left">12</property>
                 <property name="xalign">0</property>
+                <property name="xpad">12</property>
                 <property name="label" translatable="yes">Tile size:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">tiles:0px</property>
@@ -149,96 +207,12 @@
               </packing>
             </child>
           </object>
-                </child>
-              </object>
-            </child>
-            <child type="label">
-              <object class="GtkLabel" id="label1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Settings</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="can_focus">False</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="ok">
-                <property name="label">gtk-ok</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="can_default">True</property>
-                <property name="has_default">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="cancel">
-                <property name="label">gtk-cancel</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
-            <child>
-              <object class="GtkButton" id="preview">
-                <property name="label" translatable="yes">Preview</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_underline">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="help">
-                <property name="label">gtk-help</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_stock">True</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">3</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkGrid" id="grid1">
             <property name="visible">True</property>
@@ -306,38 +280,12 @@
             <property name="position">2</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkGrid" id="grid3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="hexpand">True</property>
-            <property name="column_spacing">12</property>
-            <child>
-              <object class="GtkLabel" id="label7">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Progress</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">progressbar</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-              </packing>
-            </child>
         <child>
           <object class="GtkProgressBar" id="progressbar">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="hexpand">True</property>
           </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
-              </packing>
-            </child>
-          </object>
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>

sfx2/uiconfig/ui/cmisinfopage.ui

 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkGrid" id="CmisInfoPage">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
     <property name="border_width">6</property>
-    <property name="row_spacing">12</property>
-    <child>
-      <object class="GtkLabel" id="label56">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="halign">start</property>
-        <property name="label" translatable="yes">_CMIS Properties</property>
-        <property name="use_underline">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">0</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
-      </packing>
-    </child>
+    <property name="row_spacing">6</property>
     <child>
       <object class="GtkScrolledWindow" id="CmisScroll">
         <property name="visible">True</property>
@@ -34,6 +19,7 @@
         <child>
           <object class="GtkViewport" id="viewport1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <child>
               <object class="GtkBox" id="CmisWindow">
                 <property name="visible">True</property>
@@ -51,9 +37,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">2</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">1</property>
       </packing>
     </child>
     <child>
@@ -102,9 +86,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">1</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">0</property>
       </packing>
     </child>
   </object>

sfx2/uiconfig/ui/custominfopage.ui

 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkGrid" id="CustomInfoPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="hexpand">True</property>
     <property name="vexpand">True</property>
     <property name="border_width">6</property>
-    <property name="row_spacing">12</property>
-    <child>
-      <object class="GtkLabel" id="label56">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="halign">start</property>
-        <property name="label" translatable="yes">_Properties</property>
-        <property name="use_underline">True</property>
-      </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">0</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
-      </packing>
-    </child>
+    <property name="row_spacing">6</property>
     <child>
       <object class="GtkButton" id="add">
         <property name="label">gtk-add</property>
@@ -34,9 +20,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">3</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">2</property>
       </packing>
     </child>
     <child>
@@ -48,9 +32,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">2</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">1</property>
       </packing>
     </child>
     <child>
@@ -99,9 +81,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">1</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">0</property>
       </packing>
     </child>
   </object>

sfx2/uiconfig/ui/documentinfopage.ui

 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkGrid" id="DocumentInfoPage">
@@ -9,7 +9,7 @@
     <property name="vexpand">True</property>
     <property name="border_width">6</property>
     <property name="row_spacing">6</property>
-    <property name="column_spacing">18</property>
+    <property name="column_spacing">12</property>
     <child>
       <object class="GtkLabel" id="label13">
         <property name="visible">True</property>
@@ -21,9 +21,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">7</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">5</property>
       </packing>
     </child>
     <child>
@@ -37,9 +35,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">8</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">6</property>
       </packing>
     </child>
     <child>
@@ -53,9 +49,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">10</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">8</property>
       </packing>
     </child>
     <child>
@@ -69,9 +63,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">11</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">9</property>
       </packing>
     </child>
     <child>
@@ -85,9 +77,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">12</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">10</property>
       </packing>
     </child>
     <child>
@@ -101,9 +91,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">13</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">11</property>
       </packing>
     </child>
     <child>
@@ -116,9 +104,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="top_attach">7</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">5</property>
       </packing>
     </child>
     <child>
@@ -131,9 +117,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="top_attach">8</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">6</property>
       </packing>
     </child>
     <child>
@@ -147,9 +131,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="top_attach">10</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">8</property>
       </packing>
     </child>
     <child>
@@ -162,9 +144,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="top_attach">11</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">9</property>
       </packing>
     </child>
     <child>
@@ -177,9 +157,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="top_attach">12</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">10</property>
       </packing>
     </child>
     <child>
@@ -192,9 +170,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="top_attach">13</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">11</property>
       </packing>
     </child>
     <child>
@@ -210,9 +186,8 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">14</property>
+        <property name="top_attach">12</property>
         <property name="width">2</property>
-        <property name="height">1</property>
       </packing>
     </child>
     <child>
@@ -226,9 +201,7 @@
       </object>
       <packing>
         <property name="left_attach">2</property>
-        <property name="top_attach">14</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">12</property>
       </packing>
     </child>
     <child>
@@ -243,9 +216,7 @@
       </object>
       <packing>
         <property name="left_attach">2</property>
-        <property name="top_attach">10</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">8</property>
       </packing>
     </child>
     <child>
@@ -259,9 +230,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">5</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">4</property>
       </packing>
     </child>
     <child>
@@ -274,9 +243,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="top_attach">5</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">4</property>
       </packing>
     </child>
     <child>
@@ -290,9 +257,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">4</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">3</property>
       </packing>
     </child>
     <child>
@@ -306,9 +271,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="top_attach">4</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">3</property>
       </packing>
     </child>
     <child>
@@ -323,9 +286,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">3</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">2</property>
       </packing>
     </child>
     <child>
@@ -337,9 +298,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="top_attach">3</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">2</property>
       </packing>
     </child>
     <child>
@@ -354,35 +313,7 @@
       </object>
       <packing>
         <property name="left_attach">2</property>
-        <property name="top_attach">1</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="label2">
-        <property name="height_request">18</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">2</property>
-        <property name="width">3</property>
-        <property name="height">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="label3">
-        <property name="height_request">18</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">6</property>
-        <property name="width">3</property>
-        <property name="height">1</property>
+        <property name="top_attach">0</property>
       </packing>
     </child>
     <child>
@@ -398,22 +329,7 @@
       </object>
       <packing>
         <property name="left_attach">2</property>
-        <property name="top_attach">3</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="label1">
-        <property name="height_request">18</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-      </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">0</property>
-        <property name="width">3</property>
-        <property name="height">1</property>
+        <property name="top_attach">2</property>
       </packing>
     </child>
     <child>
@@ -427,9 +343,7 @@
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">9</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">7</property>
       </packing>
     </child>
     <child>
@@ -442,9 +356,7 @@
       </object>
       <packing>
         <property name="left_attach">1</property>
-        <property name="top_attach">9</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
+        <property name="top_attach">7</property>
       </packing>
     </child>
     <child>
@@ -464,8 +376,6 @@
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
@@ -479,16 +389,24 @@
           <packing>
             <property name="left_attach">1</property>
             <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">1</property>
+        <property name="top_attach">0</property>
         <property name="width">2</property>
-        <property name="height">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkSeparator" id="separator1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+      </object>
+      <packing>
+        <property name="left_attach">0</property>
+        <property name="top_attach">1</property>
+        <property name="width">3</property>
       </packing>
     </child>
     <child>