From eac301701e4f24a407c2b9df69e925e3d9cb4733 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 30 Sep 2019 13:26:41 +0100
Subject: add activates_default to GtkEntries in dialogs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

activates-default of True means pressing return activates the default
button of the action area, which is typically what vcl Edit did by
default.

Change-Id: I60bc1634b04a486af86526d887d0ada961b08076
Reviewed-on: https://gerrit.libreoffice.org/79860
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
---
 svx/uiconfig/ui/asianphoneticguidedialog.ui | 10 ++++-
 svx/uiconfig/ui/chinesedictionary.ui        | 64 +++++++++++++++--------------
 svx/uiconfig/ui/classificationdialog.ui     | 22 ++++++----
 svx/uiconfig/ui/docrecoverybrokendialog.ui  |  1 +
 4 files changed, 56 insertions(+), 41 deletions(-)

(limited to 'svx')

diff --git a/svx/uiconfig/ui/asianphoneticguidedialog.ui b/svx/uiconfig/ui/asianphoneticguidedialog.ui
index 38cb2cce1d09..2031144d6e3e 100644
--- a/svx/uiconfig/ui/asianphoneticguidedialog.ui
+++ b/svx/uiconfig/ui/asianphoneticguidedialog.ui
@@ -138,14 +138,15 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="hexpand">True</property>
+                            <property name="border_width">6</property>
                             <property name="row_spacing">6</property>
                             <property name="column_spacing">12</property>
-                            <property name="border_width">6</property>
                             <child>
                               <object class="GtkEntry" id="Left2ED">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="hexpand">True</property>
+                                <property name="activates_default">True</property>
                                 <child internal-child="accessible">
                                   <object class="AtkObject" id="Left2ED-atkobject">
                                     <property name="AtkObject::accessible-name" translatable="yes" context="asianphoneticguidedialog|Left2ED-atkobject">Base text</property>
@@ -161,6 +162,7 @@
                               <object class="GtkEntry" id="Left1ED">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="activates_default">True</property>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
@@ -172,6 +174,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="hexpand">True</property>
+                                <property name="activates_default">True</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -182,6 +185,7 @@
                               <object class="GtkEntry" id="Right2ED">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="activates_default">True</property>
                                 <child internal-child="accessible">
                                   <object class="AtkObject" id="Right2ED-atkobject">
                                     <property name="AtkObject::accessible-name" translatable="yes" context="asianphoneticguidedialog|Right2ED-atkobject">Ruby text</property>
@@ -197,6 +201,7 @@
                               <object class="GtkEntry" id="Left3ED">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="activates_default">True</property>
                                 <child internal-child="accessible">
                                   <object class="AtkObject" id="Left3ED-atkobject">
                                     <property name="AtkObject::accessible-name" translatable="yes" context="asianphoneticguidedialog|Left3ED-atkobject">Base text</property>
@@ -212,6 +217,7 @@
                               <object class="GtkEntry" id="Right3ED">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="activates_default">True</property>
                                 <child internal-child="accessible">
                                   <object class="AtkObject" id="Right3ED-atkobject">
                                     <property name="AtkObject::accessible-name" translatable="yes" context="asianphoneticguidedialog|Right3ED-atkobject">Ruby text</property>
@@ -227,6 +233,7 @@
                               <object class="GtkEntry" id="Right4ED">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="activates_default">True</property>
                                 <child internal-child="accessible">
                                   <object class="AtkObject" id="Right4ED-atkobject">
                                     <property name="AtkObject::accessible-name" translatable="yes" context="asianphoneticguidedialog|Right4ED-atkobject">Ruby text</property>
@@ -242,6 +249,7 @@
                               <object class="GtkEntry" id="Left4ED">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="activates_default">True</property>
                                 <child internal-child="accessible">
                                   <object class="AtkObject" id="Left4ED-atkobject">
                                     <property name="AtkObject::accessible-name" translatable="yes" context="asianphoneticguidedialog|Left4ED-atkobject">Base text</property>
diff --git a/svx/uiconfig/ui/chinesedictionary.ui b/svx/uiconfig/ui/chinesedictionary.ui
index 66f75bd27e5c..a7f9da974b8f 100644
--- a/svx/uiconfig/ui/chinesedictionary.ui
+++ b/svx/uiconfig/ui/chinesedictionary.ui
@@ -2,6 +2,30 @@
 <!-- Generated with glade 3.22.1 -->
 <interface domain="svx">
   <requires lib="gtk+" version="3.18"/>
+  <object class="GtkTreeStore" id="liststore2">
+    <columns>
+      <!-- column-name text -->
+      <column type="gchararray"/>
+      <!-- column-name text2 -->
+      <column type="gchararray"/>
+      <!-- column-name text3 -->
+      <column type="gchararray"/>
+      <!-- column-name id -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
+  <object class="GtkTreeStore" id="liststore3">
+    <columns>
+      <!-- column-name text -->
+      <column type="gchararray"/>
+      <!-- column-name text2 -->
+      <column type="gchararray"/>
+      <!-- column-name text3 -->
+      <column type="gchararray"/>
+      <!-- column-name id -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
   <object class="GtkDialog" id="ChineseDictionaryDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
