cui/uiconfig/ui/searchattrdialog.ui | 49 +++++++-------- sfx2/uiconfig/ui/linefragment.ui | 111 ++++++++++++++++++------------------ vcl/qt5/QtInstanceBuilder.cxx | 1 3 files changed, 82 insertions(+), 79 deletions(-)
New commits: commit 06eeafef14a91b42fd82476fc7b1787a1e362b57 Author: Michael Weghorn <[email protected]> AuthorDate: Thu May 29 13:08:53 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Fri May 30 07:46:25 2025 +0200 sfx2 a11y: Set a11y name for date combobox in linefragment.ui Resave the file with glade 3.40, but manually restore the "label" property for the "date" GtkMenuButton to avoid this critical warning seen with gtk3 otherwise: (soffice:197852): GLib-GObject-CRITICAL **: 13:11:54.151: invalid cast from 'GtkImage' to 'GtkLabel' (soffice:197852): Gtk-CRITICAL **: 13:11:54.151: gtk_label_set_label: assertion 'GTK_IS_LABEL (label)' failed Address this preexisting issue now flagged by gla11y and resulting in a build error otherwise: sfx2/uiconfig/ui/linefragment.ui:92 FATAL WARNING: 'GtkMenuButton' 'date' does not have its own label This makes Orca say "Date" now when that menu buttons get focus. Sample scenario: * start Orca * start LO Writer with the gtk3 VCL plugin * "File" -> "Properties" * switch to "Custom Properties" tab * press "Add Property" * for the newly created entry, select type "Date" * tab to move focus to the menu button in the "Value" column Change-Id: I1c24e4e61cd7550299a00101c29f53c925675add Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186005 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/sfx2/uiconfig/ui/linefragment.ui b/sfx2/uiconfig/ui/linefragment.ui index 422a3324199d..4abac21a8629 100644 --- a/sfx2/uiconfig/ui/linefragment.ui +++ b/sfx2/uiconfig/ui/linefragment.ui @@ -1,80 +1,80 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> +<!-- Generated with glade 3.40.0 --> <interface domain="sfx"> <requires lib="gtk+" version="3.20"/> <object class="GtkAdjustment" id="adjustment1"> <property name="upper">86400000</property> - <property name="step_increment">1000</property> - <property name="page_increment">60000</property> + <property name="step-increment">1000</property> + <property name="page-increment">60000</property> </object> <object class="GtkImage" id="image1"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">sfx2/res/deleterow.png</property> + <property name="can-focus">False</property> + <property name="icon-name">sfx2/res/deleterow.png</property> </object> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=4 n-rows=1 --> <object class="GtkGrid" id="lineentry"> <property name="visible">True</property> - <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="valign">start</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="column_spacing">4</property> + <property name="column-spacing">4</property> <child> <object class="GtkComboBoxText" id="namebox"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="has_entry">True</property> + <property name="can-focus">False</property> + <property name="has-entry">True</property> <child internal-child="entry"> <object class="GtkEntry"> - <property name="can_focus">True</property> + <property name="can-focus">True</property> + <property name="width-chars">27</property> <property name="truncate-multiline">True</property> - <property name="width_chars">27</property> </object> </child> </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="GtkComboBoxText" id="typebox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</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="GtkButton" id="remove"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes" context="linefragment|STR_SFX_REMOVE_PROPERTY">Remove Property</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes" context="linefragment|STR_SFX_REMOVE_PROPERTY">Remove Property</property> <property name="image">image1</property> <property name="always-show-image">True</property> </object> <packing> - <property name="left_attach">3</property> - <property name="top_attach">0</property> + <property name="left-attach">3</property> + <property name="top-attach">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="orientation">vertical</property> <child> <object class="GtkEntry" id="valueedit"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> + <property name="width-chars">32</property> <property name="truncate-multiline">True</property> - <property name="width_chars">32</property> </object> <packing> <property name="expand">True</property> @@ -84,20 +84,25 @@ </child> <child> <object class="GtkBox" id="datetimebox"> - <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="hexpand">True</property> <property name="spacing">3</property> <child> <object class="GtkMenuButton" id="date"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="draw_indicator">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="draw-indicator">True</property> <property name="label" translatable="no"></property> <child> <placeholder/> </child> + <child internal-child="accessible"> + <object class="AtkObject" id="date-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes" context="linefragment|date">Date</property> + </object> + </child> </object> <packing> <property name="expand">True</property> @@ -108,7 +113,7 @@ <child> <object class="GtkSpinButton" id="time"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="truncate-multiline">True</property> <property name="adjustment">adjustment1</property> </object> @@ -127,16 +132,16 @@ </child> <child> <object class="GtkBox" id="durationbox"> - <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="spacing">3</property> <child> <object class="GtkEntry" id="duration"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> - <property name="truncate-multiline">True</property> <property name="editable">False</property> + <property name="truncate-multiline">True</property> </object> <packing> <property name="expand">False</property> @@ -148,8 +153,8 @@ <object class="GtkButton" id="durationbutton"> <property name="label" translatable="yes" context="linefragment|SFX_ST_EDIT">...</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="expand">False</property> @@ -166,28 +171,28 @@ </child> <child> <object class="GtkScrolledWindow" id="yesno"> - <property name="can_focus">True</property> - <property name="no_show_all">True</property> - <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">never</property> - <property name="shadow_type">in</property> + <property name="can-focus">True</property> + <property name="no-show-all">True</property> + <property name="hscrollbar-policy">never</property> + <property name="vscrollbar-policy">never</property> + <property name="shadow-type">in</property> <child> <object class="GtkViewport"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="homogeneous">True</property> <child> <object class="GtkRadioButton" id="yes"> <property name="label" translatable="yes" context="linefragment|yes">Yes</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> <property name="active">True</property> - <property name="draw_indicator">True</property> + <property name="draw-indicator">True</property> </object> <packing> <property name="expand">False</property> @@ -199,9 +204,9 @@ <object class="GtkRadioButton" id="no"> <property name="label" translatable="yes" context="linefragment|no">No</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="draw_indicator">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="draw-indicator">True</property> <property name="group">yes</property> </object> <packing> @@ -223,8 +228,8 @@ </child> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> + <property name="left-attach">2</property> + <property name="top-attach">0</property> </packing> </child> </object> commit f4b8780fd7a3a5efbfab50f97372e9dc8434141f Author: Michael Weghorn <[email protected]> AuthorDate: Thu May 29 11:56:27 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Fri May 30 07:46:18 2025 +0200 tdf#130857 qt weld: Support search attributes 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. This dialog can be triggered as follows: * In Writer, select "Tools" -> "Find and Replace" * click on the "Attributes..." button Change-Id: Ifce43cd3b57a20cca16bd12eecc731639ae2901a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185998 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index 6bceecf6ccbb..e96ce889f8ba 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -81,6 +81,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"cui/ui/querydeletedictionarydialog.ui"_ustr, u"cui/ui/qrcodegen.ui"_ustr, u"cui/ui/querydialog.ui"_ustr, + u"cui/ui/searchattrdialog.ui"_ustr, u"cui/ui/securityoptionsdialog.ui"_ustr, u"cui/ui/selectpathdialog.ui"_ustr, u"cui/ui/similaritysearchdialog.ui"_ustr, commit b13594de5cbb40d68bb31765ec0c47af284b23b2 Author: Michael Weghorn <[email protected]> AuthorDate: Thu May 29 11:50:08 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Fri May 30 07:46:12 2025 +0200 cui: Resave searchattrdialog.ui with glade 3.40 A dialog using it can be triggered as follows: * In Writer, select "Tools" -> "Find and Replace" * click on the "Attributes..." button in the dialog Change-Id: I9bd2a8a5242bfd5b622cecd261663cfac6e5e7be Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185997 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/cui/uiconfig/ui/searchattrdialog.ui b/cui/uiconfig/ui/searchattrdialog.ui index 5e94639f3733..33d743f1a08c 100644 --- a/cui/uiconfig/ui/searchattrdialog.ui +++ b/cui/uiconfig/ui/searchattrdialog.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"> @@ -17,29 +17,29 @@ </columns> </object> <object class="GtkDialog" id="SearchAttrDialog"> - <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="searchattrdialog|SearchAttrDialog">Attributes</property> <property name="resizable">False</property> <property name="modal">True</property> - <property name="type_hint">dialog</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> @@ -52,8 +52,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> @@ -66,8 +66,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> @@ -81,27 +81,27 @@ <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="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="treeview"> <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="vexpand">True</property> <property name="model">liststore1</property> - <property name="headers_visible">False</property> - <property name="search_column">0</property> - <property name="show_expanders">False</property> + <property name="headers-visible">False</property> + <property name="search-column">0</property> + <property name="show-expanders">False</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="Macro Library List-selection2"/> </child> @@ -147,9 +147,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="SearchAttrDialog-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="searchattrdialog|extended_tip|SearchAttrDialog">Choose the text attributes that you want to search for. For example, if you search for the Font attribute, all instances of text that do not use the default font are found. All text that has a directly coded font attribute, and all text where a style switches the font attribute, are found.</property>
