From 44a6a4380eecebe8aa2ea89627a4c383b5e6eceb Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Tue, 5 Aug 2025 11:59:51 +0200 Subject: [PATCH] tdf#130857 Define widgets in spelling dialog in order Switch the order in which the widgets in the .ui file are defined so that the order matches the visual appearance and logical order, which makes sure that tab focus order with the Qt-based VCL plugins is correct as well when using native Qt widgets (SAL_VCL_QT_USE_WELDED_WIDGETS=1), where focus order is (by default) based on widget creation order. See commit 02692566ad9fc7c3484f8581ffa0004cd4e43987 Author: Michael Weghorn Date: Thu Oct 24 17:43:35 2024 +0200 tdf#130857 optnewdictionarydialog.ui: Define focusable widgets in order for more background. The dialog can be triggered as follows: * start Writer * type some random text * "Tools" -> "Spelling" The dialog is not yet declared as supported for use with native Qt widgets, but in a WIP branch it makes moving focus with the Tab key work as expected. Change-Id: I3a8d750a543deeab45ee0085088f4f90f32307a9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188938 Reviewed-by: Michael Weghorn Tested-by: Jenkins --- cui/uiconfig/ui/spellingdialog.ui | 550 +++++++++++++++--------------- 1 file changed, 275 insertions(+), 275 deletions(-) diff --git a/cui/uiconfig/ui/spellingdialog.ui b/cui/uiconfig/ui/spellingdialog.ui index 80103891ba71..fbaea71d62dc 100644 --- a/cui/uiconfig/ui/spellingdialog.ui +++ b/cui/uiconfig/ui/spellingdialog.ui @@ -127,6 +127,64 @@ True 6 12 + + + + True + False + 12 + + + True + False + True + Text languag_e: + True + languagelb + 0 + + + 0 + 0 + + + + + True + False + end + liststore6 + 0 + 1 + + + + 0 + + + + + + 2 + + + + + Specifies the language to use to check the spelling. + + + + + 1 + 0 + + + + + 0 + 0 + + False @@ -153,115 +211,6 @@ 1 - - - True - True - 0 - never - in - - - True - False - - - True - True - 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 - - - Displays the sentence with the misspelled word highlighted. Edit the word or the sentence, or click one of the suggestions in the text box below. - - - - - - - - - 0 - 3 - - - - - True - False - _Suggestions - True - suggestionslb - 0 - - - 0 - 4 - 2 - - - - - True - True - True - True - in - - - True - True - True - True - liststore1 - False - False - - - - - - 6 - - - - 0 - - - - - - - Lists suggested words to replace the misspelled word. Select the word that you want to use, and then click Correct or Correct All. - - - - - - - 0 - 5 - - - - - Chec_k grammar - True - True - False - True - True - - - Enable Check grammar to work first on all spelling errors, then on all grammar errors. - - - - - 0 - 6 - 2 - - @@ -326,184 +275,34 @@ - - + True - False - 12 + True + 0 + never + in - + True False - True - Text languag_e: - True - languagelb - 0 - - - 0 - 0 - - - - - True - False - end - liststore6 - 0 - 1 - - - 0 - - - - - - 2 - - - - - Specifies the language to use to check the spelling. + + True + True + 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 + + + Displays the sentence with the misspelled word highlighted. Edit the word or the sentence, or click one of the suggestions in the text box below. + + - - 1 - 0 - 0 - 0 - - - - - - False - True - 6 - - - False - True - Res_ume - True - - - 0 - 0 - - - - - False - True - (no suggestions) - True - - - 1 - 0 - - - - - False - True - Spelling: $LANGUAGE ($LOCATION) - True - - - 2 - 0 - - - - - 0 - 7 - 2 - - - - - - True - False - vertical - 6 - - - Co_rrect - True - True - True - center - True - True - - - Replaces the unknown word with the current suggestion. If you changed more than just the misspelled word, the entire sentence is replaced. - - - - - 0 - 0 - - - - - Correct A_ll - True - True - True - center - True - True - - - Replaces all occurrences of the unknown word with the current suggestion. - - - - - 0 - 1 - - - - - Add to _AutoCorrect - True - True - True - Add selected suggestion as replacement for incorrect word in AutoCorrect replacement table. - center - True - True - - - Adds the current combination of the incorrect word and the replacement word to the AutoCorrect replacement table. - - - - - 0 - 2 - - - - - 1 - 5 + 3 @@ -625,6 +424,207 @@ 3 + + + True + False + _Suggestions + True + suggestionslb + 0 + + + 0 + 4 + 2 + + + + + True + True + True + True + in + + + True + True + True + True + liststore1 + False + False + + + + + + 6 + + + + 0 + + + + + + + Lists suggested words to replace the misspelled word. Select the word that you want to use, and then click Correct or Correct All. + + + + + + + 0 + 5 + + + + + + True + False + vertical + 6 + + + Co_rrect + True + True + True + center + True + True + + + Replaces the unknown word with the current suggestion. If you changed more than just the misspelled word, the entire sentence is replaced. + + + + + 0 + 0 + + + + + Correct A_ll + True + True + True + center + True + True + + + Replaces all occurrences of the unknown word with the current suggestion. + + + + + 0 + 1 + + + + + Add to _AutoCorrect + True + True + True + Add selected suggestion as replacement for incorrect word in AutoCorrect replacement table. + center + True + True + + + Adds the current combination of the incorrect word and the replacement word to the AutoCorrect replacement table. + + + + + 0 + 2 + + + + + 1 + 5 + + + + + Chec_k grammar + True + True + False + True + True + + + Enable Check grammar to work first on all spelling errors, then on all grammar errors. + + + + + 0 + 6 + 2 + + + + + + False + True + 6 + + + False + True + Res_ume + True + + + 0 + 0 + + + + + False + True + (no suggestions) + True + + + 1 + 0 + + + + + False + True + Spelling: $LANGUAGE ($LOCATION) + True + + + 2 + 0 + + + + + 0 + 7 + 2 + +