include/vcl/weld/TreeView.hxx | 4 + sc/uiconfig/scalc/ui/rowheightdialog.ui | 79 +++++++++++++++----------------- vcl/qt5/QtInstanceBuilder.cxx | 1 3 files changed, 42 insertions(+), 42 deletions(-)
New commits: commit b3c648ef0fb5e204527c5061f2dd480b94d37e0e Author: Michael Weghorn <[email protected]> AuthorDate: Fri Jan 16 00:08:46 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Jan 16 07:44:03 2026 +0100 sc: Resave rowheightdialog.ui with glade 3.40 The dialog can be triggered like this: * start Calc * select a few cells * "Format" -> "Rows" -> "Height" Change-Id: Id778e6475e1a6debd35e00cdc1ca7453a97b227e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197403 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/sc/uiconfig/scalc/ui/rowheightdialog.ui b/sc/uiconfig/scalc/ui/rowheightdialog.ui index 950ed83fc9c9..617454b28b8c 100644 --- a/sc/uiconfig/scalc/ui/rowheightdialog.ui +++ b/sc/uiconfig/scalc/ui/rowheightdialog.ui @@ -1,33 +1,33 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.36.0 --> +<!-- Generated with glade 3.40.0 --> <interface domain="sc"> <requires lib="gtk+" version="3.24"/> <object class="GtkDialog" id="RowHeightDialog"> - <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="rowheightdialog|RowHeightDialog">Row Height</property> <property name="resizable">False</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> @@ -40,8 +40,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> @@ -54,8 +54,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> @@ -69,42 +69,42 @@ <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> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=2 n-rows=2 --> <object class="GtkGrid" id="grid2"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="valign">start</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="row-spacing">6</property> + <property name="column-spacing">12</property> <child> <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="rowheightdialog|label1">Height:</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">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkSpinButton" 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="digits">2</property> + <property name="activates-default">True</property> <property name="truncate-multiline">True</property> + <property name="digits">2</property> <child internal-child="accessible"> <object class="AtkObject" id="value-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="rowheightdialog|extended_tip|value">Enter the row height that you want to use.</property> @@ -112,18 +112,18 @@ </child> </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="GtkCheckButton" id="default"> <property name="label" translatable="yes" context="rowheightdialog|default">_Default value</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> <child internal-child="accessible"> <object class="AtkObject" id="default-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="rowheightdialog|extended_tip|default">Adjusts the row height to the size based on the default template. Existing contents may be shown vertically cropped. The height no longer increases automatically when you enter larger contents.</property> @@ -131,8 +131,8 @@ </child> </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> <child> @@ -152,9 +152,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="RowHeightDialog-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="rowheightdialog|extended_tip|RowHeightDialog">Changes the height of the current row, or the selected rows.</property> commit e5bdec31a460aef52bf58984aeec9d81093baa69 Author: Michael Weghorn <[email protected]> AuthorDate: Thu Jan 15 23:53:54 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Jan 16 07:43:56 2026 +0100 tdf#130857 qt weld: Support command popup (Shift+Esc) This means that native Qt widgets are used for that popup now when using the qt5 or qt6 VCL plugin and starting LO with environment variable SAL_VCL_QT_USE_WELDED_WIDGETS=1 set. It can be triggered by pressing Shift+Esc in Writer. Side note: With current qtbase dev, the "Search command" placeholder text isn't displayed, but this is a Qt regression: https://qt-project.atlassian.net/browse/QTBUG-143114 Change-Id: I036ef8769a2f86aba5fd92f8efadffadc4645fcd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197402 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index 94facee0f54a..c96209fb805d 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -201,6 +201,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"modules/swriter/ui/watermarkdialog.ui"_ustr, u"modules/swriter/ui/wordcount.ui"_ustr, u"modules/swriter/ui/wrapdialog.ui"_ustr, + u"sfx/ui/commandpopup.ui"_ustr, u"sfx/ui/documentpropertiesdialog.ui"_ustr, u"sfx/ui/editdurationdialog.ui"_ustr, u"sfx/ui/helpmanual.ui"_ustr, commit edd8a7d8611503fab85087f8277d88920ffbc688 Author: Michael Weghorn <[email protected]> AuthorDate: Thu Jan 15 18:19:48 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Jan 16 07:43:49 2026 +0100 weld: Make most weld::TreeView handlers private There are corresponding signal_* methods that are used by the subclasses to call these handlers/Links, so there's no need for the handler members themselves to be protected. Make them private. Change-Id: I1cb1357574c4ab3df99a416e88b436987e96fee0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197400 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/include/vcl/weld/TreeView.hxx b/include/vcl/weld/TreeView.hxx index 2456eba9f1c1..847142e95221 100644 --- a/include/vcl/weld/TreeView.hxx +++ b/include/vcl/weld/TreeView.hxx @@ -37,7 +37,7 @@ public: typedef std::tuple<vcl::RenderContext&, const tools::Rectangle&, bool, const OUString&> render_args; -protected: +private: Link<TreeView&, void> m_aSelectionChangedHdl; Link<TreeView&, bool> m_aRowActivatedHdl; Link<int, void> m_aColumnClickedHdl; @@ -50,6 +50,8 @@ protected: Link<const TreeIter&, bool> m_aCollapsingHdl; Link<TreeView&, void> m_aVisibleRangeChangedHdl; Link<TreeView&, void> m_aModelChangedHdl; + +protected: // if handler returns true, drag is disallowed, consumer can change bool // arg to false to disable the treeview default dnd icon Link<bool&, bool> m_aDragBeginHdl;
