sw/uiconfig/swriter/ui/watermarkdialog.ui | 138 ++++++++++++++---------------- vcl/qt5/QtInstanceBuilder.cxx | 4 2 files changed, 71 insertions(+), 71 deletions(-)
New commits: commit c01e50ce848eb175813c27679d6c52056ea67625 Author: Michael Weghorn <[email protected]> AuthorDate: Sun Oct 5 21:24:13 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Sun Oct 5 22:35:19 2025 +0200 tdf#130857 qt weld: Support Writer "Watermark" 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 using "Format" -> "Watermark" in Writer. Change-Id: I37bc11c301675655f9e13595bb56b785f658138f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191926 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index 0a3003575674..7f760b5bf997 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -174,6 +174,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"modules/swriter/ui/rowheight.ui"_ustr, u"modules/swriter/ui/splittable.ui"_ustr, u"modules/swriter/ui/testmailsettings.ui"_ustr, + u"modules/swriter/ui/watermarkdialog.ui"_ustr, u"modules/swriter/ui/wordcount.ui"_ustr, u"sfx/ui/documentpropertiesdialog.ui"_ustr, u"sfx/ui/editdurationdialog.ui"_ustr, commit cfc019baa6b2dae9d9ebc32ec2e45cba561b867b Author: Michael Weghorn <[email protected]> AuthorDate: Sun Oct 5 21:21:53 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Sun Oct 5 22:35:13 2025 +0200 sw: Resave watermarkdialog.ui with glade 3.40 The dialog can be triggered using "Format" -> "Watermark" in Writer. Change-Id: Ia231d3a6248a871f5212e2a5b1c40ebccaaa65d6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191925 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/sw/uiconfig/swriter/ui/watermarkdialog.ui b/sw/uiconfig/swriter/ui/watermarkdialog.ui index 1a31bdbb5235..ca9686faac34 100644 --- a/sw/uiconfig/swriter/ui/watermarkdialog.ui +++ b/sw/uiconfig/swriter/ui/watermarkdialog.ui @@ -1,39 +1,39 @@ <?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.20"/> <object class="GtkAdjustment" id="angle_adj"> <property name="upper">359</property> - <property name="step_increment">45</property> + <property name="step-increment">45</property> </object> <object class="GtkAdjustment" id="transparenct_adj"> <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="GtkDialog" id="WatermarkDialog"> - <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="watermarkdialog|WatermarkDialog">Watermark</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">24</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="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> @@ -47,10 +47,10 @@ <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> @@ -63,8 +63,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> @@ -77,41 +77,41 @@ <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">1</property> </packing> </child> <child> <object class="GtkBox" id="Box"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=2 n-rows=5 --> <object class="GtkGrid" id="TextGrid"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> + <property name="can-focus">False</property> + <property name="row-spacing">6</property> + <property name="column-spacing">6</property> <child> <object class="GtkLabel" id="TextLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="label" translatable="yes" context="watermarkdialog|TextLabel">Text</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="GtkEntry" id="TextInput"> <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="TextInput-atkobject"> @@ -120,67 +120,67 @@ </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="FontLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="label" translatable="yes" context="watermarkdialog|FontLabel">Font</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="AngleLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="label" translatable="yes" context="watermarkdialog|AngleLabel">Angle</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="TransparencyLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="label" translatable="yes" context="watermarkdialog|TransparencyLabel">Transparency</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="ColorLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="label" translatable="yes" context="watermarkdialog|ColorLabel">Color</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">Color</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">Color</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="GtkSpinButton" id="Angle"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="adjustment">angle_adj</property> + <property name="can-focus">True</property> + <property name="activates-default">True</property> <property name="truncate-multiline">True</property> + <property name="adjustment">angle_adj</property> <child internal-child="accessible"> <object class="AtkObject" id="Angle-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="watermarkdialog|extended_tip|Angle">Select the rotation angle for the watermark. The text will be rotated by this angle in counterclockwise direction.</property> @@ -188,18 +188,18 @@ </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="Transparency"> <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="adjustment">transparenct_adj</property> <property name="value">50</property> - <property name="truncate-multiline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="Transparency-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="watermarkdialog|extended_tip|Transparency">Select the transparency level for the watermark. A 0% value produces an opaque watermark and a value of 100% is totally transparent (invisible).</property> @@ -207,18 +207,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="GtkMenuButton" id="Color"> - <property name="label" translatable="no"></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="xalign">0</property> - <property name="draw_indicator">True</property> + <property name="draw-indicator">True</property> <child> <placeholder/> </child> @@ -229,20 +228,20 @@ </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="GtkComboBoxText" id="FontBox"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="has_entry">True</property> + <property name="can-focus">False</property> + <property name="has-entry">True</property> <child internal-child="entry"> <object class="GtkEntry"> <property name="visible">True</property> + <property name="can-focus">True</property> <property name="truncate-multiline">True</property> - <property name="can_focus">True</property> </object> </child> <child internal-child="accessible"> @@ -252,8 +251,8 @@ </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> @@ -277,9 +276,6 @@ <action-widget response="-5">ok</action-widget> <action-widget response="-6">cancel</action-widget> </action-widgets> - <child type="titlebar"> - <placeholder/> - </child> <child internal-child="accessible"> <object class="AtkObject" id="WatermarkDialog-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="watermarkdialog|extended_tip|WatermarkDialog">Insert a watermark text in the current page style background.</property> commit 0a6cff37cbbf6ede1f4dbac94dcd8bc5417dec94 Author: Michael Weghorn <[email protected]> AuthorDate: Sun Oct 5 21:17:17 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Sun Oct 5 22:35:06 2025 +0200 tdf#130857 qt weld: Support Writer "Columns" 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 via "Format" -> "Columns" in Writer. Change-Id: Ie7a279f8d7bc64fb5afcb37ba7fa51180869f019 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191924 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index e03e6dd4fb4d..0a3003575674 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -156,6 +156,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"modules/spropctrlr/ui/taborder.ui"_ustr, u"modules/swriter/ui/authenticationsettingsdialog.ui"_ustr, u"modules/swriter/ui/captionoptions.ui"_ustr, + u"modules/swriter/ui/columndialog.ui"_ustr, u"modules/swriter/ui/columnwidth.ui"_ustr, u"modules/swriter/ui/editcategories.ui"_ustr, u"modules/swriter/ui/endnotepage.ui"_ustr, @@ -245,6 +246,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"filter/ui/pdfviewpage.ui"_ustr, u"modules/scalc/ui/statisticsinfopage.ui"_ustr, u"modules/simpress/ui/annotationtagmenu.ui"_ustr, + u"modules/swriter/ui/columnpage.ui"_ustr, u"modules/swriter/ui/printoptionspage.ui"_ustr, u"modules/swriter/ui/statisticsinfopage.ui"_ustr, u"sfx/ui/custominfopage.ui"_ustr, @@ -254,6 +256,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"sfx/ui/linefragment.ui"_ustr, u"sfx/ui/securityinfopage.ui"_ustr, u"svt/ui/datewindow.ui"_ustr, + u"svt/ui/linewindow.ui"_ustr, u"svx/ui/colorwindow.ui"_ustr, u"vcl/ui/editmenu.ui"_ustr, u"xmlsec/ui/certdetails.ui"_ustr,
