[Libreoffice-commits] core.git: sw/uiconfig

[Caolán McNamara]

 sw/uiconfig/swriter/ui/insertbreak.ui |    2 +-
 sw/uiconfig/swriter/ui/inserttable.ui |   28 +++++++++++++++++++++++-----
 2 files changed, 24 insertions(+), 6 deletions(-)

New commits:
commit 19da5bcd620f94bc709cff87a6872a9bd53bee8f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Aug 7 19:21:45 2017 +0100

    tweak insert table dialog to load the same with native gtk builder
    
    we can't share adjustments between widgets where we just wanted
    to share initial settings and not subsequent changed adjustment
    settings
    
    and set default responses
    
    Change-Id: I9c15f97a87b0a631e414cc0d3b76f7447fc9ecd3
    Reviewed-on: https://gerrit.libreoffice.org/40849
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/uiconfig/swriter/ui/insertbreak.ui b/sw/uiconfig/swriter/ui/insertbreak.ui
index 12e2f94907b7..2cd012930905 100644
--- a/sw/uiconfig/swriter/ui/insertbreak.ui
+++ b/sw/uiconfig/swriter/ui/insertbreak.ui
@@ -236,7 +236,7 @@
       </object>
     </child>
     <action-widgets>
-      <action-widget response="-5">ok</action-widget>
+      <action-widget response="0">ok</action-widget>
       <action-widget response="-6">cancel</action-widget>
       <action-widget response="-11">help</action-widget>
     </action-widgets>
diff --git a/sw/uiconfig/swriter/ui/inserttable.ui b/sw/uiconfig/swriter/ui/inserttable.ui
index f02c02f1d992..207b8e77cccc 100644
--- a/sw/uiconfig/swriter/ui/inserttable.ui
+++ b/sw/uiconfig/swriter/ui/inserttable.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 domain="sw">
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -9,10 +9,25 @@
     <property name="step_increment">1</property>
     <property name="page_increment">10</property>
   </object>
+  <object class="GtkAdjustment" id="adjustment2">
+    <property name="lower">1</property>
+    <property name="upper">99</property>
+    <property name="value">2</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
+  <object class="GtkAdjustment" id="adjustment3">
+    <property name="lower">1</property>
+    <property name="upper">99</property>
+    <property name="value">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
   <object class="GtkDialog" id="InsertTableDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes" context="inserttable|InsertTableDialog">Insert Table</property>
+    <property name="modal">True</property>
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
@@ -153,6 +168,7 @@
                             <property name="progress_pulse_step">1</property>
                             <property name="adjustment">adjustment1</property>
                             <property name="climb_rate">1</property>
+                            <property name="value">2</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
@@ -180,8 +196,9 @@
                             <property name="invisible_char">•</property>
                             <property name="shadow_type">out</property>
                             <property name="progress_pulse_step">1</property>
-                            <property name="adjustment">adjustment1</property>
+                            <property name="adjustment">adjustment2</property>
                             <property name="climb_rate">1</property>
+                            <property name="value">2</property>
                           </object>
                           <packing>
                             <property name="left_attach">3</property>
@@ -304,9 +321,10 @@
                                 <property name="can_focus">True</property>
                                 <property name="invisible_char">•</property>
                                 <property name="progress_pulse_step">1</property>
-                                <property name="adjustment">adjustment1</property>
+                                <property name="adjustment">adjustment3</property>
                                 <property name="climb_rate">1</property>
                                 <property name="update_policy">if-valid</property>
+                                <property name="value">1</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -380,8 +398,8 @@
     </child>
     <action-widgets>
       <action-widget response="0">ok</action-widget>
-      <action-widget response="0">cancel</action-widget>
-      <action-widget response="0">help</action-widget>
+      <action-widget response="-6">cancel</action-widget>
+      <action-widget response="-11">help</action-widget>
     </action-widgets>
   </object>
 </interface>