cui/uiconfig/ui/hyperlinknewdocpage.ui |  146 ++++++++++++++++-----------------
 sc/uiconfig/scalc/ui/scenariodialog.ui |  114 ++++++++++++-------------
 2 files changed, 130 insertions(+), 130 deletions(-)

New commits:
commit 70070e868e2f092239f3f214f0d1c3237706f4d9
Author:     Michael Weghorn <[email protected]>
AuthorDate: Tue Feb 3 15:31:56 2026 +0100
Commit:     Michael Weghorn <[email protected]>
CommitDate: Tue Feb 3 19:33:04 2026 +0100

    tdf#130857 Define widgets in Calc "Scenario" 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 <[email protected]>
        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 like this:
    
    * start Calc
    * select multiple cells, e.g. A1:B2
    * "Tools" -> "Scenarios..."
    
    Change-Id: I6c0470c6c2a5517256c78e1cf3e5751675169e7f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198606
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <[email protected]>

diff --git a/sc/uiconfig/scalc/ui/scenariodialog.ui 
b/sc/uiconfig/scalc/ui/scenariodialog.ui
index 8cdf4d77fb5d..703b8baf0683 100644
--- a/sc/uiconfig/scalc/ui/scenariodialog.ui
+++ b/sc/uiconfig/scalc/ui/scenariodialog.ui
@@ -195,63 +195,6 @@
                     <property name="margin-top">6</property>
                     <property name="hexpand">True</property>
                     <property name="row-spacing">6</property>
-                    <child>
-                      <object class="GtkCheckButton" id="copyback">
-                        <property name="label" translatable="yes" 
context="scenariodialog|copyback">Copy _back</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="draw-indicator">True</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="copyback-atkobject">
-                            <property name="AtkObject::accessible-description" 
translatable="yes" context="scenariodialog|extended_tip|copyback">Copies the 
values of cells that you change into the active scenario. If you do not select 
this option, the scenario is not changed when you change cell values. The 
behavior of the Copy back setting depends on the cell protection, the sheet 
protection, and the Prevent changes settings.</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="copysheet">
-                        <property name="label" translatable="yes" 
context="scenariodialog|copysheet">Copy _entire sheet</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="draw-indicator">True</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="copysheet-atkobject">
-                            <property name="AtkObject::accessible-description" 
translatable="yes" context="scenariodialog|extended_tip|copysheet">Copies the 
entire sheet into an additional scenario sheet.</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="preventchanges">
-                        <property name="label" translatable="yes" 
context="scenariodialog|preventchanges">_Prevent changes</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="draw-indicator">True</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" 
id="preventchanges-atkobject">
-                            <property name="AtkObject::accessible-description" 
translatable="yes" 
context="scenariodialog|extended_tip|preventchanges">Prevents changes to the 
active scenario. The behavior of the Copy back setting depends on the cell 
protection, the sheet protection, and the Prevent changes settings.</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left-attach">0</property>
-                        <property name="top-attach">3</property>
-                      </packing>
-                    </child>
                     <child>
                       <!-- n-columns=2 n-rows=1 -->
                       <object class="GtkGrid" id="grid3">
@@ -311,6 +254,63 @@
                         <property name="top-attach">0</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkCheckButton" id="copyback">
+                        <property name="label" translatable="yes" 
context="scenariodialog|copyback">Copy _back</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="draw-indicator">True</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="copyback-atkobject">
+                            <property name="AtkObject::accessible-description" 
translatable="yes" context="scenariodialog|extended_tip|copyback">Copies the 
values of cells that you change into the active scenario. If you do not select 
this option, the scenario is not changed when you change cell values. The 
behavior of the Copy back setting depends on the cell protection, the sheet 
protection, and the Prevent changes settings.</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="copysheet">
+                        <property name="label" translatable="yes" 
context="scenariodialog|copysheet">Copy _entire sheet</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="draw-indicator">True</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" id="copysheet-atkobject">
+                            <property name="AtkObject::accessible-description" 
translatable="yes" context="scenariodialog|extended_tip|copysheet">Copies the 
entire sheet into an additional scenario sheet.</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="preventchanges">
+                        <property name="label" translatable="yes" 
context="scenariodialog|preventchanges">_Prevent changes</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="draw-indicator">True</property>
+                        <child internal-child="accessible">
+                          <object class="AtkObject" 
id="preventchanges-atkobject">
+                            <property name="AtkObject::accessible-description" 
translatable="yes" 
context="scenariodialog|extended_tip|preventchanges">Prevents changes to the 
active scenario. The behavior of the Copy back setting depends on the cell 
protection, the sheet protection, and the Prevent changes settings.</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left-attach">0</property>
+                        <property name="top-attach">3</property>
+                      </packing>
+                    </child>
                   </object>
                 </child>
                 <child type="label">
commit 0183043ddb7e292d4cf019217b3fd74d5d39f5ea
Author:     Michael Weghorn <[email protected]>
AuthorDate: Tue Feb 3 15:24:53 2026 +0100
Commit:     Michael Weghorn <[email protected]>
CommitDate: Tue Feb 3 19:32:54 2026 +0100

    tdf#130857 Hyperlink dlg: Define widgets in "New Document" page 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 <[email protected]>
        Date:   Thu Oct 24 17:43:35 2024 +0200
    
            tdf#130857 optnewdictionarydialog.ui: Define focusable widgets in 
