From c0266d67bbc79ba78cbd58f7051458253c8e5196 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Sun, 9 Sep 2018 15:20:00 +0100
Subject: weld SvxGridTabPage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I04c2ead288547ecd0fba22a7a95a2497ab8dc768
Reviewed-on: https://gerrit.libreoffice.org/60217
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
---
 svx/uiconfig/ui/optgridpage.ui | 60 +++++++++++++++++++++++++++---------------
 1 file changed, 39 insertions(+), 21 deletions(-)

(limited to 'svx/uiconfig')

diff --git a/svx/uiconfig/ui/optgridpage.ui b/svx/uiconfig/ui/optgridpage.ui
index 8c67fc5108a2..808572da6ad6 100644
--- a/svx/uiconfig/ui/optgridpage.ui
+++ b/svx/uiconfig/ui/optgridpage.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.1 -->
 <interface domain="svx">
   <requires lib="gtk+" version="3.18"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -32,6 +32,18 @@
     <property name="step_increment">5</property>
     <property name="page_increment">10</property>
   </object>
+  <object class="GtkAdjustment" id="adjustment6">
+    <property name="lower">0.01</property>
+    <property name="upper">10</property>
+    <property name="step_increment">0.20000000000000001</property>
+    <property name="page_increment">1</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment7">
+    <property name="lower">1</property>
+    <property name="upper">99</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkBox" id="OptGridPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -138,9 +150,10 @@
                     <property name="row_spacing">6</property>
                     <property name="column_spacing">12</property>
                     <child>
-                      <object class="GtkSpinButton" id="mtrflddrawx:0.00cm">
+                      <object class="GtkSpinButton" id="mtrflddrawx">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="activates_default">True</property>
                         <property name="adjustment">adjustment1</property>
                         <property name="digits">2</property>
                       </object>
@@ -150,10 +163,11 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkSpinButton" id="mtrflddrawy:0.00cm">
+                      <object class="GtkSpinButton" id="mtrflddrawy">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="adjustment">adjustment1</property>
+                        <property name="activates_default">True</property>
+                        <property name="adjustment">adjustment6</property>
                         <property name="digits">2</property>
                       </object>
                       <packing>
@@ -165,10 +179,10 @@
                       <object class="GtkLabel" id="flddrawx">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes" context="optgridpage|flddrawx">H_orizontal:</property>
                         <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">mtrflddrawx:0.00cm</property>
+                        <property name="mnemonic_widget">mtrflddrawx</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -179,10 +193,10 @@
                       <object class="GtkLabel" id="flddrawy">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes" context="optgridpage|flddrawy">_Vertical:</property>
                         <property name="use_underline">True</property>
-                        <property name="mnemonic_widget">mtrflddrawy:0.00cm</property>
+                        <property name="mnemonic_widget">mtrflddrawy</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -259,6 +273,7 @@
                           <object class="GtkSpinButton" id="numflddivisionx">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="activates_default">True</property>
                             <property name="adjustment">adjustment2</property>
                           </object>
                           <packing>
@@ -270,8 +285,8 @@
                           <object class="GtkLabel" id="label4">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes" context="optgridpage|label4">space(s)</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -293,7 +308,8 @@
                           <object class="GtkSpinButton" id="numflddivisiony">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="adjustment">adjustment2</property>
+                            <property name="activates_default">True</property>
+                            <property name="adjustment">adjustment7</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -304,8 +320,8 @@
                           <object class="GtkLabel" id="label5">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes" context="optgridpage|label5">space(s)</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -322,10 +338,10 @@
                       <object class="GtkLabel" id="divisionx">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes" context="optgridpage|divisionx">Horizont_al:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">numflddivisionx</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -336,10 +352,10 @@
                       <object class="GtkLabel" id="divisiony">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
                         <property name="label" translatable="yes" context="optgridpage|divisiony">V_ertical:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">numflddivisiony</property>
+                        <property name="xalign">0</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -463,9 +479,10 @@
                         <property name="can_focus">False</property>
                         <property name="column_spacing">12</property>
                         <child>
-                          <object class="GtkSpinButton" id="mtrfldsnaparea:0pixels">
+                          <object class="GtkSpinButton" id="mtrfldsnaparea">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="activates_default">True</property>
                             <property name="adjustment">adjustment3</property>
                           </object>
                           <packing>
@@ -477,10 +494,10 @@
                           <object class="GtkLabel" id="label7">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes" context="optgridpage|label7">_Snap range:</property>
                             <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">mtrfldsnaparea:0pixels</property>
+                            <property name="mnemonic_widget">mtrfldsnaparea</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -570,7 +587,7 @@
                         <property name="row_spacing">6</property>
                         <property name="column_spacing">12</property>
                         <child>
-                          <object class="GtkSpinButton" id="mtrfldangle:0.00degrees">
+                          <object class="GtkSpinButton" id="mtrfldangle">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="adjustment">adjustment4</property>
@@ -594,7 +611,7 @@
                             <property name="xalign">0</property>
                             <property name="draw_indicator">True</property>
                             <accessibility>
-                              <relation type="label-for" target="mtrfldangle:0.00degrees"/>
+                              <relation type="label-for" target="mtrfldangle"/>
                             </accessibility>
                           </object>
                           <packing>
@@ -603,9 +620,10 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSpinButton" id="mtrfldbezangle:0.00degrees">
+                          <object class="GtkSpinButton" id="mtrfldbezangle">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="activates_default">True</property>
                             <property name="adjustment">adjustment5</property>
                             <property name="digits">2</property>
                           </object>
@@ -618,10 +636,10 @@
                           <object class="GtkLabel" id="label9">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes" context="optgridpage|label9">Point reducti_on:</property>
                             <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">mtrfldbezangle:0.00degrees</property>
+                            <property name="mnemonic_widget">mtrfldbezangle</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
-- 
cgit