From 387cdc35d79cd3dd235e4bb61e01e17d8781630a Mon Sep 17 00:00:00 2001
From: Szymon Kłos <eszkadev@gmail.com>
Date: Tue, 28 Mar 2017 10:40:16 +0200
Subject: Notebookbar: Separated paragraph spacing controls

One big paragraph spacing control was splitted
to separated widgets. It will be possible to
reuse that in the sidebar. Also layout is better
because explicit size setting is no longer needed.

Change-Id: Ieb200af4a9a6120ae03b22b27da56256aa816193
Reviewed-on: https://gerrit.libreoffice.org/35801
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
---
 svx/uiconfig/ui/paralrspacing.ui | 81 +++++++++++-----------------------------
 svx/uiconfig/ui/paraulspacing.ui | 62 ++++++++++--------------------
 2 files changed, 41 insertions(+), 102 deletions(-)

(limited to 'svx/uiconfig')

diff --git a/svx/uiconfig/ui/paralrspacing.ui b/svx/uiconfig/ui/paralrspacing.ui
index a8da5617d745..0e0cd5b45929 100644
--- a/svx/uiconfig/ui/paralrspacing.ui
+++ b/svx/uiconfig/ui/paralrspacing.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <requires lib="LibreOffice" version="1.0"/>
@@ -11,10 +11,8 @@
       <object class="GtkGrid" id="grid1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="row_spacing">1</property>
-        <property name="column_spacing">6</property>
         <child>
-          <object class="GtkBox" id="box67">
+          <object class="GtkBox" id="before">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">6</property>
@@ -24,7 +22,7 @@
                 <property name="can_focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
-                <property name="pixbuf">svx/res/symphony/Indent4.png</property>
+                <property name="pixbuf">svx/res/symphony/Indent2.png</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -33,15 +31,18 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label11">
+              <object class="svxlo-SvxRelativeField" id="beforetextindent">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Before</property>
+                <property name="can_focus">True</property>
+                <property name="tooltip_text" translatable="yes">Before Text Indent</property>
+                <property name="invisible_char">•</property>
+                <property name="text">0</property>
+                <property name="progress_fraction">0.10000000000000001</property>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
           </object>
@@ -51,21 +52,7 @@
           </packing>
         </child>
         <child>
-          <object class="svxlo-SvxRelativeField" id="beforetextindent">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="tooltip_text" translatable="yes">Before Text Indent</property>
-            <property name="invisible_char">•</property>
-            <property name="text">0</property>
-            <property name="progress_fraction">0.10000000000000001</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="box66">
+          <object class="GtkBox" id="after">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">6</property>
@@ -75,7 +62,7 @@
                 <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>
@@ -84,15 +71,17 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label12">
+              <object class="svxlo-SvxRelativeField" id="aftertextindent">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">After</property>
+                <property name="can_focus">True</property>
+                <property name="tooltip_text" translatable="yes">After Text Indent</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">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
           </object>
@@ -102,20 +91,7 @@
           </packing>
         </child>
         <child>
-          <object class="svxlo-SvxRelativeField" id="aftertextindent">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="tooltip_text" translatable="yes">After Text Indent</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">
+          <object class="GtkBox" id="firstline">
             <property name="can_focus">False</property>
             <property name="spacing">6</property>
             <child>
@@ -132,18 +108,6 @@
                 <property name="position">0</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkLabel" id="label13">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">First line</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
             <child>
               <object class="svxlo-SvxRelativeField" id="firstlineindent">
                 <property name="visible">True</property>
@@ -160,13 +124,10 @@
             </child>
           </object>
           <packing>
-            <property name="left_attach">2</property>
-            <property name="top_attach">0</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">2</property>
           </packing>
         </child>
-        <child>
-          <placeholder/>
-        </child>
       </object>
       <packing>
         <property name="expand">False</property>
diff --git a/svx/uiconfig/ui/paraulspacing.ui b/svx/uiconfig/ui/paraulspacing.ui
index c81bb6a8b377..db62128f1a4f 100644
--- a/svx/uiconfig/ui/paraulspacing.ui
+++ b/svx/uiconfig/ui/paraulspacing.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.20.0 -->
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <requires lib="LibreOffice" version="1.0"/>
@@ -19,7 +19,7 @@
         <property name="row_spacing">1</property>
         <property name="column_spacing">6</property>
         <child>
-          <object class="GtkBox" id="box27">
+          <object class="GtkBox" id="above">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">6</property>
@@ -29,7 +29,7 @@
                 <property name="can_focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">center</property>
-                <property name="pixbuf">svx/res/symphony/spacing1.png</property>
+                <property name="pixbuf">svx/res/symphony/spacing2.png</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -38,15 +38,19 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label2">
+              <object class="svxlo-SvxRelativeField" id="aboveparaspacing">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Above</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="invisible_char">•</property>
+                <property name="text">0</property>
+                <property name="adjustment">adjustment1</property>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
           </object>
@@ -56,7 +60,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkBox" id="box28">
+          <object class="GtkBox" id="below">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="spacing">6</property>
@@ -75,15 +79,19 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label10">
+              <object class="svxlo-SvxRelativeField" id="belowparaspacing">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Below</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="invisible_char">•</property>
+                <property name="text">0</property>
+                <property name="adjustment">adjustment1</property>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
           </object>
@@ -92,36 +100,6 @@
             <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="invisible_char">•</property>
-            <property name="text">0</property>
-            <property name="adjustment">adjustment1</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="invisible_char">•</property>
-            <property name="text">0</property>
-            <property name="adjustment">adjustment1</property>
-          </object>
-          <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
-        </child>
       </object>
       <packing>
         <property name="expand">False</property>
-- 
cgit v1.2.3