cui/uiconfig/ui/macroassigndialog.ui | 39 ++++++++++++++++------------------- vcl/qt5/QtInstanceBuilder.cxx | 3 ++ 2 files changed, 21 insertions(+), 21 deletions(-)
New commits: commit cd32b5f24a354175de00576920023ad4a799eb13 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Jan 16 00:36:19 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Jan 16 07:45:21 2026 +0100 tdf#130857 qt weld: Support "Assign Action" 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 Calc * "Sheet" -> "Sheet Events..." Change-Id: Id283a03ffc07bde4aa1961100e0eb21cb2a77737 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197409 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index c7c3a1b238f8..cc9daf53e1f7 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -84,6 +84,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"cui/ui/javaclasspathdialog.ui"_ustr, u"cui/ui/javastartparametersdialog.ui"_ustr, u"cui/ui/linedialog.ui"_ustr, + u"cui/ui/macroassigndialog.ui"_ustr, u"cui/ui/macroselectordialog.ui"_ustr, u"cui/ui/namedialog.ui"_ustr, u"cui/ui/newtabledialog.ui"_ustr, @@ -265,6 +266,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"cui/ui/lineendstabpage.ui"_ustr, u"cui/ui/linetabpage.ui"_ustr, u"cui/ui/linestyletabpage.ui"_ustr, + u"cui/ui/macroassignpage.ui"_ustr, u"cui/ui/optlingupage.ui"_ustr, u"cui/ui/possizetabpage.ui"_ustr, u"cui/ui/rotationtabpage.ui"_ustr, commit 64defc653e025626df60e89f70b68ce50c771c89 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Jan 16 00:33:50 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Jan 16 07:45:14 2026 +0100 tdf#130857 qt weld: Support "Macro Selector" 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 Calc * "Sheet" -> "Sheet Events..." * press the "Macro" button Change-Id: I6eabd5342a669d17fc302d55899d18743fcb1fca Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197408 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index fba2a3c396cb..c7c3a1b238f8 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -84,6 +84,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"cui/ui/javaclasspathdialog.ui"_ustr, u"cui/ui/javastartparametersdialog.ui"_ustr, u"cui/ui/linedialog.ui"_ustr, + u"cui/ui/macroselectordialog.ui"_ustr, u"cui/ui/namedialog.ui"_ustr, u"cui/ui/newtabledialog.ui"_ustr, u"cui/ui/numberdialog.ui"_ustr, commit 92f00f5e6debf159bce87a959beb238008a27fae Author: Michael Weghorn <[email protected]> AuthorDate: Fri Jan 16 00:29:08 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Fri Jan 16 07:45:08 2026 +0100 cui: Resave macroassigndialog.ui with glade 3.40 The dialog can be triggered as follows: * start Calc * "Sheet" -> "Sheet Events" Change-Id: Id008baad79dc6d2357cf6ddfeb289d2e2e839fa6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197407 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/cui/uiconfig/ui/macroassigndialog.ui b/cui/uiconfig/ui/macroassigndialog.ui index 6888b373d9f6..a9d385c29dfe 100644 --- a/cui/uiconfig/ui/macroassigndialog.ui +++ b/cui/uiconfig/ui/macroassigndialog.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="cui"> <requires lib="gtk+" version="3.24"/> <object class="GtkDialog" id="MacroAssignDialog"> - <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="macroassigndialog|MacroAssignDialog">Assign Action</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> @@ -82,9 +82,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="MacroAssignDialog-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="macroassigndialog|extended_tip|MacroAssignDialog">Assigns macros to program events. The assigned macro runs automatically every time the selected event occurs.</property>
