tdf#130857 Define widgets in "Table Properties" dlg "Columns" 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 02692566ad
    Author: Michael Weghorn <m.weghorn@posteo.de>
    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 Writer
* "Table" -> "Insert Table", confirm
* right-click on a table cell to open the
  context menu
* select the "Table Properties" context menu entry

Change-Id: I4ce1d243ca8ccc632046b16017c7a145866ebb80
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/203837
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins
This commit is contained in:
Michael Weghorn
2026-04-18 07:06:46 +02:00
parent 704ad487c4
commit aae5c0371c
+165 -165
View File
@@ -127,20 +127,6 @@
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="spacefmt">
<property name="can-focus">True</property>
<property name="no-show-all">True</property>
<property name="activates-default">True</property>
<property name="truncate-multiline">True</property>
<property name="adjustment">adjustment1</property>
<property name="digits">2</property>
</object>
<packing>
<property name="left-attach">2</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="space">
<property name="visible">True</property>
@@ -161,6 +147,20 @@
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="spacefmt">
<property name="can-focus">True</property>
<property name="no-show-all">True</property>
<property name="activates-default">True</property>
<property name="truncate-multiline">True</property>
<property name="adjustment">adjustment1</property>
<property name="digits">2</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>
@@ -184,6 +184,157 @@
<property name="hexpand">True</property>
<property name="row-spacing">6</property>
<property name="column-spacing">12</property>
<child>
<object class="GtkLabel" id="1">
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="label">_1</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">width1</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="2">
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="label">_2</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">width2</property>
</object>
<packing>
<property name="left-attach">2</property>
<property name="top-attach">0</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="3">
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="label">_3</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">width3</property>
</object>
<packing>
<property name="left-attach">4</property>
<property name="top-attach">0</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="4">
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="label">_4</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">width4</property>
</object>
<packing>
<property name="left-attach">6</property>
<property name="top-attach">0</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="5">
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="label">_5</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">width5</property>
</object>
<packing>
<property name="left-attach">8</property>
<property name="top-attach">0</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="6">
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="label">_6</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">width6</property>
</object>
<packing>
<property name="left-attach">10</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="back">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="halign">start</property>
<property name="image">image7</property>
<property name="always-show-image">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="back-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="tablecolumnpage|extended_tip|back">Displays the table columns found to the left of the current column.</property>
</object>
</child>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="next">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="halign">end</property>
<property name="image">image8</property>
<property name="always-show-image">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="next-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="tablecolumnpage|extended_tip|next">Displays the table columns found to the right of the current column.</property>
</object>
</child>
</object>
<packing>
<property name="left-attach">11</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="width1">
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="halign">center</property>
<property name="hexpand">True</property>
<property name="activates-default">True</property>
<property name="truncate-multiline">True</property>
<property name="adjustment">adjustment2</property>
<property name="digits">2</property>
<child internal-child="accessible">
<object class="AtkObject" id="width1-atkobject">
<property name="AtkObject::accessible-name" translatable="yes" context="tablecolumnpage|width1-atkobject">Column 1 Width</property>
<property name="AtkObject::accessible-description" translatable="yes" context="tablecolumnpage|extended_tip|width1">Enter the width that you want for the column.</property>
</object>
</child>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">1</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="width2">
<property name="sensitive">False</property>
@@ -299,157 +450,6 @@
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="6">
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="label">_6</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">width6</property>
</object>
<packing>
<property name="left-attach">10</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="1">
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="label">_1</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">width1</property>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="2">
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="label">_2</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">width2</property>
</object>
<packing>
<property name="left-attach">2</property>
<property name="top-attach">0</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="3">
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="label">_3</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">width3</property>
</object>
<packing>
<property name="left-attach">4</property>
<property name="top-attach">0</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="5">
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="label">_5</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">width5</property>
</object>
<packing>
<property name="left-attach">8</property>
<property name="top-attach">0</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="4">
<property name="sensitive">False</property>
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="label">_4</property>
<property name="use-underline">True</property>
<property name="mnemonic-widget">width4</property>
</object>
<packing>
<property name="left-attach">6</property>
<property name="top-attach">0</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="width1">
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="halign">center</property>
<property name="hexpand">True</property>
<property name="activates-default">True</property>
<property name="truncate-multiline">True</property>
<property name="adjustment">adjustment2</property>
<property name="digits">2</property>
<child internal-child="accessible">
<object class="AtkObject" id="width1-atkobject">
<property name="AtkObject::accessible-name" translatable="yes" context="tablecolumnpage|width1-atkobject">Column 1 Width</property>
<property name="AtkObject::accessible-description" translatable="yes" context="tablecolumnpage|extended_tip|width1">Enter the width that you want for the column.</property>
</object>
</child>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">1</property>
<property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkButton" id="back">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="halign">start</property>
<property name="image">image7</property>
<property name="always-show-image">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="back-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="tablecolumnpage|extended_tip|back">Displays the table columns found to the left of the current column.</property>
</object>
</child>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="next">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="halign">end</property>
<property name="image">image8</property>
<property name="always-show-image">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="next-atkobject">
<property name="AtkObject::accessible-description" translatable="yes" context="tablecolumnpage|extended_tip|next">Displays the table columns found to the right of the current column.</property>
</object>
</child>
</object>
<packing>
<property name="left-attach">11</property>
<property name="top-attach">0</property>
</packing>
</child>
</object>
</child>
<child type="label">