weld SvxGeneralTabPage

Change-Id: I3b32a8f657078ba76d92bee7bff6bab1b226e31e
Reviewed-on: https://gerrit.libreoffice.org/69083
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 39 insertions, 20 deletions

diff --git a/cui/uiconfig/ui/optuserpage.ui b/cui/uiconfig/ui/optuserpage.ui
index 37726febbd22..24616760fbb9 100644
--- a/cui/uiconfig/ui/optuserpage.ui
+++ b/cui/uiconfig/ui/optuserpage.ui
@@ -1,18 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.22.1 -->
 <interface domain="cui">
   <requires lib="gtk+" version="3.18"/>
-  <object class="GtkListStore" id="liststore1">
-    <columns>
-      <!-- column-name gchararray1 -->
-      <column type="gchararray"/>
-    </columns>
-    <data>
-      <row>
-        <col id="0" translatable="yes" context="optuserpage|liststore1">No key</col>
-      </row>
-    </data>
-  </object>
   <object class="GtkBox" id="OptUserPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -165,6 +154,7 @@
                         <property name="no_show_all">True</property>
                         <property name="valign">center</property>
                         <property name="hexpand">True</property>
+                        <property name="activates_default">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="firstname-atkobject">
                             <property name="AtkObject::accessible-name" translatable="yes" context="optuserpage|firstname-atkobject">First name</property>
@@ -182,6 +172,7 @@
                         <property name="no_show_all">True</property>
                         <property name="valign">center</property>
                         <property name="hexpand">True</property>
+                        <property name="activates_default">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="lastname-atkobject">
                             <property name="AtkObject::accessible-name" translatable="yes" context="lastname-atkobject">Last name</property>
@@ -198,6 +189,7 @@
                         <property name="can_focus">True</property>
                         <property name="no_show_all">True</property>
                         <property name="valign">center</property>
+                        <property name="activates_default">True</property>
                         <property name="width_chars">7</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="shortname-atkobject">
@@ -227,6 +219,7 @@
                         <property name="no_show_all">True</property>
                         <property name="valign">center</property>
                         <property name="hexpand">True</property>
+                        <property name="activates_default">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="city-atkobject">
                             <property name="AtkObject::accessible-name" translatable="yes" context="city-atkobject">City</property>
@@ -244,6 +237,7 @@
                         <property name="no_show_all">True</property>
                         <property name="valign">center</property>
                         <property name="hexpand">True</property>
+                        <property name="activates_default">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="state-atkobject">
                             <property name="AtkObject::accessible-name" translatable="yes" context="state-atkobject">State</property>
@@ -260,6 +254,7 @@
                         <property name="can_focus">True</property>
                         <property name="no_show_all">True</property>
                         <property name="valign">center</property>
+                        <property name="activates_default">True</property>
                         <property name="width_chars">15</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="zip-atkobject">
@@ -290,6 +285,7 @@
                         <property name="no_show_all">True</property>
                         <property name="valign">center</property>
                         <property name="hexpand">True</property>
+                        <property name="activates_default">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="title-atkobject">
                             <property name="AtkObject::accessible-name" translatable="yes" context="title-atkobject">Title</property>
@@ -307,6 +303,7 @@
                         <property name="no_show_all">True</property>
                         <property name="valign">center</property>
                         <property name="hexpand">True</property>
+                        <property name="activates_default">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="position-atkobject">
                             <property name="AtkObject::accessible-name" translatable="yes" context="position-atkobject">Position</property>
@@ -335,6 +332,7 @@
                         <property name="no_show_all">True</property>
                         <property name="valign">center</property>
                         <property name="hexpand">True</property>
+                        <property name="activates_default">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="home-atkobject">
                             <property name="AtkObject::accessible-name" translatable="yes" context="home-atkobject">Home telephone number</property>
@@ -352,6 +350,7 @@
                         <property name="no_show_all">True</property>
                         <property name="valign">center</property>
                         <property name="hexpand">True</property>
+                        <property name="activates_default">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="work-atkobject">
                             <property name="AtkObject::accessible-name" translatable="yes" context="work-atkobject">Work telephone number</property>
@@ -381,6 +380,7 @@
                         <property name="no_show_all">True</property>
                         <property name="valign">center</property>
                         <property name="hexpand">True</property>
+                        <property name="activates_default">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="fax-atkobject">
                             <property name="AtkObject::accessible-name" translatable="yes" context="fax-atkobject">Fax number</property>
@@ -398,6 +398,7 @@
                         <property name="no_show_all">True</property>
                         <property name="valign">center</property>
                         <property name="hexpand">True</property>
+                        <property name="activates_default">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="email-atkobject">
                             <property name="AtkObject::accessible-name" translatable="yes" context="email-atkobject">email address</property>
@@ -455,6 +456,7 @@
                         <property name="no_show_all">True</property>
                         <property name="valign">center</property>
                         <property name="hexpand">True</property>
+                        <property name="activates_default">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="ruslastname-atkobject">
                             <property name="AtkObject::accessible-name" translatable="yes" context="ruslastname-atkobject">Last name</property>
