cui/uiconfig/ui/spinbox.ui | 27 +- sw/uiconfig/swriter/ui/cardmediumpage.ui | 310 +++++++++++++++--------------- sw/uiconfig/swriter/ui/labelformatpage.ui | 264 ++++++++++++------------- sw/uiconfig/swriter/ui/savelabeldialog.ui | 48 ++-- 4 files changed, 323 insertions(+), 326 deletions(-)
New commits: commit 61481b8f56d7ff3f9be1c84a2b75c3b453156911 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Feb 11 20:59:48 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Feb 12 09:56:11 2026 +0100 cui: Resave spinbox.ui with glade 3.40 This gets used e.g. in the "Labels" dialog that can be triggered like this: * start Writer * "File" -> "New" -> "Labels" Change-Id: I193f6f9e6bc62cef3cae967db0009c491c481149 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199214 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/cui/uiconfig/ui/spinbox.ui b/cui/uiconfig/ui/spinbox.ui index 8626d8d53834..d4103db71632 100644 --- a/cui/uiconfig/ui/spinbox.ui +++ b/cui/uiconfig/ui/spinbox.ui @@ -1,33 +1,30 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> +<!-- Generated with glade 3.40.0 --> <interface domain="cui"> <requires lib="gtk+" version="3.24"/> <object class="GtkAdjustment" id="adjustment1"> <property name="upper">100000</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> </object> <object class="GtkDialog" id="SpinDialog"> - <property name="can_focus">False</property> - <property name="type_hint">dialog</property> - <child> - <placeholder/> - </child> + <property name="can-focus">False</property> + <property name="type-hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">2</property> <child internal-child="action_area"> <object class="GtkButtonBox"> - <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="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> </object> <packing> @@ -46,13 +43,13 @@ <child> <object class="GtkBox" id="SpinBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="spacing">6</property> <child> <object class="GtkSpinButton" id="spin"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="truncate-multiline">True</property> commit b774b2dff6247c9659eb053786eec0ee180d39c5 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Feb 11 20:56:25 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Feb 12 09:56:04 2026 +0100 sw: Resave .ui files used in "Labels" dialog with glade 3.40 These UI files are used in the "Labels" dialog that can be triggered like this: * start Writer * "File" -> "New" -> "Labels" Change-Id: I6eecdb43721a6c614accfdfcc7a6fd8b26937b60 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199213 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/sw/uiconfig/swriter/ui/cardmediumpage.ui b/sw/uiconfig/swriter/ui/cardmediumpage.ui index ecc4874c163a..19a4bb9463e4 100644 --- a/sw/uiconfig/swriter/ui/cardmediumpage.ui +++ b/sw/uiconfig/swriter/ui/cardmediumpage.ui @@ -1,68 +1,68 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.36.0 --> +<!-- Generated with glade 3.40.0 --> <interface domain="sw"> <requires lib="gtk+" version="3.24"/> <object class="GtkAdjustment" id="adjustment1"> <property name="lower">1</property> <property name="upper">100</property> <property name="value">1</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> </object> <object class="GtkImage" id="image1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="icon-name">go-previous</property> </object> <object class="GtkBox" id="CardMediumPage"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="border_width">6</property> + <property name="border-width">6</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkFrame" id="addressframe"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">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=3 n-rows=1 --> <object class="GtkGrid" id="grid3"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="column_spacing">18</property> + <property name="can-focus">False</property> <property name="margin-start">12</property> <property name="margin-top">6</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="column-spacing">18</property> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=1 n-rows=2 --> <object class="GtkGrid" id="grid4"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="row_spacing">6</property> + <property name="row-spacing">6</property> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=2 n-rows=1 --> <object class="GtkGrid" id="grid5"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">12</property> + <property name="can-focus">False</property> + <property name="column-spacing">12</property> <child> <object class="GtkCheckButton" id="address"> <property name="label" translatable="yes" context="cardmediumpage|address">Address</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> <property name="halign">end</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> <child internal-child="accessible"> <object class="AtkObject" id="address-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="cardmediumpage|extended_tip|address">Creates a label with your return address. Text that is currently in the Label text box is overwritten.</property> @@ -70,42 +70,42 @@ </child> </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="label2"> <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" translatable="yes" context="cardmediumpage|label2">Label text:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">textview</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">textview</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> </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="GtkScrolledWindow" id="scrolledwindow1"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="shadow_type">in</property> + <property name="shadow-type">in</property> <child> <object class="GtkTextView" id="textview"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <child internal-child="accessible"> @@ -117,49 +117,49 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> </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> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=1 n-rows=3 --> <object class="GtkGrid" id="grid6"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">12</property> - <property name="row_homogeneous">True</property> + <property name="can-focus">False</property> + <property name="row-spacing">12</property> + <property name="row-homogeneous">True</property> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=1 n-rows=2 --> <object class="GtkGrid" id="grid8"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="valign">start</property> <property name="hexpand">True</property> - <property name="row_spacing">6</property> + <property name="row-spacing">6</property> <child> <object class="GtkLabel" id="label4"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="cardmediumpage|label4">Database:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">database</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">database</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="GtkComboBoxText" id="database"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <child internal-child="accessible"> <object class="AtkObject" id="database-atkobject"> @@ -168,42 +168,42 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> </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> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=1 n-rows=2 --> <object class="GtkGrid" id="grid9"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="valign">center</property> <property name="hexpand">True</property> - <property name="row_spacing">6</property> + <property name="row-spacing">6</property> <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="cardmediumpage|label7">Table:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">table</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">table</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="GtkComboBoxText" id="table"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <child internal-child="accessible"> <object class="AtkObject" id="table-atkobject"> @@ -212,42 +212,42 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=1 n-rows=2 --> <object class="GtkGrid" id="grid10"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="valign">end</property> <property name="hexpand">True</property> - <property name="row_spacing">6</property> + <property name="row-spacing">6</property> <child> <object class="GtkLabel" id="label8"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="cardmediumpage|label8">Database field:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">field</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">field</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="GtkComboBoxText" id="field"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <child internal-child="accessible"> <object class="AtkObject" id="field-atkobject"> @@ -256,31 +256,31 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </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> </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="GtkButton" id="insert"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="cardmediumpage|insert|tooltip_text">Insert</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes" context="cardmediumpage|insert|tooltip_text">Insert</property> <property name="valign">center</property> <property name="image">image1</property> - <property name="always_show_image">True</property> + <property name="always-show-image">True</property> <child internal-child="accessible"> <object class="AtkObject" id="insert-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="cardmediumpage|extended_tip|insert">Select the database field that you want, and then click the arrow to the left of this box to insert the field into the Label text box.</property> @@ -288,8 +288,8 @@ </child> </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> </object> @@ -297,7 +297,7 @@ <child type="label"> <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="cardmediumpage|label6">Inscription</property> <attributes> <attribute name="weight" value="bold"/> @@ -314,43 +314,43 @@ <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=1 n-rows=3 --> <object class="GtkGrid" id="grid1"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="row_spacing">6</property> + <property name="can-focus">False</property> <property name="margin-start">12</property> <property name="margin-top">6</property> + <property name="hexpand">True</property> + <property name="row-spacing">6</property> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=2 n-rows=1 --> <object class="GtkGrid" id="grid2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> - <property name="row_spacing">12</property> - <property name="column_spacing">12</property> - <property name="column_homogeneous">True</property> + <property name="row-spacing">12</property> + <property name="column-spacing">12</property> + <property name="column-homogeneous">True</property> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=1 n-rows=2 --> <object class="GtkGrid" id="grid7"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> + <property name="can-focus">False</property> + <property name="row-spacing">6</property> <child> <object class="GtkRadioButton" id="continuous"> <property name="label" translatable="yes" context="cardmediumpage|continuous">_Continuous</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="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> <property name="active">True</property> - <property name="draw_indicator">True</property> + <property name="draw-indicator">True</property> <child internal-child="accessible"> <object class="AtkObject" id="continuous-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="cardmediumpage|extended_tip|continuous">Prints labels on continuous paper.</property> @@ -358,74 +358,74 @@ </child> </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="GtkRadioButton" id="sheet"> <property name="label" translatable="yes" context="cardmediumpage|sheet">_Sheet</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> <property name="hexpand">True</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> <property name="group">continuous</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> </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> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=2 n-rows=2 --> <object class="GtkGrid" id="grid11"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> + <property name="row-spacing">6</property> + <property name="column-spacing">12</property> <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="cardmediumpage|label5">Brand:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">brand</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">brand</property> <property name="xalign">1</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="label3"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="cardmediumpage|label3">_Type:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">type</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">type</property> <property name="xalign">1</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkComboBoxText" id="brand"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> - <property name="popup_fixed_width">False</property> + <property name="popup-fixed-width">False</property> <child internal-child="accessible"> <object class="AtkObject" id="brand-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="cardmediumpage|extended_tip|brand">Select the brand of paper that you want to use.</property> @@ -433,16 +433,16 @@ </child> </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="GtkComboBoxText" id="type"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> - <property name="popup_fixed_width">False</property> + <property name="popup-fixed-width">False</property> <child internal-child="accessible"> <object class="AtkObject" id="type-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="cardmediumpage|extended_tip|type">Select the size format that you want to use. The available formats depend on the brand you selected in the Brand list. If you want to use a custom label format, select [User], and then click the Format tab to define the format.</property> @@ -450,26 +450,26 @@ </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> </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> </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="formatinfo"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="xalign">0</property> <child internal-child="accessible"> <object class="AtkObject" id="formatinfo-atkobject"> @@ -478,18 +478,18 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkComboBoxText" id="hiddentype"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> </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> </object> @@ -497,7 +497,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="cardmediumpage|label1">Format</property> <attributes> <attribute name="weight" value="bold"/> diff --git a/sw/uiconfig/swriter/ui/labelformatpage.ui b/sw/uiconfig/swriter/ui/labelformatpage.ui index 7515bbc89260..1b06f294d346 100644 --- a/sw/uiconfig/swriter/ui/labelformatpage.ui +++ b/sw/uiconfig/swriter/ui/labelformatpage.ui @@ -1,182 +1,182 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.36.0 --> +<!-- Generated with glade 3.40.0 --> <interface domain="sw"> <requires lib="gtk+" version="3.24"/> <object class="GtkAdjustment" id="adjustment1"> <property name="lower">1</property> <property name="upper">100</property> <property name="value">1</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> </object> <object class="GtkAdjustment" id="adjustment2"> <property name="lower">1</property> <property name="upper">100</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> </object> <object class="GtkBox" id="LabelFormatPage"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="border_width">6</property> + <property name="border-width">6</property> <property name="spacing">12</property> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=2 n-rows=11 --> <object class="GtkGrid" id="grid1"> <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="row-spacing">6</property> + <property name="column-spacing">12</property> <child> <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="labelformatpage|label1">Hori_zontal pitch:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">hori</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">hori</property> <property name="xalign">1</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="label2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="labelformatpage|label2">_Vertical pitch:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">vert</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">vert</property> <property name="xalign">1</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkLabel" id="label3"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="labelformatpage|label3">_Width:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">width</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">width</property> <property name="xalign">1</property> </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="GtkLabel" id="label4"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="labelformatpage|label4">_Height:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">height</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">height</property> <property name="xalign">1</property> </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> <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="labelformatpage|label5">_Left margin:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">left</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">left</property> <property name="xalign">1</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> + <property name="left-attach">0</property> + <property name="top-attach">4</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="labelformatpage|label6">_Top margin:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">top</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">top</property> <property name="xalign">1</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> + <property name="left-attach">0</property> + <property name="top-attach">5</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="labelformatpage|label7">_Columns:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">cols</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">cols</property> <property name="xalign">1</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">6</property> + <property name="left-attach">0</property> + <property name="top-attach">6</property> </packing> </child> <child> <object class="GtkLabel" id="label8"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="labelformatpage|label8">R_ows:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">rows</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">rows</property> <property name="xalign">1</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">7</property> + <property name="left-attach">0</property> + <property name="top-attach">7</property> </packing> </child> <child> <object class="GtkLabel" id="label9"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="labelformatpage|label9">P_age width:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">pagewidth</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">pagewidth</property> <property name="xalign">1</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">8</property> + <property name="left-attach">0</property> + <property name="top-attach">8</property> </packing> </child> <child> <object class="GtkLabel" id="label10"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="labelformatpage|label10">Pa_ge height:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">pageheight</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">pageheight</property> <property name="xalign">1</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">9</property> + <property name="left-attach">0</property> + <property name="top-attach">9</property> </packing> </child> <child> <object class="GtkButton" id="save"> <property name="label" translatable="yes" context="labelformatpage|save">_Save...</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="halign">end</property> - <property name="use_underline">True</property> + <property name="use-underline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="save-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="labelformatpage|extended_tip|save">Saves the current label or business card format.</property> @@ -184,18 +184,18 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">10</property> + <property name="left-attach">0</property> + <property name="top-attach">10</property> <property name="width">2</property> </packing> </child> <child> <object class="GtkSpinButton" id="hori"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="digits">2</property> + <property name="can-focus">True</property> + <property name="activates-default">True</property> <property name="truncate-multiline">True</property> + <property name="digits">2</property> <child internal-child="accessible"> <object class="AtkObject" id="hori-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="labelformatpage|extended_tip|hori">Displays the distance between the left edges of adjacent labels or business cards. If you are defining a custom format, enter a value here.</property> @@ -203,17 +203,17 @@ </child> </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="GtkSpinButton" id="vert"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="digits">2</property> + <property name="can-focus">True</property> + <property name="activates-default">True</property> <property name="truncate-multiline">True</property> + <property name="digits">2</property> <child internal-child="accessible"> <object class="AtkObject" id="vert-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="labelformatpage|extended_tip|vert">Displays the distance between the upper edge of a label or a business card and the upper edge of the label or the business card directly below. If you are defining a custom format, enter a value here.</property> @@ -221,17 +221,17 @@ </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="GtkSpinButton" id="width"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="digits">2</property> + <property name="can-focus">True</property> + <property name="activates-default">True</property> <property name="truncate-multiline">True</property> + <property name="digits">2</property> <child internal-child="accessible"> <object class="AtkObject" id="width-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="labelformatpage|extended_tip|width">Displays the width for the label or the business card. If you are defining a custom format, enter a value here.</property> @@ -239,17 +239,17 @@ </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="GtkSpinButton" id="height"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="digits">2</property> + <property name="can-focus">True</property> + <property name="activates-default">True</property> <property name="truncate-multiline">True</property> + <property name="digits">2</property> <child internal-child="accessible"> <object class="AtkObject" id="height-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="labelformatpage|extended_tip|height">Displays the height for the label or business card. If you are defining a custom format, enter a value here.</property> @@ -257,17 +257,17 @@ </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="GtkSpinButton" id="left"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="digits">2</property> + <property name="can-focus">True</property> + <property name="activates-default">True</property> <property name="truncate-multiline">True</property> + <property name="digits">2</property> <child internal-child="accessible"> <object class="AtkObject" id="left-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="labelformatpage|extended_tip|left">Displays the distance from the left edge of the page to the left edge of the first label or business card. If you are defining a custom format, enter a value here.</property> @@ -275,17 +275,17 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> + <property name="left-attach">1</property> + <property name="top-attach">4</property> </packing> </child> <child> <object class="GtkSpinButton" id="top"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="digits">2</property> + <property name="can-focus">True</property> + <property name="activates-default">True</property> <property name="truncate-multiline">True</property> + <property name="digits">2</property> <child internal-child="accessible"> <object class="AtkObject" id="top-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="labelformatpage|extended_tip|top">Displays distance from the top edge of the page to the top of the first label or business card. If you are defining a custom format, enter a value here.</property> @@ -293,17 +293,17 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">5</property> + <property name="left-attach">1</property> + <property name="top-attach">5</property> </packing> </child> <child> <object class="GtkSpinButton" id="cols"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment1</property> + <property name="can-focus">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="cols-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="labelformatpage|extended_tip|cols">Enter the number of labels or business cards that you want to span the width of the page.</property> @@ -311,17 +311,17 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">6</property> + <property name="left-attach">1</property> + <property name="top-attach">6</property> </packing> </child> <child> <object class="GtkSpinButton" id="rows"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="adjustment">adjustment2</property> + <property name="can-focus">True</property> + <property name="activates-default">True</property> <property name="truncate-multiline">True</property> + <property name="adjustment">adjustment2</property> <child internal-child="accessible"> <object class="AtkObject" id="rows-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="labelformatpage|extended_tip|rows">Enter the number of labels or business cards that you want to span the height of the page.</property> @@ -329,34 +329,34 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">7</property> + <property name="left-attach">1</property> + <property name="top-attach">7</property> </packing> </child> <child> <object class="GtkSpinButton" id="pagewidth"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> + <property name="can-focus">True</property> + <property name="activates-default">True</property> <property name="truncate-multiline">True</property> <property name="digits">2</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">8</property> + <property name="left-attach">1</property> + <property name="top-attach">8</property> </packing> </child> <child> <object class="GtkSpinButton" id="pageheight"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> + <property name="can-focus">True</property> + <property name="activates-default">True</property> <property name="truncate-multiline">True</property> <property name="digits">2</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">9</property> + <property name="left-attach">1</property> + <property name="top-attach">9</property> </packing> </child> </object> @@ -367,47 +367,47 @@ </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=2 n-rows=2 --> <object class="GtkGrid" id="grid2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="column_spacing">12</property> + <property name="column-spacing">12</property> <child> <object class="GtkDrawingArea" id="preview"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> <property name="width">2</property> </packing> </child> <child> <object class="GtkLabel" id="make"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">top</property> - <property name="max_width_chars">32</property> + <property name="can-focus">False</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">top</property> + <property name="max-width-chars">32</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="type"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">top</property> - <property name="max_width_chars">32</property> + <property name="can-focus">False</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">top</property> + <property name="max-width-chars">32</property> <property name="xalign">0</property> <child internal-child="accessible"> <object class="AtkObject" id="type-atkobject"> @@ -416,8 +416,8 @@ </child> </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> </object> commit f52be7125f74d14d54b3f64425ff890d7e38994e Author: Michael Weghorn <[email protected]> AuthorDate: Wed Feb 11 20:48:36 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Feb 12 09:55:58 2026 +0100 tdf#130857 Define widgets in "Save Label Format" 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 * "File" -> "New" -> "Labels" * in the "Format" tab, press the "Save..." button Change-Id: I88028a3499151a261fd768b49574190897a170c3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199212 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/sw/uiconfig/swriter/ui/savelabeldialog.ui b/sw/uiconfig/swriter/ui/savelabeldialog.ui index f7893ff7c138..a686b08cc734 100644 --- a/sw/uiconfig/swriter/ui/savelabeldialog.ui +++ b/sw/uiconfig/swriter/ui/savelabeldialog.ui @@ -103,6 +103,30 @@ <property name="top-attach">0</property> </packing> </child> + <child> + <object class="GtkComboBoxText" id="brand"> + <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" id="comboboxtext-entry"> + <property name="can-focus">True</property> + <property name="activates-default">True</property> + <property name="truncate-multiline">True</property> + </object> + </child> + <child internal-child="accessible"> + <object class="AtkObject" id="brand-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="savelabeldialog|extended_tip|brand">Enter or select the desired brand.</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">0</property> + </packing> + </child> <child> <object class="GtkLabel" id="label3"> <property name="visible">True</property> @@ -135,30 +159,6 @@ <property name="top-attach">1</property> </packing> </child> - <child> - <object class="GtkComboBoxText" id="brand"> - <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" id="comboboxtext-entry"> - <property name="can-focus">True</property> - <property name="activates-default">True</property> - <property name="truncate-multiline">True</property> - </object> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="brand-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="savelabeldialog|extended_tip|brand">Enter or select the desired brand.</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">0</property> - </packing> - </child> </object> </child> <child type="label">
