From 3b4935255c3b1c4592259239d6ade4adae6cb888 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Sun, 30 Sep 2018 16:10:21 +0100
Subject: weld SvxLineDefTabPage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I7a7f421190c89cec8e1a772015b7544d60b26298
Reviewed-on: https://gerrit.libreoffice.org/61158
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
---
 cui/uiconfig/ui/lineendstabpage.ui  |   8 +--
 cui/uiconfig/ui/linestyletabpage.ui | 139 +++++++++++++++++-------------------
 2 files changed, 70 insertions(+), 77 deletions(-)

(limited to 'cui/uiconfig/ui')

diff --git a/cui/uiconfig/ui/lineendstabpage.ui b/cui/uiconfig/ui/lineendstabpage.ui
index 81145b0285e3..8423d30df951 100644
--- a/cui/uiconfig/ui/lineendstabpage.ui
+++ b/cui/uiconfig/ui/lineendstabpage.ui
@@ -91,7 +91,7 @@
                     <child>
                       <object class="GtkEntry" id="EDT_NAME">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
                         <property name="halign">start</property>
                         <property name="hexpand">True</property>
                         <property name="width_chars">30</property>
@@ -148,7 +148,7 @@
                       <object class="GtkButton" id="BTN_ADD">
                         <property name="label">gtk-add</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
@@ -163,7 +163,7 @@
                       <object class="GtkButton" id="BTN_MODIFY">
                         <property name="label" translatable="yes" context="lineendstabpage|BTN_MODIFY">_Modify</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="use_underline">True</property>
                       </object>
@@ -177,7 +177,7 @@
                       <object class="GtkButton" id="BTN_DELETE">
                         <property name="label">gtk-delete</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="use_stock">True</property>
                       </object>
diff --git a/cui/uiconfig/ui/linestyletabpage.ui b/cui/uiconfig/ui/linestyletabpage.ui
index 6ecc1adfdfb0..39537e1dac69 100644
--- a/cui/uiconfig/ui/linestyletabpage.ui
+++ b/cui/uiconfig/ui/linestyletabpage.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
 <interface domain="cui">
-  <!-- interface-requires gtk+ 3.0 -->
-  <!-- interface-requires LibreOffice 1.0 -->
+  <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustmentDIST">
     <property name="upper">5</property>
     <property name="step_increment">0.10000000000000001</property>
@@ -15,30 +15,22 @@
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="pixbuf">res/sc05501.png</property>
+    <property name="icon_name">res/sc05501.png</property>
   </object>
   <object class="GtkImage" id="image2">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="pixbuf">res/sc05502.png</property>
+    <property name="icon_name">res/sc05502.png</property>
   </object>
-  <object class="GtkListStore" id="liststoreTYPE">
+  <object class="GtkListStore" id="liststore4">
     <columns>
-      <!-- column-name gchararray1 -->
+      <!-- column-name text -->
       <column type="gchararray"/>
-      <!-- column-name guint1 -->
-      <column type="guint"/>
+      <!-- column-name id -->
+      <column type="gchararray"/>
+      <!-- column-name image -->
+      <column type="GdkPixbuf"/>
     </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes" context="linestyletabpage|liststoreTYPE">Dots</col>
-        <col id="1">0</col>
-      </row>
-      <row>
-        <col id="0" translatable="yes" context="linestyletabpage|liststoreTYPE">Dash</col>
-        <col id="1">0</col>
-      </row>
-    </data>
   </object>
   <object class="GtkFrame" id="LineStylePage">
     <property name="visible">True</property>
@@ -88,9 +80,10 @@
                           <object class="GtkLabel" id="FT_LINESTYLE">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes" context="linestyletabpage|FT_LINESTYLE">Line _style:</property>
                             <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">LB_LINESTYLES</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -99,9 +92,12 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="svxlo-LineLB" id="LB_LINESTYLES">
+                          <object class="GtkComboBox" id="LB_LINESTYLES">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="halign">start</property>
+                            <property name="model">liststore4</property>
+                            <property name="id_column">1</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -126,71 +122,63 @@
                           <object class="GtkLabel" id="FT_TYPE">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes" context="linestyletabpage|FT_TYPE">_Type:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">LB_TYPE_1</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <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="FT_NUMBER">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes" context="linestyletabpage|FT_NUMBER">_Number:</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">NUM_FLD_1</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="FT_LENGTH">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes" context="linestyletabpage|FT_LENGTH">_Length:</property>
                             <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">MTR_FLD_LENGTH_1:0.00cm</property>
