chart2/uiconfig/ui/dlg_InsertLegend.ui | 119 ++++++++++++++++----------------- vcl/qt5/QtInstanceBuilder.cxx | 2 2 files changed, 60 insertions(+), 61 deletions(-)
New commits: commit 65a95ddf8b9ef209cd575f5cb4392e10ba8a9a17 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Feb 11 00:37:55 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Feb 11 08:57:33 2026 +0100 tdf#130857 qt weld: Support chart "Legend" 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 Writer * "Insert" -> "Chart" * "Insert" -> "Legend..." Change-Id: I1610f958d3d67158f6ebac39d2b414c281191be1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199112 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index 0a56cd13485d..8654cc03fe20 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -165,6 +165,7 @@ constexpr auto SUPPORTED_UI_FILES = frozen::make_unordered_set<std::u16string_vi u"modules/scalc/ui/ttestdialog.ui", u"modules/scalc/ui/ztestdialog.ui", u"modules/schart/ui/charttypedialog.ui", + u"modules/schart/ui/dlg_InsertLegend.ui", u"modules/schart/ui/insertaxisdlg.ui", u"modules/schart/ui/insertgriddlg.ui", u"modules/schart/ui/inserttitledlg.ui", commit f948e36120ee066a6a7181ed6eec2c9c6a1a5e12 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Feb 11 00:35:46 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Feb 11 08:57:26 2026 +0100 chart2: Resave dlg_InsertLegend.ui with glade 3.40 The dialog can be triggered like this: * start Writer * "Insert" -> "Chart" * "Insert" -> "Legend..." Change-Id: I47eb0d6c5d68628620958062cb0b6aa3889fc9e3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199111 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/chart2/uiconfig/ui/dlg_InsertLegend.ui b/chart2/uiconfig/ui/dlg_InsertLegend.ui index 3a1d030453f3..73ebc6cacb93 100644 --- a/chart2/uiconfig/ui/dlg_InsertLegend.ui +++ b/chart2/uiconfig/ui/dlg_InsertLegend.ui @@ -1,35 +1,32 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.1 --> +<!-- Generated with glade 3.40.0 --> <interface domain="chart"> <requires lib="gtk+" version="3.24"/> <object class="GtkDialog" id="dlg_InsertLegend"> - <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="dlg_InsertLegend|dlg_InsertLegend">Legend</property> <property name="modal">True</property> - <property name="default_width">0</property> - <property name="default_height">0</property> - <property name="type_hint">dialog</property> - <child> - <placeholder/> - </child> + <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> @@ -42,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> @@ -56,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="margin-end">6</property> <property name="use-underline">True</property> </object> @@ -72,39 +69,39 @@ <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="GtkBox" id="dlg_LegendPosition"> <property name="visible">True</property> - <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="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkFrame" id="framePOSITION"> <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="GtkCheckButton" id="show"> <property name="label" translatable="yes" context="dlg_InsertLegend|show">_Display legend</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> </object> <packing> <property name="expand">False</property> @@ -113,70 +110,70 @@ </packing> </child> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=1 n-rows=4 --> <object class="GtkGrid" id="grid1"> <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="row_spacing">6</property> + <property name="row-spacing">6</property> <child> <object class="GtkRadioButton" id="left"> <property name="label" translatable="yes" context="dlg_InsertLegend|left">_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="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> </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="GtkRadioButton" id="right"> <property name="label" translatable="yes" context="dlg_InsertLegend|right">_Right</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">left</property> </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="GtkRadioButton" id="top"> <property name="label" translatable="yes" context="dlg_InsertLegend|top">_Top</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">left</property> </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="GtkRadioButton" id="bottom"> <property name="label" translatable="yes" context="dlg_InsertLegend|bottom">_Bottom</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">left</property> </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> </object> @@ -191,7 +188,7 @@ <child type="label"> <object class="GtkLabel" id="TXT_POSITION"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="dlg_InsertLegend|TXT_POSITION">Position</property> <property name="xalign">0</property> <attributes> commit fccf2b8f973ac7ee90400a144b85d9f9a61ee212 Author: Michael Weghorn <[email protected]> AuthorDate: Wed Feb 11 00:30:32 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Feb 11 08:57:20 2026 +0100 tdf#130857 qt weld: Support chart "Grids" 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 Writer * "Insert" -> "Chart" * "Insert" -> "Grids..." Change-Id: I74fc1ef51970acc0eb2a7f08f1a9b96628148f86 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199110 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index b94eb7167606..0a56cd13485d 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -166,6 +166,7 @@ constexpr auto SUPPORTED_UI_FILES = frozen::make_unordered_set<std::u16string_vi u"modules/scalc/ui/ztestdialog.ui", u"modules/schart/ui/charttypedialog.ui", u"modules/schart/ui/insertaxisdlg.ui", + u"modules/schart/ui/insertgriddlg.ui", u"modules/schart/ui/inserttitledlg.ui", u"modules/sdraw/ui/dlgsnap.ui", u"modules/sdraw/ui/insertlayer.ui",
