svx/uiconfig/ui/deletefooterdialog.ui | 16 ++++++++-------- svx/uiconfig/ui/deleteheaderdialog.ui | 16 ++++++++-------- vcl/qt5/QtInstanceBuilder.cxx | 3 +++ 3 files changed, 19 insertions(+), 16 deletions(-)
New commits: commit 11df94e8c882dd6656e73a548011e3c131bcf464 Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Sat Feb 15 23:32:55 2025 +0100 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Sun Feb 16 11:14:05 2025 +0100 tdf#130857 qt weld: Support "Delete {Header,Footer}?" dialogs To trigger the "Delete Footer?" dialog * start Writer * "Insert" -> "Header and Footer" -> "Footer" -> "Default Page Style" * type something in the footer * "Insert" -> "Header and Footer" -> "Footer" -> "Default Page Style" to disable again For "Delete Header?" one, choose "Header" instead of "Footer" in the steps mentioned above. 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. Change-Id: I38157fed85a05af74383d1d8f2b7548b323da876 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181737 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index 4770c72056ee..f76dfbe60495 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -109,6 +109,8 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile) u"svt/ui/restartdialog.ui"_ustr, u"svx/ui/compressgraphicdialog.ui"_ustr, u"svx/ui/fontworkgallerydialog.ui"_ustr, + u"svx/ui/deletefooterdialog.ui"_ustr, + u"svx/ui/deleteheaderdialog.ui"_ustr, u"svx/ui/gotopagedialog.ui"_ustr, u"svx/ui/safemodedialog.ui"_ustr, u"vcl/ui/openlockedquerybox.ui"_ustr, commit ea3b83e228d56e33d8bcffeeb88b7fbcdaf08e87 Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Sat Feb 15 23:27:15 2025 +0100 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Sun Feb 16 11:13:59 2025 +0100 svx: Resave delete{footer,header}dialog.ui with glade 3.40 To trigger the "Delete Footer?" dialog * start Writer * "Insert" -> "Header and Footer" -> "Footer" -> "Default Page Style" * type something in the footer * "Insert" -> "Header and Footer" -> "Footer" -> "Default Page Style" to disable again For "Delete Header?" one, choose "Header" instead of "Footer" in the steps mentioned above. Change-Id: I9f7add612401df223d2102c4bebf705a96c0dd52 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181736 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> diff --git a/svx/uiconfig/ui/deletefooterdialog.ui b/svx/uiconfig/ui/deletefooterdialog.ui index d86eed95b747..348eaa594efe 100644 --- a/svx/uiconfig/ui/deletefooterdialog.ui +++ b/svx/uiconfig/ui/deletefooterdialog.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="svx"> <requires lib="gtk+" version="3.20"/> <object class="GtkMessageDialog" id="DeleteFooterDialog"> @@ -24,11 +24,11 @@ <object class="GtkButton" id="no"> <property name="label" translatable="yes" context="stock">_No</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="use_underline">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> <property name="expand">False</property> @@ -40,8 +40,8 @@ <object class="GtkButton" id="yes"> <property name="label" translatable="yes" context="stock">_Yes</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> <style> <class name="destructive-action"/> diff --git a/svx/uiconfig/ui/deleteheaderdialog.ui b/svx/uiconfig/ui/deleteheaderdialog.ui index dfa2dbda6f64..60798f3f2d16 100644 --- a/svx/uiconfig/ui/deleteheaderdialog.ui +++ b/svx/uiconfig/ui/deleteheaderdialog.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="svx"> <requires lib="gtk+" version="3.20"/> <object class="GtkMessageDialog" id="DeleteHeaderDialog"> @@ -24,11 +24,11 @@ <object class="GtkButton" id="no"> <property name="label" translatable="yes" context="stock">_No</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="use_underline">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> <property name="expand">False</property> @@ -40,8 +40,8 @@ <object class="GtkButton" id="yes"> <property name="label" translatable="yes" context="stock">_Yes</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> <style> <class name="destructive-action"/> commit b4716d8a58bd6c4e36cdc0009874fef78c21c3fa Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Sat Feb 15 23:16:44 2025 +0100 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Sun Feb 16 11:13:53 2025 +0100 tdf#130857 qt weld: Support zoom dialog Declare support for this dialog that can be triggered in Writer using "View" -> "Zoom" -> "Zoom". 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. Change-Id: I420b96dd1c585b2628e9f429621b99be77af1c3f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181734 Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> Tested-by: Jenkins diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index ecbed2a0f2d6..4770c72056ee 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -74,6 +74,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile) u"cui/ui/splitcellsdialog.ui"_ustr, u"cui/ui/tipofthedaydialog.ui"_ustr, u"cui/ui/toolbarmodedialog.ui"_ustr, + u"cui/ui/zoomdialog.ui"_ustr, u"dbaccess/ui/savedialog.ui"_ustr, u"dbaccess/ui/tabledesignsavemodifieddialog.ui"_ustr, u"modules/scalc/ui/inputstringdialog.ui"_ustr,