+                            <property name="mnemonic_widget">MTR_FLD_LENGTH_1</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">2</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="FT_DISTANCE">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
                             <property name="label" translatable="yes" context="linestyletabpage|FT_DISTANCE">_Spacing:</property>
                             <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">MTR_FLD_DISTANCE:0.00cm</property>
+                            <property name="mnemonic_widget">MTR_FLD_DISTANCE</property>
+                            <property name="xalign">0</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">3</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkCheckButton" id="CBX_SYNCHRONIZE">
                             <property name="label" translatable="yes" context="linestyletabpage|CBX_SYNCHRONIZE">_Fit to line width</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="xalign">0</property>
@@ -199,102 +187,97 @@
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">4</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkComboBox" id="LB_TYPE_1">
+                          <object class="GtkComboBoxText" id="LB_TYPE_1">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="model">liststoreTYPE</property>
+                            <items>
+                              <item translatable="yes" context="linestyletabpage|liststoreTYPE">Dots</item>
+                              <item translatable="yes" context="linestyletabpage|liststoreTYPE">Dash</item>
+                            </items>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkComboBox" id="LB_TYPE_2">
+                          <object class="GtkComboBoxText" id="LB_TYPE_2">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="model">liststoreTYPE</property>
+                            <items>
+                              <item translatable="yes" context="linestyletabpage|liststoreTYPE">Dots</item>
+                              <item translatable="yes" context="linestyletabpage|liststoreTYPE">Dash</item>
+                            </items>
                           </object>
                           <packing>
                             <property name="left_attach">2</property>
                             <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkSpinButton" id="NUM_FLD_1">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="activates_default">True</property>
                             <property name="adjustment">adjustmentNUM</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkSpinButton" id="NUM_FLD_2">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="activates_default">True</property>
                             <property name="adjustment">adjustmentNUM</property>
                           </object>
                           <packing>
                             <property name="left_attach">2</property>
                             <property name="top_attach">1</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSpinButton" id="MTR_FLD_LENGTH_1:0.00cm">
+                          <object class="GtkSpinButton" id="MTR_FLD_LENGTH_1">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="activates_default">True</property>
                             <property name="adjustment">adjustmentDIST</property>
                             <property name="digits">2</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">2</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSpinButton" id="MTR_FLD_LENGTH_2:0.00cm">
+                          <object class="GtkSpinButton" id="MTR_FLD_LENGTH_2">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="activates_default">True</property>
                             <property name="adjustment">adjustmentDIST</property>
                             <property name="digits">2</property>
                           </object>
                           <packing>
                             <property name="left_attach">2</property>
                             <property name="top_attach">2</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkSpinButton" id="MTR_FLD_DISTANCE:0.00cm">
+                          <object class="GtkSpinButton" id="MTR_FLD_DISTANCE">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="activates_default">True</property>
                             <property name="adjustment">adjustmentDIST</property>
                             <property name="digits">2</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">3</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -333,7 +316,7 @@
                       <object class="GtkButton" id="BTN_ADD">
                         <property name="label">gtk-add</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
@@ -348,7 +331,7 @@
                       <object class="GtkButton" id="BTN_MODIFY">
                         <property name="label" translatable="yes" context="linestyletabpage|BTN_MODIFY">_Modify</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="use_underline">True</property>
                       </object>
@@ -362,7 +345,7 @@
                       <object class="GtkButton" id="BTN_DELETE">
                         <property name="label">gtk-delete</property>
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="use_stock">True</property>
                       </object>
@@ -392,8 +375,6 @@
                           <packing>
                             <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>
@@ -410,8 +391,6 @@
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">0</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
                           </packing>
                         </child>
                       </object>
@@ -437,10 +416,24 @@
               </packing>
             </child>
             <child>
-              <object class="svxlo-SvxXLinePreview" id="CTL_PREVIEW">
+              <object class="GtkScrolledWindow">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="valign">end</property>
+                <property name="hscrollbar_policy">never</property>
+                <property name="vscrollbar_policy">never</property>
+                <property name="shadow_type">in</property>
+                <child>
+                  <object class="GtkViewport">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkDrawingArea" id="CTL_PREVIEW">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -456,8 +449,8 @@
       <object class="GtkLabel" id="label1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="xalign">0</property>
         <property name="label" translatable="yes" context="linestyletabpage|label1">Properties</property>
+        <property name="xalign">0</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
-- 
cgit