sc/uiconfig/scalc/ui/conditionalformatdialog.ui | 145 +++++++++--------------- vcl/qt5/QtInstanceBuilder.cxx | 2 2 files changed, 61 insertions(+), 86 deletions(-)
New commits: commit fe68266ddaf957ca28cde5d7709735d7a484908b Author: Michael Weghorn <[email protected]> AuthorDate: Thu Oct 30 15:27:40 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Oct 30 21:27:00 2025 +0100 tdf#130857 tdf#169006 qt weld: Support Calc "Conditional Formatting" 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 from Calc using "Format" -> "Conditional" -> "Condition" -> "More rules...". The native Qt version doesn't show the keyboard trap issue described for the vcl variant described in tdf#130857. Change-Id: I604295dee25066373548c466c8c4f277feebeb54 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193215 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index 19745758d478..b70adaf291d8 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -129,6 +129,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"filter/ui/xsltfilterdialog.ui"_ustr, u"modules/BasicIDE/ui/gotolinedialog.ui"_ustr, u"modules/BasicIDE/ui/newlibdialog.ui"_ustr, + u"modules/scalc/ui/conditionalformatdialog.ui"_ustr, u"modules/scalc/ui/definedatabaserangedialog.ui"_ustr, u"modules/scalc/ui/deletecells.ui"_ustr, u"modules/scalc/ui/deletecontents.ui"_ustr, @@ -258,6 +259,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"filter/ui/pdfsignpage.ui"_ustr, u"filter/ui/pdfuserinterfacepage.ui"_ustr, u"filter/ui/pdfviewpage.ui"_ustr, + u"modules/scalc/ui/conditionalentry.ui"_ustr, u"modules/scalc/ui/sortcriteriapage.ui"_ustr, u"modules/scalc/ui/sortkey.ui"_ustr, u"modules/scalc/ui/sortoptionspage.ui"_ustr, commit d234a9452cdc6b465b3a106fe39fb9f4bed7677a Author: Michael Weghorn <[email protected]> AuthorDate: Thu Oct 30 14:50:21 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Oct 30 21:26:49 2025 +0100 sc: Resave conditionalformatdialog.ui with glade 3.40 This dialog can be triggered from Calc using "Format" -> "Conditional" -> "Condition" -> "More rules...". Change-Id: If13663925815fdcb11614dd67423542d2087ca1e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/193214 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/sc/uiconfig/scalc/ui/conditionalformatdialog.ui b/sc/uiconfig/scalc/ui/conditionalformatdialog.ui index 54a58eff11c6..96e59608e46f 100644 --- a/sc/uiconfig/scalc/ui/conditionalformatdialog.ui +++ b/sc/uiconfig/scalc/ui/conditionalformatdialog.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.20"/> <object class="GtkDialog" id="ConditionalFormatDialog"> - <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="conditionalformatdialog|ConditionalFormatDialog">Conditional Formatting for</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="hexpand">True</property> <property name="vexpand">True</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> <child internal-child="accessible"> <object class="AtkObject" id="ok-atkobject"> @@ -45,9 +45,9 @@ <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="can_default">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="can-default">True</property> + <property name="receives-default">True</property> <property name="use-underline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="cancel-atkobject"> @@ -65,8 +65,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> @@ -80,77 +80,53 @@ <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="framecondition"> <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-end">12</property> + <property name="margin-top">6</property> + <property name="margin-bottom">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> - <property name="margin-bottom">6</property> - <property name="margin-end">12</property> <child> <object class="GtkScrolledWindow" id="listwindow"> <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="hscrollbar_policy">never</property> - <property name="shadow_type">in</property> + <property name="hscrollbar-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> <!-- n-columns=1 n-rows=1 --> <object class="GtkGrid" id="list"> <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="orientation">vertical</property> <child> <placeholder/> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> <child internal-child="accessible"> <object class="AtkObject" id="list-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="conditionalformatdialog|extended_tip|list">List of the conditions defined for the cell range in order of evaluation.</property> @@ -170,15 +146,15 @@ <child> <object class="GtkButtonBox" id="buttonbox1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="spacing">12</property> - <property name="layout_style">start</property> + <property name="layout-style">start</property> <child> <object class="GtkButton" id="add"> <property name="label" translatable="yes" context="stock">_Add</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> <child internal-child="accessible"> <object class="AtkObject" id="add-atkobject"> @@ -196,8 +172,8 @@ <object class="GtkButton" id="delete"> <property name="label" translatable="yes" context="stock">_Delete</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> <child internal-child="accessible"> <object class="AtkObject" id="delete-atkobject"> @@ -215,9 +191,9 @@ <object class="GtkButton" id="up"> <property name="label" translatable="yes" context="conditionalformatdialog|up">_Up</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="use-underline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="up-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="conditionalformatdialog|extended_tip|up">Increase priority of the selected condition.</property> @@ -234,9 +210,9 @@ <object class="GtkButton" id="down"> <property name="label" translatable="yes" context="conditionalformatdialog|down">Do_wn</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_underline">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="use-underline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="down-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="conditionalformatdialog|extended_tip|down">Decrease priority of the selected condition.</property> @@ -261,7 +237,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="conditionalformatdialog|label1">Conditions</property> <attributes> <attribute name="weight" value="bold"/> @@ -278,26 +254,26 @@ <child> <object class="GtkFrame" id="framerange"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="can-focus">False</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> <child> <object class="GtkBox" id="box2"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</property> + <property name="can-focus">False</property> <property name="margin-start">12</property> + <property name="margin-end">12</property> <property name="margin-top">6</property> <property name="margin-bottom">6</property> - <property name="margin-end">12</property> + <property name="spacing">12</property> <child> <object class="GtkLabel" id="ftassign"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="valign">center</property> <property name="label" translatable="yes" context="conditionalformatdialog|ftassign">Range:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">edassign</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">edassign</property> </object> <packing> <property name="expand">False</property> @@ -308,11 +284,11 @@ <child> <object class="GtkEntry" id="edassign"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="valign">center</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="expand">False</property> @@ -323,8 +299,8 @@ <child> <object class="GtkButton" id="rbassign"> <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="valign">center</property> <child internal-child="accessible"> <object class="AtkObject" id="rbassign-atkobject"> @@ -343,7 +319,7 @@ <child type="label"> <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="conditionalformatdialog|label2">Cell Range</property> <attributes> <attribute name="weight" value="bold"/> @@ -364,9 +340,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="ConditionalFormatDialog-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="conditionalformatdialog|extended_tip|ConditionalFormatDialog">Choose Conditional Formatting to define format styles depending on certain conditions.</property>
