sc/uiconfig/scalc/ui/optdlg.ui | 48 +++++++--------
sw/uiconfig/swriter/ui/printoptionspage.ui | 92 ++++++++++++++---------------
2 files changed, 70 insertions(+), 70 deletions(-)
New commits:
commit 0a0ca7f1ac33984cb29a1a5297b4c704a670166d
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Sat Aug 2 19:06:04 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sat Aug 2 22:45:31 2025 +0200
tdf#130857 sc: Define widgets in printer options dlg in order
Switch the order in which the widgets in the .ui file
are defined so that the order 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 <m.wegh...@posteo.de>
Date: Thu Oct 24 17:43:35 2024 +0200
tdf#130857 optnewdictionarydialog.ui: Define focusable widgets in
order
for more background.
This dialog can be triggered as follows in Calc:
* "File" -> "Printer Settings"
* press "Options" button
Change-Id: Iba897fb4e4e6b9f07889724a74e81f1d4388a969
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188836
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/sc/uiconfig/scalc/ui/optdlg.ui b/sc/uiconfig/scalc/ui/optdlg.ui
index 8dd869f817af..0506a5f47876 100644
--- a/sc/uiconfig/scalc/ui/optdlg.ui
+++ b/sc/uiconfig/scalc/ui/optdlg.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
+<!-- Generated with glade 3.40.0 -->
<interface domain="sc">
<requires lib="gtk+" version="3.20"/>
<object class="GtkBox" id="optCalcPrintPage">
@@ -24,22 +24,16 @@
<property name="row-spacing">6</property>
<property name="column-spacing">6</property>
<child>
- <object class="GtkCheckButton" id="suppressCB">
- <property name="label" translatable="yes"
context="optdlg|suppressCB">_Suppress output of empty pages</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="suppressCB-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|suppressCB">Specifies that empty pages
that have no cell contents or draw objects are not printed.</property>
- </object>
- </child>
+ <object class="GtkImage" id="lockforceBreaksCB">
+ <property name="can-focus">False</property>
+ <property name="no-show-all">True</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="icon-name">res/lock.png</property>
</object>
<packing>
- <property name="left-attach">1</property>
- <property name="top-attach">1</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
<child>
@@ -57,7 +51,7 @@
</packing>
</child>
<child>
- <object class="GtkImage" id="lockforceBreaksCB">
+ <object class="GtkImage" id="locksuppressCB">
<property name="can-focus">False</property>
<property name="no-show-all">True</property>
<property name="halign">center</property>
@@ -66,19 +60,25 @@
</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="GtkImage" id="locksuppressCB">
- <property name="can-focus">False</property>
- <property name="no-show-all">True</property>
- <property name="halign">center</property>
- <property name="valign">center</property>
- <property name="icon-name">res/lock.png</property>
+ <object class="GtkCheckButton" id="suppressCB">
+ <property name="label" translatable="yes"
context="optdlg|suppressCB">_Suppress output of empty pages</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="suppressCB-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|suppressCB">Specifies that empty pages
that have no cell contents or draw objects are not printed.</property>
+ </object>
+ </child>
</object>
<packing>
- <property name="left-attach">0</property>
+ <property name="left-attach">1</property>
<property name="top-attach">1</property>
</packing>
</child>
commit cfc1908dc7bdfae61e8b20704a3e608c6f635952
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Sat Aug 2 19:00:59 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Sat Aug 2 22:45:26 2025 +0200
tdf#130857 sw: Define widgets in printer options dlg in order
Switch the order in which the widgets in the .ui file
are defined so that the order 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 <m.wegh...@posteo.de>
Date: Thu Oct 24 17:43:35 2024 +0200
tdf#130857 optnewdictionarydialog.ui: Define focusable widgets in
order
for more background.
This dialog can be triggered as follows in Writer:
* "File" -> "Printer Settings"
* press "Options" button
Change-Id: I2d4184a8382baa818c4233111b42d2b46ed7ae72
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188835
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/sw/uiconfig/swriter/ui/printoptionspage.ui
b/sw/uiconfig/swriter/ui/printoptionspage.ui
index dd10a102e5d4..08370355cd3c 100644
--- a/sw/uiconfig/swriter/ui/printoptionspage.ui
+++ b/sw/uiconfig/swriter/ui/printoptionspage.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
+<!-- Generated with glade 3.40.0 -->
<interface domain="sw">
<requires lib="gtk+" version="3.20"/>
<object class="GtkBox" id="PrintOptionsPage">
@@ -580,51 +580,6 @@
<property name="margin-start">12</property>
<property name="margin-top">6</property>
<property name="row-spacing">6</property>
- <child>
- <!-- n-columns=2 n-rows=1 -->
- <object class="GtkGrid" id="grid7">
- <property name="visible">True</property>
- <property name="can-focus">False</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="label" translatable="yes"
context="printoptionspage|label5">_Fax:</property>
- <property name="use-underline">True</property>
- <property name="mnemonic-widget">fax</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="label5-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|label5">If you have installed fax
software on your computer and wish to fax directly from the text document,
select the desired fax machine.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="fax">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="fax-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|fax">If you have installed fax
software on your computer and wish to fax directly from the text document,
select the desired fax machine.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">2</property>
- </packing>
- </child>
<child>
<object class="GtkCheckButton" id="blankpages">
<property name="label" translatable="yes"
context="printoptionspage|blankpages">Print _automatically inserted blank
pages</property>
@@ -702,6 +657,51 @@
<property name="top-attach">2</property>
</packing>
</child>
+ <child>
+ <!-- n-columns=2 n-rows=1 -->
+ <object class="GtkGrid" id="grid7">
+ <property name="visible">True</property>
+ <property name="can-focus">False</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="label" translatable="yes"
context="printoptionspage|label5">_Fax:</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">fax</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="label5-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|label5">If you have installed fax
software on your computer and wish to fax directly from the text document,
select the desired fax machine.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="fax">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="fax-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="extended_tip|fax">If you have installed fax
software on your computer and wish to fax directly from the text document,
select the desired fax machine.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">2</property>
+ </packing>
+ </child>
</object>
</child>
<child type="label">
