chart2/uiconfig/ui/sidebaraxis.ui | 178 +++---
chart2/uiconfig/ui/sidebarelements.ui | 902 +++++++++++++++-------------------
chart2/uiconfig/ui/sidebarerrorbar.ui | 357 ++++++-------
chart2/uiconfig/ui/sidebarseries.ui | 473 ++++++++---------
chart2/uiconfig/ui/sidebartype.ui | 560 +++++++++------------
5 files changed, 1124 insertions(+), 1346 deletions(-)
New commits:
commit 0f0fd9c6e35a86f03606361211067c7887c3e0fc
Author: andreas kainz <kain...@gmail.com>
AuthorDate: Thu Oct 27 23:03:08 2022 +0200
Commit: Andreas Kainz <kain...@gmail.com>
CommitDate: Tue Nov 8 09:57:07 2022 +0100
tdf#148017 harmonize sidebar .ui files for chart2
Change-Id: Iaacee42c23878b9f03623eec36a5f3a10051f926
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141949
Tested-by: Jenkins
Reviewed-by: Pedro Silva <pedro.si...@collabora.com>
diff --git a/chart2/uiconfig/ui/sidebaraxis.ui
b/chart2/uiconfig/ui/sidebaraxis.ui
index db8ad151329b..873d6565ce1e 100644
--- a/chart2/uiconfig/ui/sidebaraxis.ui
+++ b/chart2/uiconfig/ui/sidebaraxis.ui
@@ -1,130 +1,130 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.38.2 -->
<interface domain="chart">
<requires lib="gtk+" version="3.20"/>
<object class="GtkAdjustment" id="adjustmentSpinDegrees">
<property name="upper">359</property>
- <property name="step_increment">5</property>
+ <property name="step-increment">5</property>
</object>
<!-- n-columns=1 n-rows=1 -->
<object class="GtkGrid" id="ChartAxisPanel">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
+ <property name="can-focus">False</property>
<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">6</property>
+ <property name="can-focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="border-width">6</property>
+ <property name="row-spacing">3</property>
+ <property name="column-spacing">6</property>
<child>
<object class="GtkCheckButton" id="checkbutton_show_label">
<property name="label" translatable="yes"
context="sidebaraxis|checkbutton_show_label">Show labels</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="halign">start</property>
+ <property name="use-underline">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>
+ <property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="checkbutton_reverse">
<property name="label" translatable="yes"
context="sidebaraxis|checkbutton_reverse">Reverse direction</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="halign">start</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">3</property>
</packing>
</child>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="label_props">
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin-start">12</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">5</property>
- <child>
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="label" translatable="yes"
context="sidebaraxis|label1">_Label position:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">comboboxtext_label_position</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="comboboxtext_label_position">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <items>
- <item translatable="yes"
context="sidebaraxis|comboboxtext_label_position">Near Axis</item>
- <item translatable="yes"
context="sidebaraxis|comboboxtext_label_position">Near Axis (other side)</item>
- <item translatable="yes"
context="sidebaraxis|comboboxtext_label_position">Outside start</item>
- <item translatable="yes"
context="sidebaraxis|comboboxtext_label_position">Outside end</item>
- </items>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label2">
- <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="sidebaraxis|label2">_Text orientation:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">spinbutton1</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="spinbutton1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="truncate-multiline">True</property>
- <property name="adjustment">adjustmentSpinDegrees</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes"
context="sidebaraxis|label1">_Label position:</property>
+ <property name="use-underline">True</property>
+ <property
name="mnemonic-widget">comboboxtext_label_position</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="comboboxtext_label_position">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="hexpand">True</property>
+ <items>
+ <item translatable="yes"
context="sidebaraxis|comboboxtext_label_position">Near Axis</item>
+ <item translatable="yes"
context="sidebaraxis|comboboxtext_label_position">Near Axis (other side)</item>
+ <item translatable="yes"
context="sidebaraxis|comboboxtext_label_position">Outside start</item>
+ <item translatable="yes"
context="sidebaraxis|comboboxtext_label_position">Outside end</item>
+ </items>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
+ <property name="valign">center</property>
+ <property name="label" translatable="yes"
context="sidebaraxis|label2">_Text orientation:</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">spinbutton1</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="spinbutton1">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="truncate-multiline">True</property>
+ <property name="adjustment">adjustmentSpinDegrees</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
- <placeholder/>
+ <object class="GtkBox" id="label_props">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <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">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
</object>
diff --git a/chart2/uiconfig/ui/sidebarelements.ui
b/chart2/uiconfig/ui/sidebarelements.ui
index c16216bf6dae..14c31ce68e82 100644
--- a/chart2/uiconfig/ui/sidebarelements.ui
+++ b/chart2/uiconfig/ui/sidebarelements.ui
@@ -1,549 +1,469 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 -->
+<!-- Generated with glade 3.38.2 -->
<interface domain="chart">
<requires lib="gtk+" version="3.20"/>
<!-- n-columns=1 n-rows=1 -->
<object class="GtkGrid" id="ChartElementsPanel">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<child>
- <object class="GtkBox" id="container">
+ <!-- n-columns=2 n-rows=16 -->
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="border_width">6</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="can-focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="border-width">6</property>
+ <property name="row-spacing">3</property>
+ <property name="column-spacing">6</property>
+ <child type="label">
+ <object class="GtkLabel" id="l">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin-top">6</property>
+ <property name="margin-bottom">3</property>
+ <property name="label" translatable="yes"
context="sidebarelements|l">Titles</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkCheckButton" id="checkbutton_title">
+ <property name="label" translatable="yes"
context="sidebarelements|checkbutton_title">Title</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="halign">start</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ <accessibility>
+ <relation type="label-for" target="edit_title"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="edit_title">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
<property name="hexpand">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <!-- n-columns=1 n-rows=1 -->
- <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">6</property>
- <property name="margin-start">12</property>
- <property name="margin-top">6</property>
- <child>
- <object class="GtkCheckButton" id="checkbutton_title">
- <property name="label" translatable="yes"
context="sidebarelements|checkbutton_title">Title</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>
- <accessibility>
- <relation type="label-for" target="edit_title"/>
- </accessibility>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_subtitle">
- <property name="label" translatable="yes"
context="sidebarelements|checkbutton_subtitle">Subtitle</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>
- <accessibility>
- <relation type="label-for" target="edit_subtitle"/>
- </accessibility>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="edit_title">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="truncate-multiline">True</property>
- <accessibility>
- <relation type="labelled-by" target="checkbutton_title"/>
- </accessibility>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="edit_subtitle">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="truncate-multiline">True</property>
- <accessibility>
- <relation type="labelled-by"
target="checkbutton_subtitle"/>
- </accessibility>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="l">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="sidebarelements|l">Titles</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
+ <property name="truncate-multiline">True</property>
+ <accessibility>
+ <relation type="labelled-by" target="checkbutton_title"/>
+ </accessibility>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame3">
+ <object class="GtkCheckButton" id="checkbutton_subtitle">
+ <property name="label" translatable="yes"
context="sidebarelements|checkbutton_subtitle">Subtitle</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkBox" id="box_legend2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <property name="margin-start">12</property>
- <property name="margin-top">6</property>
- <child>
- <object class="GtkCheckButton" id="checkbutton_legend">
- <property name="label" translatable="yes"
context="sidebarelements|checkbutton_legend">Show legend</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes"
context="sidebarelements|checkbutton_legend|tooltip_text">Show Legend</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box_legend">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="placement_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="margin-start">4</property>
- <property name="label" translatable="yes"
context="sidebarelements|placement_label">_Placement:</property>
- <property name="use_underline">True</property>
- <property name="ellipsize">end</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="comboboxtext_legend">
- <property name="width_request">100</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <items>
- <item translatable="yes"
context="sidebarelements|comboboxtext_legend">Right</item>
- <item translatable="yes"
context="sidebarelements|comboboxtext_legend">Top</item>
- <item translatable="yes"
context="sidebarelements|comboboxtext_legend">Bottom</item>
- <item translatable="yes"
context="sidebarelements|comboboxtext_legend">Left</item>
- </items>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_no_overlay">
- <property name="label" translatable="yes"
context="sidebarelements|checkbutton_no_overlay">Show the legend without
overlapping the chart</property>
- <property name="visible">True</property>
- <property name="can_focus">False</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>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label_legen">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="sidebarelements|label_legen">Legend</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="halign">start</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ <accessibility>
+ <relation type="label-for" target="edit_subtitle"/>
+ </accessibility>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame2">
+ <object class="GtkEntry" id="edit_subtitle">
<property name="visible">True</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 -->
- <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">6</property>
- <property name="margin-start">12</property>
- <property name="margin-top">6</property>
- <child>
- <object class="GtkCheckButton" id="checkbutton_x_axis">
- <property name="label" translatable="yes"
context="sidebarelements|checkbutton_x_axis">X axis</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>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_x_axis_title">
- <property name="label" translatable="yes"
context="sidebarelements|checkbutton_x_axis_title">X axis title</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>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_y_axis">
- <property name="label" translatable="yes"
context="sidebarelements|checkbutton_y_axis">Y axis</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>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_y_axis_title">
- <property name="label" translatable="yes"
context="sidebarelements|checkbutton_y_axis_title">Y axis title</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>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_z_axis">
- <property name="label" translatable="yes"
context="sidebarelements|checkbutton_z_axis">Z axis</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>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_z_axis_title">
- <property name="label" translatable="yes"
context="sidebarelements|checkbutton_z_axis_title">Z axis title</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>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_2nd_x_axis">
- <property name="label" translatable="yes"
context="sidebarelements|checkbutton_2nd_x_axis">2nd X axis</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="left_attach">0</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton"
id="checkbutton_2nd_x_axis_title">
- <property name="label" translatable="yes"
context="sidebarelements|checkbutton_2nd_x_axis_title">2nd X axis
title</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="left_attach">1</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_2nd_y_axis">
- <property name="label" translatable="yes"
context="sidebarelements|checkbutton_2nd_y_axis">2nd Y axis</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="left_attach">0</property>
- <property name="top_attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton"
id="checkbutton_2nd_y_axis_title">
- <property name="label" translatable="yes"
context="sidebarelements|checkbutton_2nd_y_axis_title">2nd Y axis
title</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="left_attach">1</property>
- <property name="top_attach">4</property>
- </packing>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label_axes">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="sidebarelements|label_axes">Axes</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
+ <property name="can-focus">True</property>
+ <property name="truncate-multiline">True</property>
+ <accessibility>
+ <relation type="labelled-by" target="checkbutton_subtitle"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">2</property>
+ </packing>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label_legen">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin-top">12</property>
+ <property name="margin-bottom">3</property>
+ <property name="label" translatable="yes"
context="sidebarelements|label_legen">Legend</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">3</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame4">
+ <object class="GtkCheckButton" id="checkbutton_legend">
+ <property name="label" translatable="yes"
context="sidebarelements|checkbutton_legend">Show legend</property>
<property name="visible">True</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 -->
- <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">6</property>
- <property name="margin-start">12</property>
- <property name="margin-top">6</property>
- <child>
- <object class="GtkCheckButton"
id="checkbutton_gridline_horizontal_major">
- <property name="label" translatable="yes"
context="sidebarelements|checkbutton_gridline_horizontal_major">Horizontal
major</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>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton"
id="checkbutton_gridline_vertical_major">
- <property name="label" translatable="yes"
context="sidebarelements|checkbutton_gridline_vertical_major">Vertical
major</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>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton"
id="checkbutton_gridline_horizontal_minor">
- <property name="label" translatable="yes"
context="sidebarelements|checkbutton_gridline_horizontal_minor">Horizontal
minor</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>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton"
id="checkbutton_gridline_vertical_minor">
- <property name="label" translatable="yes"
context="sidebarelements|checkbutton_gridline_vertical_minor">Vertical
minor</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>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label_gri">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="sidebarelements|label_gri">Gridlines</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="tooltip-text" translatable="yes"
context="sidebarelements|checkbutton_legend|tooltip_text">Show Legend</property>
+ <property name="halign">start</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="comboboxtext_legend">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="hexpand">True</property>
+ <items>
+ <item translatable="yes"
context="sidebarelements|comboboxtext_legend">Right</item>
+ <item translatable="yes"
context="sidebarelements|comboboxtext_legend">Top</item>
+ <item translatable="yes"
context="sidebarelements|comboboxtext_legend">Bottom</item>
+ <item translatable="yes"
context="sidebarelements|comboboxtext_legend">Left</item>
+ </items>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">4</property>
</packing>
</child>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid4">
- <property name="can_focus">False</property>
+ <object class="GtkCheckButton" id="checkbutton_no_overlay">
+ <property name="label" translatable="yes"
context="sidebarelements|checkbutton_no_overlay">Show the legend without
overlapping the chart</property>
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="receives-default">False</property>
+ <property name="halign">start</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">5</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label_axes">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin-top">12</property>
+ <property name="margin-bottom">3</property>
+ <property name="label" translatable="yes"
context="sidebarelements|label_axes">Axes</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">6</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_x_axis">
+ <property name="label" translatable="yes"
context="sidebarelements|checkbutton_x_axis">X axis</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="halign">start</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_y_axis">
+ <property name="label" translatable="yes"
context="sidebarelements|checkbutton_y_axis">Y axis</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="halign">start</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">8</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_z_axis">
+ <property name="label" translatable="yes"
context="sidebarelements|checkbutton_z_axis">Z axis</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="halign">start</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">9</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_2nd_x_axis">
+ <property name="label" translatable="yes"
context="sidebarelements|checkbutton_2nd_x_axis">2nd X axis</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="halign">start</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">10</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_2nd_y_axis">
+ <property name="label" translatable="yes"
context="sidebarelements|checkbutton_2nd_y_axis">2nd Y axis</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="halign">start</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">11</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_x_axis_title">
+ <property name="label" translatable="yes"
context="sidebarelements|checkbutton_x_axis_title">X axis title</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="halign">start</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_y_axis_title">
+ <property name="label" translatable="yes"
context="sidebarelements|checkbutton_y_axis_title">Y axis title</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="halign">start</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">8</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_z_axis_title">
+ <property name="label" translatable="yes"
context="sidebarelements|checkbutton_z_axis_title">Z axis title</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="halign">start</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">9</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_2nd_x_axis_title">
+ <property name="label" translatable="yes"
context="sidebarelements|checkbutton_2nd_x_axis_title">2nd X axis
title</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="halign">start</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">10</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_2nd_y_axis_title">
+ <property name="label" translatable="yes"
context="sidebarelements|checkbutton_2nd_y_axis_title">2nd Y axis
title</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="halign">start</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">11</property>
+ </packing>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label_gri">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin-top">12</property>
+ <property name="margin-bottom">3</property>
+ <property name="label" translatable="yes"
context="sidebarelements|label_gri">Gridlines</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">12</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton"
id="checkbutton_gridline_horizontal_major">
+ <property name="label" translatable="yes"
context="sidebarelements|checkbutton_gridline_horizontal_major">Horizontal
major</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="halign">start</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">13</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton"
id="checkbutton_gridline_vertical_major">
+ <property name="label" translatable="yes"
context="sidebarelements|checkbutton_gridline_vertical_major">Vertical
major</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="halign">start</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">14</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton"
id="checkbutton_gridline_horizontal_minor">
+ <property name="label" translatable="yes"
context="sidebarelements|checkbutton_gridline_horizontal_minor">Horizontal
minor</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="halign">start</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">13</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton"
id="checkbutton_gridline_vertical_minor">
+ <property name="label" translatable="yes"
context="sidebarelements|checkbutton_gridline_vertical_minor">Vertical
minor</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="halign">start</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">14</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box_legend">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
<child>
<object class="GtkLabel" id="text_title">
- <property name="can_focus">False</property>
- <property name="no_show_all">True</property>
+ <property name="can-focus">False</property>
+ <property name="no-show-all">True</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes"
context="sidebarelements|text_title">Title</property>
</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">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="text_subtitle">
- <property name="can_focus">False</property>
- <property name="no_show_all">True</property>
+ <property name="can-focus">False</property>
+ <property name="no-show-all">True</property>
+ <property name="halign">start</property>
<property name="label" translatable="yes"
context="sidebarelements|text_subtitle">Subtitle</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="placement_label">
+ <property name="can-focus">False</property>
+ <property name="halign">end</property>
+ <property name="margin-start">4</property>
+ <property name="label" translatable="yes"
context="sidebarelements|placement_label">_Placement:</property>
+ <property name="use-underline">True</property>
+ <property name="ellipsize">end</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">4</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">15</property>
+ <property name="width">2</property>
</packing>
</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>
</object>
- <object class="GtkSizeGroup" id="sizegroup1">
- <widgets>
- <widget name="checkbutton_title"/>
- <widget name="checkbutton_x_axis"/>
- <widget name="checkbutton_y_axis"/>
- <widget name="checkbutton_z_axis"/>
- <widget name="checkbutton_2nd_x_axis"/>
- <widget name="checkbutton_2nd_y_axis"/>
- <widget name="checkbutton_gridline_vertical_major"/>
- <widget name="checkbutton_gridline_horizontal_major"/>
- </widgets>
- </object>
- <object class="GtkSizeGroup" id="sizegroup2">
- <widgets>
- <widget name="checkbutton_subtitle"/>
- <widget name="checkbutton_x_axis_title"/>
- <widget name="checkbutton_y_axis_title"/>
- <widget name="checkbutton_z_axis_title"/>
- <widget name="checkbutton_2nd_x_axis_title"/>
- <widget name="checkbutton_2nd_y_axis_title"/>
- <widget name="checkbutton_gridline_vertical_minor"/>
- <widget name="checkbutton_gridline_horizontal_minor"/>
- </widgets>
- </object>
</interface>
diff --git a/chart2/uiconfig/ui/sidebarerrorbar.ui
b/chart2/uiconfig/ui/sidebarerrorbar.ui
index 7ffdc3a68192..32c3ef130ad0 100644
--- a/chart2/uiconfig/ui/sidebarerrorbar.ui
+++ b/chart2/uiconfig/ui/sidebarerrorbar.ui
@@ -1,218 +1,146 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.38.2 -->
<interface domain="chart">
<requires lib="gtk+" version="3.20"/>
<object class="GtkAdjustment" id="adjustmentNEG">
<property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
+ <property name="step-increment">1</property>
+ <property name="page-increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustmentPOS">
<property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
+ <property name="step-increment">1</property>
+ <property name="page-increment">10</property>
</object>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">chart2/res/errorup_30.png</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">chart2/res/errorup_30.png</property>
</object>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">chart2/res/errorbothverti_30.png</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">chart2/res/errorbothverti_30.png</property>
</object>
<object class="GtkImage" id="image3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">chart2/res/errordown_30.png</property>
+ <property name="can-focus">False</property>
+ <property name="icon-name">chart2/res/errordown_30.png</property>
</object>
<!-- n-columns=1 n-rows=1 -->
<object class="GtkGrid" id="ChartErrorBarPanel">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<child>
- <object class="GtkBox" id="box1">
+ <!-- n-columns=2 n-rows=4 -->
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="border_width">6</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <property name="baseline_position">top</property>
+ <property name="can-focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="border-width">6</property>
+ <property name="row-spacing">3</property>
+ <property name="column-spacing">6</property>
<child>
- <object class="GtkBox" id="box3">
+ <object class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes"
context="sidebarerrorbar|label2">Category:</property>
+ <property name="use-underline">True</property>
+ <property name="mnemonic-widget">comboboxtext_type</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="comboboxtext_type">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="hexpand">True</property>
+ <items>
+ <item translatable="yes"
context="sidebarerrorbar|comboboxtext_type">Constant</item>
+ <item translatable="yes"
context="sidebarerrorbar|comboboxtext_type">Percentage</item>
+ <item translatable="yes"
context="sidebarerrorbar|comboboxtext_type">Cell Range or Data Table</item>
+ <item translatable="yes"
context="sidebarerrorbar|comboboxtext_type">Standard deviation</item>
+ <item translatable="yes"
context="sidebarerrorbar|comboboxtext_type">Standard error</item>
+ <item translatable="yes"
context="sidebarerrorbar|comboboxtext_type">Variance</item>
+ <item translatable="yes"
context="sidebarerrorbar|comboboxtext_type">Error margin</item>
+ </items>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes"
context="sidebarerrorbar|label3">Positive (+):</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes"
context="sidebarerrorbar|label4">Negative (-):</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="spinbutton_pos">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="text" translatable="yes"
context="sidebarerrorbar|spinbutton_pos">0.00</property>
+ <property name="truncate-multiline">True</property>
+ <property name="adjustment">adjustmentPOS</property>
+ <property name="digits">2</property>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="spinbutton_neg">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="text" translatable="yes"
context="sidebarerrorbar|spinbutton_neg">0.00</property>
+ <property name="truncate-multiline">True</property>
+ <property name="adjustment">adjustmentNEG</property>
+ <property name="digits">2</property>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box2">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
<property name="spacing">6</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid1">
+ <object class="GtkRadioButton"
id="radiobutton_positive_negative">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
- <child>
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes"
context="sidebarerrorbar|label2">Category:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">comboboxtext_type</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="comboboxtext_type">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <items>
- <item translatable="yes"
context="sidebarerrorbar|comboboxtext_type">Constant</item>
- <item translatable="yes"
context="sidebarerrorbar|comboboxtext_type">Percentage</item>
- <item translatable="yes"
context="sidebarerrorbar|comboboxtext_type">Cell Range or Data Table</item>
- <item translatable="yes"
context="sidebarerrorbar|comboboxtext_type">Standard deviation</item>
- <item translatable="yes"
context="sidebarerrorbar|comboboxtext_type">Standard error</item>
- <item translatable="yes"
context="sidebarerrorbar|comboboxtext_type">Variance</item>
- <item translatable="yes"
context="sidebarerrorbar|comboboxtext_type">Error margin</item>
- </items>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes"
context="sidebarerrorbar|label3">Positive (+):</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes"
context="sidebarerrorbar|label4">Negative (-):</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="spinbutton_pos">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">start</property>
- <property name="text" translatable="yes"
context="sidebarerrorbar|spinbutton_pos">0.00</property>
- <property name="adjustment">adjustmentPOS</property>
- <property name="truncate-multiline">True</property>
- <property name="digits">2</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="spinbutton_neg">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="halign">start</property>
- <property name="text" translatable="yes"
context="sidebarerrorbar|spinbutton_neg">0.00</property>
- <property name="adjustment">adjustmentNEG</property>
- <property name="truncate-multiline">True</property>
- <property name="digits">2</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkRadioButton"
id="radiobutton_positive_negative">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes"
context="sidebarerrorbar|radiobutton_positive_negative|tooltip_text">Positive
and Negative</property>
- <property name="image">image2</property>
- <property name="use_underline">True</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="radiobutton_positive">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes"
context="sidebarerrorbar|radiobutton_positive|tooltip_text">Positive</property>
- <property name="image">image1</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <property
name="group">radiobutton_positive_negative</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="radiobutton_negative">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes"
context="sidebarerrorbar|radiobutton_negative|tooltip_text">Negative</property>
- <property name="image">image3</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <property
name="group">radiobutton_positive_negative</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes"
context="sidebarerrorbar|label5">Indicator</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="tooltip-text" translatable="yes"
context="sidebarerrorbar|radiobutton_positive_negative|tooltip_text">Positive
and Negative</property>
+ <property name="image">image2</property>
+ <property name="use-underline">True</property>
+ <property name="active">True</property>
+ <property name="draw-indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -220,17 +148,62 @@
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <object class="GtkRadioButton" id="radiobutton_positive">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="tooltip-text" translatable="yes"
context="sidebarerrorbar|radiobutton_positive|tooltip_text">Positive</property>
+ <property name="image">image1</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ <property name="group">radiobutton_positive_negative</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="radiobutton_negative">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="tooltip-text" translatable="yes"
context="sidebarerrorbar|radiobutton_negative|tooltip_text">Negative</property>
+ <property name="image">image3</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ <property name="group">radiobutton_positive_negative</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes"
context="sidebarerrorbar|label5">Indicator</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">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">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
</packing>
</child>
</object>
diff --git a/chart2/uiconfig/ui/sidebarseries.ui
b/chart2/uiconfig/ui/sidebarseries.ui
index e7ec66f134e5..399094310ef9 100644
--- a/chart2/uiconfig/ui/sidebarseries.ui
+++ b/chart2/uiconfig/ui/sidebarseries.ui
@@ -1,288 +1,241 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.38.2 -->
<interface domain="chart">
<requires lib="gtk+" version="3.20"/>
<!-- n-columns=1 n-rows=1 -->
<object class="GtkGrid" id="ChartSeriesPanel">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<child>
- <object class="GtkBox" id="box1">
+ <!-- n-columns=2 n-rows=10 -->
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="border_width">6</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="can-focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="border-width">5</property>
+ <property name="row-spacing">3</property>
+ <property name="column-spacing">6</property>
+ <child type="label">
+ <object class="GtkLabel" id="label_series_name">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin-top">6</property>
+ <property name="margin-bottom">3</property>
+ <property name="label" translatable="no">Label</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">0</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_label">
+ <property name="label" translatable="yes"
context="sidebarseries|checkbutton_label">Show data labels</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>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="comboboxtext_label">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="hexpand">True</property>
+ <items>
+ <item translatable="yes"
context="sidebarseries|comboboxtext_label">Above</item>
+ <item translatable="yes"
context="sidebarseries|comboboxtext_label">Below</item>
+ <item translatable="yes"
context="sidebarseries|comboboxtext_label">Center</item>
+ <item translatable="yes"
context="sidebarseries|comboboxtext_label">Outside</item>
+ <item translatable="yes"
context="sidebarseries|comboboxtext_label">Inside</item>
+ <item translatable="yes"
context="sidebarseries|comboboxtext_label">Near origin</item>
+ </items>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_trendline">
+ <property name="label" translatable="yes"
context="sidebarseries|checkbutton_trendline">Show trendline</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="halign">start</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin-top">12</property>
+ <property name="margin-bottom">3</property>
+ <property name="label" translatable="yes"
context="sidebarseries|label1">Error Bars</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">3</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="checkbutton_y_error">
+ <property name="label" translatable="yes"
context="sidebarseries|checkbutton_y_error">Y error bars</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="halign">start</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">4</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
<child>
- <placeholder/>
+ <object class="GtkCheckButton" id="checkbutton_x_error">
+ <property name="label" translatable="yes"
context="sidebarseries|checkbutton_x_error">X error bars</property>
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="halign">start</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">5</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="axis_label">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
+ <property name="margin-top">12</property>
+ <property name="margin-bottom">3</property>
+ <property name="label" translatable="yes"
context="sidebarseries|axis_label">Align Series to Axis</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">6</property>
+ <property name="width">2</property>
+ </packing>
</child>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkLabel" id="label_series_tmpl">
+ <property name="can-focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes"
context="sidebarseries|label_series_tmpl">Data series '%1'</property>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">8</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box5">
<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="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkBox" id="box2">
+ <object class="GtkRadioButton" id="radiobutton_primary_axis">
+ <property name="label" translatable="yes"
context="sidebarseries|radiobutton_primary_axis">Primary Y axis</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <property name="margin-start">12</property>
- <property name="margin-top">6</property>
- <child>
- <object class="GtkBox" id="box3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="checkbutton_label">
- <property name="label" translatable="yes"
context="sidebarseries|checkbutton_label">Show data labels</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>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="datalabel_box">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin-start">12</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkLabel" id="label_box">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="sidebarseries|label_box">P_lacement:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">comboboxtext_label</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText"
id="comboboxtext_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <items>
- <item translatable="yes"
context="sidebarseries|comboboxtext_label">Above</item>
- <item translatable="yes"
context="sidebarseries|comboboxtext_label">Below</item>
- <item translatable="yes"
context="sidebarseries|comboboxtext_label">Center</item>
- <item translatable="yes"
context="sidebarseries|comboboxtext_label">Outside</item>
- <item translatable="yes"
context="sidebarseries|comboboxtext_label">Inside</item>
- <item translatable="yes"
context="sidebarseries|comboboxtext_label">Near origin</item>
- </items>
- </object>
- <packing>
- <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>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="checkbutton_trendline">
- <property name="label" translatable="yes"
context="sidebarseries|checkbutton_trendline">Show trendline</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>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <object class="GtkFrame" id="frame3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkBox" id="box6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <property name="margin-start">12</property>
- <property name="margin-top">6</property>
- <child>
- <object class="GtkCheckButton"
id="checkbutton_y_error">
- <property name="label" translatable="yes"
context="sidebarseries|checkbutton_y_error">Y error bars</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>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton"
id="checkbutton_x_error">
- <property name="label" translatable="yes"
context="sidebarseries|checkbutton_x_error">X error bars</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
... etc. - the rest is truncated
