sw/uiconfig/swriter/ui/contentcontrollistitemdlg.ui | 85 +++++++++----------- vcl/qt5/QtInstanceBuilder.cxx | 2 2 files changed, 43 insertions(+), 44 deletions(-)
New commits: commit 9e11374ff1f497f5e8a8e554a2447d21c0ebe01f Author: Michael Weghorn <[email protected]> AuthorDate: Thu Feb 26 17:55:58 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Feb 28 00:55:40 2026 +0100 tdf#130857 qt weld: Support "Content Control Properties" dlg 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 like this: * start Writer * "Form" -> "Content Controls" -> "Rich Text" * right-click on the newly inserted control and activate the "Content Control Properties..." menu entry Change-Id: Ie3696c08ac9634ca5e928d325c3da2a0d2750a4a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200478 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index df4f48882604..956290b2885b 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -211,6 +211,7 @@ constexpr auto SUPPORTED_UI_FILES = frozen::make_unordered_set<std::u16string_vi u"modules/swriter/ui/ccdialog.ui", u"modules/swriter/ui/columndialog.ui", u"modules/swriter/ui/columnwidth.ui", + u"modules/swriter/ui/contentcontroldlg.ui", u"modules/swriter/ui/contentcontrollistitemdlg.ui", u"modules/swriter/ui/createaddresslist.ui", u"modules/swriter/ui/createauthorentry.ui", commit 04067529d04db1148f37350a45e5657cc2330324 Author: Michael Weghorn <[email protected]> AuthorDate: Thu Feb 26 17:54:15 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Feb 28 00:55:32 2026 +0100 tdf#130857 qt weld: Support "Content Control List Item Properties" dlg 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 like this: * start Writer * "Form" -> "Content Controls" -> "Drop-Down List" * right-click on the newly inserted control and activate the "Content Control Properties..." menu entry * select the "Choose an item" entry in the table * press the "Modify" button Change-Id: I9006182310ac244bf9241d55a55925aa7656a75b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200477 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index d7e07078d1d3..df4f48882604 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -211,6 +211,7 @@ constexpr auto SUPPORTED_UI_FILES = frozen::make_unordered_set<std::u16string_vi u"modules/swriter/ui/ccdialog.ui", u"modules/swriter/ui/columndialog.ui", u"modules/swriter/ui/columnwidth.ui", + u"modules/swriter/ui/contentcontrollistitemdlg.ui", u"modules/swriter/ui/createaddresslist.ui", u"modules/swriter/ui/createauthorentry.ui", u"modules/swriter/ui/customizeaddrlistdialog.ui", commit 14d018360368bed3200ff1b7cd24c63380e6211a Author: Michael Weghorn <[email protected]> AuthorDate: Thu Feb 26 17:49:46 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Feb 28 00:55:25 2026 +0100 sw: Resave contentcontrollistitemdlg.ui with glade 3.40 The dialog can be triggered like this: * start Writer * "Form" -> "Content Controls" -> "Drop-Down List" * right-click on the newly inserted control and activate the "Content Control Properties..." menu entry * select the "Choose an item" entry in the table * press the "Modify" button Change-Id: I6dac2821f799e52c7532432f74ecededb95fc52e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200476 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/sw/uiconfig/swriter/ui/contentcontrollistitemdlg.ui b/sw/uiconfig/swriter/ui/contentcontrollistitemdlg.ui index c7bf4891ac59..af935cda09fe 100644 --- a/sw/uiconfig/swriter/ui/contentcontrollistitemdlg.ui +++ b/sw/uiconfig/swriter/ui/contentcontrollistitemdlg.ui @@ -1,32 +1,32 @@ <?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.24"/> <object class="GtkDialog" id="ContentControlListItemDialog"> - <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="contentcontrollistitemdlg|ContentControlListItemDialog">Content Control List Item Properties</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="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> @@ -39,8 +39,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> @@ -53,8 +53,8 @@ <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> @@ -68,7 +68,7 @@ <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> @@ -76,65 +76,65 @@ <!-- n-columns=2 n-rows=2 --> <object class="GtkGrid" id="grid1"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> + <property name="can-focus">False</property> <property name="margin-start">12</property> <property name="margin-top">6</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="row-spacing">6</property> + <property name="column-spacing">12</property> <child> <object class="GtkLabel" id="lbdisplayname"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="contentcontrollistitemdlg|lbdisplayname">Display name:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">displayname</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">displayname</property> <property name="xalign">0</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="displayname"> <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="truncate-multiline">True</property> - <property name="activates_default">True</property> </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="lbvalue"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="contentcontrollistitemdlg|lbvalue">Value:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">value</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">value</property> <property name="xalign">0</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="GtkEntry" id="value"> <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="truncate-multiline">True</property> - <property name="activates_default">True</property> </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> @@ -151,8 +151,5 @@ <action-widget response="-6">cancel</action-widget> <action-widget response="-11">help</action-widget> </action-widgets> - <child type="titlebar"> - <placeholder/> - </child> </object> </interface>
