dbaccess/uiconfig/ui/queryfilterdialog.ui | 151 ++++++++-------- sw/uiconfig/swriter/ui/outlinenumberingpage.ui | 112 ++++++------ sw/uiconfig/swriter/ui/outlinepositionpage.ui | 226 ++++++++++++------------- vcl/qt5/QtInstanceBuilder.cxx | 3 4 files changed, 246 insertions(+), 246 deletions(-)
New commits: commit 5613a9b3224b920bb68c3294a3e50e01239bbaaf Author: Michael Weghorn <[email protected]> AuthorDate: Wed Feb 11 11:41:37 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Feb 11 18:15:42 2026 +0100 dbaccess: Resave queryfilterdialog.ui with glade 3.40 The dialog can be triggered like this: * start Writer * "Tools" -> Bibliography Database" * press the "Standard Filter" button at the top Change-Id: I2fca38b1968550e1ee70ea8341dcc58fd321b168 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199148 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/dbaccess/uiconfig/ui/queryfilterdialog.ui b/dbaccess/uiconfig/ui/queryfilterdialog.ui index ab806a0202f2..4ca462a9cf12 100644 --- a/dbaccess/uiconfig/ui/queryfilterdialog.ui +++ b/dbaccess/uiconfig/ui/queryfilterdialog.ui @@ -1,32 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.36.0 --> +<!-- Generated with glade 3.40.0 --> <interface domain="dba"> <requires lib="gtk+" version="3.24"/> <object class="GtkDialog" id="QueryFilterDialog"> - <property name="can_focus">False</property> - <property name="border_width">6</property> + <property name="can-focus">False</property> + <property name="border-width">6</property> <property name="title" translatable="yes" context="queryfilterdialog|QueryFilterDialog">Standard Filter</property> <property name="modal">True</property> - <property name="default_width">0</property> - <property name="default_height">0</property> - <property name="type_hint">dialog</property> + <property name="default-width">0</property> + <property name="default-height">0</property> + <property name="type-hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child internal-child="action_area"> <object class="GtkButtonBox" id="dialog-action_area1"> - <property name="can_focus">False</property> - <property name="layout_style">end</property> + <property name="can-focus">False</property> + <property name="layout-style">end</property> <child> <object class="GtkButton" id="ok"> <property name="label" translatable="yes" context="stock">_OK</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="can-default">True</property> + <property name="has-default">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> </object> <packing> @@ -39,8 +39,8 @@ <object class="GtkButton" id="cancel"> <property name="label" translatable="yes" context="stock">_Cancel</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> </object> <packing> @@ -53,8 +53,8 @@ <object class="GtkButton" id="help"> <property name="label" translatable="yes" context="stock">_Help</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> </object> <packing> @@ -68,64 +68,64 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack_type">end</property> + <property name="pack-type">end</property> <property name="position">0</property> </packing> </child> <child> <object class="GtkFrame" id="frame1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=4 n-rows=4 --> <object class="GtkGrid" id="grid2"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> + <property name="can-focus">False</property> <property name="margin-start">12</property> <property name="margin-top">6</property> + <property name="row-spacing">6</property> + <property name="column-spacing">12</property> <child> <object class="GtkLabel" id="label2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="queryfilterdialog|label2">Operator</property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkLabel" id="label5"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="queryfilterdialog|label5">Field name</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left-attach">1</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkLabel" id="label6"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="queryfilterdialog|label6">Condition</property> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> + <property name="left-attach">2</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkComboBoxText" id="field1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="active">0</property> <items> <item translatable="yes" context="queryfilterdialog|field1">- none -</item> @@ -137,14 +137,14 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="left-attach">1</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkComboBoxText" id="cond1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="active">0</property> <items> @@ -166,14 +166,14 @@ </child> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> + <property name="left-attach">2</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkComboBoxText" id="field2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="active">0</property> <items> <item translatable="yes" context="queryfilterdialog|field2">- none -</item> @@ -185,14 +185,14 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="left-attach">1</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkComboBoxText" id="field3"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="active">0</property> <items> <item translatable="yes" context="queryfilterdialog|field3">- none -</item> @@ -204,14 +204,14 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> + <property name="left-attach">1</property> + <property name="top-attach">3</property> </packing> </child> <child> <object class="GtkComboBoxText" id="cond2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="active">0</property> <child internal-child="accessible"> @@ -221,14 +221,14 @@ </child> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">2</property> + <property name="left-attach">2</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkComboBoxText" id="cond3"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="active">0</property> <child internal-child="accessible"> @@ -238,27 +238,27 @@ </child> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">3</property> + <property name="left-attach">2</property> + <property name="top-attach">3</property> </packing> </child> <child> <object class="GtkLabel" id="label7"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="queryfilterdialog|label7">Value</property> </object> <packing> - <property name="left_attach">3</property> - <property name="top_attach">0</property> + <property name="left-attach">3</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkEntry" id="value1"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> - <property name="activates_default">True</property> + <property name="activates-default">True</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="value1-atkobject"> @@ -267,16 +267,16 @@ </child> </object> <packing> - <property name="left_attach">3</property> - <property name="top_attach">1</property> + <property name="left-attach">3</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkEntry" id="value2"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> - <property name="activates_default">True</property> + <property name="activates-default">True</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="value2-atkobject"> @@ -285,16 +285,16 @@ </child> </object> <packing> - <property name="left_attach">3</property> - <property name="top_attach">2</property> + <property name="left-attach">3</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkEntry" id="value3"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> - <property name="activates_default">True</property> + <property name="activates-default">True</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="value3-atkobject"> @@ -303,14 +303,14 @@ </child> </object> <packing> - <property name="left_attach">3</property> - <property name="top_attach">3</property> + <property name="left-attach">3</property> + <property name="top-attach">3</property> </packing> </child> <child> <object class="GtkComboBoxText" id="op2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="active">0</property> <items> <item translatable="yes" context="queryfilterdialog|op2">AND</item> @@ -323,14 +323,14 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkComboBoxText" id="op3"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="active">0</property> <items> <item translatable="yes" context="queryfilterdialog|op3">AND</item> @@ -343,8 +343,8 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> + <property name="left-attach">0</property> + <property name="top-attach">3</property> </packing> </child> <child> @@ -355,7 +355,7 @@ <child type="label"> <object class="GtkLabel" id="label1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="queryfilterdialog|label1">Criteria</property> <attributes> <attribute name="weight" value="bold"/> @@ -376,9 +376,6 @@ <action-widget response="-6">cancel</action-widget> <action-widget response="-11">help</action-widget> </action-widgets> - <child type="titlebar"> - <placeholder/> - </child> <child internal-child="accessible"> <object class="AtkObject" id="QueryFilterDialog-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="queryfilterdialog|extended_tip|QueryFilterDialog">Allows you to set the filtering options.</property> commit f9a2a83bd2fee43b3f148599620471f19cc9838f Author: Michael Weghorn <[email protected]> AuthorDate: Wed Feb 11 11:36:58 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Feb 11 18:15:35 2026 +0100 tdf#130857 Define widgets in "Heading Numbering" 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 Writer * "Tools" -> "Heading Numbering..." Change-Id: I842d88e2ce7ec8c2871425d21f48daa1dded1010 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199147 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/sw/uiconfig/swriter/ui/outlinenumberingpage.ui b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui index ead9a9382664..bcd793bf191d 100644 --- a/sw/uiconfig/swriter/ui/outlinenumberingpage.ui +++ b/sw/uiconfig/swriter/ui/outlinenumberingpage.ui @@ -167,162 +167,162 @@ <property name="row-spacing">6</property> <property name="column-spacing">12</property> <child> - <object class="GtkLabel" id="label3"> + <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="outlinenumberingpage|label3">Paragraph style:</property> + <property name="label" translatable="yes" context="outlinenumberingpage|label4">Number:</property> <property name="use-underline">True</property> - <property name="mnemonic-widget">style</property> + <property name="mnemonic-widget">numbering</property> <property name="xalign">0</property> </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">2</property> + <property name="top-attach">0</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="style"> + <object class="GtkComboBoxText" id="numbering"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="hexpand">True</property> - <property name="tooltip-text" translatable="yes" context="outlinenumberingpage|tooltip_text|style">Select the paragraph style to assign to the selected outline level. Select [None] to skip the outline level.</property> <child internal-child="accessible"> - <object class="AtkObject" id="style-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="outlinenumberingpage|extended_tip|style">Select the paragraph style to assign to the selected outline level. Select [None] to skip the outline level.</property> + <object class="AtkObject" id="numbering-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="outlinenumberingpage|extended_tip|numbering">Select the numbering scheme that you want to apply to the selected outline level.</property> </object> </child> </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">2</property> + <property name="top-attach">0</property> </packing> </child> <child> - <object class="GtkLabel" id="label4"> + <object class="GtkLabel" id="label10"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="outlinenumberingpage|label4">Number:</property> + <property name="label" translatable="yes" context="outlinenumberingpage|label10">Start at:</property> <property name="use-underline">True</property> - <property name="mnemonic-widget">numbering</property> + <property name="mnemonic-widget">startat</property> <property name="xalign">0</property> </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">0</property> + <property name="top-attach">1</property> </packing> </child> <child> - <object class="GtkLabel" id="label5"> + <object class="GtkSpinButton" id="startat"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="outlinenumberingpage|label5">Character style:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">charstyle</property> - <property name="xalign">0</property> + <property name="can-focus">True</property> + <property name="hexpand">True</property> + <property name="activates-default">True</property> + <property name="truncate-multiline">True</property> + <property name="adjustment">adjustment1</property> + <child internal-child="accessible"> + <object class="AtkObject" id="startat-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="outlinenumberingpage|extended_tip|startat">Enter the number at which to start the numbering for the selected outline level.</property> + </object> + </child> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">3</property> + <property name="left-attach">1</property> + <property name="top-attach">1</property> </packing> </child> <child> - <object class="GtkLabel" id="sublevelsft"> + <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="outlinenumberingpage|sublevelsft">Show sublevels:</property> + <property name="label" translatable="yes" context="outlinenumberingpage|label3">Paragraph style:</property> <property name="use-underline">True</property> - <property name="mnemonic-widget">sublevelsnf</property> + <property name="mnemonic-widget">style</property> <property name="xalign">0</property> </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">4</property> + <property name="top-attach">2</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="numbering"> + <object class="GtkComboBoxText" id="style"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="hexpand">True</property> + <property name="tooltip-text" translatable="yes" context="outlinenumberingpage|tooltip_text|style">Select the paragraph style to assign to the selected outline level. Select [None] to skip the outline level.</property> <child internal-child="accessible"> - <object class="AtkObject" id="numbering-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="outlinenumberingpage|extended_tip|numbering">Select the numbering scheme that you want to apply to the selected outline level.</property> + <object class="AtkObject" id="style-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="outlinenumberingpage|extended_tip|style">Select the paragraph style to assign to the selected outline level. Select [None] to skip the outline level.</property> </object> </child> </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">0</property> + <property name="top-attach">2</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="charstyle"> + <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="hexpand">True</property> - <child internal-child="accessible"> - <object class="AtkObject" id="charstyle-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="outlinenumberingpage|extended_tip|charstyle">Select the character style of the numbering character.</property> - </object> - </child> + <property name="label" translatable="yes" context="outlinenumberingpage|label5">Character style:</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">charstyle</property> + <property name="xalign">0</property> </object> <packing> - <property name="left-attach">1</property> + <property name="left-attach">0</property> <property name="top-attach">3</property> </packing> </child> <child> - <object class="GtkSpinButton" id="sublevelsnf"> + <object class="GtkComboBoxText" id="charstyle"> <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can-focus">True</property> + <property name="can-focus">False</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="value">1</property> <child internal-child="accessible"> - <object class="AtkObject" id="sublevelsnf-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="outlinenumberingpage|extended_tip|sublevelsnf">Select the number of outline levels to display in the heading number, where 1 starts at the current level, and increasing the value shows additional previous levels. For example, select “3” to display the current level and the two previous levels in the heading number.</property> + <object class="AtkObject" id="charstyle-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="outlinenumberingpage|extended_tip|charstyle">Select the character style of the numbering character.</property> </object> </child> </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">4</property> + <property name="top-attach">3</property> </packing> </child> <child> - <object class="GtkLabel" id="label10"> + <object class="GtkLabel" id="sublevelsft"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="outlinenumberingpage|label10">Start at:</property> + <property name="label" translatable="yes" context="outlinenumberingpage|sublevelsft">Show sublevels:</property> <property name="use-underline">True</property> - <property name="mnemonic-widget">startat</property> + <property name="mnemonic-widget">sublevelsnf</property> <property name="xalign">0</property> </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">1</property> + <property name="top-attach">4</property> </packing> </child> <child> - <object class="GtkSpinButton" id="startat"> + <object class="GtkSpinButton" id="sublevelsnf"> <property name="visible">True</property> + <property name="sensitive">False</property> <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="activates-default">True</property> <property name="truncate-multiline">True</property> - <property name="adjustment">adjustment1</property> + <property name="adjustment">adjustment2</property> + <property name="value">1</property> <child internal-child="accessible"> - <object class="AtkObject" id="startat-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="outlinenumberingpage|extended_tip|startat">Enter the number at which to start the numbering for the selected outline level.</property> + <object class="AtkObject" id="sublevelsnf-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="outlinenumberingpage|extended_tip|sublevelsnf">Select the number of outline levels to display in the heading number, where 1 starts at the current level, and increasing the value shows additional previous levels. For example, select “3” to display the current level and the two previous levels in the heading number.</property> </object> </child> </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">1</property> + <property name="top-attach">4</property> </packing> </child> </object> diff --git a/sw/uiconfig/swriter/ui/outlinepositionpage.ui b/sw/uiconfig/swriter/ui/outlinepositionpage.ui index 664b2218d99b..9d3a3ecce7e8 100644 --- a/sw/uiconfig/swriter/ui/outlinepositionpage.ui +++ b/sw/uiconfig/swriter/ui/outlinepositionpage.ui @@ -130,160 +130,137 @@ <property name="row-spacing">6</property> <property name="column-spacing">12</property> <child> - <object class="GtkLabel" id="numalign"> + <object class="GtkLabel" id="num2align"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="outlinepositionpage|numalign">Alignment:</property> + <property name="label" translatable="yes" context="outlinepositionpage|num2align">Alignment:</property> <property name="use-underline">True</property> - <property name="mnemonic-widget">numalignlb</property> + <property name="mnemonic-widget">num2alignlb</property> <property name="xalign">0</property> </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">9</property> + <property name="top-attach">0</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="numalignlb"> + <object class="GtkComboBoxText" id="num2alignlb"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="hexpand">True</property> - <items> - <item translatable="yes" context="outlinepositionpage|liststore1">Left</item> - <item translatable="yes" context="outlinepositionpage|liststore1">Centered</item> - <item translatable="yes" context="outlinepositionpage|liststore1">Right</item> - </items> <child internal-child="accessible"> - <object class="AtkObject" id="numalignlb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|numalignlb">Set the alignment of the numbering symbols. Select "Left" to align the numbering symbol to start directly at the "Aligned at" position. Select "Right" to align the symbol to end directly before the "Aligned at" position. Select "Centered" to center the symbol around the "Aligned at" position.</property> + <object class="AtkObject" id="num2alignlb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|num2alignlb">Set the alignment of the numbering symbols. Select "Left" to align the numbering symbol to start directly at the "Aligned at" position. Select "Right" to align the symbol to end directly before the "Aligned at" position. Select "Centered" to center the symbol around the "Aligned at" position.</property> </object> </child> </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">9</property> + <property name="top-attach">0</property> </packing> </child> <child> - <object class="GtkLabel" id="numdist"> + <object class="GtkLabel" id="alignedat"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="outlinepositionpage|numdist">Minimum space between -numbering and text:</property> + <property name="label" translatable="yes" context="outlinepositionpage|alignedat">Aligned at:</property> <property name="use-underline">True</property> - <property name="mnemonic-widget">numdistmf</property> + <property name="mnemonic-widget">alignedatmf</property> <property name="xalign">0</property> </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">8</property> + <property name="top-attach">1</property> </packing> </child> <child> - <object class="GtkSpinButton" id="numdistmf"> + <object class="GtkSpinButton" id="alignedatmf"> <property name="visible">True</property> <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="activates-default">True</property> <property name="truncate-multiline">True</property> - <property name="adjustment">adjustment3</property> + <property name="adjustment">adjustment4</property> <property name="digits">2</property> <child internal-child="accessible"> - <object class="AtkObject" id="numdistmf-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|numdistmf">The alignment of the numbering symbol is adjusted to get the desired minimum space. If it is not possible because the numbering area is not wide enough, then the start of the text is adjusted.</property> + <object class="AtkObject" id="alignedatmf-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|alignedatmf">Enter the distance from the left page margin at which the numbering symbol will be aligned.</property> </object> </child> </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">8</property> + <property name="top-attach">1</property> </packing> </child> <child> - <object class="GtkLabel" id="numberingwidth"> + <object class="GtkLabel" id="numfollowedby"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="outlinepositionpage|numberingwidth">Width of numbering:</property> + <property name="label" translatable="yes" context="outlinepositionpage|numfollowedby">Followed by:</property> <property name="use-underline">True</property> - <property name="mnemonic-widget">numberingwidthmf</property> + <property name="mnemonic-widget">numfollowedbylb</property> <property name="xalign">0</property> </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">7</property> + <property name="top-attach">2</property> </packing> </child> <child> - <object class="GtkSpinButton" id="numberingwidthmf"> + <object class="GtkComboBoxText" id="numfollowedbylb"> <property name="visible">True</property> - <property name="can-focus">True</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> - <property name="activates-default">True</property> - <property name="truncate-multiline">True</property> - <property name="adjustment">adjustment1</property> - <property name="digits">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="numberingwidthmf-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|numberingwidthmf">Enter the width of the numbering area. The numbering symbol can be left, center or right in this area.</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">7</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="relative"> - <property name="label" translatable="yes" context="outlinepositionpage|relative">Relative</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> + <items> + <item translatable="yes" context="outlinepositionpage|liststore2">Tab stop</item> + <item translatable="yes" context="outlinepositionpage|liststore2">Space</item> + <item translatable="yes" context="outlinepositionpage|liststore2">Nothing</item> + <item translatable="yes" context="outlinepositionpage|liststore2">New Line</item> + </items> <child internal-child="accessible"> - <object class="AtkObject" id="relative-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|relative">Indents the current level relative to the previous level in the list hierarchy.</property> + <object class="AtkObject" id="numfollowedbylb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|numfollowedbylb">Enter the distance from the left page margin at which the numbering symbol will be aligned.</property> </object> </child> </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">6</property> + <property name="top-attach">2</property> </packing> </child> <child> - <object class="GtkLabel" id="indent"> + <object class="GtkLabel" id="at"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="outlinepositionpage|indent">Indent:</property> + <property name="label" translatable="yes" context="outlinepositionpage|at">Tab stop at:</property> <property name="use-underline">True</property> - <property name="mnemonic-widget">indentmf</property> + <property name="mnemonic-widget">atmf</property> <property name="xalign">0</property> </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">5</property> + <property name="top-attach">3</property> </packing> </child> <child> - <object class="GtkSpinButton" id="indentmf"> + <object class="GtkSpinButton" id="atmf"> <property name="visible">True</property> <property name="can-focus">True</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="adjustment">adjustment5</property> <property name="digits">2</property> <child internal-child="accessible"> - <object class="AtkObject" id="indentmf-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|indentmf">Enter the amount of space to leave between the left page margin (or the left edge of the text object) and the left edge of the numbering area. If the current paragraph style uses an indent, the amount you enter here is added to the indent.</property> + <object class="AtkObject" id="atmf-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|atmf">If you select a tab stop to follow the numbering, you can enter a non-negative value as the tab stop position.</property> </object> </child> </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">5</property> + <property name="top-attach">3</property> </packing> </child> <child> @@ -321,137 +298,160 @@ numbering and text:</property> </packing> </child> <child> - <object class="GtkLabel" id="num2align"> + <object class="GtkLabel" id="indent"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="outlinepositionpage|num2align">Alignment:</property> + <property name="label" translatable="yes" context="outlinepositionpage|indent">Indent:</property> <property name="use-underline">True</property> - <property name="mnemonic-widget">num2alignlb</property> + <property name="mnemonic-widget">indentmf</property> <property name="xalign">0</property> </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">0</property> + <property name="top-attach">5</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="num2alignlb"> + <object class="GtkSpinButton" id="indentmf"> <property name="visible">True</property> - <property name="can-focus">False</property> + <property name="can-focus">True</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="num2alignlb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|num2alignlb">Set the alignment of the numbering symbols. Select "Left" to align the numbering symbol to start directly at the "Aligned at" position. Select "Right" to align the symbol to end directly before the "Aligned at" position. Select "Centered" to center the symbol around the "Aligned at" position.</property> + <object class="AtkObject" id="indentmf-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|indentmf">Enter the amount of space to leave between the left page margin (or the left edge of the text object) and the left edge of the numbering area. If the current paragraph style uses an indent, the amount you enter here is added to the indent.</property> </object> </child> </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">0</property> + <property name="top-attach">5</property> </packing> </child> <child> - <object class="GtkLabel" id="alignedat"> + <object class="GtkCheckButton" id="relative"> + <property name="label" translatable="yes" context="outlinepositionpage|relative">Relative</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="relative-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|relative">Indents the current level relative to the previous level in the list hierarchy.</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">6</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="numberingwidth"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="outlinepositionpage|alignedat">Aligned at:</property> + <property name="label" translatable="yes" context="outlinepositionpage|numberingwidth">Width of numbering:</property> <property name="use-underline">True</property> - <property name="mnemonic-widget">alignedatmf</property> + <property name="mnemonic-widget">numberingwidthmf</property> <property name="xalign">0</property> </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">1</property> + <property name="top-attach">7</property> </packing> </child> <child> - <object class="GtkSpinButton" id="alignedatmf"> + <object class="GtkSpinButton" id="numberingwidthmf"> <property name="visible">True</property> <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="activates-default">True</property> <property name="truncate-multiline">True</property> - <property name="adjustment">adjustment4</property> + <property name="adjustment">adjustment1</property> <property name="digits">2</property> <child internal-child="accessible"> - <object class="AtkObject" id="alignedatmf-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|alignedatmf">Enter the distance from the left page margin at which the numbering symbol will be aligned.</property> + <object class="AtkObject" id="numberingwidthmf-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|numberingwidthmf">Enter the width of the numbering area. The numbering symbol can be left, center or right in this area.</property> </object> </child> </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">1</property> + <property name="top-attach">7</property> </packing> </child> <child> - <object class="GtkLabel" id="at"> + <object class="GtkLabel" id="numdist"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="outlinepositionpage|at">Tab stop at:</property> + <property name="label" translatable="yes" context="outlinepositionpage|numdist">Minimum space between +numbering and text:</property> <property name="use-underline">True</property> - <property name="mnemonic-widget">atmf</property> + <property name="mnemonic-widget">numdistmf</property> <property name="xalign">0</property> </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">3</property> + <property name="top-attach">8</property> </packing> </child> <child> - <object class="GtkSpinButton" id="atmf"> + <object class="GtkSpinButton" id="numdistmf"> <property name="visible">True</property> <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="activates-default">True</property> <property name="truncate-multiline">True</property> - <property name="adjustment">adjustment5</property> + <property name="adjustment">adjustment3</property> <property name="digits">2</property> <child internal-child="accessible"> - <object class="AtkObject" id="atmf-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|atmf">If you select a tab stop to follow the numbering, you can enter a non-negative value as the tab stop position.</property> + <object class="AtkObject" id="numdistmf-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|numdistmf">The alignment of the numbering symbol is adjusted to get the desired minimum space. If it is not possible because the numbering area is not wide enough, then the start of the text is adjusted.</property> </object> </child> </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">3</property> + <property name="top-attach">8</property> </packing> </child> <child> - <object class="GtkComboBoxText" id="numfollowedbylb"> + <object class="GtkLabel" id="numalign"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="hexpand">True</property> - <items> - <item translatable="yes" context="outlinepositionpage|liststore2">Tab stop</item> - <item translatable="yes" context="outlinepositionpage|liststore2">Space</item> - <item translatable="yes" context="outlinepositionpage|liststore2">Nothing</item> - <item translatable="yes" context="outlinepositionpage|liststore2">New Line</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="numfollowedbylb-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|numfollowedbylb">Enter the distance from the left page margin at which the numbering symbol will be aligned.</property> - </object> - </child> + <property name="label" translatable="yes" context="outlinepositionpage|numalign">Alignment:</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">numalignlb</property> + <property name="xalign">0</property> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">9</property> </packing> </child> <child> - <object class="GtkLabel" id="numfollowedby"> + <object class="GtkComboBoxText" id="numalignlb"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes" context="outlinepositionpage|numfollowedby">Followed by:</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">numfollowedbylb</property> - <property name="xalign">0</property> + <property name="hexpand">True</property> + <items> + <item translatable="yes" context="outlinepositionpage|liststore1">Left</item> + <item translatable="yes" context="outlinepositionpage|liststore1">Centered</item> + <item translatable="yes" context="outlinepositionpage|liststore1">Right</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="numalignlb-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="outlinepositionpage|extended_tip|numalignlb">Set the alignment of the numbering symbols. Select "Left" to align the numbering symbol to start directly at the "Aligned at" position. Select "Right" to align the symbol to end directly before the "Aligned at" position. Select "Centered" to center the symbol around the "Aligned at" position.</property> + </object> + </child> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> + <property name="left-attach">1</property> + <property name="top-attach">9</property> </packing> </child> <child> commit afde9bd873b0f090b7afde8dd362f051840c38ca Author: Michael Weghorn <[email protected]> AuthorDate: Wed Feb 11 11:19:45 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Feb 11 18:15:27 2026 +0100 tdf#130857 qt weld: Support Heading Numbering dialog This means that native Qt widgets are used for that dialog now when using the qt5 or qt6 VCL plugin and starting LO with environment variable SAL_VCL_QT_USE_WELDED_WIDGETS=1 set. The dialog can be triggered like this: * start Writer * "Tools" -> "Heading Numbering..." Change-Id: Ide2d9362ce7c835fda2e243589d5d415c22ffb87 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199146 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index 8790abb07935..e737bd4475ad 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -210,6 +210,7 @@ constexpr auto SUPPORTED_UI_FILES = frozen::make_unordered_set<std::u16string_vi u"modules/swriter/ui/inserttable.ui", u"modules/swriter/ui/linenumbering.ui", u"modules/swriter/ui/numberingnamedialog.ui", + u"modules/swriter/ui/outlinenumbering.ui", u"modules/swriter/ui/pagenumberdlg.ui", u"modules/swriter/ui/printmergedialog.ui", u"modules/swriter/ui/renameautotextdialog.ui", @@ -338,6 +339,8 @@ constexpr auto SUPPORTED_WITH_QT_PARENT = frozen::make_unordered_set<std::u16str u"modules/swriter/ui/fldrefpage.ui", u"modules/swriter/ui/fldvarpage.ui", u"modules/swriter/ui/optcaptionpage.ui", + u"modules/swriter/ui/outlinenumberingpage.ui", + u"modules/swriter/ui/outlinepositionpage.ui", u"modules/swriter/ui/printeroptions.ui", u"modules/swriter/ui/printoptionspage.ui", u"modules/swriter/ui/statisticsinfopage.ui",
