chart2/source/controller/dialogs/ChartResourceGroups.cxx | 3 chart2/source/inc/ChartResourceGroups.hxx | 1 chart2/uiconfig/ui/sidebartype.ui | 37 chart2/uiconfig/ui/tp_ChartType.ui | 782 +++++++-------- formula/uiconfig/ui/functionpage.ui | 8 formula/uiconfig/ui/structpage.ui | 4 solenv/sanitizers/ui/modules/schart.suppr | 1 7 files changed, 446 insertions(+), 390 deletions(-)
New commits: commit 97e40d9d946c0d1b1341712aa6375e6c7a58ad12 Author: Parth Raiyani <[email protected]> AuthorDate: Mon Sep 1 17:48:00 2025 +0530 Commit: Caolán McNamara <[email protected]> CommitDate: Wed Feb 25 11:18:12 2026 +0100 Rename conflicting label IDs to improve clarity in function and structure pages Signed-off-by: Parth Raiyani <[email protected]> Change-Id: I5af42131968d64d6df5becb1073999b2c82f799e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190478 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Szymon Kłos <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200240 Reviewed-by: Caolán McNamara <[email protected]> diff --git a/formula/uiconfig/ui/functionpage.ui b/formula/uiconfig/ui/functionpage.ui index b429c29d35bd..97ea344ca374 100644 --- a/formula/uiconfig/ui/functionpage.ui +++ b/formula/uiconfig/ui/functionpage.ui @@ -73,11 +73,11 @@ </packing> </child> <child> - <object class="GtkLabel" id="label1"> + <object class="GtkLabel" id="label_category"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes" context="functionpage|label1">_Category:</property> + <property name="label" translatable="yes" context="functionpage|label_category">_Category:</property> <property name="use-underline">True</property> <property name="mnemonic-widget">category</property> </object> @@ -109,11 +109,11 @@ </packing> </child> <child> - <object class="GtkLabel" id="label2"> + <object class="GtkLabel" id="label_function"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes" context="functionpage|label2">_Function:</property> + <property name="label" translatable="yes" context="functionpage|label_function">_Function:</property> <property name="use-underline">True</property> <property name="mnemonic-widget">function</property> </object> diff --git a/formula/uiconfig/ui/structpage.ui b/formula/uiconfig/ui/structpage.ui index 27b8a5d96d43..f5b1cbff6c9a 100644 --- a/formula/uiconfig/ui/structpage.ui +++ b/formula/uiconfig/ui/structpage.ui @@ -21,11 +21,11 @@ <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label1"> + <object class="GtkLabel" id="label_struct"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes" context="structpage|label1">Content:</property> + <property name="label" translatable="yes" context="structpage|label_struct">Content:</property> <property name="use-underline">True</property> <property name="mnemonic-widget">struct</property> </object> commit f9069f0e6b007fbc0edd9a2d479890e9a903f1df Author: Parth Raiyani <[email protected]> AuthorDate: Fri Aug 29 20:21:24 2025 +0530 Commit: Caolán McNamara <[email protected]> CommitDate: Wed Feb 25 11:18:01 2026 +0100 Restructure chart type selection for improved clarity - Wrap Chart Type selection elements with `GtkFrame` - Improve accessibility by adding missing label and adjusting label related properties - Remove orphan label suppression entry as it is no longer needed due to the restructuring Change-Id: Ia285ac757b88584cf88ea7b4f36eb01f7d63f542 Signed-off-by: Parth Raiyani <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190299 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Szymon Kłos <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200239 Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/chart2/source/controller/dialogs/ChartResourceGroups.cxx b/chart2/source/controller/dialogs/ChartResourceGroups.cxx index 9d4f1099f59b..b34d0b1d34d8 100644 --- a/chart2/source/controller/dialogs/ChartResourceGroups.cxx +++ b/chart2/source/controller/dialogs/ChartResourceGroups.cxx @@ -31,6 +31,7 @@ using namespace ::com::sun::star::chart2; Dim3DLookResourceGroup::Dim3DLookResourceGroup(weld::Builder* pBuilder) : m_xCB_3DLook(pBuilder->weld_check_button(u"3dlook"_ustr)) , m_xLB_Scheme(pBuilder->weld_combo_box(u"3dscheme"_ustr)) + , m_xFT_Scheme(pBuilder->weld_label(u"3dschemeft"_ustr)) { m_xCB_3DLook->connect_toggled(LINK(this, Dim3DLookResourceGroup, Dim3DLookCheckHdl)); m_xLB_Scheme->connect_changed(LINK(this, Dim3DLookResourceGroup, SelectSchemeHdl)); @@ -41,12 +42,14 @@ void Dim3DLookResourceGroup::showControls(bool bShow) { m_xCB_3DLook->set_visible(bShow); m_xLB_Scheme->set_visible(bShow); + m_xFT_Scheme->set_visible(bShow); } void Dim3DLookResourceGroup::fillControls(const ChartTypeParameter& rParameter) { m_xCB_3DLook->set_active(rParameter.b3DLook); m_xLB_Scheme->set_sensitive(rParameter.b3DLook); + m_xFT_Scheme->set_sensitive(rParameter.b3DLook); // tdf#124295 - select always a 3D scheme switch (rParameter.eThreeDLookScheme) diff --git a/chart2/source/inc/ChartResourceGroups.hxx b/chart2/source/inc/ChartResourceGroups.hxx index a3ce6f564cc2..05547dc386b9 100644 --- a/chart2/source/inc/ChartResourceGroups.hxx +++ b/chart2/source/inc/ChartResourceGroups.hxx @@ -52,6 +52,7 @@ private: private: std::unique_ptr<weld::CheckButton> m_xCB_3DLook; std::unique_ptr<weld::ComboBox> m_xLB_Scheme; + std::unique_ptr<weld::Label> m_xFT_Scheme; }; class SortByXValuesResourceGroup final : public ChangingResource diff --git a/chart2/uiconfig/ui/sidebartype.ui b/chart2/uiconfig/ui/sidebartype.ui index 6913c9ec29a9..ba83f7310fbb 100644 --- a/chart2/uiconfig/ui/sidebartype.ui +++ b/chart2/uiconfig/ui/sidebartype.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.38.2 --> +<!-- Generated with glade 3.40.0 --> <interface domain="chart"> <requires lib="gtk+" version="3.24"/> <object class="GtkAdjustment" id="adjustment1"> @@ -99,6 +99,21 @@ <property name="top-attach">2</property> </packing> </child> + <child> + <object class="GtkLabel" id="3dschemeft"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">end</property> + <property name="valign">center</property> + <property name="label" translatable="yes" context="sidebartype|3dschemeft">3D _Scheme:</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">3dscheme</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">3</property> + </packing> + </child> <child> <object class="GtkComboBoxText" id="3dscheme"> <property name="can-focus">False</property> @@ -110,7 +125,7 @@ </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">2</property> + <property name="top-attach">3</property> </packing> </child> <child> @@ -125,7 +140,7 @@ </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">3</property> + <property name="top-attach">4</property> </packing> </child> <child> @@ -162,7 +177,7 @@ </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">3</property> + <property name="top-attach">4</property> </packing> </child> <child> @@ -177,7 +192,7 @@ </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">4</property> + <property name="top-attach">5</property> </packing> </child> <child> @@ -190,7 +205,7 @@ </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">5</property> + <property name="top-attach">6</property> </packing> </child> <child> @@ -204,7 +219,7 @@ </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">5</property> + <property name="top-attach">6</property> </packing> </child> <child> @@ -216,7 +231,7 @@ </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">6</property> + <property name="top-attach">7</property> </packing> </child> <child> @@ -229,7 +244,7 @@ </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">7</property> + <property name="top-attach">8</property> </packing> </child> <child> @@ -244,7 +259,7 @@ </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">8</property> + <property name="top-attach">9</property> </packing> </child> <child> @@ -257,7 +272,7 @@ </object> <packing> <property name="left-attach">1</property> - <property name="top-attach">8</property> + <property name="top-attach">9</property> </packing> </child> <child> diff --git a/chart2/uiconfig/ui/tp_ChartType.ui b/chart2/uiconfig/ui/tp_ChartType.ui index ea1661df26c1..186584111b7e 100644 --- a/chart2/uiconfig/ui/tp_ChartType.ui +++ b/chart2/uiconfig/ui/tp_ChartType.ui @@ -58,127 +58,70 @@ <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkLabel" id="FT_CAPTION_FOR_WIZARD"> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="tp_ChartType|FT_CAPTION_FOR_WIZARD">Choose a Chart Type</property> - <property name="xalign">0</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <!-- n-columns=2 n-rows=1 --> - <object class="GtkGrid" id="grid1"> + <object class="GtkFrame" id="frame1"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="column-spacing">12</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> + <child type="label"> + <object class="GtkLabel" id="FT_CAPTION_FOR_WIZARD"> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="tp_ChartType|FT_CAPTION_FOR_WIZARD">Choose a Chart Type</property> + <property name="xalign">0</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> <child> - <!-- n-columns=1 n-rows=3 --> - <object class="GtkGrid" id="grid2"> + <!-- n-columns=2 n-rows=1 --> + <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="row-spacing">6</property> - <child> - <object class="GtkScrolledWindow"> - <property name="can-focus">True</property> - <property name="hexpand">False</property> - <property name="vexpand">False</property> - <property name="hscrollbar-policy">never</property> - <property name="vscrollbar-policy">never</property> - <property name="shadow-type">in</property> - <child> - <object class="GtkIconView" id="subtype_iconview"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="model">liststore3</property> - <property name="pixbuf-column">0</property> - <property name="columns">4</property> - <property name="selection-mode">single</property> - <property name="item-padding">2</property> - <property name="row-spacing">2</property> - <property name="column-spacing">2</property> - <property name="margin">2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="subtype_iconview-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tp_ChartType|extended_tip|subtype_iconview">Select a sub type of the basic chart type.</property> - </object> - </child> - </object> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> + <property name="column-spacing">12</property> <child> <!-- n-columns=1 n-rows=3 --> - <object class="GtkGrid" id="3dblock"> + <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="row-spacing">3</property> + <property name="row-spacing">6</property> <child> - <!-- n-columns=2 n-rows=1 --> - <object class="GtkGrid" id="grid9"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="column-spacing">6</property> + <object class="GtkScrolledWindow"> + <property name="can-focus">True</property> + <property name="hexpand">False</property> + <property name="vexpand">False</property> + <property name="hscrollbar-policy">never</property> + <property name="vscrollbar-policy">never</property> + <property name="shadow-type">in</property> <child> - <object class="GtkCheckButton" id="3dlook"> - <property name="label" translatable="yes" context="tp_ChartType|3dlook">_3D Look</property> + <object class="GtkIconView" id="subtype_iconview"> + <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> - <accessibility> - <relation type="label-for" target="3dscheme"/> - </accessibility> - <child internal-child="accessible"> - <object class="AtkObject" id="3dlook-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tp_ChartType|extended_tip|3dlook">Enables a 3D look for the data values.</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="3dscheme"> - <property name="can-focus">False</property> <property name="hexpand">True</property> - <items> - <item translatable="yes" context="tp_ChartType|3dscheme">Simple</item> - <item translatable="yes" context="tp_ChartType|3dscheme">Realistic</item> - </items> - <accessibility> - <relation type="labelled-by" target="3dlook"/> - </accessibility> + <property name="vexpand">True</property> + <property name="model">liststore3</property> + <property name="pixbuf-column">0</property> + <property name="columns">4</property> + <property name="selection-mode">single</property> + <property name="item-padding">2</property> + <property name="row-spacing">2</property> + <property name="column-spacing">2</property> + <property name="margin">2</property> <child internal-child="accessible"> - <object class="AtkObject" id="3dscheme-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tp_ChartType|extended_tip|3dscheme">Select the type of 3D look.</property> + <object class="AtkObject" id="subtype_iconview-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tp_ChartType|extended_tip|subtype_iconview">Select a sub type of the basic chart type.</property> </object> </child> </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">0</property> - </packing> </child> </object> <packing> @@ -187,111 +130,81 @@ </packing> </child> <child> - <object class="GtkLabel" id="shapeft"> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="tp_ChartType|shapeft">Sh_ape</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">shape</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow"> + <!-- n-columns=1 n-rows=3 --> + <object class="GtkGrid" id="3dblock"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="shadow-type">in</property> + <property name="row-spacing">3</property> <child> - <object class="GtkTreeView" id="shape"> + <!-- n-columns=2 n-rows=1 --> + <object class="GtkGrid" id="grid9"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="model">liststore1</property> - <property name="headers-visible">False</property> - <property name="headers-clickable">False</property> - <property name="search-column">0</property> - <property name="show-expanders">False</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection1"/> - </child> + <property name="can-focus">False</property> + <property name="column-spacing">30</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn1"> - <child> - <object class="GtkCellRendererText" id="cellrenderertext1"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> + <object class="GtkCheckButton" id="3dlook"> + <property name="label" translatable="yes" context="tp_ChartType|3dlook">_3D Look</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="3dlook-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tp_ChartType|extended_tip|3dlook">Enables a 3D look for the data values.</property> + </object> </child> </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> </child> - <child internal-child="accessible"> - <object class="AtkObject" id="shape-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tp_ChartType|extended_tip|shape">Select a shape from the list.</property> - </object> - </child> - </object> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> - </packing> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=6 --> - <object class="GtkGrid" id="stackblock"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="row-spacing">3</property> - <child> - <object class="GtkCheckButton" id="stack"> - <property name="label" translatable="yes" context="tp_ChartType|stack">_Stack series</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="stack-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tp_ChartType|extended_tip|stack">Displays stacked series for Line charts.</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <!-- n-columns=1 n-rows=3 --> - <object class="GtkGrid" id="grid6"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="margin-start">12</property> - <property name="row-spacing">3</property> - <child> - <object class="GtkRadioButton" id="ontop"> - <property name="label" translatable="yes" context="tp_ChartType|ontop">On top</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> - <child internal-child="accessible"> - <object class="AtkObject" id="ontop-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tp_ChartType|extended_tip|ontop">Stack series display values on top of each other.</property> + <child> + <!-- n-columns=2 n-rows=1 --> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="column-spacing">6</property> + <child> + <object class="GtkLabel" id="3dschemeft"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="tp_ChartType|3dschemeft">3D _Scheme:</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">3dscheme</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="3dscheme"> + <property name="can-focus">False</property> + <property name="hexpand">True</property> + <items> + <item translatable="yes" context="tp_ChartType|3dscheme">Simple</item> + <item translatable="yes" context="tp_ChartType|3dscheme">Realistic</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="3dscheme-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tp_ChartType|extended_tip|3dscheme">Select the type of 3D look.</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">0</property> + </packing> + </child> </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">0</property> + </packing> </child> </object> <packing> @@ -300,18 +213,14 @@ </packing> </child> <child> - <object class="GtkRadioButton" id="percent"> - <property name="label" translatable="yes" context="tp_ChartType|percent">Percent</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">ontop</property> - <child internal-child="accessible"> - <object class="AtkObject" id="percent-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tp_ChartType|extended_tip|percent">Stack series display values as percent.</property> - </object> - </child> + <object class="GtkLabel" id="shapeft"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="tp_ChartType|shapeft">Sh_ape</property> + <property name="xalign">0</property> + <accessibility> + <relation type="label-for" target="shape"/> + </accessibility> </object> <packing> <property name="left-attach">0</property> @@ -319,13 +228,46 @@ </packing> </child> <child> - <object class="GtkRadioButton" id="deep"> - <property name="label" translatable="yes" context="tp_ChartType|deep">Deep</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">ontop</property> + <object class="GtkScrolledWindow"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="shadow-type">in</property> + <child> + <object class="GtkTreeView" id="shape"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="model">liststore1</property> + <property name="headers-visible">False</property> + <property name="headers-clickable">False</property> + <property name="search-column">0</property> + <property name="show-expanders">False</property> + <accessibility> + <relation type="labelled-by" target="shapeft"/> + </accessibility> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn1"> + <child> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + </child> + <child internal-child="accessible"> + <object class="AtkObject" id="shape-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tp_ChartType|extended_tip|shape">Select a shape from the list.</property> + </object> + </child> + </object> + </child> </object> <packing> <property name="left-attach">0</property> @@ -339,18 +281,23 @@ </packing> </child> <child> - <!-- n-columns=3 n-rows=1 --> - <object class="GtkGrid" id="grid7"> + <!-- n-columns=1 n-rows=5 --> + <object class="GtkGrid" id="stackblock"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="column-spacing">6</property> + <property name="row-spacing">3</property> <child> - <object class="GtkLabel" id="linetypeft"> - <property name="can-focus">False</property> - <property name="label" translatable="yes" context="tp_ChartType|linetypeft">_Line type</property> + <object class="GtkCheckButton" id="stack"> + <property name="label" translatable="yes" context="tp_ChartType|stack">_Stack series</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> <property name="use-underline">True</property> - <property name="mnemonic-widget">linetype</property> - <property name="xalign">0</property> + <property name="draw-indicator">True</property> + <child internal-child="accessible"> + <object class="AtkObject" id="stack-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tp_ChartType|extended_tip|stack">Displays stacked series for Line charts.</property> + </object> + </child> </object> <packing> <property name="left-attach">0</property> @@ -358,224 +305,315 @@ </packing> </child> <child> - <object class="GtkComboBoxText" id="linetype"> + <!-- n-columns=1 n-rows=3 --> + <object class="GtkGrid" id="grid6"> + <property name="visible">True</property> <property name="can-focus">False</property> - <items> - <item translatable="yes" context="tp_ChartType|linetype">Straight</item> - <item translatable="yes" context="tp_ChartType|linetype">Smooth</item> - <item translatable="yes" context="tp_ChartType|linetype">Stepped</item> - </items> - <child internal-child="accessible"> - <object class="AtkObject" id="linetype-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tp_ChartType|extended_tip|linetype">Choose the type of line to draw.</property> + <property name="margin-start">12</property> + <property name="row-spacing">3</property> + <child> + <object class="GtkRadioButton" id="ontop"> + <property name="label" translatable="yes" context="tp_ChartType|ontop">On top</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> + <child internal-child="accessible"> + <object class="AtkObject" id="ontop-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tp_ChartType|extended_tip|ontop">Stack series display values on top of each other.</property> + </object> + </child> </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> </child> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="properties"> - <property name="label" translatable="yes" context="tp_ChartType|properties">Properties...</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="properties-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tp_ChartType|extended_tip|properties">Opens a dialog to set the line or curve properties.</property> + <child> + <object class="GtkRadioButton" id="percent"> + <property name="label" translatable="yes" context="tp_ChartType|percent">Percent</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">ontop</property> + <child internal-child="accessible"> + <object class="AtkObject" id="percent-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tp_ChartType|extended_tip|percent">Stack series display values as percent.</property> + </object> + </child> </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="deep"> + <property name="label" translatable="yes" context="tp_ChartType|deep">Deep</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">ontop</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">2</property> + </packing> </child> </object> <packing> - <property name="left-attach">2</property> - <property name="top-attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="sort"> - <property name="label" translatable="yes" context="tp_ChartType|sort">_Sort by X values</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="sort-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tp_ChartType|extended_tip|sort">Connects points by ascending X values, even if the order of values is different, in an XY scatter diagram.</property> - </object> - </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">3</property> - </packing> - </child> - <child> - <!-- n-columns=2 n-rows=1 --> - <object class="GtkGrid" id="grid8"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="column-spacing">6</property> <child> - <object class="GtkLabel" id="nolinesft"> + <!-- n-columns=3 n-rows=1 --> + <object class="GtkGrid" id="grid7"> + <property name="visible">True</property> <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="label" translatable="yes" context="tp_ChartType|nolinesft">_Number of lines</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">nolines</property> - <property name="ellipsize">end</property> - <property name="xalign">0</property> + <property name="column-spacing">6</property> + <child> + <object class="GtkLabel" id="linetypeft"> + <property name="can-focus">False</property> + <property name="label" translatable="yes" context="tp_ChartType|linetypeft">_Line type</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">linetype</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="linetype"> + <property name="can-focus">False</property> + <items> + <item translatable="yes" context="tp_ChartType|linetype">Straight</item> + <item translatable="yes" context="tp_ChartType|linetype">Smooth</item> + <item translatable="yes" context="tp_ChartType|linetype">Stepped</item> + </items> + <child internal-child="accessible"> + <object class="AtkObject" id="linetype-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tp_ChartType|extended_tip|linetype">Choose the type of line to draw.</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="properties"> + <property name="label" translatable="yes" context="tp_ChartType|properties">Properties...</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="properties-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tp_ChartType|extended_tip|properties">Opens a dialog to set the line or curve properties.</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">2</property> + <property name="top-attach">0</property> + </packing> + </child> </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">0</property> + <property name="top-attach">2</property> </packing> </child> <child> - <object class="GtkSpinButton" id="nolines"> + <object class="GtkCheckButton" id="sort"> + <property name="label" translatable="yes" context="tp_ChartType|sort">_Sort by X values</property> <property name="can-focus">True</property> - <property name="no-show-all">True</property> - <property name="activates-default">True</property> - <property name="truncate-multiline">True</property> - <property name="adjustment">adjustment1</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="nolines-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tp_ChartType|extended_tip|nolines">Set the number of lines for the Column and Line chart type.</property> + <object class="AtkObject" id="sort-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tp_ChartType|extended_tip|sort">Connects points by ascending X values, even if the order of values is different, in an XY scatter diagram.</property> </object> </child> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">3</property> </packing> </child> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">4</property> - </packing> - </child> - <child> - <!-- n-columns=2 n-rows=1 --> - <object class="GtkGrid" id="grid10"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="column-spacing">6</property> <child> - <object class="GtkLabel" id="compositesizeft"> + <!-- n-columns=2 n-rows=1 --> + <object class="GtkGrid" id="grid8"> + <property name="visible">True</property> <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="label" translatable="yes" context="tp_ChartType|compositesizeft">_Size of composite wedge</property> - <property name="use-underline">True</property> - <property name="mnemonic-widget">compositesize</property> - <property name="ellipsize">end</property> - <property name="xalign">0</property> + <property name="column-spacing">6</property> + <child> + <object class="GtkLabel" id="nolinesft"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="label" translatable="yes" context="tp_ChartType|nolinesft">_Number of lines</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">nolines</property> + <property name="ellipsize">end</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="nolines"> + <property name="can-focus">True</property> + <property name="no-show-all">True</property> + <property name="activates-default">True</property> + <property name="truncate-multiline">True</property> + <property name="adjustment">adjustment1</property> + <child internal-child="accessible"> + <object class="AtkObject" id="nolines-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tp_ChartType|extended_tip|nolines">Set the number of lines for the Column and Line chart type.</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">0</property> + </packing> + </child> </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">0</property> + <property name="top-attach">4</property> </packing> </child> <child> - <object class="GtkSpinButton" id="compositesize"> - <property name="can-focus">True</property> - <property name="no-show-all">True</property> - <property name="activates-default">True</property> - <property name="truncate-multiline">True</property> - <property name="adjustment">adjustment2</property> - <child internal-child="accessible"> - <object class="AtkObject" id="compositesize-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tp_ChartType|extended_tip|compositesize">Set the number of entries in the composite wedge.</property> + <!-- n-columns=2 n-rows=1 --> + <object class="GtkGrid" id="grid10"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="column-spacing">6</property> + <child> + <object class="GtkLabel" id="compositesizeft"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="label" translatable="yes" context="tp_ChartType|compositesizeft">_Size of composite wedge</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">compositesize</property> + <property name="ellipsize">end</property> + <property name="xalign">0</property> </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="compositesize"> + <property name="can-focus">True</property> + <property name="no-show-all">True</property> + <property name="activates-default">True</property> + <property name="truncate-multiline">True</property> + <property name="adjustment">adjustment1</property> + <child internal-child="accessible"> + <object class="AtkObject" id="compositesize-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tp_ChartType|extended_tip|compositesize">Set the number of entries in an of-pie chart composite wedge.</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">0</property> + </packing> </child> </object> <packing> - <property name="left-attach">1</property> - <property name="top-attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">4</property> </packing> </child> </object> <packing> <property name="left-attach">0</property> - <property name="top-attach">5</property> + <property name="top-attach">2</property> </packing> </child> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> + <property name="left-attach">1</property> + <property name="top-attach">0</property> </packing> </child> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow"> - <property name="can-focus">False</property> - <property name="vexpand">True</property> - <property name="hscrollbar-policy">never</property> - <property name="shadow-type">in</property> <child> - <object class="GtkTreeView" id="charttype"> - <property name="can-focus">True</property> - <property name="has-focus">True</property> + <object class="GtkScrolledWindow"> + <property name="can-focus">False</property> <property name="vexpand">True</property> - <property name="model">liststore2</property> - <property name="headers-visible">False</property> - <property name="headers-clickable">False</property> - <property name="search-column">0</property> - <property name="show-expanders">False</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection2"/> - </child> + <property name="hscrollbar-policy">never</property> + <property name="shadow-type">in</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn3"> + <object class="GtkTreeView" id="charttype"> + <property name="can-focus">True</property> + <property name="has-focus">True</property> + <property name="vexpand">True</property> + <property name="model">liststore2</property> + <property name="headers-visible">False</property> + <property name="headers-clickable">False</property> + <property name="search-column">0</property> + <property name="show-expanders">False</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection2"/> + </child> <child> - <object class="GtkCellRendererPixbuf" id="cellrenderertext3"/> - <attributes> - <attribute name="pixbuf">0</attribute> - </attributes> + <object class="GtkTreeViewColumn" id="treeviewcolumn3"> + <child> + <object class="GtkCellRendererPixbuf" id="cellrenderertext3"/> + <attributes> + <attribute name="pixbuf">0</attribute> + </attributes> + </child> + </object> </child> - </object> - </child> - <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn2"> <child> - <object class="GtkCellRendererText" id="cellrenderertext2"/> - <attributes> - <attribute name="text">1</attribute> - </attributes> + <object class="GtkTreeViewColumn" id="treeviewcolumn2"> + <child> + <object class="GtkCellRendererText" id="cellrenderertext2"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> + </child> + </object> + </child> + <child internal-child="accessible"> + <object class="AtkObject" id="charttype-atkobject"> + <property name="AtkObject::accessible-description" translatable="yes" context="tp_ChartType|extended_tip|charttype">Select a basic chart type.</property> + </object> </child> - </object> - </child> - <child internal-child="accessible"> - <object class="AtkObject" id="charttype-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="tp_ChartType|extended_tip|charttype">Select a basic chart type.</property> </object> </child> </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> </child> </object> <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> </object> diff --git a/solenv/sanitizers/ui/modules/schart.suppr b/solenv/sanitizers/ui/modules/schart.suppr index da1ebbe98f25..839871104e9e 100644 --- a/solenv/sanitizers/ui/modules/schart.suppr +++ b/solenv/sanitizers/ui/modules/schart.suppr @@ -25,7 +25,6 @@ chart2/uiconfig/ui/tp_3D_SceneIllumination.ui://GtkScale[@id='vert'] no-labelled chart2/uiconfig/ui/tp_axisLabel.ui://GtkLabel[@id='degreeL'] orphan-label chart2/uiconfig/ui/tp_axisLabel.ui://GtkLabel[@id='labelABCD'] orphan-label chart2/uiconfig/ui/tp_axisLabel.ui://GtkLabel[@id='textdirL'] orphan-label -chart2/uiconfig/ui/tp_ChartType.ui://GtkLabel[@id='FT_CAPTION_FOR_WIZARD'] orphan-label chart2/uiconfig/ui/tp_DataLabel.ui://GtkLabel[@id='CT_LABEL_DIAL'] orphan-label chart2/uiconfig/ui/tp_DataLabel.ui://GtkLabel[@id='STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE'] orphan-label chart2/uiconfig/ui/tp_DataLabel.ui://GtkLabel[@id='FT_LABEL_DEGREES'] orphan-label
