chart2/uiconfig/ui/charttypedialog.ui | 39 ++---- chart2/uiconfig/ui/inserttitledlg.ui | 207 ++++++++++++++++------------------ vcl/qt5/QtInstanceBuilder.cxx | 2 3 files changed, 122 insertions(+), 126 deletions(-)
New commits: commit 9943a8a771d7daa98617affdfa904f704bb1adb0 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Jan 16 16:26:56 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Jan 17 06:38:59 2026 +0100 chart: Resave inserttitledlg.ui with glade 3.40 The dialog can be triggered like this: * start Writer * "Insert" -> "Chart" * right-click on the background of the chart and select the "Insert Titles" context menu entry Change-Id: I58a686bd3cd1de3ba37b82f2ed3db493ee849649 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197463 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/chart2/uiconfig/ui/inserttitledlg.ui b/chart2/uiconfig/ui/inserttitledlg.ui index 748fa37a6a64..8ee607847349 100644 --- a/chart2/uiconfig/ui/inserttitledlg.ui +++ b/chart2/uiconfig/ui/inserttitledlg.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="chart"> <requires lib="gtk+" version="3.24"/> <object class="GtkDialog" id="InsertTitleDialog"> - <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="inserttitledlg|InsertTitleDialog">Titles</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,57 +68,57 @@ <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="box1"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=2 n-rows=2 --> <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="can-focus">False</property> + <property name="row-spacing">6</property> + <property name="column-spacing">12</property> <child> <object class="GtkLabel" id="labelMainTitle"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="inserttitledlg|labelMainTitle">_Title</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">maintitle</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">maintitle</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="GtkLabel" id="labelSubTitle"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="inserttitledlg|labelSubTitle">_Subtitle</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">subtitle</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">subtitle</property> <property name="xalign">0</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="GtkEntry" id="maintitle"> <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="activates-default">True</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="maintitle-atkobject"> @@ -127,16 +127,16 @@ </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="GtkEntry" id="subtitle"> <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="activates-default">True</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="subtitle-atkobject"> @@ -145,8 +145,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> </object> @@ -159,66 +159,66 @@ <child> <object class="GtkFrame" id="frameAxes"> <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> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=2 n-rows=3 --> <object class="GtkGrid" id="grid2"> <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="can-focus">False</property> <property name="margin-start">12</property> <property name="margin-top">6</property> + <property name="row-spacing">6</property> + <property name="column-spacing">12</property> <child> <object class="GtkLabel" id="labelPrimaryXaxis"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="inserttitledlg|labelPrimaryXaxis">_X axis</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">primaryXaxis</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">primaryXaxis</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="GtkLabel" id="labelPrimaryYaxis"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="inserttitledlg|labelPrimaryYaxis">_Y axis</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">primaryYaxis</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">primaryYaxis</property> <property name="xalign">0</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="GtkLabel" id="labelPrimaryZaxis"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="inserttitledlg|labelPrimaryZaxis">_Z axis</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">primaryZaxis</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">primaryZaxis</property> <property name="xalign">0</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="GtkEntry" id="primaryXaxis"> <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="activates-default">True</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="primaryXaxis-atkobject"> @@ -227,16 +227,16 @@ </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="GtkEntry" id="primaryYaxis"> <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="activates-default">True</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="primaryYaxis-atkobject"> @@ -245,16 +245,16 @@ </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="GtkEntry" id="primaryZaxis"> <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="activates-default">True</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="primaryZaxis-atkobject"> @@ -263,8 +263,8 @@ </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> </object> @@ -272,7 +272,7 @@ <child type="label"> <object class="GtkLabel" id="Axe"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="inserttitledlg|Axe">Axes</property> <attributes> <attribute name="weight" value="bold"/> @@ -289,52 +289,52 @@ <child> <object class="GtkFrame" id="frameSecondaryAxes"> <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> - <!-- n-columns=1 n-rows=1 --> + <!-- n-columns=2 n-rows=2 --> <object class="GtkGrid" id="grid3"> <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="can-focus">False</property> <property name="margin-start">12</property> <property name="margin-top">6</property> + <property name="row-spacing">6</property> + <property name="column-spacing">12</property> <child> <object class="GtkLabel" id="labelSecondaryXAxis"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="inserttitledlg|labelSecondaryXAxis">X _axis</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">secondaryXaxis</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">secondaryXaxis</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="GtkLabel" id="labelSecondaryYAxis"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" context="inserttitledlg|labelSecondaryYAxis">Y ax_is</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">secondaryYaxis</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">secondaryYaxis</property> <property name="xalign">0</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="GtkEntry" id="secondaryXaxis"> <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="activates-default">True</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="secondaryXaxis-atkobject"> @@ -343,16 +343,16 @@ </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="GtkEntry" id="secondaryYaxis"> <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="activates-default">True</property> <property name="truncate-multiline">True</property> <child internal-child="accessible"> <object class="AtkObject" id="secondaryYaxis-atkobject"> @@ -361,8 +361,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> </object> @@ -370,7 +370,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="inserttitledlg|label2">Secondary Axes</property> <attributes> <attribute name="weight" value="bold"/> @@ -398,9 +398,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="InsertTitleDialog-atkobject"> <property name="AtkObject::accessible-description" translatable="yes" context="inserttitledlg|extended_tip|InsertTitleDialog">Opens a dialog to enter or modify the titles in a chart.</property> commit d24ca6e7604ad6b5308037f8cae3a3402e955a97 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Jan 16 16:22:37 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Jan 17 06:38:52 2026 +0100 tdf#130857 qt weld: Support "Chart Type" 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" * right-click on one of the bars in the bar chart and select the "Chart Type" context entry Change-Id: I904fc9c861447cbf4b6ce68be0b8fb127a2aaced Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197462 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/qt5/QtInstanceBuilder.cxx b/vcl/qt5/QtInstanceBuilder.cxx index cc9daf53e1f7..ade726cd52c1 100644 --- a/vcl/qt5/QtInstanceBuilder.cxx +++ b/vcl/qt5/QtInstanceBuilder.cxx @@ -161,6 +161,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"modules/scalc/ui/subtotaldialog.ui"_ustr, u"modules/scalc/ui/ttestdialog.ui"_ustr, u"modules/scalc/ui/ztestdialog.ui"_ustr, + u"modules/schart/ui/charttypedialog.ui"_ustr, u"modules/schart/ui/insertaxisdlg.ui"_ustr, u"modules/sdraw/ui/dlgsnap.ui"_ustr, u"modules/sdraw/ui/insertlayer.ui"_ustr, @@ -287,6 +288,7 @@ bool QtInstanceBuilder::IsUIFileSupported(const OUString& rUIFile, const weld::W u"modules/scalc/ui/statisticsinfopage.ui"_ustr, u"modules/scalc/ui/subtotalgrppage.ui"_ustr, u"modules/scalc/ui/subtotaloptionspage.ui"_ustr, + u"modules/schart/ui/tp_ChartType.ui"_ustr, u"modules/simpress/ui/annotationtagmenu.ui"_ustr, u"modules/swriter/ui/bibliofragment.ui"_ustr, u"modules/swriter/ui/columnpage.ui"_ustr, commit 647fabe045853a09acac9f3b23f96ed366e1fe35 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Jan 16 16:20:23 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Jan 17 06:38:46 2026 +0100 chart: Resave charttypedialog.ui with glade 3.40 The dialog can be triggered as follows: * start Writer * "Insert" -> "Chart" * right-click on one of the bars in the bar chart and select the "Chart Type" context entry Change-Id: I88cf741808cf21a69554bed7652ee135b0e604f8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197461 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/chart2/uiconfig/ui/charttypedialog.ui b/chart2/uiconfig/ui/charttypedialog.ui index c3e7e2ba2168..b416d4a61856 100644 --- a/chart2/uiconfig/ui/charttypedialog.ui +++ b/chart2/uiconfig/ui/charttypedialog.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="ChartTypeDialog"> - <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="charttypedialog|ChartTypeDialog">Chart Type</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="use-underline">True</property> </object> <packing> @@ -71,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>
