diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-09-30 13:26:41 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-10-01 09:53:50 +0200 |
commit | eac301701e4f24a407c2b9df69e925e3d9cb4733 (patch) | |
tree | 9bcf4bec7eae785fd44b1c9e8740269094665aa0 /cui | |
parent | 724cca5d89a856095f2720ce61b9cdffa84f49ec (diff) |
add activates_default to GtkEntries in dialogs
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>
Diffstat (limited to 'cui')
-rw-r--r-- | cui/uiconfig/ui/blackorwhitelistentrydialog.ui | 6 | ||||
-rw-r--r-- | cui/uiconfig/ui/colorpickerdialog.ui | 19 | ||||
-rw-r--r-- | cui/uiconfig/ui/editdictionarydialog.ui | 2 | ||||
-rw-r--r-- | cui/uiconfig/ui/hangulhanjaadddialog.ui | 9 | ||||
-rw-r--r-- | cui/uiconfig/ui/hangulhanjaconversiondialog.ui | 19 | ||||
-rw-r--r-- | cui/uiconfig/ui/hangulhanjaeditdictdialog.ui | 5 | ||||
-rw-r--r-- | cui/uiconfig/ui/insertfloatingframe.ui | 12 | ||||
-rw-r--r-- | cui/uiconfig/ui/insertoleobject.ui | 9 | ||||
-rw-r--r-- | cui/uiconfig/ui/javastartparametersdialog.ui | 1 | ||||
-rw-r--r-- | cui/uiconfig/ui/specialcharacters.ui | 24 |
10 files changed, 70 insertions, 36 deletions
diff --git a/cui/uiconfig/ui/blackorwhitelistentrydialog.ui b/cui/uiconfig/ui/blackorwhitelistentrydialog.ui index 3336f28a835f..bcb663daeb27 100644 --- a/cui/uiconfig/ui/blackorwhitelistentrydialog.ui +++ b/cui/uiconfig/ui/blackorwhitelistentrydialog.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.18.3 --> +<!-- Generated with glade 3.22.1 --> <interface domain="cui"> <requires lib="gtk+" version="3.18"/> <object class="GtkListStore" id="os-liststore"> @@ -137,6 +137,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="width_chars">22</property> </object> <packing> @@ -149,6 +150,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="width_chars">12</property> </object> <packing> @@ -161,6 +163,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="width_chars">22</property> </object> <packing> @@ -173,6 +176,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="width_chars">22</property> </object> <packing> diff --git a/cui/uiconfig/ui/colorpickerdialog.ui b/cui/uiconfig/ui/colorpickerdialog.ui index 816d18787d70..71e05ddfd590 100644 --- a/cui/uiconfig/ui/colorpickerdialog.ui +++ b/cui/uiconfig/ui/colorpickerdialog.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.20.2 --> +<!-- Generated with glade 3.22.1 --> <interface domain="cui"> <requires lib="gtk+" version="3.18"/> <object class="GtkAdjustment" id="adjustmentblue"> @@ -63,6 +63,9 @@ <property name="default_width">0</property> <property name="default_height">0</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> @@ -326,6 +329,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="adjustment">adjustmentred</property> </object> <packing> @@ -338,6 +342,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="adjustment">adjustmentgreen</property> </object> <packing> @@ -350,6 +355,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="adjustment">adjustmentblue</property> </object> <packing> @@ -376,6 +382,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> @@ -480,6 +487,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="adjustment">adjustmenthue</property> </object> <packing> @@ -492,6 +500,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="adjustment">adjustmentsat</property> </object> <packing> @@ -504,6 +513,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="adjustment">adjustmentbright</property> </object> <packing> @@ -619,6 +629,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="adjustment">adjustmentcyan</property> </object> <packing> @@ -631,6 +642,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="adjustment">adjustmentmag</property> </object> <packing> @@ -643,6 +655,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="adjustment">adjustmentyellow</property> </object> <packing> @@ -655,6 +668,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="adjustment">adjustmentkey</property> </object> <packing> @@ -704,9 +718,6 @@ <action-widget response="-6">cancel</action-widget> <action-widget response="-11">help</action-widget> </action-widgets> - <child> - <placeholder/> - </child> </object> <object class="GtkSizeGroup" id="sizegroup1"> <widgets> diff --git a/cui/uiconfig/ui/editdictionarydialog.ui b/cui/uiconfig/ui/editdictionarydialog.ui index d77c96fb80bb..066f7155c9a0 100644 --- a/cui/uiconfig/ui/editdictionarydialog.ui +++ b/cui/uiconfig/ui/editdictionarydialog.ui @@ -167,6 +167,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> @@ -178,6 +179,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> diff --git a/cui/uiconfig/ui/hangulhanjaadddialog.ui b/cui/uiconfig/ui/hangulhanjaadddialog.ui index 62b12dd82cf3..cbf7cfed39b1 100644 --- a/cui/uiconfig/ui/hangulhanjaadddialog.ui +++ b/cui/uiconfig/ui/hangulhanjaadddialog.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.20.4 --> +<!-- Generated with glade 3.22.1 --> <interface domain="cui"> <requires lib="gtk+" version="3.18"/> <object class="GtkDialog" id="HangulHanjaAddDialog"> @@ -10,6 +10,9 @@ <property name="default_width">0</property> <property name="default_height">0</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> @@ -112,6 +115,7 @@ <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="max_length">32</property> + <property name="activates_default">True</property> </object> <packing> <property name="expand">False</property> @@ -147,8 +151,5 @@ <action-widget response="-6">cancel</action-widget> <action-widget response="-11">help</action-widget> </action-widgets> - <child> - <placeholder/> - </child> </object> </interface> diff --git a/cui/uiconfig/ui/hangulhanjaconversiondialog.ui b/cui/uiconfig/ui/hangulhanjaconversiondialog.ui index e6eba95320d4..dcbeea86256d 100644 --- a/cui/uiconfig/ui/hangulhanjaconversiondialog.ui +++ b/cui/uiconfig/ui/hangulhanjaconversiondialog.ui @@ -2,6 +2,15 @@ <!-- Generated with glade 3.22.1 --> <interface domain="cui"> <requires lib="gtk+" version="3.18"/> + <object class="GtkSizeGroup"/> + <object class="GtkTreeStore" id="liststore2"> + <columns> + <!-- column-name text --> + <column type="gchararray"/> + <!-- column-name id --> + <column type="gchararray"/> + </columns> + </object> <object class="GtkDialog" id="HangulHanjaConversionDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> @@ -138,6 +147,7 @@ <object class="GtkEntry" id="wordinput"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="activates_default">True</property> </object> <packing> <property name="expand">True</property> @@ -583,13 +593,4 @@ <action-widget response="-11">help</action-widget> </action-widgets> </object> - <object class="GtkSizeGroup"/> - <object class="GtkTreeStore" id="liststore2"> - <columns> - <!-- column-name text --> - <column type="gchararray"/> - <!-- column-name id --> - <column type="gchararray"/> - </columns> - </object> </interface> diff --git a/cui/uiconfig/ui/hangulhanjaeditdictdialog.ui b/cui/uiconfig/ui/hangulhanjaeditdictdialog.ui index 9d076b3e3943..c519c1a8bf68 100644 --- a/cui/uiconfig/ui/hangulhanjaeditdictdialog.ui +++ b/cui/uiconfig/ui/hangulhanjaeditdictdialog.ui @@ -152,6 +152,7 @@ <child internal-child="entry"> <object class="GtkEntry" id="combobox-entry"> <property name="can_focus">True</property> + <property name="activates_default">True</property> <property name="shadow_type">none</property> <property name="caps_lock_warning">False</property> </object> @@ -266,6 +267,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="width_chars">40</property> </object> <packing> @@ -279,6 +281,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="expand">True</property> @@ -291,6 +294,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="expand">True</property> @@ -303,6 +307,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="expand">True</property> diff --git a/cui/uiconfig/ui/insertfloatingframe.ui b/cui/uiconfig/ui/insertfloatingframe.ui index 1b175b0ea13b..95afc4ef5f15 100644 --- a/cui/uiconfig/ui/insertfloatingframe.ui +++ b/cui/uiconfig/ui/insertfloatingframe.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.20.4 --> +<!-- Generated with glade 3.22.1 --> <interface domain="cui"> <requires lib="gtk+" version="3.18"/> <object class="GtkAdjustment" id="adjustment1"> @@ -20,6 +20,9 @@ <property name="default_width">0</property> <property name="default_height">0</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> @@ -99,6 +102,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> @@ -113,6 +117,7 @@ <property name="can_focus">True</property> <property name="margin_right">12</property> <property name="hexpand">True</property> + <property name="activates_default">True</property> </object> <packing> <property name="left_attach">1</property> @@ -385,6 +390,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="margin_right">12</property> + <property name="activates_default">True</property> <property name="adjustment">adjustment1</property> </object> <packing> @@ -397,6 +403,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="margin_right">12</property> + <property name="activates_default">True</property> <property name="adjustment">adjustment2</property> </object> <packing> @@ -477,8 +484,5 @@ <action-widget response="-6">cancel</action-widget> <action-widget response="-11">help</action-widget> </action-widgets> - <child> - <placeholder/> - </child> </object> </interface> diff --git a/cui/uiconfig/ui/insertoleobject.ui b/cui/uiconfig/ui/insertoleobject.ui index 2a34863d0d2f..f3b045c4bdb5 100644 --- a/cui/uiconfig/ui/insertoleobject.ui +++ b/cui/uiconfig/ui/insertoleobject.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.20.4 --> +<!-- Generated with glade 3.22.1 --> <interface domain="cui"> <requires lib="gtk+" version="3.18"/> <object class="GtkTreeStore" id="liststore1"> @@ -18,6 +18,9 @@ <property name="default_width">0</property> <property name="default_height">0</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> @@ -230,6 +233,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> @@ -317,8 +321,5 @@ <action-widget response="-6">cancel</action-widget> <action-widget response="-11">help</action-widget> </action-widgets> - <child> - <placeholder/> - </child> </object> </interface> diff --git a/cui/uiconfig/ui/javastartparametersdialog.ui b/cui/uiconfig/ui/javastartparametersdialog.ui index f83d26178a1b..e8da8b2ecbc9 100644 --- a/cui/uiconfig/ui/javastartparametersdialog.ui +++ b/cui/uiconfig/ui/javastartparametersdialog.ui @@ -119,6 +119,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> diff --git a/cui/uiconfig/ui/specialcharacters.ui b/cui/uiconfig/ui/specialcharacters.ui index c3bc8b7276b2..d671c62f63fe 100644 --- a/cui/uiconfig/ui/specialcharacters.ui +++ b/cui/uiconfig/ui/specialcharacters.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.20.4 --> +<!-- Generated with glade 3.22.1 --> <interface domain="cui"> <requires lib="gtk+" version="3.18"/> <object class="GtkDialog" id="SpecialCharactersDialog"> @@ -10,6 +10,9 @@ <property name="default_width">0</property> <property name="default_height">0</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> @@ -20,13 +23,13 @@ <property name="can_focus">False</property> <property name="layout_style">end</property> <child> - <object class="GtkButton" id="ok"> - <property name="label">gtk-ok</property> + <object class="GtkButton" id="insert"> + <property name="label" translatable="yes" context="specialcharacters|insert">_Insert</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="has_default">True</property> <property name="receives_default">True</property> - <property name="use_stock">True</property> + <property name="use_underline">True</property> </object> <packing> <property name="expand">False</property> @@ -35,13 +38,13 @@ </packing> </child> <child> - <object class="GtkButton" id="insert"> - <property name="label" translatable="yes" context="specialcharacters|insert">_Insert</property> + <object class="GtkButton" id="ok"> + <property name="label">gtk-ok</property> <property name="can_focus">True</property> <property name="can_default">True</property> <property name="has_default">True</property> <property name="receives_default">True</property> - <property name="use_underline">True</property> + <property name="use_stock">True</property> </object> <packing> <property name="expand">False</property> @@ -146,6 +149,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> @@ -172,6 +176,7 @@ <child internal-child="entry"> <object class="GtkEntry"> <property name="can_focus">True</property> + <property name="activates_default">True</property> </object> </child> </object> @@ -252,6 +257,7 @@ <object class="GtkEntry" id="hexvalue"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="activates_default">True</property> <property name="width_chars">8</property> <property name="text" translatable="no">A2</property> </object> @@ -285,6 +291,7 @@ <object class="GtkEntry" id="decimalvalue"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="activates_default">True</property> <property name="width_chars">8</property> <property name="text">162</property> </object> @@ -872,9 +879,6 @@ <action-widget response="-6">cancel</action-widget> <action-widget response="-11">help</action-widget> </action-widgets> - <child> - <placeholder/> - </child> </object> <object class="GtkAdjustment" id="adjustment1"> <property name="upper">80</property> |