cui/uiconfig/ui/hyperlinkmarkdialog.ui | 61 +++++++++++++++------------------ vcl/qt5/QtInstanceBuilder.cxx | 2 + 2 files changed, 31 insertions(+), 32 deletions(-)
New commits: commit 8ba77171145d4d9820fcfc9f3d44e8ebc7d682b5 Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Mon Sep 15 23:27:27 2025 +0200 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Tue Sep 16 09:07:55 2025 +0200 tdf#130857 qt weld: Support "Insert" -> "Page Number" 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 "Insert" -> "Page Number" in Writer. Change-Id: I9ff0eb21e15d59b9514059d6f9bdf6ba56939b84 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191009 Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> Tested-by: Jenkins diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index 10241bab087b..a770290f8d1c 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"modules/swriter/ui/inserttable.ui"_ustr, u"modules/swriter/ui/linenumbering.ui"_ustr, u"modules/swriter/ui/numberingnamedialog.ui"_ustr, + u"modules/swriter/ui/pagenumberdlg.ui"_ustr, u"modules/swriter/ui/printmergedialog.ui"_ustr, u"modules/swriter/ui/renameautotextdialog.ui"_ustr, u"modules/swriter/ui/renameobjectdialog.ui"_ustr, commit 14c0c9afde2e6f54af35ded3cb3ae238971c784d Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Mon Sep 15 23:20:14 2025 +0200 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Tue Sep 16 09:07:49 2025 +0200 tdf#130857 qt weld: Support "Target in Document" 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. Sample steps to trigger the dialog: * start Writer * "Insert" -> "Hyperlink" * switch to "Documents" tab * press the "Target in Document" button Change-Id: I6655a9723e215d4a8db88023bac1772bce946521 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191008 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index e2b83eb89a3c..10241bab087b 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -74,6 +74,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"cui/ui/fontfragment.ui"_ustr, u"cui/ui/gallerytitledialog.ui"_ustr, u"cui/ui/graphictestdlg.ui"_ustr, + u"cui/ui/hyperlinkmarkdialog.ui"_ustr, u"cui/ui/imageviewer.ui"_ustr, u"cui/ui/insertrowcolumn.ui"_ustr, u"cui/ui/javaclasspathdialog.ui"_ustr, commit 7aeb5642a1628378f9d3ef46d7346589992d5cff Author: Michael Weghorn <m.wegh...@posteo.de> AuthorDate: Mon Sep 15 23:16:24 2025 +0200 Commit: Michael Weghorn <m.wegh...@posteo.de> CommitDate: Tue Sep 16 09:07:43 2025 +0200 cui: Resave hyperlinkmarkdialog.ui with glade 3.40 Sample steps to trigger the dialog: * start Writer * "Insert" -> "Hyperlink" * switch to "Documents" tab * press the "Target in Document" button Change-Id: Ic40c4c2426fc52d851f2b59edd40ed8864026cb7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191007 Reviewed-by: Michael Weghorn <m.wegh...@posteo.de> Tested-by: Jenkins diff --git a/cui/uiconfig/ui/hyperlinkmarkdialog.ui b/cui/uiconfig/ui/hyperlinkmarkdialog.ui index 007dcd5caf90..a0b09b19e108 100644 --- a/cui/uiconfig/ui/hyperlinkmarkdialog.ui +++ b/cui/uiconfig/ui/hyperlinkmarkdialog.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.36.0 --> +<!-- Generated with glade 3.40.0 --> <interface domain="cui"> <requires lib="gtk+" version="3.20"/> <object class="GtkTreeStore" id="liststore1"> @@ -13,30 +13,30 @@ </columns> </object> <object class="GtkDialog" id="HyperlinkMark"> - <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="hyperlinkmarkdialog|HyperlinkMark">Target in Document</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">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="ok"> <property name="label" translatable="yes" context="hyperlinkmarkdialog|apply">_Apply</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> @@ -48,9 +48,9 @@ <object class="GtkButton" id="close"> <property name="label" translatable="yes" context="hyperlinkmarkdialog|close">_Close</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> <child internal-child="accessible"> <object class="AtkObject" id="close-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkmarkdialog|extended_tip|close">Once the hyperlink has been completely entered, click on Close to set the link and leave the dialog.</property> @@ -67,36 +67,36 @@ <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="GtkBox"> <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="orientation">vertical</property> <child> <object class="GtkScrolledWindow"> <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="GtkTreeView" id="TreeListBox"> - <property name="width_request">-1</property> + <property name="width-request">-1</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="hexpand">True</property> <property name="vexpand">True</property> <property name="model">liststore1</property> - <property name="headers_visible">False</property> - <property name="search_column">1</property> - <property name="enable_tree_lines">True</property> + <property name="headers-visible">False</property> + <property name="search-column">1</property> + <property name="enable-tree-lines">True</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="Macro Library List-selection1"/> </child> @@ -134,8 +134,8 @@ </child> <child> <object class="GtkLabel" id="error"> - <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> <property name="xalign">0.5</property> <property name="yalign">0.5</property> </object> @@ -158,8 +158,5 @@ <action-widget response="101">ok</action-widget> <action-widget response="-6">close</action-widget> </action-widgets> - <child type="titlebar"> - <placeholder/> - </child> </object> </interface>