tdf#148017 harmonize sidebar .ui files

Change-Id: Ia5139f7255ba0e78f7089a4313a41d583ae62961
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141275
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>

1 files changed, 50 insertions, 44 deletions

diff --git a/sw/uiconfig/swriter/ui/sidebarwrap.ui b/sw/uiconfig/swriter/ui/sidebarwrap.ui
index 37c3a6af8d8a..1707e746fa7a 100644
--- a/sw/uiconfig/swriter/ui/sidebarwrap.ui
+++ b/sw/uiconfig/swriter/ui/sidebarwrap.ui
@@ -1,78 +1,79 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.40.0 -->
 <interface domain="sw">
   <requires lib="gtk+" version="3.20"/>
   <!-- n-columns=1 n-rows=1 -->
   <object class="GtkGrid" id="WrapPropertyPanel">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <child>
-      <!-- n-columns=1 n-rows=1 -->
-      <object class="GtkGrid">
+      <!-- n-columns=2 n-rows=2 -->
+      <object class="GtkGrid" id="grid1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
+        <property name="can-focus">False</property>
         <property name="hexpand">True</property>
-        <property name="border_width">6</property>
-        <property name="row_spacing">3</property>
-        <property name="column_spacing">6</property>
+        <property name="border-width">6</property>
+        <property name="row-spacing">3</property>
+        <property name="column-spacing">6</property>
         <child>
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">False</property>
             <property name="hexpand">True</property>
             <property name="label" translatable="yes" context="sidebarwrap|label1">Spacing:</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">spacingLB</property>
+            <property name="use-underline">True</property>
+            <property name="mnemonic-widget">spacingLB</property>
             <property name="xalign">0</property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkComboBoxText" id="spacingLB">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="tooltip_text" translatable="yes" context="sidebarwrap|spacingLB|tooltip_text">Set the amount of space between the image and surrounding text</property>
+            <property name="can-focus">False</property>
+            <property name="tooltip-text" translatable="yes" context="sidebarwrap|spacingLB|tooltip_text">Set the amount of space between the image and surrounding text</property>
+            <property name="hexpand">True</property>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="hexpand">True</property>
+            <property name="can-focus">False</property>
             <property name="label" translatable="yes" context="sidebarwrap|label2">Wrap:</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">spacingLB</property>
+            <property name="use-underline">True</property>
+            <property name="mnemonic-widget">spacingLB</property>
             <property name="xalign">0</property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="halign">end</property>
+            <property name="can-focus">False</property>
+            <property name="hexpand">True</property>
             <child>
               <object class="GtkToolbar" id="wrapoptions">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="toolbar_style">icons</property>
-                <property name="show_arrow">False</property>
+                <property name="can-focus">True</property>
+                <property name="toolbar-style">icons</property>
+                <property name="show-arrow">False</property>
                 <property name="icon_size">2</property>
                 <child>
                   <object class="GtkRadioToolButton" id=".uno:WrapOff">
                     <property name="visible">True</property>
-                    <property name="tooltip_text" translatable="yes" context="sidebarwrap|wrapoff|tooltip_text">None</property>
-                    <property name="use_underline">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="tooltip-text" translatable="yes" context="sidebarwrap|wrapoff|tooltip_text">None</property>
+                    <property name="use-underline">True</property>
                     <property name="active">True</property>
                   </object>
                   <packing>
@@ -83,8 +84,9 @@
                 <child>
                   <object class="GtkRadioToolButton" id=".uno:WrapOn">
                     <property name="visible">True</property>
-                    <property name="tooltip_text" translatable="yes" context="sidebarwrap|wrapon|tooltip_text">Parallel</property>
-                    <property name="use_underline">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="tooltip-text" translatable="yes" context="sidebarwrap|wrapon|tooltip_text">Parallel</property>
+                    <property name="use-underline">True</property>
                     <property name="group">.uno:WrapOff</property>
                   </object>
                   <packing>
@@ -95,8 +97,9 @@
                 <child>
                   <object class="GtkRadioToolButton" id=".uno:WrapIdeal">
                     <property name="visible">True</property>
-                    <property name="tooltip_text" translatable="yes" context="sidebarwrap|wrapideal|tooltip_text">Optimal</property>
-                    <property name="use_underline">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="tooltip-text" translatable="yes" context="sidebarwrap|wrapideal|tooltip_text">Optimal</property>
+                    <property name="use-underline">True</property>
                     <property name="group">.uno:WrapOff</property>
                   </object>
                   <packing>
@@ -107,8 +110,9 @@
                 <child>
                   <object class="GtkRadioToolButton" id=".uno:WrapLeft">
                     <property name="visible">True</property>
-                    <property name="tooltip_text" translatable="yes" context="sidebarwrap|wrapbefore|tooltip_text">Before</property>
-                    <property name="use_underline">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="tooltip-text" translatable="yes" context="sidebarwrap|wrapbefore|tooltip_text">Before</property>
+                    <property name="use-underline">True</property>
                     <property name="group">.uno:WrapOff</property>
                   </object>
                   <packing>
@@ -119,8 +123,9 @@
                 <child>
                   <object class="GtkRadioToolButton" id=".uno:WrapRight">
                     <property name="visible">True</property>
-                    <property name="tooltip_text" translatable="yes" context="sidebarwrap|wrapafter|tooltip_text">After</property>
-                    <property name="use_underline">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="tooltip-text" translatable="yes" context="sidebarwrap|wrapafter|tooltip_text">After</property>
+                    <property name="use-underline">True</property>
                     <property name="group">.uno:WrapOff</property>
                   </object>
                   <packing>
@@ -131,8 +136,9 @@
                 <child>
                   <object class="GtkRadioToolButton" id=".uno:WrapThrough">
                     <property name="visible">True</property>
-                    <property name="tooltip_text" translatable="yes" context="sidebarwrap|wrapthrough|tooltip_text">Through</property>
-                    <property name="use_underline">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="tooltip-text" translatable="yes" context="sidebarwrap|wrapthrough|tooltip_text">Through</property>
+                    <property name="use-underline">True</property>
                     <property name="group">.uno:WrapOff</property>
                   </object>
                   <packing>
@@ -149,14 +155,14 @@
             </child>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">0</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">0</property>
           </packing>
         </child>
       </object>
       <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">0</property>
+        <property name="left-attach">0</property>
+        <property name="top-attach">0</property>
       </packing>
     </child>
   </object>