diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-09-02 10:49:52 +0100 |
---|---|---|
committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2019-09-08 14:00:52 +0200 |
commit | c2bd5be0253068f2fc02e23c6f00b8fec2a0f723 (patch) | |
tree | ca081791bd551613e41c9ed007cfeb3506abd6aa /cui | |
parent | tdf#127066 Font size of Calc input bar aligned to UI font size (diff) | |
download | core-c2bd5be0253068f2fc02e23c6f00b8fec2a0f723.tar.gz core-c2bd5be0253068f2fc02e23c6f00b8fec2a0f723.zip |
Related: tdf#126935 rearrange spell dialog for expected tab traversal
so tabbing through goes in visual left to right top to bottom direction
Change-Id: I6ad13b7989464af805aa5ed8a080effe04b9b4c0
Reviewed-on: https://gerrit.libreoffice.org/78410
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'cui')
-rw-r--r-- | cui/uiconfig/ui/spellingdialog.ui | 576 |
1 files changed, 319 insertions, 257 deletions
diff --git a/cui/uiconfig/ui/spellingdialog.ui b/cui/uiconfig/ui/spellingdialog.ui index 2019f3200f2d..67c6b46a9465 100644 --- a/cui/uiconfig/ui/spellingdialog.ui +++ b/cui/uiconfig/ui/spellingdialog.ui @@ -121,146 +121,6 @@ <property name="row_spacing">6</property> <property name="column_spacing">12</property> <child> - <object class="GtkComboBox" id="languagelb"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="model">liststore6</property> - <property name="entry_text_column">0</property> - <property name="id_column">1</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext9"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - <child> - <object class="GtkCellRendererPixbuf" id="cellrenderertext6"/> - <attributes> - <attribute name="pixbuf">2</attribute> - </attributes> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="ignore"> - <property name="label" translatable="yes" context="spellingdialog|ignore">_Ignore Once</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="valign">center</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkButton" id="change"> - <property name="label" translatable="yes" context="spellingdialog|change">Co_rrect</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="valign">center</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">9</property> - </packing> - </child> - <child> - <object class="GtkButton" id="changeall"> - <property name="label" translatable="yes" context="spellingdialog|changeall">Correct A_ll</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="valign">center</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">10</property> - </packing> - </child> - <child> - <object class="GtkButton" id="autocorrect"> - <property name="label" translatable="yes" context="spellingdialog|autocorrect">Alwa_ys Correct</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="valign">center</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">11</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="checkgrammar"> - <property name="label" translatable="yes" context="spellingdialog|checkgrammar">Chec_k grammar</property> - <property name="visible">True</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> - <property name="left_attach">0</property> - <property name="top_attach">12</property> - <property name="width">3</property> - </packing> - </child> - <child> - <object class="GtkButton" id="ignoreall"> - <property name="label" translatable="yes" context="spellingdialog|ignoreall">I_gnore All</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="no_show_all">True</property> - <property name="valign">center</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkButton" id="ignorerule"> - <property name="label" translatable="yes" context="spellingdialog|ignorerule">I_gnore Rule</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="no_show_all">True</property> - <property name="valign">center</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">5</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="languageft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="spellingdialog|languageft">Text languag_e:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">languagelb</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> <object class="GtkLabel" id="explain"> <property name="can_focus">False</property> <property name="no_show_all">True</property> @@ -271,7 +131,6 @@ <packing> <property name="left_attach">0</property> <property name="top_attach">1</property> - <property name="width">2</property> </packing> </child> <child> @@ -284,212 +143,415 @@ <property name="relief">none</property> </object> <packing> - <property name="left_attach">2</property> + <property name="left_attach">1</property> <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkLabel" id="resumeft"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="label" translatable="yes" context="spellingdialog|resumeft">Res_ume</property> - <property name="use_underline">True</property> + <object class="GtkScrolledWindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="border_width">0</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkViewport"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <child> + <object class="GtkDrawingArea" id="sentence"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="events">GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK</property> + </object> + </child> + </object> + </child> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">13</property> + <property name="top_attach">3</property> </packing> </child> <child> - <object class="GtkLabel" id="nosuggestionsft"> + <object class="GtkLabel" id="suggestionsft"> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="label" translatable="yes" context="spellingdialog|nosuggestionsft">(no suggestions)</property> + <property name="label" translatable="yes" context="spellingdialog|suggestionsft">_Suggestions</property> <property name="use_underline">True</property> + <property name="mnemonic_widget">suggestionslb</property> + <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">13</property> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + <property name="width">2</property> </packing> </child> <child> - <object class="GtkLabel" id="alttitleft"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="label" translatable="yes" context="spellingdialog|alttitleft">Spelling: $LANGUAGE ($LOCATION)</property> - <property name="use_underline">True</property> + <object class="GtkScrolledWindow"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="suggestionslb"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="model">liststore1</property> + <property name="headers_visible">False</property> + <property name="show_expanders">False</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn2"> + <property name="spacing">6</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext2"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + </child> + </object> + </child> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">13</property> + <property name="left_attach">0</property> + <property name="top_attach">5</property> </packing> </child> <child> - <object class="GtkButton" id="add"> - <property name="label" translatable="yes" context="spellingdialog|add">_Add to Dictionary</property> + <object class="GtkCheckButton" id="checkgrammar"> + <property name="label" translatable="yes" context="spellingdialog|checkgrammar">Chec_k grammar</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="valign">center</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> - <property name="left_attach">2</property> + <property name="left_attach">0</property> <property name="top_attach">6</property> + <property name="width">2</property> </packing> </child> <child> - <object class="GtkMenuButton" id="addmb"> - <property name="label" translatable="yes" context="spellingdialog|addmb">_Add to Dictionary</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="no_show_all">True</property> - <property name="valign">center</property> - <property name="use_underline">True</property> - <property name="popup">addmenu</property> - <property name="use_popover">False</property> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="column_spacing">12</property> <child> - <placeholder/> + <object class="GtkLabel" id="notindictft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="label" translatable="yes" context="spellingdialog|notindictft">_Not in dictionary</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">sentence</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkToolbar" id="toolbar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="toolbar_style">icons</property> + <child> + <object class="GtkToolButton" id="paste"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="spellingdialog|paste">Paste</property> + <property name="use_underline">True</property> + <property name="icon_name">cmd/sc_paste.png</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="insert"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="spellingdialog|insert">Special Character</property> + <property name="use_underline">True</property> + <property name="icon_name">cmd/sc_insertsymbol.png</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> </child> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">7</property> + <property name="left_attach">0</property> + <property name="top_attach">2</property> </packing> </child> <child> - <object class="GtkLabel" id="suggestionsft"> + <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="spellingdialog|suggestionsft">_Suggestions</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">suggestionslb</property> - <property name="xalign">0</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="languageft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="label" translatable="yes" context="spellingdialog|languageft">Text languag_e:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">languagelb</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="languagelb"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="model">liststore6</property> + <property name="entry_text_column">0</property> + <property name="id_column">1</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext9"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + <child> + <object class="GtkCellRendererPixbuf" id="cellrenderertext6"/> + <attributes> + <attribute name="pixbuf">2</attribute> + </attributes> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">8</property> - <property name="width">3</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkLabel" id="notindictft"> - <property name="visible">True</property> + <object class="GtkGrid"> <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes" context="spellingdialog|notindictft">_Not in dictionary</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">sentence</property> - <property name="xalign">0</property> + <property name="no_show_all">True</property> + <property name="column_spacing">6</property> + <child> + <object class="GtkLabel" id="resumeft"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="label" translatable="yes" context="spellingdialog|resumeft">Res_ume</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="nosuggestionsft"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="label" translatable="yes" context="spellingdialog|nosuggestionsft">(no suggestions)</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="alttitleft"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="label" translatable="yes" context="spellingdialog|alttitleft">Spelling: $LANGUAGE ($LOCATION)</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + </packing> + </child> </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="top_attach">7</property> + <property name="width">2</property> </packing> </child> <child> - <object class="GtkToolbar" id="toolbar"> + <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="toolbar_style">icons</property> + <property name="orientation">vertical</property> + <property name="row_spacing">6</property> <child> - <object class="GtkToolButton" id="paste"> + <object class="GtkButton" id="change"> + <property name="label" translatable="yes" context="spellingdialog|change">Co_rrect</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="spellingdialog|paste">Paste</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> <property name="use_underline">True</property> - <property name="icon_name">cmd/sc_paste.png</property> </object> <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkToolButton" id="insert"> + <object class="GtkButton" id="changeall"> + <property name="label" translatable="yes" context="spellingdialog|changeall">Correct A_ll</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="spellingdialog|insert">Special Character</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="autocorrect"> + <property name="label" translatable="yes" context="spellingdialog|autocorrect">Alwa_ys Correct</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> <property name="use_underline">True</property> - <property name="icon_name">cmd/sc_insertsymbol.png</property> </object> <packing> - <property name="expand">False</property> - <property name="homogeneous">True</property> + <property name="left_attach">0</property> + <property name="top_attach">2</property> </packing> </child> </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="top_attach">5</property> </packing> </child> <child> - <object class="GtkScrolledWindow"> + <object class="GtkGrid"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="border_width">0</property> - <property name="shadow_type">in</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="row_spacing">6</property> <child> - <object class="GtkViewport"> + <object class="GtkButton" id="ignore"> + <property name="label" translatable="yes" context="spellingdialog|ignore">_Ignore Once</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkDrawingArea" id="sentence"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="events">GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="use_underline">True</property> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> </child> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - <property name="width">2</property> - <property name="height">5</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="shadow_type">in</property> <child> - <object class="GtkTreeView" id="suggestionslb"> + <object class="GtkButton" id="ignoreall"> + <property name="label" translatable="yes" context="spellingdialog|ignoreall">I_gnore All</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="no_show_all">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="ignorerule"> + <property name="label" translatable="yes" context="spellingdialog|ignorerule">I_gnore Rule</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="no_show_all">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="add"> + <property name="label" translatable="yes" context="spellingdialog|add">_Add to Dictionary</property> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="valign">center</property> <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="model">liststore1</property> - <property name="headers_visible">False</property> - <property name="show_expanders">False</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection1"/> - </child> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="addmb"> + <property name="label" translatable="yes" context="spellingdialog|addmb">_Add to Dictionary</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="no_show_all">True</property> + <property name="valign">center</property> + <property name="hexpand">True</property> + <property name="use_underline">True</property> + <property name="popup">addmenu</property> + <property name="use_popover">False</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn2"> - <property name="spacing">6</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext2"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> + <placeholder/> </child> </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">9</property> - <property name="width">2</property> - <property name="height">3</property> + <property name="left_attach">1</property> + <property name="top_attach">3</property> </packing> </child> <child> |