order
    
    for more background.
    
    This is for the "New Document" page of the "Insert" -> "Hyperlink"
    dialog.
    
    Change-Id: I0e17f19ecadcd674d8cd197a6ee765eac728d752
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198605
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <[email protected]>

diff --git a/cui/uiconfig/ui/hyperlinknewdocpage.ui 
b/cui/uiconfig/ui/hyperlinknewdocpage.ui
index e587a1476ce7..c59f16877e45 100644
--- a/cui/uiconfig/ui/hyperlinknewdocpage.ui
+++ b/cui/uiconfig/ui/hyperlinknewdocpage.ui
@@ -110,6 +110,30 @@
                 <property name="top_attach">1</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkComboBoxText" id="path">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="has_entry">True</property>
+                <child internal-child="entry">
+                  <object class="GtkEntry">
+                    <property name="can_focus">True</property>
+                    <property name="truncate-multiline">True</property>
+                    <property name="activates_default">True</property>
+                  </object>
+                </child>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="path-atkobject">
+                    <property name="AtkObject::accessible-description" 
translatable="yes" context="hyperlinknewdocpage|extended_tip|path">Enter a URL 
for the file that you want to open when you click the hyperlink.</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
             <child>
               <object class="GtkButton" id="create">
                 <property name="visible">True</property>
@@ -145,30 +169,6 @@
                 <property name="top_attach">2</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkComboBoxText" id="path">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="has_entry">True</property>
-                <child internal-child="entry">
-                  <object class="GtkEntry">
-                    <property name="can_focus">True</property>
-                    <property name="truncate-multiline">True</property>
-                    <property name="activates_default">True</property>
-                  </object>
-                </child>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="path-atkobject">
-                    <property name="AtkObject::accessible-description" 
translatable="yes" context="hyperlinknewdocpage|extended_tip|path">Enter a URL 
for the file that you want to open when you click the hyperlink.</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
             <child>
               <object class="GtkScrolledWindow">
                 <property name="visible">True</property>
@@ -302,40 +302,6 @@
                 <property name="top_attach">2</property>
               </packing>
             </child>
-            <child>
-              <object class="GtkEntry" id="indication">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="activates_default">True</property>
-                <property name="truncate-multiline">True</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="indication-atkobject">
-                    <property name="AtkObject::accessible-description" 
translatable="yes" 
context="hyperlinknewdocpage|extended_tip|indication">Specifies the visible 
text or button caption for the hyperlink.</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="name">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="activates_default">True</property>
-                <property name="truncate-multiline">True</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="name-atkobject">
-                    <property name="AtkObject::accessible-description" 
translatable="yes" context="hyperlinknewdocpage|extended_tip|name">Enter a name 
for the hyperlink.</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
-              </packing>
-            </child>
             <child>
               <!-- n-columns=1 n-rows=1 -->
               <object class="GtkGrid" id="grid4">
@@ -344,6 +310,22 @@
                 <property name="hexpand">True</property>
                 <property name="row_spacing">6</property>
                 <property name="column_spacing">12</property>
+                <child>
+                  <object class="GtkComboBoxText" id="frame">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <child internal-child="accessible">
+                      <object class="AtkObject" id="frame-atkobject">
+                        <property name="AtkObject::accessible-description" 
translatable="yes" context="hyperlinknewdocpage|extended_tip|frame">Enter the 
name of the frame that you want the linked file to open in, or select a 
predefined frame from the list. If you leave this box blank, the linked file 
opens in the current browser window.</property>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
                 <child>
                   <object class="GtkLabel" id="form_label">
                     <property name="visible">True</property>
@@ -390,26 +372,44 @@
                     <property name="top_attach">0</property>
                   </packing>
                 </child>
-                <child>
-                  <object class="GtkComboBoxText" id="frame">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="hexpand">True</property>
-                    <child internal-child="accessible">
-                      <object class="AtkObject" id="frame-atkobject">
-                        <property name="AtkObject::accessible-description" 
translatable="yes" context="hyperlinknewdocpage|extended_tip|frame">Enter the 
name of the frame that you want the linked file to open in, or select a 
predefined frame from the list. If you leave this box blank, the linked file 
opens in the current browser window.</property>
-                      </object>
-                    </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="indication">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="activates_default">True</property>
+                <property name="truncate-multiline">True</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="indication-atkobject">
+                    <property name="AtkObject::accessible-description" 
translatable="yes" 
context="hyperlinknewdocpage|extended_tip|indication">Specifies the visible 
text or button caption for the hyperlink.</property>
                   </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
-                  </packing>
                 </child>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="name">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="activates_default">True</property>
+                <property name="truncate-multiline">True</property>
+                <child internal-child="accessible">
+                  <object class="AtkObject" id="name-atkobject">
+                    <property name="AtkObject::accessible-description" 
translatable="yes" context="hyperlinknewdocpage|extended_tip|name">Enter a name 
for the hyperlink.</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">2</property>
               </packing>
             </child>
           </object>

Reply via email to