From 434f2f3616b7f886bf5fe7e7832c9e6fc2aa6a05 Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Fri, 24 Jul 2026 18:05:51 +0200 Subject: [PATCH] tdf#130857 Define widgets in Calc "Solver" dialog in order Switch the order in which the widgets in the .ui file are defined so that the order better 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 e.g. be triggered like this: * start Calc * insert following values into the spreadsheet: * A1: "1" * A3: "=A1" * "Tools" -> "Solver..." The Python script mentioned in the commit message of commit 327679b2fb96b70797a61ff07ddd8d8b3f3a2606 Author: Michael Weghorn Date: Wed Jul 8 15:50:59 2026 +0200 tdf#130857 Define widgets in Calc "General" options page in order was used to reorder the GtkGrid children automatically. Change-Id: I2b510d55c1129c6d3dcbb5bcbaabbc1cf1f46af5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/208597 Tested-by: Jenkins Reviewed-by: Michael Weghorn --- sc/uiconfig/scalc/ui/solverdlg.ui | 686 +++++++++++++++--------------- 1 file changed, 343 insertions(+), 343 deletions(-) diff --git a/sc/uiconfig/scalc/ui/solverdlg.ui b/sc/uiconfig/scalc/ui/solverdlg.ui index a5900d1def18..0b0c5e50c67a 100644 --- a/sc/uiconfig/scalc/ui/solverdlg.ui +++ b/sc/uiconfig/scalc/ui/solverdlg.ui @@ -135,130 +135,6 @@ 0 - - - True - False - Optimize result to - True - 0 - 0 - - - - - - - - 0 - 1 - 3 - - - - - True - False - _By changing cells - True - changeedit - 0 - - - 0 - 4 - - - - - Minim_um - True - True - False - True - True - max - - - - - - Enter the cell range that can be changed. - - - - - 1 - 2 - - - - - _Maximum - True - True - False - True - True - True - - - - - - Enter the cell range that can be changed. - - - - - 1 - 1 - - - - - True - False - True - 6 - - - True - True - True - True - 32 - True - - - Enter the cell range that can be changed. - - - - - False - True - 0 - - - - - True - True - True - - - False - True - 1 - - - - - 1 - 4 - - True @@ -302,6 +178,72 @@ 0 + + + True + False + Optimize result to + True + 0 + 0 + + + + + + + + 0 + 1 + 3 + + + + + _Maximum + True + True + False + True + True + True + + + + + + Enter the cell range that can be changed. + + + + + 1 + 1 + + + + + Minim_um + True + True + False + True + True + max + + + + + + Enter the cell range that can be changed. + + + + + 1 + 2 + + True @@ -382,6 +324,64 @@ 3 + + + True + False + _By changing cells + True + changeedit + 0 + + + 0 + 4 + + + + + True + False + True + 6 + + + True + True + True + True + 32 + True + + + Enter the cell range that can be changed. + + + + + False + True + 0 + + + + + True + True + True + + + False + True + 1 + + + + + 1 + 4 + + False @@ -487,63 +487,6 @@ 1 - - - True - True - True - True - 20 - True - - - Cell reference - - - - - 0 - 2 - - - - - True - True - True - True - 20 - True - - - Cell reference - - - - - 0 - 3 - - - - - True - True - True - True - 20 - True - - - Cell reference - - - - - 0 - 4 - - True @@ -555,39 +498,6 @@ 1 - - - True - True - True - - - 1 - 2 - - - - - True - True - True - - - 1 - 3 - - - - - True - True - True - - - 1 - 4 - - True @@ -610,6 +520,79 @@ 1 + + + True + True + 6 + True + True + 15 + True + + + Value + + + + + 3 + 1 + + + + + True + True + True + + + 4 + 1 + + + + + True + True + True + Remove + + + 5 + 1 + + + + + True + True + True + True + 20 + True + + + Cell reference + + + + + 0 + 2 + + + + + True + True + True + + + 1 + 2 + + True @@ -632,6 +615,79 @@ 2 + + + True + True + 6 + True + True + 15 + True + + + Value + + + + + 3 + 2 + + + + + True + True + True + + + 4 + 2 + + + + + True + True + True + Remove + + + 5 + 2 + + + + + True + True + True + True + 20 + True + + + Cell reference + + + + + 0 + 3 + + + + + True + True + True + + + 1 + 3 + + True @@ -654,6 +710,79 @@ 3 + + + True + True + 6 + True + True + 15 + True + + + Value + + + + + 3 + 3 + + + + + True + True + True + + + 4 + 3 + + + + + True + True + True + Remove + + + 5 + 3 + + + + + True + True + True + True + 20 + True + + + Cell reference + + + + + 0 + 4 + + + + + True + True + True + + + 1 + 4 + + True @@ -676,66 +805,6 @@ 4 - - - True - True - 6 - True - True - 15 - True - - - Value - - - - - 3 - 1 - - - - - True - True - 6 - True - True - 15 - True - - - Value - - - - - 3 - 2 - - - - - True - True - 6 - True - True - 15 - True - - - Value - - - - - 3 - 3 - - True @@ -756,39 +825,6 @@ 4 - - - True - True - True - - - 4 - 1 - - - - - True - True - True - - - 4 - 2 - - - - - True - True - True - - - 4 - 3 - - True @@ -800,42 +836,6 @@ 4 - - - True - True - True - Remove - - - 5 - 2 - - - - - True - True - True - Remove - - - 5 - 1 - - - - - True - True - True - Remove - - - 5 - 3 - - True