From 148526249745d11262cbf8ebddae92c9933efd4c Mon Sep 17 00:00:00 2001
From: Szymon Kłos <eszkadev@gmail.com>
Date: Sat, 28 May 2016 14:40:54 +0200
Subject: notebookbar: sw ui adjustment

Change-Id: I89d1a1fe20a617155a11dc59c49454bcd24e3e3d
---
 sw/uiconfig/swriter/ui/notebookbar.ui | 156 +++++++++++++++++-----------------
 1 file changed, 76 insertions(+), 80 deletions(-)

diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui b/sw/uiconfig/swriter/ui/notebookbar.ui
index 3f556e8582f3..ed987f454000 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -1911,22 +1911,6 @@
                                 <property name="position">1</property>
                               </packing>
                             </child>
-                            <child>
-                              <object class="svxlo-SvxRelativeField" id="aboveparaspacing">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="has_tooltip">True</property>
-                                <property name="tooltip_text" translatable="yes">Above Paragraph Spacing</property>
-                                <property name="hexpand">True</property>
-                                <property name="invisible_char">•</property>
-                                <property name="text">0</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -1964,28 +1948,42 @@
                                 <property name="position">1</property>
                               </packing>
                             </child>
-                            <child>
-                              <object class="svxlo-SvxRelativeField" id="belowparaspacing">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="has_tooltip">True</property>
-                                <property name="tooltip_text" translatable="yes">Below Paragraph Spacing</property>
-                                <property name="hexpand">True</property>
-                                <property name="invisible_char">•</property>
-                                <property name="text">0</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">1</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="svxlo-SvxRelativeField" id="aboveparaspacing">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="has_tooltip">True</property>
+                            <property name="tooltip_text" translatable="yes">Above Paragraph Spacing</property>
+                            <property name="hexpand">True</property>
+                            <property name="invisible_char">•</property>
+                            <property name="text">0</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="svxlo-SvxRelativeField" id="belowparaspacing">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="has_tooltip">True</property>
+                            <property name="tooltip_text" translatable="yes">Below Paragraph Spacing</property>
+                            <property name="hexpand">True</property>
+                            <property name="invisible_char">•</property>
+                            <property name="text">0</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">1</property>
+                          </packing>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -2030,21 +2028,6 @@
                                 <property name="position">1</property>
                               </packing>
                             </child>
-                            <child>
-                              <object class="svxlo-SvxRelativeField" id="beforetextindent1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="tooltip_text" translatable="yes">Before Text Indent</property>
-                                <property name="hexpand">True</property>
-                                <property name="invisible_char">•</property>
-                                <property name="text">0</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -2052,17 +2035,17 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkBox" id="box68">
+                          <object class="GtkBox" id="box66">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="spacing">6</property>
                             <child>
-                              <object class="GtkImage" id="image11">
+                              <object class="GtkImage" id="image4">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="halign">center</property>
                                 <property name="valign">center</property>
-                                <property name="pixbuf">svx/res/symphony/Indent2.png</property>
+                                <property name="pixbuf">svx/res/symphony/Indent3.png</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -2071,10 +2054,10 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkLabel" id="label13">
+                              <object class="GtkLabel" id="label12">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">First line</property>
+                                <property name="label" translatable="yes">After</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -2082,21 +2065,20 @@
                                 <property name="position">1</property>
                               </packing>
                             </child>
-                            <child>
-                              <object class="svxlo-SvxRelativeField" id="firstlineindent1">
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="tooltip_text" translatable="yes">First Line Indent</property>
-                                <property name="hexpand">True</property>
-                                <property name="invisible_char">•</property>
-                                <property name="text">0</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">2</property>
-                              </packing>
-                            </child>
+                          </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="svxlo-SvxRelativeField" id="beforetextindent1">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip_text" translatable="yes">Before Text Indent</property>
+                            <property name="hexpand">True</property>
+                            <property name="invisible_char">•</property>
+                            <property name="text">0</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -2104,17 +2086,31 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkBox" id="box66">
+                          <object class="svxlo-SvxRelativeField" id="aftertextindent1">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="tooltip_text" translatable="yes">After Text Indent</property>
+                            <property name="hexpand">True</property>
+                            <property name="invisible_char">•</property>
+                            <property name="text">0</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="box30">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="spacing">6</property>
                             <child>
-                              <object class="GtkImage" id="image4">
+                              <object class="GtkImage" id="image11">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="halign">center</property>
                                 <property name="valign">center</property>
-                                <property name="pixbuf">svx/res/symphony/Indent3.png</property>
+                                <property name="pixbuf">svx/res/symphony/Indent2.png</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -2123,10 +2119,10 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkLabel" id="label12">
+                              <object class="GtkLabel" id="label13">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="label" translatable="yes">After</property>
+                                <property name="label" translatable="yes">First line</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -2135,10 +2131,10 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="svxlo-SvxRelativeField" id="aftertextindent1">
+                              <object class="svxlo-SvxRelativeField" id="firstlineindent1">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
-                                <property name="tooltip_text" translatable="yes">After Text Indent</property>
+                                <property name="tooltip_text" translatable="yes">First Line Indent</property>
                                 <property name="hexpand">True</property>
                                 <property name="invisible_char">•</property>
                                 <property name="text">0</property>
@@ -2151,21 +2147,19 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">1</property>
+                            <property name="left_attach">2</property>
+                            <property name="top_attach">0</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkBox" id="box30">
+                          <object class="GtkBox" id="box31">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="spacing">6</property>
                             <child>
                               <object class="sfxlo-SidebarToolBox" id="linespacing1">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="has_tooltip">True</property>
-                                <property name="hexpand">True</property>
                                 <child>
                                   <object class="GtkMenuToolButton" id="setlinespacing1">
                                     <property name="visible">True</property>
@@ -2192,6 +2186,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="label" translatable="yes">Line spacing</property>
+                                <property name="xalign">0</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -2201,7 +2196,7 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="left_attach">1</property>
+                            <property name="left_attach">2</property>
                             <property name="top_attach">1</property>
                           </packing>
                         </child>
@@ -3415,6 +3410,7 @@
                             <property name="receives_default">True</property>
                             <property name="action_name">.uno:InsertRowsAfter</property>
                             <property name="relief">none</property>
+                            <property name="xalign">0</property>
                             <property name="always_show_image">True</property>
                           </object>
                           <packing>
-- 
cgit v1.2.3