svx/uiconfig/ui/fileexporteddialog.ui | 43 +++++++++++++++------------------- vcl/qt5/QtInstanceBuilder.cxx | 3 +- 2 files changed, 22 insertions(+), 24 deletions(-)
New commits: commit c72ea6d183d94b104d2ea3e7f3bb1c92c4705e42 Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Tue Jul 29 20:48:19 2025 +0200 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Wed Jul 30 14:30:15 2025 +0200 tdf#130857 qt weld: Support "File Exported" 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. To trigger the dialog: * in "Tools" -> "Options" -> "Advanced", enable experimental features * restart * "Tools" -> "View" -> "Run Graphic Tests" * press "Download Results" button Change-Id: Ie44638dc58959153f7e7c8d42c56fb00b980b80b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188544 Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> Tested-by: Jenkins diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index 17f112b8ed24..3438e3008550 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -165,6 +165,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"svx/ui/fontworkgallerydialog.ui"_ustr, u"svx/ui/deletefooterdialog.ui"_ustr, u"svx/ui/deleteheaderdialog.ui"_ustr, + u"svx/ui/fileexporteddialog.ui"_ustr, u"svx/ui/gotopagedialog.ui"_ustr, u"svx/ui/safemodedialog.ui"_ustr, u"svx/ui/themecoloreditdialog.ui"_ustr, commit 60646f48734533e12d8d4fc8696c6e4fa9813368 Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Tue Jul 29 20:45:39 2025 +0200 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Wed Jul 30 14:30:09 2025 +0200 svx: Resave fileexporteddialog.ui with glade 3.40 To trigger the dialog: * in "Tools" -> "Options" -> "Advanced", enable experimental features * restart * "Tools" -> "View" -> "Run Graphic Tests" * press "Downloard Results" button Change-Id: I0e723cff577a7a2a86388f8fe7c247814342c47a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188543 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> diff --git a/svx/uiconfig/ui/fileexporteddialog.ui b/svx/uiconfig/ui/fileexporteddialog.ui index aa1f3d4ae50f..fb9b6e173ec0 100644 --- a/svx/uiconfig/ui/fileexporteddialog.ui +++ b/svx/uiconfig/ui/fileexporteddialog.ui @@ -1,37 +1,34 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> +<!-- Generated with glade 3.40.0 --> <interface domain="svx"> <requires lib="gtk+" version="3.20"/> <object class="GtkDialog" id="FileExportedDialog"> - <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="fileexporteddialog|FileExportedDialog">File Exported</property> <property name="resizable">False</property> <property name="modal">True</property> - <property name="default_width">0</property> - <property name="default_height">0</property> - <property name="type_hint">dialog</property> - <child> - <placeholder/> - </child> + <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="close"> <property name="label" translatable="yes" context="stock">_Close</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> @@ -44,9 +41,9 @@ <object class="GtkButton" id="ok"> <property name="label" translatable="yes" context="fileexporteddialog|openfolder">Open Containing _Folder</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="use-underline">True</property> </object> <packing> <property name="expand">False</property> @@ -58,17 +55,17 @@ <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="GtkLabel" id="Filelabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="fileexporteddialog|Filelabel">File Name</property> <property name="wrap">True</property> - <property name="max_width_chars">80</property> + <property name="max-width-chars">80</property> <property name="lines">2</property> <property name="xalign">0</property> <property name="yalign">0</property> commit 9056f830ed31e8ebe0040a9c56e0cc26c8f2e56b Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Tue Jul 29 20:14:16 2025 +0200 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Wed Jul 30 14:30:03 2025 +0200 tdf#130857 qt weld: Support edit menu This means that a native Qt menu is now used for that menu when using the qt5 or qt6 VCL plugin if the menu has a native Qt widget parent and LO was started with environment variable SAL_VCL_QT_USE_WELDED_WIDGETS=1 set. Together with previous commit Change-Id: I66d273895e55698427343caf688b88b2e56e3993 Author: Michael Weghorn <m.wegh...@posteo.de> Date: Tue Jul 29 20:10:37 2025 +0200 tdf#130857 qt weld: Implement QtInstanceMenu::popup_at_rect and various other changes on a local WIP branch, this makes the context menu in the Base "Tools" -> "SQL" dialog show when right-clicking into the "Command to execute" edit view. Change-Id: Idf2a212ea27929342f2f965d25a791c53b20f3ea Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188542 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index 54d645b73f9f..17f112b8ed24 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -187,7 +187,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"cui/ui/rotationtabpage.ui"_ustr, u"cui/ui/slantcornertabpage.ui"_ustr, u"cui/ui/textattrtabpage.ui"_ustr, u"cui/ui/textanimtabpage.ui"_ustr, u"cui/ui/textcolumnstabpage.ui"_ustr, u"svt/ui/datewindow.ui"_ustr, - u"svx/ui/colorwindow.ui"_ustr, + u"svx/ui/colorwindow.ui"_ustr, u"vcl/ui/editmenu.ui"_ustr, }; if (aSupportedUIFiles.contains(rUIFile))