[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sw/uiconfig
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Dec 13 19:17:57 UTC 2018
sw/uiconfig/swriter/ui/insertcaption.ui | 4 +++
sw/uiconfig/swriter/ui/mailmerge.ui | 34 ++++++++++++++++++++-----------
sw/uiconfig/swriter/ui/optcaptionpage.ui | 7 ++++--
3 files changed, 32 insertions(+), 13 deletions(-)
New commits:
commit 265d9e6ee9c777975e5ce32d977092d7d935ad97
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Dec 12 11:59:34 2018 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Dec 13 20:17:31 2018 +0100
add activates.default, etc
Change-Id: Idc3e86d8b0f18a1910c6cde691e96fb8b04e8669
Reviewed-on: https://gerrit.libreoffice.org/65016
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
(cherry picked from commit a99f269b77b744ab2844ecb7a711c8ef339f7bb2)
Reviewed-on: https://gerrit.libreoffice.org/65113
Tested-by: Jenkins
diff --git a/sw/uiconfig/swriter/ui/insertcaption.ui b/sw/uiconfig/swriter/ui/insertcaption.ui
index e4959fd3e81f..3a858b3e0bec 100644
--- a/sw/uiconfig/swriter/ui/insertcaption.ui
+++ b/sw/uiconfig/swriter/ui/insertcaption.ui
@@ -127,6 +127,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
</object>
</child>
</object>
@@ -226,6 +227,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
<property name="text" translatable="yes" context="insertcaption|separator_edit">: </property>
</object>
<packing>
@@ -252,6 +254,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
<property name="text" translatable="yes" context="insertcaption|num_separator_edit">. </property>
</object>
<packing>
@@ -292,6 +295,7 @@
<child internal-child="entry">
<object class="GtkEntry" id="comboboxtext-entry">
<property name="can_focus">False</property>
+ <property name="activates_default">True</property>
</object>
</child>
</object>
diff --git a/sw/uiconfig/swriter/ui/mailmerge.ui b/sw/uiconfig/swriter/ui/mailmerge.ui
index ca1e629b6061..623976f6d6e2 100644
--- a/sw/uiconfig/swriter/ui/mailmerge.ui
+++ b/sw/uiconfig/swriter/ui/mailmerge.ui
@@ -1,16 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="sw">
<requires lib="gtk+" version="3.18"/>
<object class="GtkAdjustment" id="adjustment1">
<property name="lower">1</property>
<property name="step_increment">1</property>
</object>
+ <object class="GtkAdjustment" id="adjustment2">
+ <property name="lower">1</property>
+ <property name="step_increment">1</property>
+ </object>
<object class="GtkDialog" id="MailmergeDialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="title" translatable="yes" context="mailmerge|MailmergeDialog">Mail Merge</property>
<property name="type_hint">dialog</property>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
@@ -183,6 +190,7 @@
<object class="GtkSpinButton" id="from">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="activates_default">True</property>
<property name="adjustment">adjustment1</property>
<property name="numeric">True</property>
</object>
@@ -210,7 +218,8 @@
<object class="GtkSpinButton" id="to">
<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">adjustment2</property>
<property name="numeric">True</property>
</object>
<packing>
@@ -399,8 +408,8 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes" context="mailmerge|fieldlabel">Field:</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -412,10 +421,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes" context="mailmerge|pathlabel">_Path:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">path</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -427,10 +436,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes" context="mailmerge|fileformatlabel">F_ile format:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">fileformat</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -438,7 +447,7 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="field">
+ <object class="GtkComboBoxText" id="field">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
@@ -449,7 +458,7 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="fileformat">
+ <object class="GtkComboBoxText" id="fileformat">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
@@ -476,6 +485,7 @@
<object class="GtkEntry" id="path">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="activates_default">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -488,10 +498,10 @@
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes" context="mailmerge|subjectlabel">_Subject:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">subject</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -503,6 +513,7 @@
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
+ <property name="activates_default">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -515,9 +526,9 @@
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes" context="mailmerge|attachmentslabel">Attachments:</property>
<property name="mnemonic_widget">attachments</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -529,6 +540,7 @@
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
+ <property name="activates_default">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -555,8 +567,8 @@
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
- <property name="xalign">0</property>
<property name="label" translatable="yes" context="mailmerge|mailformatlabel">Mail format:</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -564,7 +576,7 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="address">
+ <object class="GtkComboBoxText" id="address">
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
diff --git a/sw/uiconfig/swriter/ui/optcaptionpage.ui b/sw/uiconfig/swriter/ui/optcaptionpage.ui
index 9abdce1ff1ce..ac2a137b2644 100644
--- a/sw/uiconfig/swriter/ui/optcaptionpage.ui
+++ b/sw/uiconfig/swriter/ui/optcaptionpage.ui
@@ -139,6 +139,7 @@
<property name="can_focus">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -151,6 +152,7 @@
<property name="can_focus">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
<property name="text" translatable="yes" context="optcaptionpage|numseparator">. </property>
</object>
<packing>
@@ -180,6 +182,7 @@
<child internal-child="entry">
<object class="GtkEntry" id="comboboxtext-entry">
<property name="can_focus">False</property>
+ <property name="activates_default">True</property>
</object>
</child>
</object>
@@ -263,6 +266,7 @@
<property name="can_focus">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -440,8 +444,7 @@
<property name="spacing">6</property>
<property name="alignment">0.5</property>
<child>
- <object class="GtkCellRendererToggle" id="cellrenderer2">
- </object>
+ <object class="GtkCellRendererToggle" id="cellrenderer2"/>
<attributes>
<attribute name="active">0</attribute>
</attributes>
More information about the Libreoffice-commits
mailing list