weld SvxParaAlignTabPage

Change-Id: I843b264d44266213e91b7e75bf35e4f6cf41dd88
Reviewed-on: https://gerrit.libreoffice.org/55792
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 42 insertions, 73 deletions

diff --git a/cui/uiconfig/ui/paragalignpage.ui b/cui/uiconfig/ui/paragalignpage.ui
index 9d43ef9f9dd6..6f0cf827b4b3 100644
--- a/cui/uiconfig/ui/paragalignpage.ui
+++ b/cui/uiconfig/ui/paragalignpage.ui
@@ -1,64 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.1 -->
 <interface domain="cui">
   <requires lib="gtk+" version="3.18"/>
-  <requires lib="LibreOffice" version="1.0"/>
-  <object class="GtkListStore" id="liststoreLB_LASTLINE">
-    <columns>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-      <!-- column-name guint1 -->
-      <column type="guint"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes" context="paragalignpage|liststoreLB_LASTLINE">Start</col>
-        <col id="1">0</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="paragalignpage|liststoreLB_LASTLINE">Start</col>
-        <col id="1">1</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="paragalignpage|liststoreLB_LASTLINE">Centered</col>
-        <col id="1">2</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="paragalignpage|liststoreLB_LASTLINE">Justified</col>
-        <col id="1">3</col>
-      </row>
-    </data>
-  </object>
-  <object class="GtkListStore" id="liststoreLB_VERTALIGN">
-    <columns>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-      <!-- column-name guint1 -->
-      <column type="guint"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes" context="paragalignpage|liststoreLB_VERTALIGN">Automatic</col>
-        <col id="1">0</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="paragalignpage|liststoreLB_VERTALIGN">Base line</col>
-        <col id="1">1</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="paragalignpage|liststoreLB_VERTALIGN">Top</col>
-        <col id="1">2</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="paragalignpage|liststoreLB_VERTALIGN">Middle</col>
-        <col id="1">3</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="paragalignpage|liststoreLB_VERTALIGN">Bottom</col>
-        <col id="1">4</col>
-      </row>
-    </data>
-  </object>
   <object class="GtkGrid" id="ParaAlignPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -75,14 +18,31 @@
         <property name="vexpand">True</property>
         <property name="top_padding">24</property>
         <child>
-          <object class="svxlo-SvxParaPrevWindow" id="drawingareaWN_EXAMPLE">
+          <object class="GtkScrolledWindow">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can_focus">True</property>
             <property name="halign">center</property>
             <property name="valign">start</property>
-            <child internal-child="accessible">
-              <object class="AtkObject" id="drawingareaWN_EXAMPLE-atkobject">
-                <property name="AtkObject::accessible-name" translatable="yes" context="paragalignpage|drawingareaWN_EXAMPLE-atkobject">Example</property>
+            <property name="hscrollbar_policy">never</property>
+            <property name="vscrollbar_policy">never</property>
+            <property name="shadow_type">in</property>
+            <child>
+              <object class="GtkViewport">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <child>
+                  <object class="GtkDrawingArea" id="drawingareaWN_EXAMPLE">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="halign">center</property>
+                    <property name="valign">start</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="drawingareaWN_EXAMPLE-atkobject">
+                        <property name="AtkObject::accessible-name" translatable="yes" context="paragalignpage|drawingareaWN_EXAMPLE-atkobject">Example</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
               </object>
             </child>
           </object>
@@ -123,8 +83,8 @@
                         <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
+                        <property name="active">True</property>
                         <property name="draw_indicator">True</property>
-                        <property name="group">radioBTN_RIGHTALIGN</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -140,7 +100,7 @@
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
-                        <property name="group">radioBTN_CENTERALIGN</property>
+                        <property name="group">radioBTN_LEFTALIGN</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -157,7 +117,7 @@
                         <property name="use_underline">True</property>
                         <property name="xalign">0</property>
                         <property name="draw_indicator">True</property>
-                        <property name="group">radioBTN_JUSTIFYALIGN</property>
+                        <property name="group">radioBTN_LEFTALIGN</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -249,10 +209,15 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkComboBox" id="comboLB_LASTLINE">
+                          <object class="GtkComboBoxText" id="comboLB_LASTLINE">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="model">liststoreLB_LASTLINE</property>
+                            <items>
+                              <item id="0" translatable="yes" context="paragalignpage|liststoreLB_LASTLINE">Start</item>
+                              <item id="1" translatable="yes" context="paragalignpage|liststoreLB_LASTLINE">Start</item>
+                              <item id="2" translatable="yes" context="paragalignpage|liststoreLB_LASTLINE">Centered</item>
+                              <item id="3" translatable="yes" context="paragalignpage|liststoreLB_LASTLINE">Justified</item>
+                            </items>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -356,10 +321,16 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkComboBox" id="comboLB_VERTALIGN">
+                      <object class="GtkComboBoxText" id="comboLB_VERTALIGN">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="model">liststoreLB_VERTALIGN</property>
+                        <items>
+                          <item id="0" translatable="yes" context="paragalignpage|liststoreLB_VERTALIGN">Automatic</item>
+                          <item id="1" translatable="yes" context="paragalignpage|liststoreLB_VERTALIGN">Base line</item>
+                          <item id="2" translatable="yes" context="paragalignpage|liststoreLB_VERTALIGN">Top</item>
+                          <item id="3" translatable="yes" context="paragalignpage|liststoreLB_VERTALIGN">Middle</item>
+                          <item id="4" translatable="yes" context="paragalignpage|liststoreLB_VERTALIGN">Bottom</item>
+                        </items>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -421,11 +392,9 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="svxlo-FrameDirectionListBox" id="comboLB_TEXTDIRECTION">
+                      <object class="GtkComboBoxText" id="comboLB_TEXTDIRECTION">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="entry_text_column">0</property>
-                        <property name="id_column">1</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>