Related: fdo#67395 add border to preview to cut up whitespace

Change-Id: Ic66bf59294f7c9fb4059574765734749a40b043f

4 files changed, 65 insertions, 61 deletions

diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui
index fe3270aff626..d89402daa8ad 100644
--- a/cui/uiconfig/ui/charnamepage.ui
+++ b/cui/uiconfig/ui/charnamepage.ui
@@ -745,13 +745,14 @@
         <property name="valign">end</property>
         <property name="top_padding">6</property>
         <property name="left_padding">12</property>
+        <property name="right_padding">12</property>
         <child>
-          <object class="svxlo-SvxFontPrevWindow" id="preview">
+          <object class="svxlo-SvxFontPrevWindow" id="preview:border">
             <property name="height_request">100</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child internal-child="accessible">
-              <object class="AtkObject" id="preview-atkobject">
+              <object class="AtkObject" id="preview:border-atkobject">
                 <property name="AtkObject::accessible-name" translatable="yes">Preview</property>
               </object>
             </child>
diff --git a/cui/uiconfig/ui/effectspage.ui b/cui/uiconfig/ui/effectspage.ui
index 76f1a82cc3b1..592984fdaa9c 100644
--- a/cui/uiconfig/ui/effectspage.ui
+++ b/cui/uiconfig/ui/effectspage.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkListStore" id="liststore1">
     <columns>
       <!-- column-name gchararray1 -->
@@ -643,13 +643,14 @@
         <property name="can_focus">False</property>
         <property name="top_padding">6</property>
         <property name="left_padding">12</property>
+        <property name="right_padding">12</property>
         <child>
-          <object class="svxlo-SvxFontPrevWindow" id="preview">
+          <object class="svxlo-SvxFontPrevWindow" id="preview:border">
             <property name="height_request">100</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child internal-child="accessible">
-              <object class="AtkObject" id="preview-atkobject">
+              <object class="AtkObject" id="preview:border-atkobject">
                 <property name="AtkObject::accessible-name" translatable="yes">Preview</property>
               </object>
             </child>
diff --git a/cui/uiconfig/ui/positionpage.ui b/cui/uiconfig/ui/positionpage.ui
index 533b5554d5d7..20927c8f7890 100644
--- a/cui/uiconfig/ui/positionpage.ui
+++ b/cui/uiconfig/ui/positionpage.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkAdjustment" id="adjustment1">
     <property name="lower">1</property>
     <property name="upper">100</property>
@@ -21,6 +21,23 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
+  <object class="GtkListStore" id="liststore1">
+    <columns>
+      <!-- column-name gchararray1 -->
+      <column type="gchararray"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Default</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Expanded</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Condensed</col>
+      </row>
+    </data>
+  </object>
   <object class="GtkBox" id="PositionPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -496,15 +513,16 @@
         <property name="valign">end</property>
         <property name="top_padding">6</property>
         <property name="left_padding">12</property>
+        <property name="right_padding">12</property>
         <child>
-          <object class="svxlo-SvxFontPrevWindow" id="preview">
+          <object class="svxlo-SvxFontPrevWindow" id="preview:border">
             <property name="height_request">100</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="hexpand">True</property>
             <property name="vexpand">True</property>
             <child internal-child="accessible">
-              <object class="AtkObject" id="preview-atkobject">
+              <object class="AtkObject" id="preview:border-atkobject">
                 <property name="AtkObject::accessible-name" translatable="yes">Preview</property>
               </object>
             </child>
@@ -519,21 +537,4 @@
       </packing>
     </child>
   </object>
-  <object class="GtkListStore" id="liststore1">
-    <columns>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">Default</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Expanded</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Condensed</col>
-      </row>
-    </data>
-  </object>
 </interface>
diff --git a/cui/uiconfig/ui/twolinespage.ui b/cui/uiconfig/ui/twolinespage.ui
index dc9643e1faf8..c6e6855f5d45 100644
--- a/cui/uiconfig/ui/twolinespage.ui
+++ b/cui/uiconfig/ui/twolinespage.ui
@@ -2,6 +2,40 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
+  <object class="GtkListStore" id="liststore2">
+    <columns>
+      <!-- column-name gchararray1 -->
+      <column type="gchararray"/>
+      <!-- column-name gint1 -->
+      <column type="gint"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">(None)</col>
+        <col id="1">0</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">)</col>
+        <col id="1">1</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">]</col>
+        <col id="1">2</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">&gt;</col>
+        <col id="1">3</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">}</col>
+        <col id="1">4</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Other Characters...</col>
+        <col id="1">5</col>
+      </row>
+    </data>
+  </object>
   <object class="GtkBox" id="TwoLinesPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -155,13 +189,14 @@
         <property name="valign">end</property>
         <property name="top_padding">6</property>
         <property name="left_padding">12</property>
+        <property name="right_padding">12</property>
         <child>
-          <object class="svxlo-SvxFontPrevWindow" id="preview">
+          <object class="svxlo-SvxFontPrevWindow" id="preview:border">
             <property name="height_request">100</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <child internal-child="accessible">
-              <object class="AtkObject" id="preview-atkobject">
+              <object class="AtkObject" id="preview:border-atkobject">
                 <property name="AtkObject::accessible-name" translatable="yes">Preview</property>
               </object>
             </child>
@@ -210,38 +245,4 @@
       </row>
     </data>
   </object>
-  <object class="GtkListStore" id="liststore2">
-    <columns>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-      <!-- column-name gint1 -->
-      <column type="gint"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes">(None)</col>
-        <col id="1">0</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">)</col>
-        <col id="1">1</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">]</col>
-        <col id="1">2</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">&gt;</col>
-        <col id="1">3</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">}</col>
-        <col id="1">4</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes">Other Characters...</col>
-        <col id="1">5</col>
-      </row>
-    </data>
-  </object>
 </interface>