@@ -472,6 +474,7 @@
                         <property name="no_show_all">True</property>
                         <property name="valign">center</property>
                         <property name="hexpand">True</property>
+                        <property name="activates_default">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="rusfathersname-atkobject">
                             <property name="AtkObject::accessible-name" translatable="yes" context="rusfathersname-atkobject">Father's name</property>
@@ -488,6 +491,7 @@
                         <property name="can_focus">True</property>
                         <property name="no_show_all">True</property>
                         <property name="valign">center</property>
+                        <property name="activates_default">True</property>
                         <property name="width_chars">7</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="russhortname-atkobject">
@@ -506,6 +510,7 @@
                         <property name="no_show_all">True</property>
                         <property name="valign">center</property>
                         <property name="hexpand">True</property>
+                        <property name="activates_default">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="rusfirstname-atkobject">
                             <property name="AtkObject::accessible-name" translatable="yes" context="rusfirstname-atkobject">First name</property>
@@ -548,6 +553,7 @@
                         <property name="no_show_all">True</property>
                         <property name="valign">center</property>
                         <property name="hexpand">True</property>
+                        <property name="activates_default">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="eastlastname-atkobject">
                             <property name="AtkObject::accessible-name" translatable="yes" context="eastlastname-atkobject">Last name</property>
@@ -565,6 +571,7 @@
                         <property name="no_show_all">True</property>
                         <property name="valign">center</property>
                         <property name="hexpand">True</property>
+                        <property name="activates_default">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="eastfirstname-atkobject">
                             <property name="AtkObject::accessible-name" translatable="yes" context="eastfirstname-atkobject">First name</property>
@@ -581,6 +588,7 @@
                         <property name="can_focus">True</property>
                         <property name="no_show_all">True</property>
                         <property name="valign">center</property>
+                        <property name="activates_default">True</property>
                         <property name="width_chars">7</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="eastshortname-atkobject">
@@ -624,6 +632,7 @@
                         <property name="no_show_all">True</property>
                         <property name="valign">center</property>
                         <property name="hexpand">True</property>
+                        <property name="activates_default">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="russtreet-atkobject">
                             <property name="AtkObject::accessible-name" translatable="yes" context="russtreet-atkobject">Street</property>
@@ -640,6 +649,7 @@
                         <property name="can_focus">True</property>
                         <property name="no_show_all">True</property>
                         <property name="valign">center</property>
+                        <property name="activates_default">True</property>
                         <property name="width_chars">15</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="apartnum-atkobject">
@@ -683,6 +693,7 @@
                         <property name="no_show_all">True</property>
                         <property name="valign">center</property>
                         <property name="hexpand">True</property>
+                        <property name="activates_default">True</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="icity-atkobject">
                             <property name="AtkObject::accessible-name" translatable="yes" context="icity-atkobject">City</property>
@@ -699,6 +710,7 @@
                         <property name="can_focus">True</property>
                         <property name="no_show_all">True</property>
                         <property name="valign">center</property>
+                        <property name="activates_default">True</property>
                         <property name="width_chars">15</property>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="izip-atkobject">
@@ -728,6 +740,7 @@
                         <property name="no_show_all">True</property>
                         <property name="valign">center</property>
                         <property name="hexpand">True</property>
+                        <property name="activates_default">True</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -751,6 +764,7 @@
                         <property name="no_show_all">True</property>
                         <property name="valign">center</property>
                         <property name="hexpand">True</property>
+                        <property name="activates_default">True</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -774,6 +788,7 @@
                         <property name="no_show_all">True</property>
                         <property name="valign">center</property>
                         <property name="hexpand">True</property>
+                        <property name="activates_default">True</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -857,11 +872,13 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkComboBox" id="encryptionkey">
+                  <object class="GtkComboBoxText" id="encryptionkey">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="model">liststore1</property>
+                    <items>
+                      <item translatable="yes" context="optuserpage|liststore1">No key</item>
+                    </items>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -869,11 +886,13 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkComboBox" id="signingkey">
+                  <object class="GtkComboBoxText" id="signingkey">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="model">liststore1</property>
+                    <items>
+                      <item translatable="yes" context="optuserpage|liststore1">No key</item>
+                    </items>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -881,13 +900,13 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkCheckButton" id="encrypttoself:wrap">
+                  <object class="GtkCheckButton" id="encrypttoself">
                     <property name="label" translatable="yes" context="optuserpage|encrypttoself">When encrypting documents, always encrypt to self</property>
-                    <property name="can_focus">True</property>
                     <property name="visible">True</property>
-                    <property name="xalign">0</property>
+                    <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
+                    <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
@@ -904,8 +923,8 @@
         </child>
         <child type="label">
           <object class="GtkLabel" id="cryptographylabel">
-            <property name="can_focus">False</property>
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="label" translatable="yes" context="optuserpage|cryptographylabel">Cryptography</property>
             <property name="use_underline">True</property>
             <attributes>