add back text flow options and some other reorgs

Change-Id: I7139779728907b20d577bf465090674238f80649

1 files changed, 56 insertions, 21 deletions

diff --git a/sw/uiconfig/swriter/ui/frmaddpage.ui b/sw/uiconfig/swriter/ui/frmaddpage.ui
index 0fef3af86022..168dac788c7d 100644
--- a/sw/uiconfig/swriter/ui/frmaddpage.ui
+++ b/sw/uiconfig/swriter/ui/frmaddpage.ui
@@ -8,7 +8,7 @@
     <property name="orientation">vertical</property>
     <property name="spacing">12</property>
     <child>
-      <object class="GtkFrame" id="frame1">
+      <object class="GtkFrame" id="nameframe">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
@@ -97,7 +97,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <items>
-                      <item>None</item>
+                      <item>&lt;None&gt;</item>
                     </items>
                   </object>
                   <packing>
@@ -113,7 +113,7 @@
                     <property name="can_focus">False</property>
                     <property name="halign">start</property>
                     <items>
-                      <item>None</item>
+                      <item>&lt;None&gt;</item>
                     </items>
                   </object>
                   <packing>
@@ -177,7 +177,7 @@
       </packing>
     </child>
     <child>
-      <object class="GtkFrame" id="frame2">
+      <object class="GtkFrame" id="protect">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
@@ -238,6 +238,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
+                    <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
@@ -336,35 +337,29 @@
                     <property name="row_spacing">6</property>
                     <property name="column_spacing">12</property>
                     <child>
-                      <object class="GtkComboBox" id="textflow">
-                        <property name="visible">True</property>
+                      <object class="GtkLabel" id="textflow_label">
                         <property name="can_focus">False</property>
-                        <property name="halign">end</property>
-                        <items>
-                          <item>Left-to-right (horizontal)</item>
-                          <item>Right-to-left (horizontal)</item>
-                          <item>Right-to-left (vertical)</item>
-                          <item>Use superordinate object settings</item>
-                        </items>
+                        <property name="no_show_all">True</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">_Text direction:</property>
+                        <property name="use_underline">True</property>
+                        <property name="mnemonic_widget">textflow</property>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
+                        <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>
-                      <object class="GtkLabel" id="textflow_label">
-                        <property name="visible">True</property>
+                      <object class="GtkComboBox" id="textflow">
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">_Text direction:</property>
-                        <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">textflow</property>
+                        <property name="no_show_all">True</property>
+                        <property name="model">liststore1</property>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
+                        <property name="left_attach">1</property>
                         <property name="top_attach">0</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
@@ -400,4 +395,44 @@
       </packing>
     </child>
   </object>
+  <object class="GtkListStore" id="liststore1">
+    <columns>
+      <!-- column-name gchararray1 -->
+      <column type="gchararray"/>
+      <!-- column-name gint1 -->
+      <column type="gint"/>
+    </columns>
+    <data>
+      <row>
+        <col id="0" translatable="yes">Left-to-right</col>
+        <col id="1">0</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Right-to-left</col>
+        <col id="1">1</col>
+      </row>
+      <row>
+        <col id="0" translatable="yes">Use superordinate object settings</col>
+        <col id="1">4</col>
+      </row>
+    </data>
+  </object>
+  <object class="GtkSizeGroup" id="sizegroup1">
+    <property name="ignore_hidden">True</property>
+    <widgets>
+      <widget name="name_label"/>
+      <widget name="altname_label"/>
+      <widget name="prev_label"/>
+      <widget name="next_label"/>
+      <widget name="textflow_label"/>
+    </widgets>
+  </object>
+  <object class="GtkSizeGroup" id="sizegroup2">
+    <property name="ignore_hidden">True</property>
+    <widgets>
+      <widget name="prev"/>
+      <widget name="next"/>
+      <widget name="textflow"/>
+    </widgets>
+  </object>
 </interface>