cui/uiconfig/ui/comment.ui | 135 ++++++++++++++++++++---------------------- vcl/qt5/QtInstanceBuilder.cxx | 1 2 files changed, 67 insertions(+), 69 deletions(-)
New commits: commit a39863f20cd38cbd09ee60b8690a68a568e68953 Author: Michael Weghorn <[email protected]> AuthorDate: Sun Feb 1 01:04:09 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sun Feb 1 09:13:49 2026 +0100 tdf#130857 qt weld: Support comment 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 like this: * start Writer * enable "Edit" -> "Track Changes" -> "Record" * type something in the document * "Edit" -> "Track Changes" -> "Manage" * right-click on the entry in the treeview and select the "Edit Comment..." context menu entry Change-Id: Idf898b8d0ae16515a5b29aa15f985d02ddc5ba5f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198476 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index 4545355406be..f0ddf5398aaa 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -64,6 +64,7 @@ constexpr auto SUPPORTED_UI_FILES = frozen::make_unordered_set<std::u16string_vi u"cui/ui/additionsdialog.ui", u"cui/ui/breaknumberoption.ui", u"cui/ui/certdialog.ui", + u"cui/ui/comment.ui", u"cui/ui/editdictionarydialog.ui", u"cui/ui/fontfeaturesdialog.ui", u"cui/ui/fontfragment.ui", commit cbd19ac0c04f020d598c5510e8f0d080facf6771 Author: Michael Weghorn <[email protected]> AuthorDate: Sun Feb 1 01:00:24 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sun Feb 1 09:13:41 2026 +0100 cui: Resave comment.ui with glade 3.40 The dialog can be triggered like this: * start Writer * enable "Edit" -> "Track Changes" -> "Record" * type something in the document * "Edit" -> "Track Changes" -> "Manage" * right-click on the entry in the treeview and select the "Edit Comment..." context menu entry Change-Id: Ifbd0360ba2b59005f958d6e9bc77c5b4a6f6990e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198475 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/cui/uiconfig/ui/comment.ui b/cui/uiconfig/ui/comment.ui index 5155ec30aa61..86412b349865 100644 --- a/cui/uiconfig/ui/comment.ui +++ b/cui/uiconfig/ui/comment.ui @@ -1,42 +1,42 @@ <?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.24"/> <object class="GtkImage" id="image2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="icon-name">go-previous</property> </object> <object class="GtkImage" id="image3"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="icon-name">go-next</property> </object> <object class="GtkDialog" id="CommentDialog"> - <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="comment|CommentDialog">Insert Comment</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> @@ -49,8 +49,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> @@ -63,8 +63,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> @@ -75,43 +75,43 @@ </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=2 n-rows=1 --> <object class="GtkGrid" id="grid2"> <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="row_spacing">6</property> - <property name="row_homogeneous">True</property> - <property name="column_homogeneous">True</property> + <property name="row-spacing">6</property> + <property name="row-homogeneous">True</property> + <property name="column-homogeneous">True</property> <child> <object class="GtkButton" id="previous"> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="no_show_all">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="no-show-all">True</property> <property name="halign">center</property> <property name="valign">center</property> <property name="image">image2</property> <property name="always-show-image">True</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="GtkButton" id="next"> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="no_show_all">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="no-show-all">True</property> <property name="halign">center</property> <property name="valign">center</property> <property name="image">image3</property> <property name="always-show-image">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> </object> @@ -126,37 +126,37 @@ <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="GtkFrame" id="frame1"> <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="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> <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="margin-start">12</property> + <property name="margin-top">6</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> <property name="spacing">6</property> - <property name="margin-start">12</property> - <property name="margin-top">6</property> <child> <object class="GtkBox" id="box2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="label2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="comment|label2">Author</property> <property name="xalign">0</property> </object> @@ -169,7 +169,7 @@ <child> <object class="GtkLabel" id="lastedit"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="xalign">0</property> </object> <packing> @@ -188,10 +188,10 @@ <child> <object class="GtkLabel" id="label4"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="comment|label4">_Text</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">edit</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">edit</property> <property name="xalign">0</property> </object> <packing> @@ -203,17 +203,17 @@ <child> <object class="GtkScrolledWindow" id="scrolledwindow1"> <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="GtkTextView" id="edit"> <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="wrap_mode">char</property> + <property name="wrap-mode">char</property> <child internal-child="accessible"> <object class="AtkObject" id="edit-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="comment|extended_tip|edit">Enter a comment for the recorded change.</property> @@ -229,35 +229,35 @@ </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=2 n-rows=1 --> <object class="GtkGrid" id="insertauthor"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">12</property> + <property name="can-focus">False</property> + <property name="column-spacing">12</property> <child> <object class="GtkLabel" id="label5"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="comment|label5">_Insert</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">author</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">author</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="GtkButton" id="author"> <property name="label" translatable="yes" context="comment|author">Author</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> </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> </object> @@ -269,8 +269,8 @@ </child> <child> <object class="GtkLabel" id="alttitle"> - <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="label" translatable="yes" context="comment|alttitle">Edit Comment</property> </object> <packing> @@ -284,7 +284,7 @@ <child type="label"> <object class="GtkLabel" id="label1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="comment|label1">Contents</property> <attributes> <attribute name="weight" value="bold"/> @@ -305,9 +305,6 @@ <action-widget response="-6">cancel</action-widget> <action-widget response="-11">help</action-widget> </action-widgets> - <child type="titlebar"> - <placeholder/> - </child> <child internal-child="accessible"> <object class="AtkObject" id="CommentDialog-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="comment|extended_tip|CommentDialog">Enter a comment for the recorded change.</property>