@@ -279,6 +303,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="hexpand">True</property>
+                    <property name="activates_default">True</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -290,6 +315,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="hexpand">True</property>
+                    <property name="activates_default">True</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -476,6 +502,13 @@
       <action-widget response="-11">help</action-widget>
     </action-widgets>
   </object>
+  <object class="GtkSizeGroup" id="sizegroup1">
+    <property name="mode">both</property>
+    <widgets>
+      <widget name="tradtosimpleview"/>
+      <widget name="simpletotradview"/>
+    </widgets>
+  </object>
   <object class="GtkSizeGroup" id="sizegroup2">
     <widgets>
       <widget name="termft"/>
@@ -494,35 +527,4 @@
       <widget name="property"/>
     </widgets>
   </object>
-  <object class="GtkTreeStore" id="liststore2">
-    <columns>
-      <!-- column-name text -->
-      <column type="gchararray"/>
-      <!-- column-name text2 -->
-      <column type="gchararray"/>
-      <!-- column-name text3 -->
-      <column type="gchararray"/>
-      <!-- column-name id -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkTreeStore" id="liststore3">
-    <columns>
-      <!-- column-name text -->
-      <column type="gchararray"/>
-      <!-- column-name text2 -->
-      <column type="gchararray"/>
-      <!-- column-name text3 -->
-      <column type="gchararray"/>
-      <!-- column-name id -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <object class="GtkSizeGroup" id="sizegroup1">
-    <property name="mode">both</property>
-    <widgets>
-      <widget name="tradtosimpleview"/>
-      <widget name="simpletotradview"/>
-    </widgets>
-  </object>
 </interface>
diff --git a/svx/uiconfig/ui/classificationdialog.ui b/svx/uiconfig/ui/classificationdialog.ui
index 29690610e250..fab9e74ffc5f 100644
--- a/svx/uiconfig/ui/classificationdialog.ui
+++ b/svx/uiconfig/ui/classificationdialog.ui
@@ -233,9 +233,6 @@
                         <property name="headers_visible">False</property>
                         <property name="headers_clickable">False</property>
                         <property name="show_expanders">False</property>
-                        <accessibility>
-                          <relation type="labelled-by" target="markingLabel"/>
-                        </accessibility>
                         <child internal-child="selection">
                           <object class="GtkTreeSelection"/>
                         </child>
@@ -251,6 +248,9 @@
                             </child>
                           </object>
                         </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="markingLabel"/>
+                        </accessibility>
                       </object>
                     </child>
                   </object>
@@ -425,6 +425,7 @@
                       <object class="GtkEntry" id="intellectualPropertyPartEntry">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="activates_default">True</property>
                         <accessibility>
                           <relation type="labelled-by" target="intellectualPropertyPartEntryLabel"/>
                         </accessibility>
@@ -450,9 +451,6 @@
                             <property name="headers_visible">False</property>
                             <property name="headers_clickable">False</property>
                             <property name="show_expanders">False</property>
-                            <accessibility>
-                              <relation type="labelled-by" target="intellectualPropertyPartLabel"/>
-                            </accessibility>
                             <child internal-child="selection">
                               <object class="GtkTreeSelection"/>
                             </child>
@@ -468,6 +466,9 @@
                                 </child>
                               </object>
                             </child>
+                            <accessibility>
+                              <relation type="labelled-by" target="intellectualPropertyPartLabel"/>
+                            </accessibility>
                           </object>
                         </child>
                       </object>
@@ -491,9 +492,6 @@
                             <property name="headers_visible">False</property>
                             <property name="headers_clickable">False</property>
                             <property name="show_expanders">False</property>
-                                <accessibility>
-                                  <relation type="labelled-by" target="intellectualPropertyPartNumberLabel"/>
-                                </accessibility>
                             <child internal-child="selection">
                               <object class="GtkTreeSelection"/>
                             </child>
@@ -509,6 +507,9 @@
                                 </child>
                               </object>
                             </child>
+                            <accessibility>
+                              <relation type="labelled-by" target="intellectualPropertyPartNumberLabel"/>
+                            </accessibility>
                           </object>
                         </child>
                       </object>
@@ -534,6 +535,9 @@
                     <child>
                       <placeholder/>
                     </child>
+                    <child>
+                      <placeholder/>
+                    </child>
                   </object>
                 </child>
                 <child type="label">
diff --git a/svx/uiconfig/ui/docrecoverybrokendialog.ui b/svx/uiconfig/ui/docrecoverybrokendialog.ui
index ebf1bdd56858..11adfe0d1df5 100644
--- a/svx/uiconfig/ui/docrecoverybrokendialog.ui
+++ b/svx/uiconfig/ui/docrecoverybrokendialog.ui
@@ -178,6 +178,7 @@ The documents listed below will be saved in the folder noted below if you click
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="hexpand">True</property>
+                    <property name="activates_default">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-- 
cgit