sc/uiconfig/scalc/ui/deletecells.ui | 85 ++++++++---------- sc/uiconfig/scalc/ui/deletecontents.ui | 155 ++++++++++++++++----------------- vcl/qt5/QtInstanceBuilder.cxx | 1 3 files changed, 118 insertions(+), 123 deletions(-)
New commits: commit 5620da919ef1ff7f44b8ce4cfda07893f85dfd4a Author: Michael Weghorn <[email protected]> AuthorDate: Mon Sep 1 16:27:57 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Sep 2 07:31:43 2025 +0200 sc: Resave deletecontents.ui with glade 3.40 This dialog can be triggered in Calc using "Sheet" -> "Clear Cells". Change-Id: Ie0ae34a87e1b4933dfb26eecbdf4c1e627873d77 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190492 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/sc/uiconfig/scalc/ui/deletecontents.ui b/sc/uiconfig/scalc/ui/deletecontents.ui index d7ce18bcc698..345a33bda998 100644 --- a/sc/uiconfig/scalc/ui/deletecontents.ui +++ b/sc/uiconfig/scalc/ui/deletecontents.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="DeleteContentsDialog"> - <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="deletecontents|DeleteContentsDialog">Delete Contents</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,32 +69,32 @@ <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="frame2"> <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="orientation">vertical</property> - <property name="spacing">12</property> + <property name="can-focus">False</property> <property name="margin-start">12</property> <property name="margin-top">6</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> <child> <object class="GtkCheckButton" id="deleteall"> <property name="label" translatable="yes" context="deletecontents|deleteall">Delete _all</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="deleteall-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="deletecontents|extended_tip|deleteall">Deletes all content from the selected cell range.</property> @@ -108,21 +108,21 @@ </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=2 n-rows=4 --> <object class="GtkGrid" id="grid1"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <property name="column_homogeneous">True</property> + <property name="can-focus">False</property> + <property name="row-spacing">6</property> + <property name="column-spacing">12</property> + <property name="column-homogeneous">True</property> <child> <object class="GtkCheckButton" id="text"> <property name="label" translatable="yes" context="deletecontents|text">_Text</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="text-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="deletecontents|extended_tip|text">Deletes text only. Formats, formulas, numbers and dates are not affected.</property> @@ -130,18 +130,18 @@ </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="GtkCheckButton" id="numbers"> <property name="label" translatable="yes" context="deletecontents|numbers">_Numbers</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="numbers-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="deletecontents|extended_tip|numbers">Deletes numbers only. Formats and formulas remain unchanged.</property> @@ -149,18 +149,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="datetime"> <property name="label" translatable="yes" context="deletecontents|datetime">_Date & time</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="datetime-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="deletecontents|extended_tip|datetime">Deletes date and time values. Formats, text, numbers and formulas remain unchanged.</property> @@ -168,18 +168,18 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkCheckButton" id="formulas"> <property name="label" translatable="yes" context="deletecontents|formulas">_Formulas</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="formulas-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="deletecontents|extended_tip|formulas">Deletes formulas. Text, numbers, formats, dates and times remain unchanged.</property> @@ -187,18 +187,18 @@ </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> <object class="GtkCheckButton" id="comments"> <property name="label" translatable="yes" context="deletecontents|comments">_Comments</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="comments-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="deletecontents|extended_tip|comments">Deletes comments added to cells. All other elements remain unchanged.</property> @@ -206,18 +206,18 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkCheckButton" id="formats"> <property name="label" translatable="yes" context="deletecontents|formats">For_mats</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="formats-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="deletecontents|extended_tip|formats">Deletes format attributes applied to cells. All cell content remains unchanged.</property> @@ -225,18 +225,18 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="left-attach">1</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkCheckButton" id="objects"> <property name="label" translatable="yes" context="deletecontents|objects">_Objects</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="objects-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="deletecontents|extended_tip|objects">Deletes objects. All cell content remains unchanged.</property> @@ -244,8 +244,8 @@ </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> + <property name="left-attach">0</property> + <property name="top-attach">3</property> </packing> </child> <child> @@ -263,7 +263,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="deletecontents|label2">Selection</property> <attributes> <attribute name="weight" value="bold"/> @@ -284,9 +284,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="DeleteContentsDialog-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="deletecontents|extended_tip|DeleteContentsDialog">Specifies the contents to be deleted from the active cell or from a selected cell range.</property> commit 92dbb3477859d1c2c853c46214e42e52a37b98c6 Author: Michael Weghorn <[email protected]> AuthorDate: Mon Sep 1 16:13:50 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Sep 2 07:31:38 2025 +0200 tdf#130857 qt weld: Support sc "Delete Cells" 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 via "Sheet" -> "Delete Cells" in Calc. Change-Id: Iabb35d9e9b53a0c5a79080e30b66b57e4740641f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190491 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index be2dd0df3f0e..24f201d7569f 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -126,6 +126,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"modules/BasicIDE/ui/gotolinedialog.ui"_ustr, u"modules/BasicIDE/ui/newlibdialog.ui"_ustr, u"modules/scalc/ui/definedatabaserangedialog.ui"_ustr, + u"modules/scalc/ui/deletecells.ui"_ustr, u"modules/scalc/ui/gotosheetdialog.ui"_ustr, u"modules/scalc/ui/groupbydate.ui"_ustr, u"modules/scalc/ui/inputstringdialog.ui"_ustr, commit 1bf14bd2723593acbd252e7b33af819b6e098818 Author: Michael Weghorn <[email protected]> AuthorDate: Mon Sep 1 16:10:02 2025 +0200 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Sep 2 07:31:32 2025 +0200 sc: Resave deletecells.ui with glade 3.40 This is used for the Calc "Sheet" -> "Delete Cells" dialog. Change-Id: I2928180f306c86999acf8c2c8aa1d31b2ccc603f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190490 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/sc/uiconfig/scalc/ui/deletecells.ui b/sc/uiconfig/scalc/ui/deletecells.ui index a6b36bfd909b..60aeab83d382 100644 --- a/sc/uiconfig/scalc/ui/deletecells.ui +++ b/sc/uiconfig/scalc/ui/deletecells.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="DeleteCellsDialog"> - <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="deletecells|DeleteCellsDialog">Delete Cells</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,33 +69,33 @@ <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="Selection"> <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="box1"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="can-focus">False</property> <property name="margin-start">12</property> <property name="margin-top">6</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> <object class="GtkRadioButton" id="up"> <property name="label" translatable="yes" context="deletecells|up">Shift cells _up</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="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> <property name="active">True</property> - <property name="draw_indicator">True</property> + <property name="draw-indicator">True</property> <child internal-child="accessible"> <object class="AtkObject" id="up-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="deletecells|extended_tip|up">Fills the space produced by the deleted cells with the cells underneath it.</property> @@ -112,10 +112,10 @@ <object class="GtkRadioButton" id="left"> <property name="label" translatable="yes" context="deletecells|left">Shift cells _left</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> <property name="group">up</property> <child internal-child="accessible"> <object class="AtkObject" id="left-atkobject"> @@ -133,10 +133,10 @@ <object class="GtkRadioButton" id="rows"> <property name="label" translatable="yes" context="deletecells|rows">Delete entire _row(s)</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> <property name="group">up</property> <child internal-child="accessible"> <object class="AtkObject" id="rows-atkobject"> @@ -154,10 +154,10 @@ <object class="GtkRadioButton" id="cols"> <property name="label" translatable="yes" context="deletecells|cols">Delete entire _column(s)</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> <property name="group">up</property> <child internal-child="accessible"> <object class="AtkObject" id="cols-atkobject"> @@ -176,7 +176,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="deletecells|label1">Selection</property> <attributes> <attribute name="weight" value="bold"/> @@ -197,9 +197,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="DeleteCellsDialog-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="deletecells|extended_tip|DeleteCellsDialog">Completely deletes selected cells, columns or rows. The cells below or to the right of the deleted cells will fill the space.</property>
