cui/uiconfig/ui/namedialog.ui | 53 +++++++++++++++++++----------------------- vcl/qt5/QtInstanceBuilder.cxx | 1 2 files changed, 26 insertions(+), 28 deletions(-)
New commits: commit bb9b4aaf3dabe582a18e544d25b15aa2f8f3d78e Author: Michael Weghorn <[email protected]> AuthorDate: Sat Dec 21 18:05:31 2024 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sun Dec 22 13:06:27 2024 +0100 cui: Resave namedialog.ui with glade 3.40 This dialog can e.g. be triggered via "Tools" -> "Options" -> "Appearance", then clicking the "New" button. Change-Id: I59b2195274ef1ff7f56057dc439b03bb0610d106 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179111 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/cui/uiconfig/ui/namedialog.ui b/cui/uiconfig/ui/namedialog.ui index 2936179e4c57..458a291f68e0 100644 --- a/cui/uiconfig/ui/namedialog.ui +++ b/cui/uiconfig/ui/namedialog.ui @@ -1,30 +1,30 @@ <?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="GtkDialog" id="NameDialog"> - <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="namedialog|NameDialog">Name</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">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="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> @@ -39,10 +39,10 @@ <property name="label" translatable="yes" context="stock">_OK</property> <property name="visible">True</property> <property name="sensitive">False</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> @@ -55,8 +55,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> @@ -69,23 +69,23 @@ <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" id="box1"> <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> <object class="GtkLabel" id="description_label"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="use_underline">True</property> + <property name="can-focus">False</property> + <property name="use-underline">True</property> <property name="wrap">True</property> - <property name="mnemonic_widget">name_entry</property> + <property name="mnemonic-widget">name_entry</property> <property name="xalign">0</property> </object> <packing> @@ -97,10 +97,10 @@ <child> <object class="GtkEntry" id="name_entry"> <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="width-chars">40</property> <property name="truncate-multiline">True</property> - <property name="width_chars">40</property> </object> <packing> <property name="expand">False</property> @@ -122,8 +122,5 @@ <action-widget response="-5">ok</action-widget> <action-widget response="-6">cancel</action-widget> </action-widgets> - <child type="titlebar"> - <placeholder/> - </child> </object> </interface> commit 0646d79de9ca728eb03b2de62c47de4194ec9fa1 Author: Michael Weghorn <[email protected]> AuthorDate: Sat Dec 21 18:03:52 2024 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sun Dec 22 13:06:21 2024 +0100 tdf#130857 qt weld: Support "Name Dialog" Declare support for the name dialog that e.g. gets used in "Tools" -> "Options" -> "Appearance" when clicking the "New" button. 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: Idaa3190d45efba87a74ef80a2999f3c6be7fa90d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/179110 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index 3294a7ec141f..146c6d067a65 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -60,6 +60,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile) static std::unordered_set<OUString> aSupportedUIFiles = { u"cui/ui/aboutdialog.ui"_ustr, u"cui/ui/insertrowcolumn.ui"_ustr, + u"cui/ui/namedialog.ui"_ustr, u"cui/ui/objecttitledescdialog.ui"_ustr, u"cui/ui/optnewdictionarydialog.ui"_ustr, u"cui/ui/password.ui"_ustr,
