summaryrefslogtreecommitdiff
path: root/chart2/uiconfig
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-12-28 20:14:00 +0000
committerCaolán McNamara <caolanm@redhat.com>2020-12-29 12:07:11 +0100
commit8b79f1efb74c383050de961051882bd5da3c730a (patch)
tree6b39b43a528160da5ea5211cc872909ee1ba7e05 /chart2/uiconfig
parent646a635efe6eecbc3d1dd3a7cbb02a278c6f3be5 (diff)
drop deprecated GtkAlignment, move left/top-padding into child margin-start/top
for chart2 Change-Id: I069ab39ef2d84bd6fac2c0cc5ab9931176501235 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108426 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'chart2/uiconfig')
-rw-r--r--chart2/uiconfig/ui/dlg_DataLabel.ui674
-rw-r--r--chart2/uiconfig/ui/dlg_InsertErrorBars.ui704
-rw-r--r--chart2/uiconfig/ui/dlg_InsertLegend.ui160
-rw-r--r--chart2/uiconfig/ui/insertaxisdlg.ui242
-rw-r--r--chart2/uiconfig/ui/insertgriddlg.ui248
-rw-r--r--chart2/uiconfig/ui/inserttitledlg.ui306
-rw-r--r--chart2/uiconfig/ui/smoothlinesdlg.ui124
-rw-r--r--chart2/uiconfig/ui/steppedlinesdlg.ui254
-rw-r--r--chart2/uiconfig/ui/titlerotationtabpage.ui230
-rw-r--r--chart2/uiconfig/ui/tp_3D_SceneIllumination.ui452
-rw-r--r--chart2/uiconfig/ui/tp_AxisPositions.ui838
-rw-r--r--chart2/uiconfig/ui/tp_ChartType.ui110
-rw-r--r--chart2/uiconfig/ui/tp_DataLabel.ui674
-rw-r--r--chart2/uiconfig/ui/tp_DataPointOption.ui42
-rw-r--r--chart2/uiconfig/ui/tp_ErrorBars.ui720
-rw-r--r--chart2/uiconfig/ui/tp_LegendPosition.ui260
-rw-r--r--chart2/uiconfig/ui/tp_PolarOptions.ui156
-rw-r--r--chart2/uiconfig/ui/tp_Scale.ui834
-rw-r--r--chart2/uiconfig/ui/tp_SeriesToAxis.ui508
-rw-r--r--chart2/uiconfig/ui/tp_Trendline.ui994
-rw-r--r--chart2/uiconfig/ui/tp_axisLabel.ui484
-rw-r--r--chart2/uiconfig/ui/wizelementspage.ui697
22 files changed, 4705 insertions, 5006 deletions
diff --git a/chart2/uiconfig/ui/dlg_DataLabel.ui b/chart2/uiconfig/ui/dlg_DataLabel.ui
index 7eca7ab7a067..1e28b419f3e6 100644
--- a/chart2/uiconfig/ui/dlg_DataLabel.ui
+++ b/chart2/uiconfig/ui/dlg_DataLabel.ui
@@ -88,290 +88,284 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <!-- n-columns=1 n-rows=1 -->
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <property name="row_homogeneous">True</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid1">
+ <object class="GtkCheckButton" id="CB_VALUE_AS_NUMBER">
+ <property name="label" translatable="yes" context="dlg_DataLabel|CB_VALUE_AS_NUMBER">Show value as _number</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <property name="row_homogeneous">True</property>
- <child>
- <object class="GtkCheckButton" id="CB_VALUE_AS_NUMBER">
- <property name="label" translatable="yes" context="dlg_DataLabel|CB_VALUE_AS_NUMBER">Show value as _number</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="CB_VALUE_AS_NUMBER-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|CB_VALUE_AS_NUMBER">Displays the absolute values of the data points.</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="CB_VALUE_AS_NUMBER-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|CB_VALUE_AS_NUMBER">Displays the absolute values of the data points.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
</child>
- <child>
- <object class="GtkCheckButton" id="CB_VALUE_AS_PERCENTAGE">
- <property name="label" translatable="yes" context="dlg_DataLabel|CB_VALUE_AS_PERCENTAGE">Show value as _percentage</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="CB_VALUE_AS_PERCENTAGE-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|CB_VALUE_AS_PERCENTAGE">Displays the percentage of the data points in each column.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="CB_VALUE_AS_PERCENTAGE">
+ <property name="label" translatable="yes" context="dlg_DataLabel|CB_VALUE_AS_PERCENTAGE">Show value as _percentage</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="CB_VALUE_AS_PERCENTAGE-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|CB_VALUE_AS_PERCENTAGE">Displays the percentage of the data points in each column.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
</child>
- <child>
- <object class="GtkCheckButton" id="CB_CATEGORY">
- <property name="label" translatable="yes" context="dlg_DataLabel|CB_CATEGORY">Show _category</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="CB_CATEGORY-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|CB_CATEGORY">Shows the data point text labels.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="CB_CATEGORY">
+ <property name="label" translatable="yes" context="dlg_DataLabel|CB_CATEGORY">Show _category</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="CB_CATEGORY-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|CB_CATEGORY">Shows the data point text labels.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
</child>
- <child>
- <object class="GtkCheckButton" id="CB_SYMBOL">
- <property name="label" translatable="yes" context="dlg_DataLabel|CB_SYMBOL">Show _legend key</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="CB_SYMBOL-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|CB_SYMBOL">Displays the legend icons next to each data point label.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="CB_SYMBOL">
+ <property name="label" translatable="yes" context="dlg_DataLabel|CB_SYMBOL">Show _legend key</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="CB_SYMBOL-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|CB_SYMBOL">Displays the legend icons next to each data point label.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- </packing>
</child>
- <child>
- <object class="GtkCheckButton" id="CB_WRAP_TEXT">
- <property name="label" translatable="yes" context="dlg_DataLabel|CB_WRAP_TEXT">Auto text _wrap</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="xalign">0</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="CB_WRAP_TEXT">
+ <property name="label" translatable="yes" context="dlg_DataLabel|CB_WRAP_TEXT">Auto text _wrap</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="xalign">0</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="GtkButton" id="PB_NUMBERFORMAT">
+ <property name="label" translatable="yes" context="dlg_DataLabel|PB_NUMBERFORMAT">Number _format...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="valign">center</property>
+ <property name="use_underline">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="PB_NUMBERFORMAT-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|PB_NUMBERFORMAT">Opens a dialog to select the number format.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="PB_PERCENT_NUMBERFORMAT">
+ <property name="label" translatable="yes" context="dlg_DataLabel|PB_PERCENT_NUMBERFORMAT">Percentage f_ormat...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="valign">center</property>
+ <property name="use_underline">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="PB_PERCENT_NUMBERFORMAT-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|PB_PERCENT_NUMBERFORMAT">Opens a dialog to select the percentage format.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
- </packing>
</child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="CT_LABEL_DIAL">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="label" translatable="yes" context="dlg_DataLabel|CT_LABEL_DIAL">ABCD</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="boxSEPARATOR">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkButton" id="PB_NUMBERFORMAT">
- <property name="label" translatable="yes" context="dlg_DataLabel|PB_NUMBERFORMAT">Number _format...</property>
+ <object class="GtkLabel" id="FT_TEXT_SEPARATOR">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="valign">center</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="dlg_DataLabel|FT_TEXT_SEPARATOR">_Separator</property>
<property name="use_underline">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="PB_NUMBERFORMAT-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|PB_NUMBERFORMAT">Opens a dialog to select the number format.</property>
- </object>
- </child>
+ <property name="mnemonic_widget">LB_TEXT_SEPARATOR</property>
+ <property name="xalign">0</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">0</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="PB_PERCENT_NUMBERFORMAT">
- <property name="label" translatable="yes" context="dlg_DataLabel|PB_PERCENT_NUMBERFORMAT">Percentage f_ormat...</property>
+ <object class="GtkComboBoxText" id="LB_TEXT_SEPARATOR">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
- <property name="use_underline">True</property>
+ <items>
+ <item id="0" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">Space</item>
+ <item id="1" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">Comma</item>
+ <item id="2" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">Semicolon</item>
+ <item id="3" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">New line</item>
+ <item id="4" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">Period</item>
+ </items>
<child internal-child="accessible">
- <object class="AtkObject" id="PB_PERCENT_NUMBERFORMAT-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|PB_PERCENT_NUMBERFORMAT">Opens a dialog to select the percentage format.</property>
+ <object class="AtkObject" id="LB_TEXT_SEPARATOR-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|LB_TEXT_SEPARATOR">Selects the separator between multiple text strings for the same object.</property>
</object>
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="CT_LABEL_DIAL">
- <property name="can_focus">False</property>
- <property name="no_show_all">True</property>
- <property name="label" translatable="yes" context="dlg_DataLabel|CT_LABEL_DIAL">ABCD</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="boxPLACEMENT">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkBox" id="boxSEPARATOR">
+ <object class="GtkLabel" id="FT_LABEL_PLACEMENT">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="FT_TEXT_SEPARATOR">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="dlg_DataLabel|FT_TEXT_SEPARATOR">_Separator</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">LB_TEXT_SEPARATOR</property>
- <property name="xalign">0</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="LB_TEXT_SEPARATOR">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <items>
- <item id="0" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">Space</item>
- <item id="1" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">Comma</item>
- <item id="2" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">Semicolon</item>
- <item id="3" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">New line</item>
- <item id="4" translatable="yes" context="dlg_DataLabel|liststoreSEPARATOR">Period</item>
- </items>
- <child internal-child="accessible">
- <object class="AtkObject" id="LB_TEXT_SEPARATOR-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|LB_TEXT_SEPARATOR">Selects the separator between multiple text strings for the same object.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="label" translatable="yes" context="dlg_DataLabel|FT_LABEL_PLACEMENT">Place_ment</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">LB_LABEL_PLACEMENT</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</property>
- <property name="width">2</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="boxPLACEMENT">
+ <object class="GtkComboBoxText" id="LB_LABEL_PLACEMENT">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="FT_LABEL_PLACEMENT">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="dlg_DataLabel|FT_LABEL_PLACEMENT">Place_ment</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">LB_LABEL_PLACEMENT</property>
- <property name="xalign">0</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="LB_LABEL_PLACEMENT">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <items>
- <item id="0" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Best fit</item>
- <item id="1" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Center</item>
- <item id="2" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Above</item>
- <item id="3" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Top left</item>
- <item id="4" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Left</item>
- <item id="5" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Bottom left</item>
- <item id="6" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Below</item>
- <item id="7" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Bottom right</item>
- <item id="8" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Right</item>
- <item id="9" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Top right</item>
- <item id="10" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Inside</item>
- <item id="11" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Outside</item>
- <item id="12" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Near origin</item>
- </items>
- <child internal-child="accessible">
- <object class="AtkObject" id="LB_LABEL_PLACEMENT-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|LB_LABEL_PLACEMENT">Selects the placement of data labels relative to the objects.</property>
- </object>
- </child>
+ <property name="valign">center</property>
+ <items>
+ <item id="0" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Best fit</item>
+ <item id="1" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Center</item>
+ <item id="2" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Above</item>
+ <item id="3" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Top left</item>
+ <item id="4" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Left</item>
+ <item id="5" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Bottom left</item>
+ <item id="6" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Below</item>
+ <item id="7" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Bottom right</item>
+ <item id="8" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Right</item>
+ <item id="9" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Top right</item>
+ <item id="10" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Inside</item>
+ <item id="11" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Outside</item>
+ <item id="12" translatable="yes" context="dlg_DataLabel|liststorePLACEMENT">Near origin</item>
+ </items>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="LB_LABEL_PLACEMENT-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|LB_LABEL_PLACEMENT">Selects the placement of data labels relative to the objects.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">6</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="dlg_DataLabel|STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE">Number Format for Percentage Value</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE">
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="dlg_DataLabel|STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE">Number Format for Percentage Value</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
</child>
</object>
</child>
@@ -400,114 +394,103 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkBox" id="box5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</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="box5">
+ <object class="GtkBox" id="boxORIENTATION">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkBox" id="boxORIENTATION">
+ <object class="GtkDrawingArea" id="CT_DIAL">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkDrawingArea" id="CT_DIAL">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="CT_DIAL-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|CT_DIAL">Click in the dial to set the text orientation for the data labels.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="NF_LABEL_DEGREES">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="valign">center</property>
- <property name="activates_default">True</property>
- <property name="adjustment">adjustmentDEGREE</property>
- <property name="wrap">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="NF_LABEL_DEGREES-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|NF_LABEL_DEGREES">Enter the counterclockwise rotation angle for the data labels.</property>
- </object>
- </child>
+ <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="CT_DIAL-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|CT_DIAL">Click in the dial to set the text orientation for the data labels.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
- <child>
- <object class="GtkLabel" id="FT_LABEL_DEGREES">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="dlg_DataLabel|FT_LABEL_DEGREES">_Degrees</property>
- <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="NF_LABEL_DEGREES">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="valign">center</property>
+ <property name="activates_default">True</property>
+ <property name="adjustment">adjustmentDEGREE</property>
+ <property name="wrap">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="NF_LABEL_DEGREES-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|NF_LABEL_DEGREES">Enter the counterclockwise rotation angle for the data labels.</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">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="FT_LABEL_DEGREES">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="dlg_DataLabel|FT_LABEL_DEGREES">_Degrees</property>
+ <property name="use_underline">True</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">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="boxTXT_DIRECTION">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="FT_LABEL_TEXTDIR">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="dlg_DataLabel|FT_LABEL_TEXTDIR">Te_xt direction</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">LB_LABEL_TEXTDIR</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="boxTXT_DIRECTION">
+ <object class="GtkComboBoxText" id="LB_LABEL_TEXTDIR">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="FT_LABEL_TEXTDIR">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="dlg_DataLabel|FT_LABEL_TEXTDIR">Te_xt direction</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">LB_LABEL_TEXTDIR</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="LB_LABEL_TEXTDIR">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="no_show_all">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="LB_LABEL_TEXTDIR-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|LB_LABEL_TEXTDIR">Specify the text direction for a paragraph that uses complex text layout (CTL). This feature is only available if complex text layout support is enabled.</property>
- </object>
- </child>
+ <property name="no_show_all">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="LB_LABEL_TEXTDIR-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|LB_LABEL_TEXTDIR">Specify the text direction for a paragraph that uses complex text layout (CTL). This feature is only available if complex text layout support is enabled.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
<packing>
@@ -517,6 +500,11 @@
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
</child>
@@ -545,38 +533,32 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment3">
+ <object class="GtkBox" id="box6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="orientation">vertical</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
- <object class="GtkBox" id="box6">
+ <object class="GtkCheckButton" id="CB_CUSTOM_LEADER_LINES">
+ <property name="label" translatable="yes" context="dlg_DataLabel|CB_CUSTOM_LEADER_LINES">_Connect displaced data labels to data points</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkCheckButton" id="CB_CUSTOM_LEADER_LINES">
- <property name="label" translatable="yes" context="dlg_DataLabel|CB_CUSTOM_LEADER_LINES">_Connect displaced data labels to data points</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="CB_CUSTOM_LEADER_LINES-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|CB_CUSTOM_LEADER_LINES">Draws a line connecting the data labels to the data points</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="CB_CUSTOM_LEADER_LINES-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="dlg_DataLabel|extended_tip|CB_CUSTOM_LEADER_LINES">Draws a line connecting the data labels to the data points</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
</child>
diff --git a/chart2/uiconfig/ui/dlg_InsertErrorBars.ui b/chart2/uiconfig/ui/dlg_InsertErrorBars.ui
index 2ac56a4ad0fd..4024e3765760 100644
--- a/chart2/uiconfig/ui/dlg_InsertErrorBars.ui
+++ b/chart2/uiconfig/ui/dlg_InsertErrorBars.ui
@@ -112,63 +112,85 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkBox" id="box3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</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">
+ <object class="GtkRadioButton" id="RB_NONE">
+ <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_NONE">_None</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkRadioButton" id="RB_NONE">
- <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_NONE">_None</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="RB_NONE-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|RB_NONE">Does not show any error bars.</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="RB_NONE-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|RB_NONE">Does not show any error bars.</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="RB_CONST">
- <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_CONST">_Constant Value</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">RB_NONE</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="RB_CONST-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|RB_CONST">Displays constant values that you specify in the Parameters area.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="RB_CONST">
+ <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_CONST">_Constant Value</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">RB_NONE</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="RB_CONST-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|RB_CONST">Displays constant values that you specify in the Parameters area.</property>
</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>
+ <child>
+ <object class="GtkRadioButton" id="RB_PERCENT">
+ <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_PERCENT">_Percentage</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">RB_NONE</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="RB_PERCENT-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|RB_PERCENT">Displays a percentage. The display refers to the corresponding data point. Set the percentage in the Parameters area.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkRadioButton" id="RB_PERCENT">
- <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_PERCENT">_Percentage</property>
+ <object class="GtkRadioButton" id="RB_FUNCTION">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -177,95 +199,67 @@
<property name="draw_indicator">True</property>
<property name="group">RB_NONE</property>
<child internal-child="accessible">
- <object class="AtkObject" id="RB_PERCENT-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|RB_PERCENT">Displays a percentage. The display refers to the corresponding data point. Set the percentage in the Parameters area.</property>
+ <object class="AtkObject" id="RB_FUNCTION-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|RB_FUNCTION">Select a function to calculate the error bars.</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box4">
+ <object class="GtkComboBoxText" id="LB_FUNCTION">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkRadioButton" id="RB_FUNCTION">
- <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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">RB_NONE</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="RB_FUNCTION-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|RB_FUNCTION">Select a function to calculate the error bars.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="LB_FUNCTION">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <items>
- <item id="0" translatable="yes" context="dlg_InsertErrorBars|liststoreFUNCTION">Standard Error</item>
- <item id="1" translatable="yes" context="dlg_InsertErrorBars|liststoreFUNCTION">Standard Deviation</item>
- <item id="2" translatable="yes" context="dlg_InsertErrorBars|liststoreFUNCTION">Variance</item>
- <item id="3" translatable="yes" context="dlg_InsertErrorBars|liststoreFUNCTION">Error Margin</item>
- </items>
- <child internal-child="accessible">
- <object class="AtkObject" id="LB_FUNCTION-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|LB_FUNCTION">Select a function to calculate the error bars.</property>
- </object>
- </child>
+ <items>
+ <item id="0" translatable="yes" context="dlg_InsertErrorBars|liststoreFUNCTION">Standard Error</item>
+ <item id="1" translatable="yes" context="dlg_InsertErrorBars|liststoreFUNCTION">Standard Deviation</item>
+ <item id="2" translatable="yes" context="dlg_InsertErrorBars|liststoreFUNCTION">Variance</item>
+ <item id="3" translatable="yes" context="dlg_InsertErrorBars|liststoreFUNCTION">Error Margin</item>
+ </items>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="LB_FUNCTION-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|LB_FUNCTION">Select a function to calculate the error bars.</property>
</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">3</property>
+ <property name="position">1</property>
</packing>
</child>
- <child>
- <object class="GtkRadioButton" id="RB_RANGE">
- <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_RANGE">Cell _Range</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">RB_NONE</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="RB_RANGE-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|RB_RANGE">Click Cell Range and then specify a cell range from which to take the positive and negative error bar values.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="RB_RANGE">
+ <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_RANGE">Cell _Range</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">RB_NONE</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="RB_RANGE-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|RB_RANGE">Click Cell Range and then specify a cell range from which to take the positive and negative error bar values.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">4</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
</child>
</object>
</child>
@@ -293,114 +287,108 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <!-- n-columns=1 n-rows=1 -->
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid1">
+ <object class="GtkRadioButton" id="RB_BOTH">
+ <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_BOTH">Positive _and Negative</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkRadioButton" id="RB_BOTH">
- <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_BOTH">Positive _and Negative</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="RB_BOTH-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|RB_BOTH">Shows positive and negative error bars.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="RB_POSITIVE">
- <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_POSITIVE">Pos_itive</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">RB_BOTH</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="RB_POSITIVE-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|RB_POSITIVE">Shows only positive error bars.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="RB_NEGATIVE">
- <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_NEGATIVE">Ne_gative</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">RB_BOTH</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="RB_NEGATIVE-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|RB_NEGATIVE">Shows only negative error bars.</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="RB_BOTH-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|RB_BOTH">Shows positive and negative error bars.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- </packing>
</child>
- <child>
- <object class="GtkImage" id="FI_BOTH">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage" id="FI_POSITIVE">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="RB_POSITIVE">
+ <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_POSITIVE">Pos_itive</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">RB_BOTH</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="RB_POSITIVE-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|RB_POSITIVE">Shows only positive error bars.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
</child>
- <child>
- <object class="GtkImage" id="FI_NEGATIVE">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="RB_NEGATIVE">
+ <property name="label" translatable="yes" context="dlg_InsertErrorBars|RB_NEGATIVE">Ne_gative</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">RB_BOTH</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="RB_NEGATIVE-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|RB_NEGATIVE">Shows only negative error bars.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="FI_BOTH">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-missing-image</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="FI_POSITIVE">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-missing-image</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="FI_NEGATIVE">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-missing-image</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
</child>
</object>
</child>
@@ -436,91 +424,25 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment3">
+ <object class="GtkBox" id="box5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</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="box5">
+ <object class="GtkBox" id="boxPOSITIVE">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkBox" id="boxPOSITIVE">
+ <object class="GtkLabel" id="FT_POSITIVE">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="FT_POSITIVE">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="dlg_InsertErrorBars|FT_POSITIVE">P_ositive (+)</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">MF_POSITIVE</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="MF_POSITIVE">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">adjustmentPOS</property>
- <property name="digits">2</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="MF_POSITIVE-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|MF_POSITIVE">Enter the value to add to the displayed value as the positive error value.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="ED_RANGE_POSITIVE">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="activates_default">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="ED_RANGE_POSITIVE-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|ED_RANGE_POSITIVE">Enter the address range from where to get the positive error values. Use the Shrink button to select the range from a sheet.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="IB_RANGE_POSITIVE">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes" context="dlg_InsertErrorBars|IB_RANGE_POSITIVE|tooltip_text">Select data range</property>
- <property name="image">imageRANGE_SELECT_POSITIVE</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="IB_RANGE_POSITIVE-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|IB_RANGE_POSITIVE">Click a button to shrink the dialog, then use the mouse to select the cell range in the spreadsheet. Click the button again to restore the dialog to full size.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
+ <property name="label" translatable="yes" context="dlg_InsertErrorBars|FT_POSITIVE">P_ositive (+)</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">MF_POSITIVE</property>
</object>
<packing>
<property name="expand">False</property>
@@ -529,78 +451,96 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="boxNEGATIVE">
+ <object class="GtkSpinButton" id="MF_POSITIVE">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="FT_NEGATIVE">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="dlg_InsertErrorBars|FT_NEGATIVE">_Negative (-)</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">MF_NEGATIVE</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">adjustmentPOS</property>
+ <property name="digits">2</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="MF_POSITIVE-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|MF_POSITIVE">Enter the value to add to the displayed value as the positive error value.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
- <child>
- <object class="GtkSpinButton" id="MF_NEGATIVE">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">adjustmentNEG</property>
- <property name="digits">2</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="MF_NEGATIVE-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|MF_NEGATIVE">Enter the value to subtract from the displayed value as the negative error value.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="ED_RANGE_POSITIVE">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="activates_default">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="ED_RANGE_POSITIVE-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|ED_RANGE_POSITIVE">Enter the address range from where to get the positive error values. Use the Shrink button to select the range from a sheet.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
- <child>
- <object class="GtkEntry" id="ED_RANGE_NEGATIVE">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="activates_default">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="ED_RANGE_NEGATIVE-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|ED_RANGE_NEGATIVE">Enter the address range from where to get the negative error values. Use the Shrink button to select the range from a sheet.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="IB_RANGE_POSITIVE">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text" translatable="yes" context="dlg_InsertErrorBars|IB_RANGE_POSITIVE|tooltip_text">Select data range</property>
+ <property name="image">imageRANGE_SELECT_POSITIVE</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="IB_RANGE_POSITIVE-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|IB_RANGE_POSITIVE">Click a button to shrink the dialog, then use the mouse to select the cell range in the spreadsheet. Click the button again to restore the dialog to full size.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
</child>
- <child>
- <object class="GtkButton" id="IB_RANGE_NEGATIVE">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes" context="dlg_InsertErrorBars|IB_RANGE_NEGATIVE|tooltip_text">Select data range</property>
- <property name="image">imageRANGE_SELECT_NEG</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="IB_RANGE_NEGATIVE-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|IB_RANGE_NEGATIVE">Click a button to shrink the dialog, then use the mouse to select the cell range in the spreadsheet. Click the button again to restore the dialog to full size.</property>
- </object>
- </child>
+ </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">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="boxNEGATIVE">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="FT_NEGATIVE">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="dlg_InsertErrorBars|FT_NEGATIVE">_Negative (-)</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">MF_NEGATIVE</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="MF_NEGATIVE">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">adjustmentNEG</property>
+ <property name="digits">2</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="MF_NEGATIVE-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|MF_NEGATIVE">Enter the value to subtract from the displayed value as the negative error value.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
</child>
</object>
<packing>
@@ -610,17 +550,14 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="CB_SYN_POS_NEG">
- <property name="label" translatable="yes" context="dlg_InsertErrorBars|CB_SYN_POS_NEG">Same value for both</property>
+ <object class="GtkEntry" id="ED_RANGE_NEGATIVE">
<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="xalign">0</property>
- <property name="draw_indicator">True</property>
+ <property name="hexpand">True</property>
+ <property name="activates_default">True</property>
<child internal-child="accessible">
- <object class="AtkObject" id="CB_SYN_POS_NEG-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|CB_SYN_POS_NEG">Enable to use the positive error values also as negative error values. You can only change the value of the "Positive (+)" box. That value gets copied to the "Negative (-)" box automatically.</property>
+ <object class="AtkObject" id="ED_RANGE_NEGATIVE-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|ED_RANGE_NEGATIVE">Enter the address range from where to get the negative error values. Use the Shrink button to select the range from a sheet.</property>
</object>
</child>
</object>
@@ -630,7 +567,52 @@
<property name="position">2</property>
</packing>
</child>
+ <child>
+ <object class="GtkButton" id="IB_RANGE_NEGATIVE">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text" translatable="yes" context="dlg_InsertErrorBars|IB_RANGE_NEGATIVE|tooltip_text">Select data range</property>
+ <property name="image">imageRANGE_SELECT_NEG</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="IB_RANGE_NEGATIVE-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|IB_RANGE_NEGATIVE">Click a button to shrink the dialog, then use the mouse to select the cell range in the spreadsheet. Click the button again to restore the dialog to full size.</property>
+ </object>
+ </child>
+ </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="CB_SYN_POS_NEG">
+ <property name="label" translatable="yes" context="dlg_InsertErrorBars|CB_SYN_POS_NEG">Same value for both</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="CB_SYN_POS_NEG-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="dlg_InsertErrorBars|extended_tip|CB_SYN_POS_NEG">Enable to use the positive error values also as negative error values. You can only change the value of the "Positive (+)" box. That value gets copied to the "Negative (-)" box automatically.</property>
+ </object>
+ </child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
</child>
</object>
</child>
diff --git a/chart2/uiconfig/ui/dlg_InsertLegend.ui b/chart2/uiconfig/ui/dlg_InsertLegend.ui
index 236adc2fc742..2c844a81d7d1 100644
--- a/chart2/uiconfig/ui/dlg_InsertLegend.ui
+++ b/chart2/uiconfig/ui/dlg_InsertLegend.ui
@@ -90,112 +90,106 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</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="box1">
+ <object class="GtkCheckButton" id="show">
+ <property name="label" translatable="yes" context="dlg_InsertLegend|show">_Display legend</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</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>
+ <!-- n-columns=1 n-rows=1 -->
+ <object class="GtkGrid" id="grid1">
<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="row_spacing">6</property>
+ <child>
+ <object class="GtkRadioButton" id="left">
+ <property name="label" translatable="yes" context="dlg_InsertLegend|left">_Left</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="active">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="show">
- <property name="label" translatable="yes" context="dlg_InsertLegend|show">_Display legend</property>
+ <object class="GtkRadioButton" id="right">
+ <property name="label" translatable="yes" context="dlg_InsertLegend|right">_Right</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
+ <property name="group">left</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">1</property>
</packing>
</child>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid1">
+ <object class="GtkRadioButton" id="top">
+ <property name="label" translatable="yes" context="dlg_InsertLegend|top">_Top</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin-start">12</property>
- <property name="row_spacing">6</property>
- <child>
- <object class="GtkRadioButton" id="left">
- <property name="label" translatable="yes" context="dlg_InsertLegend|left">_Left</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="active">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="GtkRadioButton" id="right">
- <property name="label" translatable="yes" context="dlg_InsertLegend|right">_Right</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">left</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="top">
- <property name="label" translatable="yes" context="dlg_InsertLegend|top">_Top</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">left</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="bottom">
- <property name="label" translatable="yes" context="dlg_InsertLegend|bottom">_Bottom</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">left</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">left</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="bottom">
+ <property name="label" translatable="yes" context="dlg_InsertLegend|bottom">_Bottom</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">left</property>
</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">3</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
</child>
diff --git a/chart2/uiconfig/ui/insertaxisdlg.ui b/chart2/uiconfig/ui/insertaxisdlg.ui
index 3dc744ff704c..f99885e36c75 100644
--- a/chart2/uiconfig/ui/insertaxisdlg.ui
+++ b/chart2/uiconfig/ui/insertaxisdlg.ui
@@ -89,82 +89,76 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="vexpand">True</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="box2">
+ <object class="GtkCheckButton" id="primaryX">
+ <property name="label" translatable="yes" context="insertaxisdlg|primaryX">_X axis</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="vexpand">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="primaryX">
- <property name="label" translatable="yes" context="insertaxisdlg|primaryX">_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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="primaryX-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="insertaxisdlg|extended_tip|primaryX">Displays the X axis as a line with subdivisions.</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="primaryX-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="insertaxisdlg|extended_tip|primaryX">Displays the X axis as a line with subdivisions.</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="primaryY">
- <property name="label" translatable="yes" context="insertaxisdlg|primaryY">_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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="primaryY-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="insertaxisdlg|extended_tip|primaryY">Displays the Y axis as a line with subdivisions.</property>
- </object>
- </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="primaryY">
+ <property name="label" translatable="yes" context="insertaxisdlg|primaryY">_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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="primaryY-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="insertaxisdlg|extended_tip|primaryY">Displays the Y axis as a line with subdivisions.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
- <child>
- <object class="GtkCheckButton" id="primaryZ">
- <property name="label" translatable="yes" context="insertaxisdlg|primaryZ">_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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="primaryZ-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="insertaxisdlg|extended_tip|primaryZ">Displays the Z axis as a line with subdivisions.</property>
- </object>
- </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="primaryZ">
+ <property name="label" translatable="yes" context="insertaxisdlg|primaryZ">_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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="primaryZ-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="insertaxisdlg|extended_tip|primaryZ">Displays the Z axis as a line with subdivisions.</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">2</property>
+ </packing>
</child>
</object>
</child>
@@ -194,77 +188,71 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkBox" id="box3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="vexpand">True</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">
+ <object class="GtkCheckButton" id="secondaryX">
+ <property name="label" translatable="yes" context="insertaxisdlg|secondaryX">X _axis</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="vexpand">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="secondaryX">
- <property name="label" translatable="yes" context="insertaxisdlg|secondaryX">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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="secondaryX-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="insertaxisdlg|extended_tip|secondaryX">Displays a secondary X axis in the chart.</property>
- </object>
- </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="secondaryY">
- <property name="label" translatable="yes" context="insertaxisdlg|secondaryY">Y ax_is</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="secondaryY-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="insertaxisdlg|extended_tip|secondaryY">The major axis and the secondary axis can have different scaling. For example, you can scale one axis to 2 in. and the other to 1.5 in. </property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="secondaryX-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="insertaxisdlg|extended_tip|secondaryX">Displays a secondary X axis in the chart.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
- <child>
- <object class="GtkCheckButton" id="secondaryZ">
- <property name="label" translatable="yes" context="insertaxisdlg|secondaryZ">Z axi_s</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</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="secondaryY">
+ <property name="label" translatable="yes" context="insertaxisdlg|secondaryY">Y ax_is</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="secondaryY-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="insertaxisdlg|extended_tip|secondaryY">The major axis and the secondary axis can have different scaling. For example, you can scale one axis to 2 in. and the other to 1.5 in. </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">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="secondaryZ">
+ <property name="label" translatable="yes" context="insertaxisdlg|secondaryZ">Z axi_s</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</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>
diff --git a/chart2/uiconfig/ui/insertgriddlg.ui b/chart2/uiconfig/ui/insertgriddlg.ui
index c85e709f34f4..e6f74a7650b3 100644
--- a/chart2/uiconfig/ui/insertgriddlg.ui
+++ b/chart2/uiconfig/ui/insertgriddlg.ui
@@ -89,82 +89,76 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="vexpand">True</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="box2">
+ <object class="GtkCheckButton" id="primaryX">
+ <property name="label" translatable="yes" context="insertgriddlg|primaryX">_X axis</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="vexpand">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="primaryX">
- <property name="label" translatable="yes" context="insertgriddlg|primaryX">_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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="primaryX-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="insertgriddlg|extended_tip|primaryX">Adds gridlines to the X axis of the chart.</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="primaryX-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="insertgriddlg|extended_tip|primaryX">Adds gridlines to the X axis of the chart.</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="primaryY">
- <property name="label" translatable="yes" context="insertgriddlg|primaryY">_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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="primaryY-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="insertgriddlg|extended_tip|primaryY">Adds gridlines to the Y axis of the chart.</property>
- </object>
- </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="primaryY">
+ <property name="label" translatable="yes" context="insertgriddlg|primaryY">_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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="primaryY-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="insertgriddlg|extended_tip|primaryY">Adds gridlines to the Y axis of the chart.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
- <child>
- <object class="GtkCheckButton" id="primaryZ">
- <property name="label" translatable="yes" context="insertgriddlg|primaryZ">_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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="primaryZ-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="insertgriddlg|extended_tip|primaryZ">Adds gridlines to the Z axis of the chart.</property>
- </object>
- </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="primaryZ">
+ <property name="label" translatable="yes" context="insertgriddlg|primaryZ">_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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="primaryZ-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="insertgriddlg|extended_tip|primaryZ">Adds gridlines to the Z axis of the chart.</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">2</property>
+ </packing>
</child>
</object>
</child>
@@ -194,82 +188,76 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkBox" id="box3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="vexpand">True</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">
+ <object class="GtkCheckButton" id="secondaryX">
+ <property name="label" translatable="yes" context="insertgriddlg|secondaryX">X _axis</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="vexpand">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="secondaryX">
- <property name="label" translatable="yes" context="insertgriddlg|secondaryX">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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="secondaryX-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="insertgriddlg|extended_tip|secondaryX">Adds gridlines that subdivide the X axis into smaller sections.</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="secondaryX-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="insertgriddlg|extended_tip|secondaryX">Adds gridlines that subdivide the X axis into smaller sections.</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="secondaryY">
- <property name="label" translatable="yes" context="insertgriddlg|secondaryY">Y ax_is</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="secondaryY-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="insertgriddlg|extended_tip|secondaryY">Adds gridlines that subdivide the Y axis into smaller sections.</property>
- </object>
- </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="secondaryY">
+ <property name="label" translatable="yes" context="insertgriddlg|secondaryY">Y ax_is</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="secondaryY-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="insertgriddlg|extended_tip|secondaryY">Adds gridlines that subdivide the Y axis into smaller sections.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
- <child>
- <object class="GtkCheckButton" id="secondaryZ">
- <property name="label" translatable="yes" context="insertgriddlg|secondaryZ">Z axi_s</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="secondaryZ-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="insertgriddlg|extended_tip|secondaryZ">Adds gridlines that subdivide the Z axis into smaller sections.</property>
- </object>
- </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="secondaryZ">
+ <property name="label" translatable="yes" context="insertgriddlg|secondaryZ">Z axi_s</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="secondaryZ-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="insertgriddlg|extended_tip|secondaryZ">Adds gridlines that subdivide the Z axis into smaller sections.</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">2</property>
+ </packing>
</child>
</object>
</child>
diff --git a/chart2/uiconfig/ui/inserttitledlg.ui b/chart2/uiconfig/ui/inserttitledlg.ui
index 06e3c66352d7..369797e7d862 100644
--- a/chart2/uiconfig/ui/inserttitledlg.ui
+++ b/chart2/uiconfig/ui/inserttitledlg.ui
@@ -161,112 +161,106 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <!-- n-columns=1 n-rows=1 -->
+ <object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid2">
+ <object class="GtkLabel" id="labelPrimaryXaxis">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkLabel" id="labelPrimaryXaxis">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="inserttitledlg|labelPrimaryXaxis">_X axis</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">primaryXaxis</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="labelPrimaryYaxis">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="inserttitledlg|labelPrimaryYaxis">_Y axis</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">primaryYaxis</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="labelPrimaryZaxis">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="inserttitledlg|labelPrimaryZaxis">_Z axis</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">primaryZaxis</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="primaryXaxis">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="activates_default">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="primaryXaxis-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="inserttitledlg|extended_tip|primaryXaxis">Enter the desired title for the X axis of the chart.</property>
- </object>
- </child>
+ <property name="label" translatable="yes" context="inserttitledlg|labelPrimaryXaxis">_X axis</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">primaryXaxis</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="labelPrimaryYaxis">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="inserttitledlg|labelPrimaryYaxis">_Y axis</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">primaryYaxis</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="labelPrimaryZaxis">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="inserttitledlg|labelPrimaryZaxis">_Z axis</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">primaryZaxis</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="primaryXaxis">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="activates_default">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="primaryXaxis-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="inserttitledlg|extended_tip|primaryXaxis">Enter the desired title for the X axis of the chart.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
</child>
- <child>
- <object class="GtkEntry" id="primaryYaxis">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="activates_default">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="primaryYaxis-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="inserttitledlg|extended_tip|primaryYaxis">Enter the desired title for the Y axis of the chart.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="primaryYaxis">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="activates_default">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="primaryYaxis-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="inserttitledlg|extended_tip|primaryYaxis">Enter the desired title for the Y axis of the chart.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
</child>
- <child>
- <object class="GtkEntry" id="primaryZaxis">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="activates_default">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="primaryZaxis-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="inserttitledlg|extended_tip|primaryZaxis">Enter the desired title for the Z axis of the chart.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="primaryZaxis">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="activates_default">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="primaryZaxis-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="inserttitledlg|extended_tip|primaryZaxis">Enter the desired title for the Z axis of the chart.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ </packing>
</child>
</object>
</child>
@@ -294,81 +288,75 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <!-- n-columns=1 n-rows=1 -->
+ <object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid3">
+ <object class="GtkLabel" id="labelSecondaryXAxis">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkLabel" id="labelSecondaryXAxis">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="inserttitledlg|labelSecondaryXAxis">X _axis</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">secondaryXaxis</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="labelSecondaryYAxis">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="inserttitledlg|labelSecondaryYAxis">Y ax_is</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">secondaryYaxis</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="secondaryXaxis">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="activates_default">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="secondaryXaxis-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="inserttitledlg|extended_tip|secondaryXaxis">Enter the desired secondary title for the X axis of the chart.</property>
- </object>
- </child>
+ <property name="label" translatable="yes" context="inserttitledlg|labelSecondaryXAxis">X _axis</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">secondaryXaxis</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="labelSecondaryYAxis">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="inserttitledlg|labelSecondaryYAxis">Y ax_is</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">secondaryYaxis</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="secondaryXaxis">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="activates_default">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="secondaryXaxis-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="inserttitledlg|extended_tip|secondaryXaxis">Enter the desired secondary title for the X axis of the chart.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
</child>
- <child>
- <object class="GtkEntry" id="secondaryYaxis">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="activates_default">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="secondaryYaxis-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="inserttitledlg|extended_tip|secondaryYaxis">Enter the desired secondary title for the Y axis of the chart.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="secondaryYaxis">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="activates_default">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="secondaryYaxis-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="inserttitledlg|extended_tip|secondaryYaxis">Enter the desired secondary title for the Y axis of the chart.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
</child>
</object>
</child>
diff --git a/chart2/uiconfig/ui/smoothlinesdlg.ui b/chart2/uiconfig/ui/smoothlinesdlg.ui
index 14b2a134fdc3..d16b64c7beac 100644
--- a/chart2/uiconfig/ui/smoothlinesdlg.ui
+++ b/chart2/uiconfig/ui/smoothlinesdlg.ui
@@ -151,81 +151,75 @@
</packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <!-- n-columns=1 n-rows=1 -->
+ <object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="row_spacing">3</property>
+ <property name="column_spacing">6</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid2">
+ <object class="GtkLabel" id="ResolutionLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">3</property>
- <property name="column_spacing">6</property>
- <child>
- <object class="GtkLabel" id="ResolutionLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes" context="smoothlinesdlg|ResolutionLabel">_Resolution:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">ResolutionSpinbutton</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="PolynomialsLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="label" translatable="yes" context="smoothlinesdlg|PolynomialsLabel">_Degree of polynomials:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">PolynomialsSpinButton</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="ResolutionSpinbutton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
- <property name="adjustment">ResolutionAdjustment</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="ResolutionSpinbutton-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="smoothlinesdlg|extended_tip|ResolutionSpinbutton">Set the resolution.</property>
- </object>
- </child>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes" context="smoothlinesdlg|ResolutionLabel">_Resolution:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">ResolutionSpinbutton</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="PolynomialsLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes" context="smoothlinesdlg|PolynomialsLabel">_Degree of polynomials:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">PolynomialsSpinButton</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="ResolutionSpinbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
+ <property name="adjustment">ResolutionAdjustment</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="ResolutionSpinbutton-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="smoothlinesdlg|extended_tip|ResolutionSpinbutton">Set the resolution.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
</child>
- <child>
- <object class="GtkSpinButton" id="PolynomialsSpinButton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
- <property name="adjustment">PolynomialsAdjustment</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="PolynomialsSpinButton-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="smoothlinesdlg|extended_tip|PolynomialsSpinButton">Set the degree of the polynomials.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="PolynomialsSpinButton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
+ <property name="adjustment">PolynomialsAdjustment</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="PolynomialsSpinButton-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="smoothlinesdlg|extended_tip|PolynomialsSpinButton">Set the degree of the polynomials.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
</child>
</object>
<packing>
diff --git a/chart2/uiconfig/ui/steppedlinesdlg.ui b/chart2/uiconfig/ui/steppedlinesdlg.ui
index ebc9df9eaebc..c12584456529 100644
--- a/chart2/uiconfig/ui/steppedlinesdlg.ui
+++ b/chart2/uiconfig/ui/steppedlinesdlg.ui
@@ -82,150 +82,144 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <!-- n-columns=1 n-rows=1 -->
+ <object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="row_spacing">3</property>
+ <property name="column_spacing">6</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid2">
+ <object class="GtkImage" id="step_center_x_img">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">3</property>
- <property name="column_spacing">6</property>
- <child>
- <object class="GtkImage" id="step_center_x_img">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">chart2/res/step_center_x_30.png</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage" id="step_end_img">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">chart2/res/step_end_30.png</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage" id="step_center_y_img">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">chart2/res/step_center_y_30.png</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="step_start_rb">
- <property name="label" translatable="yes" context="steppedlinesdlg|step_start_rb">_Start with horizontal line</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="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="step_start_rb-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="steppedlinesdlg|extended_tip|step_start_rb">Start with horizontal line and step up vertically at the end.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="step_center_x_rb">
- <property name="label" translatable="yes" context="steppedlinesdlg|step_center_x_rb">Step at the _horizontal mean</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="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">step_start_rb</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="step_center_x_rb-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="steppedlinesdlg|extended_tip|step_center_x_rb">Start to step up vertically and end with horizontal line.</property>
- </object>
- </child>
+ <property name="icon_name">chart2/res/step_center_x_30.png</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="step_end_img">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">chart2/res/step_end_30.png</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="step_center_y_img">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">chart2/res/step_center_y_30.png</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="step_start_rb">
+ <property name="label" translatable="yes" context="steppedlinesdlg|step_start_rb">_Start with horizontal line</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="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="step_start_rb-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="steppedlinesdlg|extended_tip|step_start_rb">Start with horizontal line and step up vertically at the end.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- </packing>
</child>
- <child>
- <object class="GtkRadioButton" id="step_end_rb">
- <property name="label" translatable="yes" context="steppedlinesdlg|step_end_rb">_End with horizontal line</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="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">step_start_rb</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="step_end_rb-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="steppedlinesdlg|extended_tip|step_end_rb">Start with horizontal line, step up vertically in the middle of the X values and end with horizontal line.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="step_center_x_rb">
+ <property name="label" translatable="yes" context="steppedlinesdlg|step_center_x_rb">Step at the _horizontal mean</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="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">step_start_rb</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="step_center_x_rb-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="steppedlinesdlg|extended_tip|step_center_x_rb">Start to step up vertically and end with horizontal line.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
</child>
- <child>
- <object class="GtkRadioButton" id="step_center_y_rb">
- <property name="label" translatable="yes" context="steppedlinesdlg|step_center_y_rb">Step to the _vertical mean</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="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">step_start_rb</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="step_center_y_rb-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="steppedlinesdlg|extended_tip|step_center_y_rb">Start to step up vertically to the middle of the Y values, draw a horizontal line and finish by stepping vertically to the end.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="step_end_rb">
+ <property name="label" translatable="yes" context="steppedlinesdlg|step_end_rb">_End with horizontal line</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="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">step_start_rb</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="step_end_rb-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="steppedlinesdlg|extended_tip|step_end_rb">Start with horizontal line, step up vertically in the middle of the X values and end with horizontal line.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
- </packing>
</child>
- <child>
- <object class="GtkImage" id="step_start_img">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">chart2/res/step_start_30.png</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="step_center_y_rb">
+ <property name="label" translatable="yes" context="steppedlinesdlg|step_center_y_rb">Step to the _vertical mean</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="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">step_start_rb</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="step_center_y_rb-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="steppedlinesdlg|extended_tip|step_center_y_rb">Start to step up vertically to the middle of the Y values, draw a horizontal line and finish by stepping vertically to the end.</property>
</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">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="step_start_img">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">chart2/res/step_start_30.png</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
</object>
</child>
diff --git a/chart2/uiconfig/ui/titlerotationtabpage.ui b/chart2/uiconfig/ui/titlerotationtabpage.ui
index dbc0dbe08412..32252eb72a8f 100644
--- a/chart2/uiconfig/ui/titlerotationtabpage.ui
+++ b/chart2/uiconfig/ui/titlerotationtabpage.ui
@@ -14,166 +14,160 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment5">
+ <!-- n-columns=1 n-rows=1 -->
+ <object class="GtkGrid" id="grid10">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
<!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid10">
+ <object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid3">
+ <object class="GtkSpinButton" id="OrientDegree">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkSpinButton" id="OrientDegree">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="margin_top">40</property>
- <property name="adjustment">adjustmentSpinDegrees</property>
- <property name="wrap">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="OrientDegree-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="titlerotationtabpage|extended_tip|OrientDegree">Allows you to manually enter the orientation angle.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="degreeL">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_top">40</property>
- <property name="label" translatable="yes" context="titlerotationtabpage|degreeL">_Degrees</property>
- <property name="use_underline">True</property>
+ <property name="can_focus">True</property>
+ <property name="margin_top">40</property>
+ <property name="adjustment">adjustmentSpinDegrees</property>
+ <property name="wrap">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="OrientDegree-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="titlerotationtabpage|extended_tip|OrientDegree">Allows you to manually enter the orientation angle.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
</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">2</property>
</packing>
</child>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid4">
+ <object class="GtkLabel" id="degreeL">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkCheckButton" id="stackedCB">
- <property name="label" translatable="yes" context="titlerotationtabpage|stackedCB">Ve_rtically stacked</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="xalign">0.019999999552965164</property>
- <property name="inconsistent">True</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="stackedCB-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="titlerotationtabpage|extended_tip|stackedCB">Assigns vertical text orientation for cell contents.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="labelABCD">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="titlerotationtabpage|labelABCD">ABCD</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
+ <property name="margin_top">40</property>
+ <property name="label" translatable="yes" context="titlerotationtabpage|degreeL">_Degrees</property>
+ <property name="use_underline">True</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="textdirL">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="titlerotationtabpage|textdirL">Te_xt direction:</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
</child>
<child>
- <object class="GtkComboBoxText" id="textdirLB">
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <!-- n-columns=1 n-rows=1 -->
+ <object class="GtkGrid" id="grid4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkCheckButton" id="stackedCB">
+ <property name="label" translatable="yes" context="titlerotationtabpage|stackedCB">Ve_rtically stacked</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="use_underline">True</property>
+ <property name="xalign">0.019999999552965164</property>
+ <property name="inconsistent">True</property>
+ <property name="draw_indicator">True</property>
<child internal-child="accessible">
- <object class="AtkObject" id="textdirLB-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="titlerotationtabpage|extended_tip|textdirLB">Specify the text direction for a paragraph that uses complex text layout (CTL). This feature is only available if complex text layout support is enabled.</property>
+ <object class="AtkObject" id="stackedCB-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="titlerotationtabpage|extended_tip|stackedCB">Assigns vertical text orientation for cell contents.</property>
</object>
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- <property name="width">2</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkDrawingArea" id="dialCtrl">
- <property name="visible">True</property>
+ <object class="GtkLabel" id="labelABCD">
<property name="can_focus">False</property>
- <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
- <property name="halign">center</property>
- <property name="valign">center</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="dialCtrl-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="titlerotationtabpage|extended_tip|dialCtrl">Clicking anywhere on the wheel defines the variable text orientation.</property>
- </object>
- </child>
+ <property name="label" translatable="yes" context="titlerotationtabpage|labelABCD">ABCD</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="top_attach">1</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="textdirL">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="titlerotationtabpage|textdirL">Te_xt direction:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="textdirLB">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="textdirLB-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="titlerotationtabpage|extended_tip|textdirLB">Specify the text direction for a paragraph that uses complex text layout (CTL). This feature is only available if complex text layout support is enabled.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkDrawingArea" id="dialCtrl">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="dialCtrl-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="titlerotationtabpage|extended_tip|dialCtrl">Clicking anywhere on the wheel defines the variable text orientation.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
</object>
</child>
diff --git a/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui b/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui
index 8bb0f7c94711..2187db5ab092 100644
--- a/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui
+++ b/chart2/uiconfig/ui/tp_3D_SceneIllumination.ui
@@ -70,175 +70,199 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</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="box1">
+ <!-- n-columns=1 n-rows=1 -->
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid1">
+ <object class="GtkToggleButton" id="BTN_LIGHT_1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkToggleButton" id="BTN_LIGHT_1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHT_1|tooltip_text">Light source 1</property>
- <property name="image">IMG_LIGHT_1</property>
- <property name="always_show_image">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="BTN_LIGHT_1-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_3D_SceneIllumination|extended_tip|BTN_LIGHT_1">Click to enable or disable the specular light source with highlights.</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHT_1|tooltip_text">Light source 1</property>
+ <property name="image">IMG_LIGHT_1</property>
+ <property name="always_show_image">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="BTN_LIGHT_1-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_3D_SceneIllumination|extended_tip|BTN_LIGHT_1">Click to enable or disable the specular light source with highlights.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
</child>
- <child>
- <object class="GtkToggleButton" id="BTN_LIGHT_2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHT_2|tooltip_text">Light source 2</property>
- <property name="image">IMG_LIGHT_2</property>
- <property name="always_show_image">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="BTN_LIGHT_2-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_3D_SceneIllumination|extended_tip|BTN_LIGHT_2">Click to enable or disable the uniform light source.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToggleButton" id="BTN_LIGHT_2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHT_2|tooltip_text">Light source 2</property>
+ <property name="image">IMG_LIGHT_2</property>
+ <property name="always_show_image">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="BTN_LIGHT_2-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_3D_SceneIllumination|extended_tip|BTN_LIGHT_2">Click to enable or disable the uniform light source.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
</child>
- <child>
- <object class="GtkToggleButton" id="BTN_LIGHT_3">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHT_3|tooltip_text">Light source 3</property>
- <property name="image">IMG_LIGHT_3</property>
- <property name="always_show_image">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="BTN_LIGHT_3-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_3D_SceneIllumination|extended_tip|BTN_LIGHT_3">Click to enable or disable the uniform light source.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToggleButton" id="BTN_LIGHT_3">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHT_3|tooltip_text">Light source 3</property>
+ <property name="image">IMG_LIGHT_3</property>
+ <property name="always_show_image">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="BTN_LIGHT_3-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_3D_SceneIllumination|extended_tip|BTN_LIGHT_3">Click to enable or disable the uniform light source.</property>
</object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
- </packing>
</child>
- <child>
- <object class="GtkToggleButton" id="BTN_LIGHT_4">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHT_4|tooltip_text">Light source 4</property>
- <property name="image">IMG_LIGHT_4</property>
- <property name="always_show_image">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="BTN_LIGHT_4-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_3D_SceneIllumination|extended_tip|BTN_LIGHT_4">Click to enable or disable the uniform light source.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToggleButton" id="BTN_LIGHT_4">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHT_4|tooltip_text">Light source 4</property>
+ <property name="image">IMG_LIGHT_4</property>
+ <property name="always_show_image">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="BTN_LIGHT_4-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_3D_SceneIllumination|extended_tip|BTN_LIGHT_4">Click to enable or disable the uniform light source.</property>
</object>
- <packing>
- <property name="left_attach">3</property>
- <property name="top_attach">0</property>
- </packing>
</child>
- <child>
- <object class="GtkToggleButton" id="BTN_LIGHT_5">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHT_5|tooltip_text">Light source 5</property>
- <property name="image">IMG_LIGHT_5</property>
- <property name="always_show_image">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="BTN_LIGHT_5-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_3D_SceneIllumination|extended_tip|BTN_LIGHT_5">Click to enable or disable the uniform light source.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToggleButton" id="BTN_LIGHT_5">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHT_5|tooltip_text">Light source 5</property>
+ <property name="image">IMG_LIGHT_5</property>
+ <property name="always_show_image">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="BTN_LIGHT_5-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_3D_SceneIllumination|extended_tip|BTN_LIGHT_5">Click to enable or disable the uniform light source.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
</child>
- <child>
- <object class="GtkToggleButton" id="BTN_LIGHT_6">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHT_6|tooltip_text">Light source 6</property>
- <property name="image">IMG_LIGHT_6</property>
- <property name="always_show_image">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="BTN_LIGHT_6-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_3D_SceneIllumination|extended_tip|BTN_LIGHT_6">Click to enable or disable the uniform light source.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToggleButton" id="BTN_LIGHT_6">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHT_6|tooltip_text">Light source 6</property>
+ <property name="image">IMG_LIGHT_6</property>
+ <property name="always_show_image">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="BTN_LIGHT_6-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_3D_SceneIllumination|extended_tip|BTN_LIGHT_6">Click to enable or disable the uniform light source.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
</child>
- <child>
- <object class="GtkToggleButton" id="BTN_LIGHT_7">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHT_7|tooltip_text">Light source 7</property>
- <property name="image">IMG_LIGHT_7</property>
- <property name="always_show_image">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="BTN_LIGHT_7-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_3D_SceneIllumination|extended_tip|BTN_LIGHT_7">Click to enable or disable the uniform light source.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToggleButton" id="BTN_LIGHT_7">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHT_7|tooltip_text">Light source 7</property>
+ <property name="image">IMG_LIGHT_7</property>
+ <property name="always_show_image">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="BTN_LIGHT_7-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_3D_SceneIllumination|extended_tip|BTN_LIGHT_7">Click to enable or disable the uniform light source.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToggleButton" id="BTN_LIGHT_8">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHT_8|tooltip_text">Light source 8</property>
+ <property name="image">IMG_LIGHT_8</property>
+ <property name="always_show_image">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="BTN_LIGHT_8-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_3D_SceneIllumination|extended_tip|BTN_LIGHT_8">Click to enable or disable the uniform light source.</property>
</object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">1</property>
- </packing>
</child>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">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="GtkBox" id="box3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkMenuButton" id="LB_LIGHTSOURCE">
+ <property name="label" translatable="no"></property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
<child>
- <object class="GtkToggleButton" id="BTN_LIGHT_8">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHT_8|tooltip_text">Light source 8</property>
- <property name="image">IMG_LIGHT_8</property>
- <property name="always_show_image">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="BTN_LIGHT_8-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_3D_SceneIllumination|extended_tip|BTN_LIGHT_8">Click to enable or disable the uniform light source.</property>
- </object>
- </child>
+ <placeholder/>
+ </child>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="LB_LIGHTSOURCE-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_3D_SceneIllumination|extended_tip|LB_LIGHTSOURCE">Select a color for the selected light source.</property>
</object>
- <packing>
- <property name="left_attach">3</property>
- <property name="top_attach">1</property>
- </packing>
</child>
</object>
<packing>
@@ -248,51 +272,16 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box3">
+ <object class="GtkToggleButton" id="BTN_LIGHTSOURCE_COLOR">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkMenuButton" id="LB_LIGHTSOURCE">
- <property name="label" translatable="no"></property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child>
- <placeholder/>
- </child>
- <child internal-child="accessible">
- <object class="AtkObject" id="LB_LIGHTSOURCE-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_3D_SceneIllumination|extended_tip|LB_LIGHTSOURCE">Select a color for the selected light source.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkToggleButton" id="BTN_LIGHTSOURCE_COLOR">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHTSOURCE_COLOR|tooltip_text">Select a color using the color dialog</property>
- <property name="image">IMG_LIGHTSOURCE_COLOR</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="BTN_LIGHTSOURCE_COLOR-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_3D_SceneIllumination|extended_tip|BTN_LIGHTSOURCE_COLOR">Select a color using the color dialog.</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_LIGHTSOURCE_COLOR|tooltip_text">Select a color using the color dialog</property>
+ <property name="image">IMG_LIGHTSOURCE_COLOR</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="BTN_LIGHTSOURCE_COLOR-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_3D_SceneIllumination|extended_tip|BTN_LIGHTSOURCE_COLOR">Select a color using the color dialog.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
<packing>
@@ -302,6 +291,11 @@
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
</child>
@@ -332,59 +326,53 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkBox" id="box4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="spacing">12</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
- <object class="GtkBox" id="box4">
+ <object class="GtkMenuButton" id="LB_AMBIENTLIGHT">
+ <property name="label" translatable="no"></property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
<child>
- <object class="GtkMenuButton" id="LB_AMBIENTLIGHT">
- <property name="label" translatable="no"></property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child>
- <placeholder/>
- </child>
- <child internal-child="accessible">
- <object class="AtkObject" id="LB_AMBIENTLIGHT-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_3D_SceneIllumination|extended_tip|LB_AMBIENTLIGHT">Select a color for the ambient light.</property>
- </object>
- </child>
+ <placeholder/>
+ </child>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="LB_AMBIENTLIGHT-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_3D_SceneIllumination|extended_tip|LB_AMBIENTLIGHT">Select a color for the ambient light.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
- <child>
- <object class="GtkToggleButton" id="BTN_AMBIENT_COLOR">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_AMBIENT_COLOR|tooltip_text">Select a color using the color dialog</property>
- <property name="image">IMG_AMBIENT_COLOR</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="BTN_AMBIENT_COLOR-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_3D_SceneIllumination|extended_tip|BTN_AMBIENT_COLOR">Select a color using the color dialog.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToggleButton" id="BTN_AMBIENT_COLOR">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text" translatable="yes" context="tp_3D_SceneIllumination|BTN_AMBIENT_COLOR|tooltip_text">Select a color using the color dialog</property>
+ <property name="image">IMG_AMBIENT_COLOR</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="BTN_AMBIENT_COLOR-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_3D_SceneIllumination|extended_tip|BTN_AMBIENT_COLOR">Select a color using the color dialog.</property>
</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>
</child>
diff --git a/chart2/uiconfig/ui/tp_AxisPositions.ui b/chart2/uiconfig/ui/tp_AxisPositions.ui
index 73f44d5e065c..a2ad7664ecb6 100644
--- a/chart2/uiconfig/ui/tp_AxisPositions.ui
+++ b/chart2/uiconfig/ui/tp_AxisPositions.ui
@@ -25,123 +25,117 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkBox" id="boxAXIS_LINE">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</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="boxAXIS_LINE">
+ <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>
+ <property name="spacing">12</property>
<child>
- <object class="GtkBox" id="box3">
+ <object class="GtkLabel" id="FT_CROSSES_OTHER_AXIS_AT">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="FT_CROSSES_OTHER_AXIS_AT">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_AxisPositions|FT_CROSSES_OTHER_AXIS_AT">_Cross other axis at</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">LB_CROSSES_OTHER_AXIS_AT</property>
- <property name="xalign">0</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="LB_CROSSES_OTHER_AXIS_AT">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <items>
- <item translatable="yes" context="tp_AxisPositions|LB_CROSSES_OTHER_AXIS_AT">Start</item>
- <item translatable="yes" context="tp_AxisPositions|LB_CROSSES_OTHER_AXIS_AT">End</item>
- <item translatable="yes" context="tp_AxisPositions|LB_CROSSES_OTHER_AXIS_AT">Value</item>
- <item translatable="yes" context="tp_AxisPositions|LB_CROSSES_OTHER_AXIS_AT">Category</item>
- </items>
- <child internal-child="accessible">
- <object class="AtkObject" id="LB_CROSSES_OTHER_AXIS_AT-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_AxisPositions|extended_tip|LB_CROSSES_OTHER_AXIS_AT">Select where to cross the other axis: at start, at end, at a specified value, or at a category.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="EDT_CROSSES_OTHER_AXIS_AT">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
- <property name="adjustment">adjustment1</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="EDT_CROSSES_OTHER_AXIS_AT-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_AxisPositions|extended_tip|EDT_CROSSES_OTHER_AXIS_AT">Enter the value where the axis line should cross the other axis.</property>
- </object>
- </child>
+ <property name="label" translatable="yes" context="tp_AxisPositions|FT_CROSSES_OTHER_AXIS_AT">_Cross other axis at</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">LB_CROSSES_OTHER_AXIS_AT</property>
+ <property name="xalign">0</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="LB_CROSSES_OTHER_AXIS_AT">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <items>
+ <item translatable="yes" context="tp_AxisPositions|LB_CROSSES_OTHER_AXIS_AT">Start</item>
+ <item translatable="yes" context="tp_AxisPositions|LB_CROSSES_OTHER_AXIS_AT">End</item>
+ <item translatable="yes" context="tp_AxisPositions|LB_CROSSES_OTHER_AXIS_AT">Value</item>
+ <item translatable="yes" context="tp_AxisPositions|LB_CROSSES_OTHER_AXIS_AT">Category</item>
+ </items>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="LB_CROSSES_OTHER_AXIS_AT-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_AxisPositions|extended_tip|LB_CROSSES_OTHER_AXIS_AT">Select where to cross the other axis: at start, at end, at a specified value, or at a category.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
</child>
- <child>
- <object class="GtkComboBoxText" id="EDT_CROSSES_OTHER_AXIS_AT_CATEGORY">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_entry">True</property>
- <child internal-child="entry">
- <object class="GtkEntry" id="combobox-entry">
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
- </object>
- </child>
- <child internal-child="accessible">
- <object class="AtkObject" id="EDT_CROSSES_OTHER_AXIS_AT_CATEGORY-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_AxisPositions|extended_tip|EDT_CROSSES_OTHER_AXIS_AT_CATEGORY">Select the category where the axis line should cross the other axis.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="EDT_CROSSES_OTHER_AXIS_AT">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
+ <property name="adjustment">adjustment1</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="EDT_CROSSES_OTHER_AXIS_AT-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_AxisPositions|extended_tip|EDT_CROSSES_OTHER_AXIS_AT">Enter the value where the axis line should cross the other axis.</property>
</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">0</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="CB_AXIS_BETWEEN_CATEGORIES">
- <property name="label" translatable="yes" context="tp_AxisPositions|CB_AXIS_BETWEEN_CATEGORIES">Axis _between categories</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
+ <object class="GtkComboBoxText" id="EDT_CROSSES_OTHER_AXIS_AT_CATEGORY">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_entry">True</property>
+ <child internal-child="entry">
+ <object class="GtkEntry" id="combobox-entry">
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
+ </object>
+ </child>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="EDT_CROSSES_OTHER_AXIS_AT_CATEGORY-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_AxisPositions|extended_tip|EDT_CROSSES_OTHER_AXIS_AT_CATEGORY">Select the category where the axis line should cross the other axis.</property>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">3</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="CB_AXIS_BETWEEN_CATEGORIES">
+ <property name="label" translatable="yes" context="tp_AxisPositions|CB_AXIS_BETWEEN_CATEGORIES">Axis _between categories</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</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>
</object>
</child>
@@ -170,59 +164,53 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment6">
+ <!-- n-columns=1 n-rows=1 -->
+ <object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="row_spacing">6</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid3">
+ <object class="GtkRadioButton" id="RB_ON">
+ <property name="label" translatable="yes" context="tp_AxisPositions|RB_ON">_On tick marks</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <child>
- <object class="GtkRadioButton" id="RB_ON">
- <property name="label" translatable="yes" context="tp_AxisPositions|RB_ON">_On tick marks</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="RB_ON-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_AxisPositions|extended_tip|RB_ON">Specifies that the axis is positioned on the first/last tickmarks. This makes the data points visual representation begin/end at the value axis.</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="RB_ON-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_AxisPositions|extended_tip|RB_ON">Specifies that the axis is positioned on the first/last tickmarks. This makes the data points visual representation begin/end at the value axis.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
</child>
- <child>
- <object class="GtkRadioButton" id="RB_BETWEEN">
- <property name="label" translatable="yes" context="tp_AxisPositions|RB_BETWEEN">_Between tick marks</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">RB_ON</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="RB_BETWEEN-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_AxisPositions|extended_tip|RB_BETWEEN">Specifies that the axis is positioned between the tickmarks. This makes the data points visual representation begin/end at a distance from the value axis.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="RB_BETWEEN">
+ <property name="label" translatable="yes" context="tp_AxisPositions|RB_BETWEEN">_Between tick marks</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">RB_ON</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="RB_BETWEEN-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_AxisPositions|extended_tip|RB_BETWEEN">Specifies that the axis is positioned between the tickmarks. This makes the data points visual representation begin/end at a distance from the value axis.</property>
</object>
- <packing>
- <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">1</property>
+ </packing>
</child>
</object>
</child>
@@ -251,59 +239,26 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkBox" id="box4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</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="box4">
+ <object class="GtkBox" id="box5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkBox" id="box5">
+ <object class="GtkLabel" id="FT_PLACE_LABELS">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="FT_PLACE_LABELS">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_AxisPositions|FT_PLACE_LABELS">_Place labels</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">LB_PLACE_LABELS</property>
- <property name="xalign">0</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="LB_PLACE_LABELS">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <items>
- <item translatable="yes" context="tp_AxisPositions|LB_PLACE_LABELS">Near axis</item>
- <item translatable="yes" context="tp_AxisPositions|LB_PLACE_LABELS">Near axis (other side)</item>
- <item translatable="yes" context="tp_AxisPositions|LB_PLACE_LABELS">Outside start</item>
- <item translatable="yes" context="tp_AxisPositions|LB_PLACE_LABELS">Outside end</item>
- </items>
- <child internal-child="accessible">
- <object class="AtkObject" id="LB_PLACE_LABELS-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_AxisPositions|extended_tip|LB_PLACE_LABELS">Select where to place the labels: near axis, near axis (other side), outside start, or outside end.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="label" translatable="yes" context="tp_AxisPositions|FT_PLACE_LABELS">_Place labels</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">LB_PLACE_LABELS</property>
+ <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
@@ -312,35 +267,19 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box6">
+ <object class="GtkComboBoxText" id="LB_PLACE_LABELS">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="FT_AXIS_LABEL_DISTANCE">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_AxisPositions|FT_AXIS_LABEL_DISTANCE">_Distance</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">EDT_AXIS_LABEL_DISTANCE</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="EDT_AXIS_LABEL_DISTANCE">
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
- <property name="adjustment">adjustment2</property>
+ <items>
+ <item translatable="yes" context="tp_AxisPositions|LB_PLACE_LABELS">Near axis</item>
+ <item translatable="yes" context="tp_AxisPositions|LB_PLACE_LABELS">Near axis (other side)</item>
+ <item translatable="yes" context="tp_AxisPositions|LB_PLACE_LABELS">Outside start</item>
+ <item translatable="yes" context="tp_AxisPositions|LB_PLACE_LABELS">Outside end</item>
+ </items>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="LB_PLACE_LABELS-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_AxisPositions|extended_tip|LB_PLACE_LABELS">Select where to place the labels: near axis, near axis (other side), outside start, or outside end.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
<packing>
@@ -350,6 +289,49 @@
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="FT_AXIS_LABEL_DISTANCE">
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="tp_AxisPositions|FT_AXIS_LABEL_DISTANCE">_Distance</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">EDT_AXIS_LABEL_DISTANCE</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="EDT_AXIS_LABEL_DISTANCE">
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
+ <property name="adjustment">adjustment2</property>
+ </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>
</child>
@@ -378,195 +360,184 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment3">
+ <object class="GtkBox" id="box8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</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="box8">
+ <!-- n-columns=1 n-rows=1 -->
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid1">
+ <object class="GtkLabel" id="FT_MAJOR">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkLabel" id="FT_MAJOR">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_AxisPositions|FT_MAJOR">Major:</property>
- <property name="xalign">0</property>
- <accessibility>
- <relation type="label-for" target="CB_TICKS_INNER"/>
- <relation type="label-for" target="CB_TICKS_OUTER"/>
- </accessibility>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="FT_MINOR">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_AxisPositions|FT_MINOR">Minor:</property>
- <property name="xalign">0</property>
- <accessibility>
- <relation type="label-for" target="CB_MINOR_INNER"/>
- <relation type="label-for" target="CB_MINOR_OUTER"/>
- </accessibility>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="CB_TICKS_INNER">
- <property name="label" translatable="yes" context="tp_AxisPositions|CB_TICKS_INNER">_Inner</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <accessibility>
- <relation type="labelled-by" target="FT_MAJOR"/>
- </accessibility>
- <child internal-child="accessible">
- <object class="AtkObject" id="CB_TICKS_INNER-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_AxisPositions|extended_tip|CB_TICKS_INNER">Specifies that marks are placed on the inner side of the axis.</property>
- </object>
- </child>
+ <property name="label" translatable="yes" context="tp_AxisPositions|FT_MAJOR">Major:</property>
+ <property name="xalign">0</property>
+ <accessibility>
+ <relation type="label-for" target="CB_TICKS_INNER"/>
+ <relation type="label-for" target="CB_TICKS_OUTER"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="FT_MINOR">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="tp_AxisPositions|FT_MINOR">Minor:</property>
+ <property name="xalign">0</property>
+ <accessibility>
+ <relation type="label-for" target="CB_MINOR_INNER"/>
+ <relation type="label-for" target="CB_MINOR_OUTER"/>
+ </accessibility>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="CB_TICKS_INNER">
+ <property name="label" translatable="yes" context="tp_AxisPositions|CB_TICKS_INNER">_Inner</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <accessibility>
+ <relation type="labelled-by" target="FT_MAJOR"/>
+ </accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="CB_TICKS_INNER-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_AxisPositions|extended_tip|CB_TICKS_INNER">Specifies that marks are placed on the inner side of the axis.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
</child>
- <child>
- <object class="GtkCheckButton" id="CB_TICKS_OUTER">
- <property name="label" translatable="yes" context="tp_AxisPositions|CB_TICKS_OUTER">_Outer</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <accessibility>
- <relation type="labelled-by" target="FT_MAJOR"/>
- </accessibility>
- <child internal-child="accessible">
- <object class="AtkObject" id="CB_TICKS_OUTER-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_AxisPositions|extended_tip|CB_TICKS_OUTER">Specifies that marks are placed on the outer side of the axis.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="CB_TICKS_OUTER">
+ <property name="label" translatable="yes" context="tp_AxisPositions|CB_TICKS_OUTER">_Outer</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <accessibility>
+ <relation type="labelled-by" target="FT_MAJOR"/>
+ </accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="CB_TICKS_OUTER-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_AxisPositions|extended_tip|CB_TICKS_OUTER">Specifies that marks are placed on the outer side of the axis.</property>
</object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
- </packing>
</child>
- <child>
- <object class="GtkCheckButton" id="CB_MINOR_INNER">
- <property name="label" translatable="yes" context="tp_AxisPositions|CB_MINOR_INNER">I_nner</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <accessibility>
- <relation type="labelled-by" target="FT_MINOR"/>
- </accessibility>
- <child internal-child="accessible">
- <object class="AtkObject" id="CB_MINOR_INNER-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_AxisPositions|extended_tip|CB_MINOR_INNER">Specifies that minor interval marks are placed on the inner side of the axis.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="CB_MINOR_INNER">
+ <property name="label" translatable="yes" context="tp_AxisPositions|CB_MINOR_INNER">I_nner</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <accessibility>
+ <relation type="labelled-by" target="FT_MINOR"/>
+ </accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="CB_MINOR_INNER-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_AxisPositions|extended_tip|CB_MINOR_INNER">Specifies that minor interval marks are placed on the inner side of the axis.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
</child>
- <child>
- <object class="GtkCheckButton" id="CB_MINOR_OUTER">
- <property name="label" translatable="yes" context="tp_AxisPositions|CB_MINOR_OUTER">O_uter</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <accessibility>
- <relation type="labelled-by" target="FT_MINOR"/>
- </accessibility>
- <child internal-child="accessible">
- <object class="AtkObject" id="CB_MINOR_OUTER-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_AxisPositions|extended_tip|CB_MINOR_OUTER">Specifies that minor interval marks are placed on the outer side of the axis.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="CB_MINOR_OUTER">
+ <property name="label" translatable="yes" context="tp_AxisPositions|CB_MINOR_OUTER">O_uter</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <accessibility>
+ <relation type="labelled-by" target="FT_MINOR"/>
+ </accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="CB_MINOR_OUTER-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_AxisPositions|extended_tip|CB_MINOR_OUTER">Specifies that minor interval marks are placed on the outer side of the axis.</property>
</object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">1</property>
- </packing>
</child>
</object>
<packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">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="GtkBox" id="boxPLACE_TICKS">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="FT_PLACE_TICKS">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="tp_AxisPositions|FT_PLACE_TICKS">Place _marks</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">LB_PLACE_TICKS</property>
+ <property name="xalign">0</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="boxPLACE_TICKS">
+ <object class="GtkComboBoxText" id="LB_PLACE_TICKS">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="FT_PLACE_TICKS">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_AxisPositions|FT_PLACE_TICKS">Place _marks</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">LB_PLACE_TICKS</property>
- <property name="xalign">0</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="LB_PLACE_TICKS">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <items>
- <item translatable="yes" context="tp_AxisPositions|LB_PLACE_TICKS">At labels</item>
- <item translatable="yes" context="tp_AxisPositions|LB_PLACE_TICKS">At axis</item>
- <item translatable="yes" context="tp_AxisPositions|LB_PLACE_TICKS">At axis and labels</item>
- </items>
- <child internal-child="accessible">
- <object class="AtkObject" id="LB_PLACE_TICKS-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_AxisPositions|extended_tip|LB_PLACE_TICKS">Select where to place the marks: at labels, at axis, or at axis and labels.</property>
- </object>
- </child>
+ <items>
+ <item translatable="yes" context="tp_AxisPositions|LB_PLACE_TICKS">At labels</item>
+ <item translatable="yes" context="tp_AxisPositions|LB_PLACE_TICKS">At axis</item>
+ <item translatable="yes" context="tp_AxisPositions|LB_PLACE_TICKS">At axis and labels</item>
+ </items>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="LB_PLACE_TICKS-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_AxisPositions|extended_tip|LB_PLACE_TICKS">Select where to place the marks: at labels, at axis, or at axis and labels.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
<packing>
@@ -576,6 +547,11 @@
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
</child>
@@ -603,77 +579,71 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment5">
+ <!-- n-columns=1 n-rows=1 -->
+ <object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="row_spacing">12</property>
+ <property name="column_spacing">6</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid2">
+ <object class="GtkCheckButton" id="CB_MAJOR_GRID">
+ <property name="label" translatable="yes" context="tp_AxisPositions|CB_MAJOR_GRID">Show major _grid</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">12</property>
- <property name="column_spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="CB_MAJOR_GRID">
- <property name="label" translatable="yes" context="tp_AxisPositions|CB_MAJOR_GRID">Show major _grid</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="relief">half</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</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="CB_MINOR_GRID">
- <property name="label" translatable="yes" context="tp_AxisPositions|CB_MINOR_GRID">_Show minor grid</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="xalign">0</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="GtkButton" id="PB_MAJOR_GRID">
- <property name="label" translatable="yes" context="tp_AxisPositions|PB_MAJOR_GRID">Mo_re...</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="PB_MINOR_GRID">
- <property name="label" translatable="yes" context="tp_AxisPositions|PB_MINOR_GRID">Mor_e...</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
- <property name="xalign">0.49000000953674316</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="relief">half</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</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="CB_MINOR_GRID">
+ <property name="label" translatable="yes" context="tp_AxisPositions|CB_MINOR_GRID">_Show minor grid</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="xalign">0</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="GtkButton" id="PB_MAJOR_GRID">
+ <property name="label" translatable="yes" context="tp_AxisPositions|PB_MAJOR_GRID">Mo_re...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="PB_MINOR_GRID">
+ <property name="label" translatable="yes" context="tp_AxisPositions|PB_MINOR_GRID">Mor_e...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.49000000953674316</property>
</object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
</child>
</object>
</child>
diff --git a/chart2/uiconfig/ui/tp_ChartType.ui b/chart2/uiconfig/ui/tp_ChartType.ui
index 5a4fb82c5294..653eb608f7c4 100644
--- a/chart2/uiconfig/ui/tp_ChartType.ui
+++ b/chart2/uiconfig/ui/tp_ChartType.ui
@@ -257,72 +257,66 @@
</packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <!-- n-columns=1 n-rows=1 -->
+ <object class="GtkGrid" id="grid6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">12</property>
+ <property name="row_spacing">3</property>
+ <property name="margin-start">12</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid6">
- <property name="visible">True</property>
- <property name="can_focus">False</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="xalign">0</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>
- <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="xalign">0</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="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="xalign">0</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>
- <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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">ontop</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </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="xalign">0</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>
- <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>
+ <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="xalign">0</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>
diff --git a/chart2/uiconfig/ui/tp_DataLabel.ui b/chart2/uiconfig/ui/tp_DataLabel.ui
index a0e1963bef2b..f6c2e150d9c4 100644
--- a/chart2/uiconfig/ui/tp_DataLabel.ui
+++ b/chart2/uiconfig/ui/tp_DataLabel.ui
@@ -20,290 +20,284 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <!-- n-columns=1 n-rows=1 -->
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <property name="row_homogeneous">True</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid1">
+ <object class="GtkCheckButton" id="CB_VALUE_AS_NUMBER">
+ <property name="label" translatable="yes" context="tp_DataLabel|CB_VALUE_AS_NUMBER">Show value as _number</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <property name="row_homogeneous">True</property>
- <child>
- <object class="GtkCheckButton" id="CB_VALUE_AS_NUMBER">
- <property name="label" translatable="yes" context="tp_DataLabel|CB_VALUE_AS_NUMBER">Show value as _number</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="CB_VALUE_AS_NUMBER-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_DataLabel|extended_tip|CB_VALUE_AS_NUMBER">Displays the absolute values of the data points.</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="CB_VALUE_AS_NUMBER-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_DataLabel|extended_tip|CB_VALUE_AS_NUMBER">Displays the absolute values of the data points.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
</child>
- <child>
- <object class="GtkCheckButton" id="CB_VALUE_AS_PERCENTAGE">
- <property name="label" translatable="yes" context="tp_DataLabel|CB_VALUE_AS_PERCENTAGE">Show value as _percentage</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="CB_VALUE_AS_PERCENTAGE-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_DataLabel|extended_tip|CB_VALUE_AS_PERCENTAGE">Displays the percentage of the data points in each column.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="CB_VALUE_AS_PERCENTAGE">
+ <property name="label" translatable="yes" context="tp_DataLabel|CB_VALUE_AS_PERCENTAGE">Show value as _percentage</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="CB_VALUE_AS_PERCENTAGE-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_DataLabel|extended_tip|CB_VALUE_AS_PERCENTAGE">Displays the percentage of the data points in each column.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
</child>
- <child>
- <object class="GtkCheckButton" id="CB_CATEGORY">
- <property name="label" translatable="yes" context="tp_DataLabel|CB_CATEGORY">Show _category</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="CB_CATEGORY-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_DataLabel|extended_tip|CB_CATEGORY">Shows the data point text labels.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="CB_CATEGORY">
+ <property name="label" translatable="yes" context="tp_DataLabel|CB_CATEGORY">Show _category</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="CB_CATEGORY-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_DataLabel|extended_tip|CB_CATEGORY">Shows the data point text labels.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
</child>
- <child>
- <object class="GtkCheckButton" id="CB_SYMBOL">
- <property name="label" translatable="yes" context="tp_DataLabel|CB_SYMBOL">Show _legend key</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="CB_SYMBOL-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_DataLabel|extended_tip|CB_SYMBOL">Displays the legend icons next to each data point label.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="CB_SYMBOL">
+ <property name="label" translatable="yes" context="tp_DataLabel|CB_SYMBOL">Show _legend key</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="CB_SYMBOL-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_DataLabel|extended_tip|CB_SYMBOL">Displays the legend icons next to each data point label.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- </packing>
</child>
- <child>
- <object class="GtkCheckButton" id="CB_WRAP_TEXT">
- <property name="label" translatable="yes" context="tp_DataLabel|CB_WRAP_TEXT">Auto text _wrap</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="xalign">0</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="CB_WRAP_TEXT">
+ <property name="label" translatable="yes" context="tp_DataLabel|CB_WRAP_TEXT">Auto text _wrap</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="xalign">0</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="GtkButton" id="PB_NUMBERFORMAT">
+ <property name="label" translatable="yes" context="tp_DataLabel|PB_NUMBERFORMAT">Number _format...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="valign">center</property>
+ <property name="use_underline">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="PB_NUMBERFORMAT-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_DataLabel|extended_tip|PB_NUMBERFORMAT">Opens a dialog to select the number format.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="PB_PERCENT_NUMBERFORMAT">
+ <property name="label" translatable="yes" context="tp_DataLabel|PB_PERCENT_NUMBERFORMAT">Percentage f_ormat...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="valign">center</property>
+ <property name="use_underline">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="PB_PERCENT_NUMBERFORMAT-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_DataLabel|extended_tip|PB_PERCENT_NUMBERFORMAT">Opens a dialog to select the percentage format.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
- </packing>
</child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="CT_LABEL_DIAL">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="label" translatable="yes" context="tp_DataLabel|CT_LABEL_DIAL">ABCD</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="boxSEPARATOR">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkButton" id="PB_NUMBERFORMAT">
- <property name="label" translatable="yes" context="tp_DataLabel|PB_NUMBERFORMAT">Number _format...</property>
+ <object class="GtkLabel" id="FT_TEXT_SEPARATOR">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="valign">center</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="tp_DataLabel|FT_TEXT_SEPARATOR">_Separator</property>
<property name="use_underline">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="PB_NUMBERFORMAT-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_DataLabel|extended_tip|PB_NUMBERFORMAT">Opens a dialog to select the number format.</property>
- </object>
- </child>
+ <property name="mnemonic_widget">LB_TEXT_SEPARATOR</property>
+ <property name="xalign">0</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">0</property>
</packing>
</child>
<child>
- <object class="GtkButton" id="PB_PERCENT_NUMBERFORMAT">
- <property name="label" translatable="yes" context="tp_DataLabel|PB_PERCENT_NUMBERFORMAT">Percentage f_ormat...</property>
+ <object class="GtkComboBoxText" id="LB_TEXT_SEPARATOR">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can_focus">False</property>
<property name="valign">center</property>
- <property name="use_underline">True</property>
+ <items>
+ <item id="0" translatable="yes" context="tp_DataLabel|liststoreSEPARATOR">Space</item>
+ <item id="1" translatable="yes" context="tp_DataLabel|liststoreSEPARATOR">Comma</item>
+ <item id="2" translatable="yes" context="tp_DataLabel|liststoreSEPARATOR">Semicolon</item>
+ <item id="3" translatable="yes" context="tp_DataLabel|liststoreSEPARATOR">New line</item>
+ <item id="4" translatable="yes" context="tp_DataLabel|liststoreSEPARATOR">Period</item>
+ </items>
<child internal-child="accessible">
- <object class="AtkObject" id="PB_PERCENT_NUMBERFORMAT-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_DataLabel|extended_tip|PB_PERCENT_NUMBERFORMAT">Opens a dialog to select the percentage format.</property>
+ <object class="AtkObject" id="LB_TEXT_SEPARATOR-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_DataLabel|extended_tip|LB_TEXT_SEPARATOR">Selects the separator between multiple text strings for the same object.</property>
</object>
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="CT_LABEL_DIAL">
- <property name="can_focus">False</property>
- <property name="no_show_all">True</property>
- <property name="label" translatable="yes" context="tp_DataLabel|CT_LABEL_DIAL">ABCD</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="boxPLACEMENT">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkBox" id="boxSEPARATOR">
+ <object class="GtkLabel" id="FT_LABEL_PLACEMENT">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="FT_TEXT_SEPARATOR">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_DataLabel|FT_TEXT_SEPARATOR">_Separator</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">LB_TEXT_SEPARATOR</property>
- <property name="xalign">0</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="LB_TEXT_SEPARATOR">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <items>
- <item id="0" translatable="yes" context="tp_DataLabel|liststoreSEPARATOR">Space</item>
- <item id="1" translatable="yes" context="tp_DataLabel|liststoreSEPARATOR">Comma</item>
- <item id="2" translatable="yes" context="tp_DataLabel|liststoreSEPARATOR">Semicolon</item>
- <item id="3" translatable="yes" context="tp_DataLabel|liststoreSEPARATOR">New line</item>
- <item id="4" translatable="yes" context="tp_DataLabel|liststoreSEPARATOR">Period</item>
- </items>
- <child internal-child="accessible">
- <object class="AtkObject" id="LB_TEXT_SEPARATOR-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_DataLabel|extended_tip|LB_TEXT_SEPARATOR">Selects the separator between multiple text strings for the same object.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="label" translatable="yes" context="tp_DataLabel|FT_LABEL_PLACEMENT">Place_ment</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">LB_LABEL_PLACEMENT</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</property>
- <property name="width">2</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="boxPLACEMENT">
+ <object class="GtkComboBoxText" id="LB_LABEL_PLACEMENT">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="FT_LABEL_PLACEMENT">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_DataLabel|FT_LABEL_PLACEMENT">Place_ment</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">LB_LABEL_PLACEMENT</property>
- <property name="xalign">0</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="LB_LABEL_PLACEMENT">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <items>
- <item id="0" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Best fit</item>
- <item id="1" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Center</item>
- <item id="2" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Above</item>
- <item id="3" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Top left</item>
- <item id="4" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Left</item>
- <item id="5" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Bottom left</item>
- <item id="6" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Below</item>
- <item id="7" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Bottom right</item>
- <item id="8" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Right</item>
- <item id="9" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Top right</item>
- <item id="10" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Inside</item>
- <item id="11" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Outside</item>
- <item id="12" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Near origin</item>
- </items>
- <child internal-child="accessible">
- <object class="AtkObject" id="LB_LABEL_PLACEMENT-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_DataLabel|extended_tip|LB_LABEL_PLACEMENT">Selects the placement of data labels relative to the objects.</property>
- </object>
- </child>
+ <property name="valign">center</property>
+ <items>
+ <item id="0" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Best fit</item>
+ <item id="1" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Center</item>
+ <item id="2" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Above</item>
+ <item id="3" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Top left</item>
+ <item id="4" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Left</item>
+ <item id="5" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Bottom left</item>
+ <item id="6" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Below</item>
+ <item id="7" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Bottom right</item>
+ <item id="8" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Right</item>
+ <item id="9" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Top right</item>
+ <item id="10" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Inside</item>
+ <item id="11" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Outside</item>
+ <item id="12" translatable="yes" context="tp_DataLabel|liststorePLACEMENT">Near origin</item>
+ </items>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="LB_LABEL_PLACEMENT-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_DataLabel|extended_tip|LB_LABEL_PLACEMENT">Selects the placement of data labels relative to the objects.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">6</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_DataLabel|STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE">Number Format for Percentage Value</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE">
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="tp_DataLabel|STR_DLG_NUMBERFORMAT_FOR_PERCENTAGE_VALUE">Number Format for Percentage Value</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
</child>
</object>
</child>
@@ -332,114 +326,103 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkBox" id="box5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</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="box5">
+ <object class="GtkBox" id="boxORIENTATION">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkBox" id="boxORIENTATION">
+ <object class="GtkDrawingArea" id="CT_DIAL">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkDrawingArea" id="CT_DIAL">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="CT_DIAL-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_DataLabel|extended_tip|CT_DIAL">Click in the dial to set the text orientation for the data labels.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="NF_LABEL_DEGREES">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="valign">center</property>
- <property name="activates_default">True</property>
- <property name="adjustment">adjustmentDEGREE</property>
- <property name="wrap">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="NF_LABEL_DEGREES-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_DataLabel|extended_tip|NF_LABEL_DEGREES">Enter the counterclockwise rotation angle for the data labels.</property>
- </object>
- </child>
+ <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="CT_DIAL-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_DataLabel|extended_tip|CT_DIAL">Click in the dial to set the text orientation for the data labels.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
- <child>
- <object class="GtkLabel" id="FT_LABEL_DEGREES">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_DataLabel|FT_LABEL_DEGREES">_Degrees</property>
- <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="NF_LABEL_DEGREES">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="valign">center</property>
+ <property name="activates_default">True</property>
+ <property name="adjustment">adjustmentDEGREE</property>
+ <property name="wrap">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="NF_LABEL_DEGREES-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_DataLabel|extended_tip|NF_LABEL_DEGREES">Enter the counterclockwise rotation angle for the data labels.</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">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="FT_LABEL_DEGREES">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="tp_DataLabel|FT_LABEL_DEGREES">_Degrees</property>
+ <property name="use_underline">True</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">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="boxTXT_DIRECTION">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="FT_LABEL_TEXTDIR">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="tp_DataLabel|FT_LABEL_TEXTDIR">Te_xt direction</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">LB_LABEL_TEXTDIR</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="boxTXT_DIRECTION">
+ <object class="GtkComboBoxText" id="LB_LABEL_TEXTDIR">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="FT_LABEL_TEXTDIR">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_DataLabel|FT_LABEL_TEXTDIR">Te_xt direction</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">LB_LABEL_TEXTDIR</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="LB_LABEL_TEXTDIR">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="no_show_all">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="LB_LABEL_TEXTDIR-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_DataLabel|extended_tip|LB_LABEL_TEXTDIR">Specify the text direction for a paragraph that uses complex text layout (CTL). This feature is only available if complex text layout support is enabled.</property>
- </object>
- </child>
+ <property name="no_show_all">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="LB_LABEL_TEXTDIR-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_DataLabel|extended_tip|LB_LABEL_TEXTDIR">Specify the text direction for a paragraph that uses complex text layout (CTL). This feature is only available if complex text layout support is enabled.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
<packing>
@@ -449,6 +432,11 @@
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
</child>
@@ -477,38 +465,32 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment3">
+ <object class="GtkBox" id="box6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="orientation">vertical</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
- <object class="GtkBox" id="box6">
+ <object class="GtkCheckButton" id="CB_CUSTOM_LEADER_LINES">
+ <property name="label" translatable="yes" context="tp_DataLabel|CB_CUSTOM_LEADER_LINES">_Connect displaced data labels to data points</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkCheckButton" id="CB_CUSTOM_LEADER_LINES">
- <property name="label" translatable="yes" context="tp_DataLabel|CB_CUSTOM_LEADER_LINES">_Connect displaced data labels to data points</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="CB_CUSTOM_LEADER_LINES-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_DataLabel|extended_tip|CB_CUSTOM_LEADER_LINES">Draws a line connecting the data labels to the data points</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="CB_CUSTOM_LEADER_LINES-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_DataLabel|extended_tip|CB_CUSTOM_LEADER_LINES">Draws a line connecting the data labels to the data points</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
</child>
diff --git a/chart2/uiconfig/ui/tp_DataPointOption.ui b/chart2/uiconfig/ui/tp_DataPointOption.ui
index b9f4cb17c00d..f6999817852a 100644
--- a/chart2/uiconfig/ui/tp_DataPointOption.ui
+++ b/chart2/uiconfig/ui/tp_DataPointOption.ui
@@ -26,37 +26,31 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="orientation">vertical</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
- <object class="GtkBox">
+ <object class="GtkCheckButton" id="CB_LEGEND_ENTRY_HIDDEN">
+ <property name="label" translatable="yes" context="tp_DataPointOption|CB_LEGEND_ENTRY_HIDDEN">Hide legend entry</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkCheckButton" id="CB_LEGEND_ENTRY_HIDDEN">
- <property name="label" translatable="yes" context="tp_DataPointOption|CB_LEGEND_ENTRY_HIDDEN">Hide legend entry</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="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="CB_LEGEND_ENTRY_HIDDEN-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_DataPointOption|extended_tip|CB_LEGEND_ENTRY_HIDDEN">Do not show legend entry for the selected data series or data point.</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="CB_LEGEND_ENTRY_HIDDEN-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_DataPointOption|extended_tip|CB_LEGEND_ENTRY_HIDDEN">Do not show legend entry for the selected data series or data point.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
</child>
diff --git a/chart2/uiconfig/ui/tp_ErrorBars.ui b/chart2/uiconfig/ui/tp_ErrorBars.ui
index 66e0d068d855..49f4498a2df6 100644
--- a/chart2/uiconfig/ui/tp_ErrorBars.ui
+++ b/chart2/uiconfig/ui/tp_ErrorBars.ui
@@ -41,66 +41,89 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkBox" id="box3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</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">
+ <object class="GtkRadioButton" id="RB_NONE">
+ <property name="label" translatable="yes" context="tp_ErrorBars|RB_NONE">_None</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkRadioButton" id="RB_NONE">
- <property name="label" translatable="yes" context="tp_ErrorBars|RB_NONE">_None</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="valign">center</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="RB_NONE-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_ErrorBars|extended_tip|RB_NONE">Does not show any error bars.</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="valign">center</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="RB_NONE-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_ErrorBars|extended_tip|RB_NONE">Does not show any error bars.</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="RB_CONST">
- <property name="label" translatable="yes" context="tp_ErrorBars|RB_CONST">_Constant Value</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="valign">center</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">RB_NONE</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="RB_CONST-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_ErrorBars|extended_tip|RB_CONST">Displays constant values that you specify in the Parameters area.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="RB_CONST">
+ <property name="label" translatable="yes" context="tp_ErrorBars|RB_CONST">_Constant Value</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="valign">center</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">RB_NONE</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="RB_CONST-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_ErrorBars|extended_tip|RB_CONST">Displays constant values that you specify in the Parameters area.</property>
</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>
+ <child>
+ <object class="GtkRadioButton" id="RB_PERCENT">
+ <property name="label" translatable="yes" context="tp_ErrorBars|RB_PERCENT">_Percentage</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="valign">center</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">RB_NONE</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="RB_PERCENT-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_ErrorBars|extended_tip|RB_PERCENT">Displays a percentage. The display refers to the corresponding data point. Set the percentage in the Parameters area.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkRadioButton" id="RB_PERCENT">
- <property name="label" translatable="yes" context="tp_ErrorBars|RB_PERCENT">_Percentage</property>
+ <object class="GtkRadioButton" id="RB_FUNCTION">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -110,97 +133,68 @@
<property name="draw_indicator">True</property>
<property name="group">RB_NONE</property>
<child internal-child="accessible">
- <object class="AtkObject" id="RB_PERCENT-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_ErrorBars|extended_tip|RB_PERCENT">Displays a percentage. The display refers to the corresponding data point. Set the percentage in the Parameters area.</property>
+ <object class="AtkObject" id="RB_FUNCTION-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_ErrorBars|extended_tip|RB_FUNCTION">Select a function to calculate the error bars.</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="box4">
+ <object class="GtkComboBoxText" id="LB_FUNCTION">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkRadioButton" id="RB_FUNCTION">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="halign">start</property>
- <property name="valign">center</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">RB_NONE</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="RB_FUNCTION-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_ErrorBars|extended_tip|RB_FUNCTION">Select a function to calculate the error bars.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="LB_FUNCTION">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <items>
- <item id="0" translatable="yes" context="tp_ErrorBars|liststoreFUNCTION">Standard Error</item>
- <item id="1" translatable="yes" context="tp_ErrorBars|liststoreFUNCTION">Standard Deviation</item>
- <item id="2" translatable="yes" context="tp_ErrorBars|liststoreFUNCTION">Variance</item>
- <item id="3" translatable="yes" context="tp_ErrorBars|liststoreFUNCTION">Error Margin</item>
- </items>
- <child internal-child="accessible">
- <object class="AtkObject" id="LB_FUNCTION-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_ErrorBars|extended_tip|LB_FUNCTION">Select a function to calculate the error bars.</property>
- </object>
- </child>
+ <items>
+ <item id="0" translatable="yes" context="tp_ErrorBars|liststoreFUNCTION">Standard Error</item>
+ <item id="1" translatable="yes" context="tp_ErrorBars|liststoreFUNCTION">Standard Deviation</item>
+ <item id="2" translatable="yes" context="tp_ErrorBars|liststoreFUNCTION">Variance</item>
+ <item id="3" translatable="yes" context="tp_ErrorBars|liststoreFUNCTION">Error Margin</item>
+ </items>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="LB_FUNCTION-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_ErrorBars|extended_tip|LB_FUNCTION">Select a function to calculate the error bars.</property>
</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">3</property>
+ <property name="position">1</property>
</packing>
</child>
- <child>
- <object class="GtkRadioButton" id="RB_RANGE">
- <property name="label" translatable="yes" context="tp_ErrorBars|RB_RANGE">Cell _Range</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="valign">center</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">RB_NONE</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="RB_RANGE-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_ErrorBars|extended_tip|RB_RANGE">Click Cell Range and then specify a cell range from which to take the positive and negative error bar values.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="RB_RANGE">
+ <property name="label" translatable="yes" context="tp_ErrorBars|RB_RANGE">Cell _Range</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="valign">center</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">RB_NONE</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="RB_RANGE-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_ErrorBars|extended_tip|RB_RANGE">Click Cell Range and then specify a cell range from which to take the positive and negative error bar values.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">4</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
</child>
</object>
</child>
@@ -228,119 +222,113 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <!-- n-columns=1 n-rows=1 -->
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="halign">start</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid1">
+ <object class="GtkRadioButton" id="RB_BOTH">
+ <property name="label" translatable="yes" context="tp_ErrorBars|RB_BOTH">Positive _and Negative</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="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkRadioButton" id="RB_BOTH">
- <property name="label" translatable="yes" context="tp_ErrorBars|RB_BOTH">Positive _and Negative</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="valign">center</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="RB_BOTH-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_ErrorBars|extended_tip|RB_BOTH">Shows positive and negative error bars.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="RB_POSITIVE">
- <property name="label" translatable="yes" context="tp_ErrorBars|RB_POSITIVE">Pos_itive</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="valign">center</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">RB_BOTH</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="RB_POSITIVE-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_ErrorBars|extended_tip|RB_POSITIVE">Shows only positive error bars.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="RB_NEGATIVE">
- <property name="label" translatable="yes" context="tp_ErrorBars|RB_NEGATIVE">Ne_gative</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="valign">center</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">RB_BOTH</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="RB_NEGATIVE-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_ErrorBars|extended_tip|RB_NEGATIVE">Shows only negative error bars.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage" id="FI_BOTH">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
+ <property name="valign">center</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="RB_BOTH-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_ErrorBars|extended_tip|RB_BOTH">Shows positive and negative error bars.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
</child>
- <child>
- <object class="GtkImage" id="FI_POSITIVE">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="RB_POSITIVE">
+ <property name="label" translatable="yes" context="tp_ErrorBars|RB_POSITIVE">Pos_itive</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="valign">center</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">RB_BOTH</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="RB_POSITIVE-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_ErrorBars|extended_tip|RB_POSITIVE">Shows only positive error bars.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
</child>
- <child>
- <object class="GtkImage" id="FI_NEGATIVE">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="RB_NEGATIVE">
+ <property name="label" translatable="yes" context="tp_ErrorBars|RB_NEGATIVE">Ne_gative</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="valign">center</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">RB_BOTH</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="RB_NEGATIVE-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_ErrorBars|extended_tip|RB_NEGATIVE">Shows only negative error bars.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="FI_BOTH">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-missing-image</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="FI_POSITIVE">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-missing-image</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="FI_NEGATIVE">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-missing-image</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
</child>
</object>
</child>
@@ -376,91 +364,25 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment3">
+ <object class="GtkBox" id="box5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</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="box5">
+ <object class="GtkBox" id="boxPOSITIVE">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkBox" id="boxPOSITIVE">
+ <object class="GtkLabel" id="FT_POSITIVE">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="FT_POSITIVE">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_ErrorBars|FT_POSITIVE">P_ositive (+)</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">MF_POSITIVE</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="MF_POSITIVE">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">adjustmentPOS</property>
- <property name="digits">2</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="MF_POSITIVE-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_ErrorBars|extended_tip|MF_POSITIVE">Enter the value to add to the displayed value as the positive error value.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="ED_RANGE_POSITIVE">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="activates_default">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="ED_RANGE_POSITIVE-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_ErrorBars|extended_tip|ED_RANGE_POSITIVE">Enter the address range from where to get the positive error values. Use the Shrink button to select the range from a sheet.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="IB_RANGE_POSITIVE">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes" context="tp_ErrorBars|IB_RANGE_POSITIVE|tooltip_text">Select data range</property>
- <property name="image">imageRANGE_SELECT_POSITIVE</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="IB_RANGE_POSITIVE-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_ErrorBars|extended_tip|IB_RANGE_POSITIVE">Click a button to shrink the dialog, then use the mouse to select the cell range in the spreadsheet. Click the button again to restore the dialog to full size.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
+ <property name="label" translatable="yes" context="tp_ErrorBars|FT_POSITIVE">P_ositive (+)</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">MF_POSITIVE</property>
</object>
<packing>
<property name="expand">False</property>
@@ -469,77 +391,96 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="boxNEGATIVE">
+ <object class="GtkSpinButton" id="MF_POSITIVE">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="FT_NEGATIVE">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_ErrorBars|FT_NEGATIVE">_Negative (-)</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">MF_NEGATIVE</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">adjustmentPOS</property>
+ <property name="digits">2</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="MF_POSITIVE-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_ErrorBars|extended_tip|MF_POSITIVE">Enter the value to add to the displayed value as the positive error value.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
- <child>
- <object class="GtkSpinButton" id="MF_NEGATIVE">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">adjustmentNEG</property>
- <property name="digits">2</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="MF_NEGATIVE-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_ErrorBars|extended_tip|MF_NEGATIVE">Enter the value to subtract from the displayed value as the negative error value.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="ED_RANGE_POSITIVE">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="activates_default">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="ED_RANGE_POSITIVE-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_ErrorBars|extended_tip|ED_RANGE_POSITIVE">Enter the address range from where to get the positive error values. Use the Shrink button to select the range from a sheet.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
- <child>
- <object class="GtkEntry" id="ED_RANGE_NEGATIVE">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="ED_RANGE_NEGATIVE-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_ErrorBars|extended_tip|ED_RANGE_NEGATIVE">Enter the address range from where to get the negative error values. Use the Shrink button to select the range from a sheet.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="IB_RANGE_POSITIVE">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text" translatable="yes" context="tp_ErrorBars|IB_RANGE_POSITIVE|tooltip_text">Select data range</property>
+ <property name="image">imageRANGE_SELECT_POSITIVE</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="IB_RANGE_POSITIVE-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_ErrorBars|extended_tip|IB_RANGE_POSITIVE">Click a button to shrink the dialog, then use the mouse to select the cell range in the spreadsheet. Click the button again to restore the dialog to full size.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
</child>
- <child>
- <object class="GtkButton" id="IB_RANGE_NEGATIVE">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes" context="tp_ErrorBars|IB_RANGE_NEGATIVE|tooltip_text">Select data range</property>
- <property name="image">imageRANGE_SELECT_NEG</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="IB_RANGE_NEGATIVE-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_ErrorBars|extended_tip|IB_RANGE_NEGATIVE">Click a button to shrink the dialog, then use the mouse to select the cell range in the spreadsheet. Click the button again to restore the dialog to full size.</property>
- </object>
- </child>
+ </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">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="boxNEGATIVE">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="FT_NEGATIVE">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="tp_ErrorBars|FT_NEGATIVE">_Negative (-)</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">MF_NEGATIVE</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="MF_NEGATIVE">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">adjustmentNEG</property>
+ <property name="digits">2</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="MF_NEGATIVE-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_ErrorBars|extended_tip|MF_NEGATIVE">Enter the value to subtract from the displayed value as the negative error value.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
</child>
</object>
<packing>
@@ -549,17 +490,13 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="CB_SYN_POS_NEG">
- <property name="label" translatable="yes" context="tp_ErrorBars|CB_SYN_POS_NEG">Same value for both</property>
+ <object class="GtkEntry" id="ED_RANGE_NEGATIVE">
<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="xalign">0</property>
- <property name="draw_indicator">True</property>
+ <property name="hexpand">True</property>
<child internal-child="accessible">
- <object class="AtkObject" id="CB_SYN_POS_NEG-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_ErrorBars|extended_tip|CB_SYN_POS_NEG">Enable to use the positive error values also as negative error values. You can only change the value of the "Positive (+)" box. That value gets copied to the "Negative (-)" box automatically.</property>
+ <object class="AtkObject" id="ED_RANGE_NEGATIVE-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_ErrorBars|extended_tip|ED_RANGE_NEGATIVE">Enter the address range from where to get the negative error values. Use the Shrink button to select the range from a sheet.</property>
</object>
</child>
</object>
@@ -569,7 +506,52 @@
<property name="position">2</property>
</packing>
</child>
+ <child>
+ <object class="GtkButton" id="IB_RANGE_NEGATIVE">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="tooltip_text" translatable="yes" context="tp_ErrorBars|IB_RANGE_NEGATIVE|tooltip_text">Select data range</property>
+ <property name="image">imageRANGE_SELECT_NEG</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="IB_RANGE_NEGATIVE-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_ErrorBars|extended_tip|IB_RANGE_NEGATIVE">Click a button to shrink the dialog, then use the mouse to select the cell range in the spreadsheet. Click the button again to restore the dialog to full size.</property>
+ </object>
+ </child>
+ </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="CB_SYN_POS_NEG">
+ <property name="label" translatable="yes" context="tp_ErrorBars|CB_SYN_POS_NEG">Same value for both</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="CB_SYN_POS_NEG-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_ErrorBars|extended_tip|CB_SYN_POS_NEG">Enable to use the positive error values also as negative error values. You can only change the value of the "Positive (+)" box. That value gets copied to the "Negative (-)" box automatically.</property>
+ </object>
+ </child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
</child>
</object>
</child>
diff --git a/chart2/uiconfig/ui/tp_LegendPosition.ui b/chart2/uiconfig/ui/tp_LegendPosition.ui
index 6741ba4e1e63..2ed5d81ffa3c 100644
--- a/chart2/uiconfig/ui/tp_LegendPosition.ui
+++ b/chart2/uiconfig/ui/tp_LegendPosition.ui
@@ -15,101 +15,95 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <!-- n-columns=1 n-rows=1 -->
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="row_spacing">6</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid1">
+ <object class="GtkRadioButton" id="left">
+ <property name="label" translatable="yes" context="tp_LegendPosition|left">_Left</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <child>
- <object class="GtkRadioButton" id="left">
- <property name="label" translatable="yes" context="tp_LegendPosition|left">_Left</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="left-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_LegendPosition|extended_tip|left">Positions the legend at the left of the chart.</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="left-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_LegendPosition|extended_tip|left">Positions the legend at the left of the chart.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
</child>
- <child>
- <object class="GtkRadioButton" id="right">
- <property name="label" translatable="yes" context="tp_LegendPosition|right">_Right</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">left</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="right-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_LegendPosition|extended_tip|right">Positions the legend at the right of the chart.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="right">
+ <property name="label" translatable="yes" context="tp_LegendPosition|right">_Right</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">left</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="right-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_LegendPosition|extended_tip|right">Positions the legend at the right of the chart.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
</child>
- <child>
- <object class="GtkRadioButton" id="top">
- <property name="label" translatable="yes" context="tp_LegendPosition|top">_Top</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">left</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="top-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_LegendPosition|extended_tip|top">Positions the legend at the top of the chart.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="top">
+ <property name="label" translatable="yes" context="tp_LegendPosition|top">_Top</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">left</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="top-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_LegendPosition|extended_tip|top">Positions the legend at the top of the chart.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
</child>
- <child>
- <object class="GtkRadioButton" id="bottom">
- <property name="label" translatable="yes" context="tp_LegendPosition|bottom">_Bottom</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">left</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="bottom-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_LegendPosition|extended_tip|bottom">Positions the legend at the bottom of the chart.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="bottom">
+ <property name="label" translatable="yes" context="tp_LegendPosition|bottom">_Bottom</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">left</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="bottom-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_LegendPosition|extended_tip|bottom">Positions the legend at the bottom of the chart.</property>
</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">3</property>
+ </packing>
</child>
</object>
</child>
@@ -138,47 +132,41 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="spacing">12</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
- <object class="GtkBox" id="box1">
+ <object class="GtkLabel" id="FT_LEGEND_TEXTDIR">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="FT_LEGEND_TEXTDIR">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_LegendPosition|FT_LEGEND_TEXTDIR">Te_xt direction</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</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="LB_LEGEND_TEXTDIR">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="LB_LEGEND_TEXTDIR-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_LegendPosition|extended_tip|LB_LEGEND_TEXTDIR">Specify the text direction for a paragraph that uses complex text layout (CTL). This feature is only available if complex text layout support is enabled.</property>
- </object>
- </child>
+ <property name="label" translatable="yes" context="tp_LegendPosition|FT_LEGEND_TEXTDIR">Te_xt direction</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</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="LB_LEGEND_TEXTDIR">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="LB_LEGEND_TEXTDIR-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_LegendPosition|extended_tip|LB_LEGEND_TEXTDIR">Specify the text direction for a paragraph that uses complex text layout (CTL). This feature is only available if complex text layout support is enabled.</property>
</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>
</child>
@@ -207,38 +195,32 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment3">
+ <object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="spacing">12</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
- <object class="GtkBox" id="box2">
+ <object class="GtkCheckButton" id="CB_NO_OVERLAY">
+ <property name="label" translatable="yes" context="tp_LegendPosition|CB_NO_OVERLAY">Show the legend without overlapping the chart</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkCheckButton" id="CB_NO_OVERLAY">
- <property name="label" translatable="yes" context="tp_LegendPosition|CB_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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="CB_NO_OVERLAY-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_LegendPosition|extended_tip|CB_NO_OVERLAY">Specifies whether the legend should overlap the chart.</property>
- </object>
- </child>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="CB_NO_OVERLAY-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_LegendPosition|extended_tip|CB_NO_OVERLAY">Specifies whether the legend should overlap the chart.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
</child>
diff --git a/chart2/uiconfig/ui/tp_PolarOptions.ui b/chart2/uiconfig/ui/tp_PolarOptions.ui
index 71c154c3caa6..9162b800034f 100644
--- a/chart2/uiconfig/ui/tp_PolarOptions.ui
+++ b/chart2/uiconfig/ui/tp_PolarOptions.ui
@@ -20,25 +20,19 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkCheckButton" id="CB_CLOCKWISE">
+ <property name="label" translatable="yes" context="tp_PolarOptions|CB_CLOCKWISE">_Clockwise direction</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkCheckButton" id="CB_CLOCKWISE">
- <property name="label" translatable="yes" context="tp_PolarOptions|CB_CLOCKWISE">_Clockwise 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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="CB_CLOCKWISE-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_PolarOptions|extended_tip|CB_CLOCKWISE">The default direction in which the pieces of a pie chart are ordered is counterclockwise. Enable the Clockwise direction checkbox to draw the pieces in opposite direction.</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="CB_CLOCKWISE-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_PolarOptions|extended_tip|CB_CLOCKWISE">The default direction in which the pieces of a pie chart are ordered is counterclockwise. Enable the Clockwise direction checkbox to draw the pieces in opposite direction.</property>
</object>
</child>
</object>
@@ -68,70 +62,64 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="spacing">12</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
- <object class="GtkBox" id="box2">
+ <object class="GtkDrawingArea" id="CT_ANGLE_DIAL">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkDrawingArea" id="CT_ANGLE_DIAL">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
- <property name="halign">center</property>
- <property name="valign">center</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="CT_ANGLE_DIAL-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_PolarOptions|extended_tip|CT_ANGLE_DIAL">Drag the small dot along the circle or click any position on the circle to set the starting angle of a pie or donut chart. The starting angle is the mathematical angle position where the first piece is drawn. The value of 90 degrees draws the first piece at the 12 o'clock position. A value of 0 degrees starts at the 3 o'clock position.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="NF_STARTING_ANGLE">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <property name="adjustment">adjustmentDEGREE</property>
- <property name="wrap">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="NF_STARTING_ANGLE-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_PolarOptions|extended_tip|NF_STARTING_ANGLE">Enter the starting angle between 0 and 359 degrees. You can also click the arrows to change the displayed value.</property>
- </object>
- </child>
+ <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="CT_ANGLE_DIAL-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_PolarOptions|extended_tip|CT_ANGLE_DIAL">Drag the small dot along the circle or click any position on the circle to set the starting angle of a pie or donut chart. The starting angle is the mathematical angle position where the first piece is drawn. The value of 90 degrees draws the first piece at the 12 o'clock position. A value of 0 degrees starts at the 3 o'clock position.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
- <child>
- <object class="GtkLabel" id="FT_ROTATION_DEGREES">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_PolarOptions|FT_ROTATION_DEGREES">_Degrees</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">NF_STARTING_ANGLE</property>
- <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="NF_STARTING_ANGLE">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="adjustment">adjustmentDEGREE</property>
+ <property name="wrap">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="NF_STARTING_ANGLE-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_PolarOptions|extended_tip|NF_STARTING_ANGLE">Enter the starting angle between 0 and 359 degrees. You can also click the arrows to change the displayed value.</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">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="FT_ROTATION_DEGREES">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="tp_PolarOptions|FT_ROTATION_DEGREES">_Degrees</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">NF_STARTING_ANGLE</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
</child>
</object>
</child>
@@ -160,22 +148,16 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment3">
+ <object class="GtkCheckButton" id="CB_INCLUDE_HIDDEN_CELLS_POLAR">
+ <property name="label" translatable="yes" context="tp_PolarOptions|CB_INCLUDE_HIDDEN_CELLS_POLAR">Include _values from hidden cells</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkCheckButton" id="CB_INCLUDE_HIDDEN_CELLS_POLAR">
- <property name="label" translatable="yes" context="tp_PolarOptions|CB_INCLUDE_HIDDEN_CELLS_POLAR">Include _values from hidden cells</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
</object>
</child>
<child type="label">
diff --git a/chart2/uiconfig/ui/tp_Scale.ui b/chart2/uiconfig/ui/tp_Scale.ui
index 32691450bd9c..ae8ca9eab5e7 100644
--- a/chart2/uiconfig/ui/tp_Scale.ui
+++ b/chart2/uiconfig/ui/tp_Scale.ui
@@ -37,112 +37,32 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</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="box1">
+ <object class="GtkBox" id="box2">
<property name="visible">True</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="GtkCheckButton" id="CBX_REVERSE">
+ <property name="label" translatable="yes" context="tp_Scale|CBX_REVERSE">_Reverse direction</property>
<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="CBX_REVERSE">
- <property name="label" translatable="yes" context="tp_Scale|CBX_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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="CBX_REVERSE-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Scale|extended_tip|CBX_REVERSE">Defines where the lower and where the higher values are displayed at the axis. The unchecked state is the mathematical direction.</property>
- </object>
- </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="CBX_LOGARITHM">
- <property name="label" translatable="yes" context="tp_Scale|CBX_LOGARITHM">_Logarithmic scale</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="CBX_LOGARITHM-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Scale|extended_tip|CBX_LOGARITHM">Specifies that you want the axis to be subdivided logarithmically.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="boxTYPE">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="TXT_AXIS_TYPE">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_Scale|TXT_AXIS_TYPE">T_ype</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">LB_AXIS_TYPE</property>
- <property name="xalign">0</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="LB_AXIS_TYPE">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <items>
- <item translatable="yes" context="tp_Scale|LB_AXIS_TYPE">Automatic</item>
- <item translatable="yes" context="tp_Scale|LB_AXIS_TYPE">Text</item>
- <item translatable="yes" context="tp_Scale|LB_AXIS_TYPE">Date</item>
- </items>
- <child internal-child="accessible">
- <object class="AtkObject" id="LB_AXIS_TYPE-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Scale|extended_tip|LB_AXIS_TYPE">For some types of axes, you can select to format an axis as text or date, or to detect the type automatically.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="CBX_REVERSE-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Scale|extended_tip|CBX_REVERSE">Defines where the lower and where the higher values are displayed at the axis. The unchecked state is the mathematical direction.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
</child>
</object>
<packing>
@@ -152,105 +72,18 @@
</packing>
</child>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="gridMINMAX">
+ <object class="GtkCheckButton" id="CBX_LOGARITHM">
+ <property name="label" translatable="yes" context="tp_Scale|CBX_LOGARITHM">_Logarithmic scale</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkLabel" id="TXT_MIN">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_Scale|TXT_MIN">_Minimum</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">EDT_MIN</property>
- <property name="xalign">0</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="CBX_LOGARITHM-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Scale|extended_tip|CBX_LOGARITHM">Specifies that you want the axis to be subdivided logarithmically.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="TXT_MAX">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_Scale|TXT_MAX">Ma_ximum</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">EDT_MAX</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="GtkCheckButton" id="CBX_AUTO_MIN">
- <property name="label" translatable="yes" context="tp_Scale|CBX_AUTO_MIN">_Automatic</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="CBX_AUTO_MAX">
- <property name="label" translatable="yes" context="tp_Scale|CBX_AUTO_MAX">A_utomatic</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="EDT_MIN">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
- <property name="width_chars">10</property>
- <property name="adjustment">adjustment1</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="EDT_MIN-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Scale|extended_tip|EDT_MIN">Defines the minimum value for the beginning of the axis.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="EDT_MAX">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
- <property name="width_chars">10</property>
- <property name="adjustment">adjustment2</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="EDT_MAX-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Scale|extended_tip|EDT_MAX">Defines the maximum value for the end of the axis.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
</child>
</object>
<packing>
@@ -260,17 +93,17 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="boxRESOLUTION">
+ <object class="GtkBox" id="boxTYPE">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
- <object class="GtkLabel" id="TXT_TIME_RESOLUTION">
+ <object class="GtkLabel" id="TXT_AXIS_TYPE">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_Scale|TXT_TIME_RESOLUTION">R_esolution</property>
+ <property name="label" translatable="yes" context="tp_Scale|TXT_AXIS_TYPE">T_ype</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">LB_TIME_RESOLUTION</property>
+ <property name="mnemonic_widget">LB_AXIS_TYPE</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -280,17 +113,17 @@
</packing>
</child>
<child>
- <object class="GtkComboBoxText" id="LB_TIME_RESOLUTION">
+ <object class="GtkComboBoxText" id="LB_AXIS_TYPE">
<property name="visible">True</property>
<property name="can_focus">False</property>
<items>
- <item id="0" translatable="yes" context="tp_Scale|liststoreDATE">Days</item>
- <item id="1" translatable="yes" context="tp_Scale|liststoreDATE">Months</item>
- <item id="2" translatable="yes" context="tp_Scale|liststoreDATE">Years</item>
+ <item translatable="yes" context="tp_Scale|LB_AXIS_TYPE">Automatic</item>
+ <item translatable="yes" context="tp_Scale|LB_AXIS_TYPE">Text</item>
+ <item translatable="yes" context="tp_Scale|LB_AXIS_TYPE">Date</item>
</items>
<child internal-child="accessible">
- <object class="AtkObject" id="LB_TIME_RESOLUTION-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Scale|extended_tip|LB_TIME_RESOLUTION">Resolution can be set to show days, months, or years as interval steps.</property>
+ <object class="AtkObject" id="LB_AXIS_TYPE-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Scale|extended_tip|LB_AXIS_TYPE">For some types of axes, you can select to format an axis as text or date, or to detect the type automatically.</property>
</object>
</child>
</object>
@@ -300,22 +133,6 @@
<property name="position">1</property>
</packing>
</child>
- <child>
- <object class="GtkCheckButton" id="CBX_AUTO_TIME_RESOLUTION">
- <property name="label" translatable="yes" context="tp_Scale|CBX_AUTO_TIME_RESOLUTION">Automat_ic</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="xalign">0</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>
<packing>
<property name="expand">False</property>
@@ -323,165 +140,250 @@
<property name="position">2</property>
</packing>
</child>
+ </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=1 -->
+ <object class="GtkGrid" id="gridMINMAX">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
- <object class="GtkBox" id="boxMAIN">
+ <object class="GtkLabel" id="TXT_MIN">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="TXT_STEP_MAIN">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_Scale|TXT_STEP_MAIN">Ma_jor interval</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
+ <property name="label" translatable="yes" context="tp_Scale|TXT_MIN">_Minimum</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">EDT_MIN</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="GtkLabel" id="TXT_MAX">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="tp_Scale|TXT_MAX">Ma_ximum</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">EDT_MAX</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="GtkCheckButton" id="CBX_AUTO_MIN">
+ <property name="label" translatable="yes" context="tp_Scale|CBX_AUTO_MIN">_Automatic</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="CBX_AUTO_MAX">
+ <property name="label" translatable="yes" context="tp_Scale|CBX_AUTO_MAX">A_utomatic</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="EDT_MIN">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
+ <property name="width_chars">10</property>
+ <property name="adjustment">adjustment1</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="EDT_MIN-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Scale|extended_tip|EDT_MIN">Defines the minimum value for the beginning of the axis.</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="box5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkBox" id="box9">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkSpinButton" id="MT_MAIN_DATE_STEP">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
- <property name="width_chars">10</property>
- <property name="adjustment">adjustmentINTERVAL</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="MT_MAIN_DATE_STEP-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Scale|extended_tip|MT_MAIN_DATE_STEP">Major interval can be set to show a certain number of days, months, or years.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="LB_MAIN_TIME_UNIT">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <items>
- <item id="0" translatable="yes" context="tp_Scale|liststoreDATE">Days</item>
- <item id="1" translatable="yes" context="tp_Scale|liststoreDATE">Months</item>
- <item id="2" translatable="yes" context="tp_Scale|liststoreDATE">Years</item>
- </items>
- <child internal-child="accessible">
- <object class="AtkObject" id="LB_MAIN_TIME_UNIT-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Scale|extended_tip|LB_MAIN_TIME_UNIT">Major interval can be set to show a certain number of days, months, or years.</property>
- </object>
- </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="GtkSpinButton" id="EDT_STEP_MAIN">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
- <property name="width_chars">10</property>
- <property name="adjustment">adjustment4</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="EDT_STEP_MAIN-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Scale|extended_tip|EDT_STEP_MAIN">Defines the interval for the main division of the axes.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="EDT_MAX">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
+ <property name="width_chars">10</property>
+ <property name="adjustment">adjustment2</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="EDT_MAX-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Scale|extended_tip|EDT_MAX">Defines the maximum value for the end of the axis.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
- <child>
- <object class="GtkCheckButton" id="CBX_AUTO_STEP_MAIN">
- <property name="label" translatable="yes" context="tp_Scale|CBX_AUTO_STEP_MAIN">Au_tomatic</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="xalign">0</property>
- <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</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="GtkBox" id="boxRESOLUTION">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="TXT_TIME_RESOLUTION">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="tp_Scale|TXT_TIME_RESOLUTION">R_esolution</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">LB_TIME_RESOLUTION</property>
+ <property name="xalign">0</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="LB_TIME_RESOLUTION">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <items>
+ <item id="0" translatable="yes" context="tp_Scale|liststoreDATE">Days</item>
+ <item id="1" translatable="yes" context="tp_Scale|liststoreDATE">Months</item>
+ <item id="2" translatable="yes" context="tp_Scale|liststoreDATE">Years</item>
+ </items>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="LB_TIME_RESOLUTION-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Scale|extended_tip|LB_TIME_RESOLUTION">Resolution can be set to show days, months, or years as interval steps.</property>
</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">3</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="CBX_AUTO_TIME_RESOLUTION">
+ <property name="label" translatable="yes" context="tp_Scale|CBX_AUTO_TIME_RESOLUTION">Automat_ic</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="xalign">0</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>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="boxMAIN">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="TXT_STEP_MAIN">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="tp_Scale|TXT_STEP_MAIN">Ma_jor interval</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</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="boxMINOR">
+ <object class="GtkBox" id="box5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkBox" id="box4">
+ <object class="GtkBox" id="box9">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkLabel" id="TXT_STEP_HELP">
+ <object class="GtkSpinButton" id="MT_MAIN_DATE_STEP">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_Scale|TXT_STEP_HELP">Minor inter_val</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
+ <property name="width_chars">10</property>
+ <property name="adjustment">adjustmentINTERVAL</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="MT_MAIN_DATE_STEP-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Scale|extended_tip|MT_MAIN_DATE_STEP">Major interval can be set to show a certain number of days, months, or years.</property>
+ </object>
+ </child>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="TXT_STEP_HELP_COUNT">
+ <object class="GtkComboBoxText" id="LB_MAIN_TIME_UNIT">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_Scale|TXT_STEP_HELP_COUNT">Minor inter_val count</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
+ <items>
+ <item id="0" translatable="yes" context="tp_Scale|liststoreDATE">Days</item>
+ <item id="1" translatable="yes" context="tp_Scale|liststoreDATE">Months</item>
+ <item id="2" translatable="yes" context="tp_Scale|liststoreDATE">Years</item>
+ </items>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="LB_MAIN_TIME_UNIT-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Scale|extended_tip|LB_MAIN_TIME_UNIT">Major interval can be set to show a certain number of days, months, or years.</property>
+ </object>
+ </child>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
@@ -494,15 +396,15 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="MT_STEPHELP">
+ <object class="GtkSpinButton" id="EDT_STEP_MAIN">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activates_default">True</property>
<property name="width_chars">10</property>
- <property name="adjustment">adjustmentINTERVAL1</property>
+ <property name="adjustment">adjustment4</property>
<child internal-child="accessible">
- <object class="AtkObject" id="MT_STEPHELP-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Scale|extended_tip|MT_STEPHELP">Defines the interval for the subdivision of the axes.</property>
+ <object class="AtkObject" id="EDT_STEP_MAIN-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Scale|extended_tip|EDT_STEP_MAIN">Defines the interval for the main division of the axes.</property>
</object>
</child>
</object>
@@ -512,117 +414,209 @@
<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>
+ <child>
+ <object class="GtkCheckButton" id="CBX_AUTO_STEP_MAIN">
+ <property name="label" translatable="yes" context="tp_Scale|CBX_AUTO_STEP_MAIN">Au_tomatic</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </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">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="boxMINOR">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkBox" id="box4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkComboBoxText" id="LB_HELP_TIME_UNIT">
+ <object class="GtkLabel" id="TXT_STEP_HELP">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <items>
- <item id="0" translatable="yes" context="tp_Scale|liststoreDATE">Days</item>
- <item id="1" translatable="yes" context="tp_Scale|liststoreDATE">Months</item>
- <item id="2" translatable="yes" context="tp_Scale|liststoreDATE">Years</item>
- </items>
- <child internal-child="accessible">
- <object class="AtkObject" id="LB_HELP_TIME_UNIT-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Scale|extended_tip|LB_HELP_TIME_UNIT">Minor interval can be set to show a certain number of days, months, or years.</property>
- </object>
- </child>
+ <property name="label" translatable="yes" context="tp_Scale|TXT_STEP_HELP">Minor inter_val</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="CBX_AUTO_STEP_HELP">
- <property name="label" translatable="yes" context="tp_Scale|CBX_AUTO_STEP_HELP">Aut_omatic</property>
+ <object class="GtkLabel" id="TXT_STEP_HELP_COUNT">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="tp_Scale|TXT_STEP_HELP_COUNT">Minor inter_val count</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
- <property name="draw_indicator">True</property>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="boxORIGIN">
+ <object class="GtkSpinButton" id="MT_STEPHELP">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
+ <property name="width_chars">10</property>
+ <property name="adjustment">adjustmentINTERVAL1</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="MT_STEPHELP-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Scale|extended_tip|MT_STEPHELP">Defines the interval for the subdivision of the axes.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="LB_HELP_TIME_UNIT">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="TXT_ORIGIN">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_Scale|TXT_ORIGIN">Re_ference value</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
+ <items>
+ <item id="0" translatable="yes" context="tp_Scale|liststoreDATE">Days</item>
+ <item id="1" translatable="yes" context="tp_Scale|liststoreDATE">Months</item>
+ <item id="2" translatable="yes" context="tp_Scale|liststoreDATE">Years</item>
+ </items>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="LB_HELP_TIME_UNIT-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Scale|extended_tip|LB_HELP_TIME_UNIT">Minor interval can be set to show a certain number of days, months, or years.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
- <child>
- <object class="GtkSpinButton" id="EDT_ORIGIN">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
- <property name="width_chars">10</property>
- <property name="adjustment">adjustment3</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="EDT_ORIGIN-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Scale|extended_tip|EDT_ORIGIN">Specifies at which position to display the values along the axis.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="CBX_AUTO_STEP_HELP">
+ <property name="label" translatable="yes" context="tp_Scale|CBX_AUTO_STEP_HELP">Aut_omatic</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </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">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="boxORIGIN">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="TXT_ORIGIN">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="tp_Scale|TXT_ORIGIN">Re_ference value</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="EDT_ORIGIN">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
+ <property name="width_chars">10</property>
+ <property name="adjustment">adjustment3</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="EDT_ORIGIN-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Scale|extended_tip|EDT_ORIGIN">Specifies at which position to display the values along the axis.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
- <child>
- <object class="GtkCheckButton" id="CBX_AUTO_ORIGIN">
- <property name="label" translatable="yes" context="tp_Scale|CBX_AUTO_ORIGIN">Automat_ic</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="CBX_AUTO_ORIGIN-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Scale|extended_tip|CBX_AUTO_ORIGIN">You must first deselect the Automatic option in order to modify the values.</property>
- </object>
- </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="CBX_AUTO_ORIGIN">
+ <property name="label" translatable="yes" context="tp_Scale|CBX_AUTO_ORIGIN">Automat_ic</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="CBX_AUTO_ORIGIN-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Scale|extended_tip|CBX_AUTO_ORIGIN">You must first deselect the Automatic option in order to modify the values.</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">5</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">5</property>
+ </packing>
</child>
</object>
</child>
diff --git a/chart2/uiconfig/ui/tp_SeriesToAxis.ui b/chart2/uiconfig/ui/tp_SeriesToAxis.ui
index c0295a418522..3bef1457b17d 100644
--- a/chart2/uiconfig/ui/tp_SeriesToAxis.ui
+++ b/chart2/uiconfig/ui/tp_SeriesToAxis.ui
@@ -26,63 +26,57 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkBox" id="box1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</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="box1">
+ <object class="GtkRadioButton" id="RBT_OPT_AXIS_1">
+ <property name="label" translatable="yes" context="tp_SeriesToAxis|RBT_OPT_AXIS_1">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>
- <child>
- <object class="GtkRadioButton" id="RBT_OPT_AXIS_1">
- <property name="label" translatable="yes" context="tp_SeriesToAxis|RBT_OPT_AXIS_1">Primary 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="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="RBT_OPT_AXIS_1-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_SeriesToAxis|extended_tip|RBT_OPT_AXIS_1">This option is active as default. All data series are aligned to the primary Y axis.</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="RBT_OPT_AXIS_1-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_SeriesToAxis|extended_tip|RBT_OPT_AXIS_1">This option is active as default. All data series are aligned to the primary Y axis.</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="RBT_OPT_AXIS_2">
- <property name="label" translatable="yes" context="tp_SeriesToAxis|RBT_OPT_AXIS_2">Secondary 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="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">RBT_OPT_AXIS_1</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="RBT_OPT_AXIS_2-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_SeriesToAxis|extended_tip|RBT_OPT_AXIS_2">Changes the scaling of the Y axis. This axis is only visible when at least one data series is assigned to it and the axis view is active.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="RBT_OPT_AXIS_2">
+ <property name="label" translatable="yes" context="tp_SeriesToAxis|RBT_OPT_AXIS_2">Secondary 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="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">RBT_OPT_AXIS_1</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="RBT_OPT_AXIS_2-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_SeriesToAxis|extended_tip|RBT_OPT_AXIS_2">Changes the scaling of the Y axis. This axis is only visible when at least one data series is assigned to it and the axis view is active.</property>
</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>
</child>
@@ -111,132 +105,126 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkBox" id="box3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</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">
+ <!-- n-columns=1 n-rows=1 -->
+ <object class="GtkGrid" id="gridSettings">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="gridSettings">
+ <object class="GtkLabel" id="FT_GAP">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkLabel" id="FT_GAP">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_SeriesToAxis|FT_GAP">_Spacing</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">MT_GAP</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="FT_OVERLAP">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_SeriesToAxis|FT_OVERLAP">_Overlap</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">MT_OVERLAP</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="MT_GAP">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="adjustment">adjustmentGAP</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="MT_GAP-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_SeriesToAxis|extended_tip|MT_GAP">Defines the spacing between the columns in percent.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="MT_OVERLAP">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="adjustment">adjustmentOVERLAP</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="MT_OVERLAP-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_SeriesToAxis|extended_tip|MT_OVERLAP">Defines the necessary settings for overlapping data series.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
+ <property name="label" translatable="yes" context="tp_SeriesToAxis|FT_GAP">_Spacing</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">MT_GAP</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">0</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="CB_BARS_SIDE_BY_SIDE">
- <property name="label" translatable="yes" context="tp_SeriesToAxis|CB_BARS_SIDE_BY_SIDE">Show _bars side by side</property>
+ <object class="GtkLabel" id="FT_OVERLAP">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="halign">start</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="tp_SeriesToAxis|FT_OVERLAP">_Overlap</property>
<property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="mnemonic_widget">MT_OVERLAP</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="MT_GAP">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="adjustment">adjustmentGAP</property>
<child internal-child="accessible">
- <object class="AtkObject" id="CB_BARS_SIDE_BY_SIDE-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_SeriesToAxis|extended_tip|CB_BARS_SIDE_BY_SIDE">The bars from different data series are shown as if they were attached only to one axis.</property>
+ <object class="AtkObject" id="MT_GAP-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_SeriesToAxis|extended_tip|MT_GAP">Defines the spacing between the columns in percent.</property>
</object>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="CB_CONNECTOR">
- <property name="label" translatable="yes" context="tp_SeriesToAxis|CB_CONNECTOR">Connection lines</property>
+ <object class="GtkSpinButton" id="MT_OVERLAP">
<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>
+ <property name="can_focus">False</property>
+ <property name="adjustment">adjustmentOVERLAP</property>
<child internal-child="accessible">
- <object class="AtkObject" id="CB_CONNECTOR-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_SeriesToAxis|extended_tip|CB_CONNECTOR">For "stacked" and "percent" column (vertical bar) charts, mark this check box to connect the column layers that belong together with lines.</property>
+ <object class="AtkObject" id="MT_OVERLAP-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_SeriesToAxis|extended_tip|MT_OVERLAP">Defines the necessary settings for overlapping data series.</property>
</object>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">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="CB_BARS_SIDE_BY_SIDE">
+ <property name="label" translatable="yes" context="tp_SeriesToAxis|CB_BARS_SIDE_BY_SIDE">Show _bars side by side</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>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="CB_BARS_SIDE_BY_SIDE-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_SeriesToAxis|extended_tip|CB_BARS_SIDE_BY_SIDE">The bars from different data series are shown as if they were attached only to one axis.</property>
+ </object>
+ </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="CB_CONNECTOR">
+ <property name="label" translatable="yes" context="tp_SeriesToAxis|CB_CONNECTOR">Connection lines</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>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="CB_CONNECTOR-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_SeriesToAxis|extended_tip|CB_CONNECTOR">For "stacked" and "percent" column (vertical bar) charts, mark this check box to connect the column layers that belong together with lines.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
</child>
</object>
</child>
@@ -264,136 +252,130 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment3">
+ <object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</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="box2">
+ <!-- n-columns=1 n-rows=1 -->
+ <object class="GtkGrid" id="gridPLOT_OPTIONS">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="gridPLOT_OPTIONS">
+ <object class="GtkLabel" id="FT_MISSING_VALUES">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkLabel" id="FT_MISSING_VALUES">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_SeriesToAxis|FT_MISSING_VALUES">Plot missing values</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="GtkRadioButton" id="RB_DONT_PAINT">
- <property name="label" translatable="yes" context="tp_SeriesToAxis|RB_DONT_PAINT">_Leave gap</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="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="RB_DONT_PAINT-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_SeriesToAxis|extended_tip|RB_DONT_PAINT">For a missing value, no data will be shown. This is the default for chart types Column, Bar, Line, Net.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="RB_ASSUME_ZERO">
- <property name="label" translatable="yes" context="tp_SeriesToAxis|RB_ASSUME_ZERO">_Assume zero</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="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">RB_DONT_PAINT</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="RB_ASSUME_ZERO-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_SeriesToAxis|extended_tip|RB_ASSUME_ZERO">For a missing value, the y-value will be shown as zero. This is the default for chart type Area.</property>
- </object>
- </child>
+ <property name="label" translatable="yes" context="tp_SeriesToAxis|FT_MISSING_VALUES">Plot missing values</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="GtkRadioButton" id="RB_DONT_PAINT">
+ <property name="label" translatable="yes" context="tp_SeriesToAxis|RB_DONT_PAINT">_Leave gap</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="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="RB_DONT_PAINT-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_SeriesToAxis|extended_tip|RB_DONT_PAINT">For a missing value, no data will be shown. This is the default for chart types Column, Bar, Line, Net.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
</child>
- <child>
- <object class="GtkRadioButton" id="RB_CONTINUE_LINE">
- <property name="label" translatable="yes" context="tp_SeriesToAxis|RB_CONTINUE_LINE">_Continue line</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="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">RB_DONT_PAINT</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="RB_CONTINUE_LINE-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_SeriesToAxis|extended_tip|RB_CONTINUE_LINE">For a missing value, the interpolation from the neighbor values will be shown. This is the default for chart type XY.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="RB_ASSUME_ZERO">
+ <property name="label" translatable="yes" context="tp_SeriesToAxis|RB_ASSUME_ZERO">_Assume zero</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="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">RB_DONT_PAINT</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="RB_ASSUME_ZERO-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_SeriesToAxis|extended_tip|RB_ASSUME_ZERO">For a missing value, the y-value will be shown as zero. This is the default for chart type Area.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
</child>
</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="GtkCheckButton" id="CB_INCLUDE_HIDDEN_CELLS">
- <property name="label" translatable="yes" context="tp_SeriesToAxis|CB_INCLUDE_HIDDEN_CELLS">Include _values from hidden cells</property>
+ <object class="GtkRadioButton" id="RB_CONTINUE_LINE">
+ <property name="label" translatable="yes" context="tp_SeriesToAxis|RB_CONTINUE_LINE">_Continue line</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="xalign">0</property>
+ <property name="active">True</property>
<property name="draw_indicator">True</property>
+ <property name="group">RB_DONT_PAINT</property>
<child internal-child="accessible">
- <object class="AtkObject" id="CB_INCLUDE_HIDDEN_CELLS-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_SeriesToAxis|extended_tip|CB_INCLUDE_HIDDEN_CELLS">Check to also show values of currently hidden cells within the source cell range.</property>
+ <object class="AtkObject" id="RB_CONTINUE_LINE-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_SeriesToAxis|extended_tip|RB_CONTINUE_LINE">For a missing value, the interpolation from the neighbor values will be shown. This is the default for chart type XY.</property>
</object>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </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="CB_INCLUDE_HIDDEN_CELLS">
+ <property name="label" translatable="yes" context="tp_SeriesToAxis|CB_INCLUDE_HIDDEN_CELLS">Include _values from hidden cells</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>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="CB_INCLUDE_HIDDEN_CELLS-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_SeriesToAxis|extended_tip|CB_INCLUDE_HIDDEN_CELLS">Check to also show values of currently hidden cells within the source cell range.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
</child>
@@ -422,37 +404,31 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="orientation">vertical</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
- <object class="GtkBox">
+ <object class="GtkCheckButton" id="CB_LEGEND_ENTRY_HIDDEN">
+ <property name="label" translatable="yes" context="tp_SeriesToAxis|CB_LEGEND_ENTRY_HIDDEN">Hide legend entry</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkCheckButton" id="CB_LEGEND_ENTRY_HIDDEN">
- <property name="label" translatable="yes" context="tp_SeriesToAxis|CB_LEGEND_ENTRY_HIDDEN">Hide legend entry</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="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="CB_LEGEND_ENTRY_HIDDEN-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_SeriesToAxis|extended_tip|CB_LEGEND_ENTRY_HIDDEN">Do not show legend entry for the selected data series or data point.</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">start</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="CB_LEGEND_ENTRY_HIDDEN-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_SeriesToAxis|extended_tip|CB_LEGEND_ENTRY_HIDDEN">Do not show legend entry for the selected data series or data point.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
</object>
</child>
diff --git a/chart2/uiconfig/ui/tp_Trendline.ui b/chart2/uiconfig/ui/tp_Trendline.ui
index e7103623d956..765a2a5284a7 100644
--- a/chart2/uiconfig/ui/tp_Trendline.ui
+++ b/chart2/uiconfig/ui/tp_Trendline.ui
@@ -47,318 +47,312 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <!-- n-columns=1 n-rows=1 -->
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="halign">start</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <property name="row_homogeneous">True</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid1">
+ <object class="GtkRadioButton" id="linear">
+ <property name="label" translatable="yes" context="tp_Trendline|linear">_Linear</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">start</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">6</property>
- <property name="row_homogeneous">True</property>
- <child>
- <object class="GtkRadioButton" id="linear">
- <property name="label" translatable="yes" context="tp_Trendline|linear">_Linear</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="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="linear-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|linear">A linear trend line is shown.</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="linear-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|linear">A linear trend line is shown.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
</child>
- <child>
- <object class="GtkRadioButton" id="logarithmic">
- <property name="label" translatable="yes" context="tp_Trendline|logarithmic">L_ogarithmic</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="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">linear</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="logarithmic-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|logarithmic">A logarithmic trend line is shown.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="logarithmic">
+ <property name="label" translatable="yes" context="tp_Trendline|logarithmic">L_ogarithmic</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="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">linear</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="logarithmic-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|logarithmic">A logarithmic trend line is shown.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
</child>
- <child>
- <object class="GtkRadioButton" id="exponential">
- <property name="label" translatable="yes" context="tp_Trendline|exponential">_Exponential</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="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">linear</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="exponential-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|exponential">An exponential trend line is shown.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="exponential">
+ <property name="label" translatable="yes" context="tp_Trendline|exponential">_Exponential</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="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">linear</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="exponential-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|exponential">An exponential trend line is shown.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- </packing>
</child>
- <child>
- <object class="GtkRadioButton" id="power">
- <property name="label" translatable="yes" context="tp_Trendline|power">Po_wer</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="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">linear</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="power-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|power">A power trend line is shown.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="power">
+ <property name="label" translatable="yes" context="tp_Trendline|power">Po_wer</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="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">linear</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="power-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|power">A power trend line is shown.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="polynomial">
+ <property name="label" translatable="yes" context="tp_Trendline|polynomial">_Polynomial</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="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">linear</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="polynomial-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|polynomial">A polynomial trend line is shown with a given degree.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="movingAverage">
+ <property name="label" translatable="yes" context="tp_Trendline|movingAverage">_Moving Average</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="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">linear</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="movingAverage-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|movingAverage">A moving average trend line is shown with a given period.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
- </packing>
</child>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <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="column_spacing">12</property>
<child>
- <object class="GtkRadioButton" id="polynomial">
- <property name="label" translatable="yes" context="tp_Trendline|polynomial">_Polynomial</property>
+ <object class="GtkLabel" id="label3">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="tp_Trendline|label3">Degree</property>
<property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">linear</property>
+ <property name="mnemonic_widget">degree</property>
<child internal-child="accessible">
- <object class="AtkObject" id="polynomial-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|polynomial">A polynomial trend line is shown with a given degree.</property>
+ <object class="AtkObject" id="label3-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|label3">Degree of polynomial trend line.</property>
</object>
</child>
</object>
<packing>
- <property name="left_attach">3</property>
+ <property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="movingAverage">
- <property name="label" translatable="yes" context="tp_Trendline|movingAverage">_Moving Average</property>
+ <object class="GtkSpinButton" id="degree">
<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="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <property name="group">linear</property>
+ <property name="activates_default">True</property>
+ <property name="adjustment">adjustmentDegree</property>
<child internal-child="accessible">
- <object class="AtkObject" id="movingAverage-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|movingAverage">A moving average trend line is shown with a given period.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">3</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <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="column_spacing">12</property>
- <child>
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_Trendline|label3">Degree</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">degree</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="label3-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|label3">Degree of polynomial trend line.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="degree">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
- <property name="adjustment">adjustmentDegree</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="degree-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|degree">Degree of polynomial trend line.</property>
- </object>
- </child>
+ <object class="AtkObject" id="degree-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|degree">Degree of polynomial trend line.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
</child>
</object>
<packing>
- <property name="left_attach">3</property>
- <property name="top_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <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="column_spacing">12</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid3">
+ <object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_Trendline|label4">Period</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">period</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="label4-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|label4">Number of points to calculate average of moving average trend line.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="period">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
- <property name="adjustment">adjustmentPeriod</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="period-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|period">Number of points to calculate average of moving average trend line.</property>
- </object>
- </child>
+ <property name="label" translatable="yes" context="tp_Trendline|label4">Period</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">period</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="label4-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|label4">Number of points to calculate average of moving average trend line.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
</child>
</object>
<packing>
- <property name="left_attach">3</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage" id="imageLinear">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
- </object>
- <packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkImage" id="imageLogarithmic">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage" id="imageExponential">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage" id="imagePower">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage" id="imagePolynomial">
+ <object class="GtkSpinButton" id="period">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
+ <property name="adjustment">adjustmentPeriod</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="period-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|period">Number of points to calculate average of moving average trend line.</property>
+ </object>
+ </child>
</object>
<packing>
- <property name="left_attach">2</property>
+ <property name="left_attach">1</property>
<property name="top_attach">0</property>
</packing>
</child>
- <child>
- <object class="GtkImage" id="imageMovingAverage">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="imageLinear">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-missing-image</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="imageLogarithmic">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-missing-image</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="imageExponential">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-missing-image</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="imagePower">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-missing-image</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="imagePolynomial">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-missing-image</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="imageMovingAverage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-missing-image</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
</child>
</object>
</child>
@@ -386,279 +380,273 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <!-- n-columns=1 n-rows=1 -->
+ <object class="GtkGrid" id="grid5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <property name="row_homogeneous">True</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid5">
+ <object class="GtkLabel" id="label7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <property name="row_homogeneous">True</property>
- <child>
- <object class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_Trendline|label7">Extrapolate Forward</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">extrapolateForward</property>
- <property name="xalign">0</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="label7-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|label7">Trend line is extrapolated for higher x-values.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label8">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_Trendline|label8">Extrapolate Backward</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">extrapolateBackward</property>
- <property name="xalign">0</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="label8-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|label8">Trend line is extrapolated for lower x-values.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="extrapolateForward">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
- <property name="caps_lock_warning">False</property>
- <property name="adjustment">adjustmentForwardBackward</property>
- <property name="digits">2</property>
+ <property name="label" translatable="yes" context="tp_Trendline|label7">Extrapolate Forward</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">extrapolateForward</property>
+ <property name="xalign">0</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="label7-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|label7">Trend line is extrapolated for higher x-values.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
</child>
- <child>
- <object class="GtkSpinButton" id="extrapolateBackward">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
- <property name="adjustment">adjustmentForwardBackward1</property>
- <property name="digits">2</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="tp_Trendline|label8">Extrapolate Backward</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">extrapolateBackward</property>
+ <property name="xalign">0</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="label8-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|label8">Trend line is extrapolated for lower x-values.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- </packing>
</child>
- <child>
- <object class="GtkCheckButton" id="setIntercept">
- <property name="label" translatable="yes" context="tp_Trendline|setIntercept">Force _Intercept</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <accessibility>
- <relation type="label-for" target="interceptValue"/>
- </accessibility>
- <child internal-child="accessible">
- <object class="AtkObject" id="setIntercept-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|setIntercept">For linear, polynomial and exponential trend lines, intercept value is forced to a given value.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="extrapolateForward">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
+ <property name="caps_lock_warning">False</property>
+ <property name="adjustment">adjustmentForwardBackward</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="extrapolateBackward">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
+ <property name="adjustment">adjustmentForwardBackward1</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="GtkCheckButton" id="setIntercept">
+ <property name="label" translatable="yes" context="tp_Trendline|setIntercept">Force _Intercept</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <accessibility>
+ <relation type="label-for" target="interceptValue"/>
+ </accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="setIntercept-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|setIntercept">For linear, polynomial and exponential trend lines, intercept value is forced to a given value.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- </packing>
</child>
- <child>
- <object class="GtkCheckButton" id="showEquation">
- <property name="label" translatable="yes" context="tp_Trendline|showEquation">Show E_quation</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="showEquation-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|showEquation">Shows the trend line equation next to the trend line.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="showEquation">
+ <property name="label" translatable="yes" context="tp_Trendline|showEquation">Show E_quation</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="showEquation-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|showEquation">Shows the trend line equation next to the trend line.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
- <property name="width">2</property>
- </packing>
</child>
- <child>
- <object class="GtkCheckButton" id="showCorrelationCoefficient">
- <property name="label" translatable="yes" context="tp_Trendline|showCorrelationCoefficient">Show _Coefficient of Determination (R²)</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="showCorrelationCoefficient-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|showCorrelationCoefficient">Shows the coefficient of determination next to the trend line.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="showCorrelationCoefficient">
+ <property name="label" translatable="yes" context="tp_Trendline|showCorrelationCoefficient">Show _Coefficient of Determination (R²)</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="showCorrelationCoefficient-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|showCorrelationCoefficient">Shows the coefficient of determination next to the trend line.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</property>
- <property name="width">2</property>
- </packing>
</child>
- <child>
- <object class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_Trendline|label5">Trendline _Name</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">entry_name</property>
- <property name="xalign">0</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="label5-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|label5">Name of trend line in legend.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="tp_Trendline|label5">Trendline _Name</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">entry_name</property>
+ <property name="xalign">0</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="label5-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|label5">Name of trend line in legend.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
</child>
- <child>
- <object class="GtkEntry" id="entry_name">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="entry_name-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|entry_name">Name of trend line in legend.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="entry_name">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="entry_name-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|entry_name">Name of trend line in legend.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
</child>
- <child>
- <object class="GtkSpinButton" id="interceptValue">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
- <property name="text">0</property>
- <property name="caps_lock_warning">False</property>
- <property name="input_purpose">number</property>
- <property name="adjustment">adjustmentForwardBackward2</property>
- <property name="digits">2</property>
- <accessibility>
- <relation type="labelled-by" target="setIntercept"/>
- </accessibility>
- <child internal-child="accessible">
- <object class="AtkObject" id="interceptValue-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|interceptValue">Value of intercept if it is forced.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="interceptValue">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
+ <property name="text">0</property>
+ <property name="caps_lock_warning">False</property>
+ <property name="input_purpose">number</property>
+ <property name="adjustment">adjustmentForwardBackward2</property>
+ <property name="digits">2</property>
+ <accessibility>
+ <relation type="labelled-by" target="setIntercept"/>
+ </accessibility>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="interceptValue-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|interceptValue">Value of intercept if it is forced.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
- </packing>
</child>
- <child>
- <object class="GtkLabel" id="label6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_Trendline|label6">_X Variable Name</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">entry_Xname</property>
- <property name="xalign">0</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="label6-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|label6">Name of X variable in trend line equation.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="tp_Trendline|label6">_X Variable Name</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">entry_Xname</property>
+ <property name="xalign">0</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="label6-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|label6">Name of X variable in trend line equation.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">6</property>
- </packing>
</child>
- <child>
- <object class="GtkEntry" id="entry_Xname">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="entry_Xname-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|entry_Xname">Name of X variable in trend line equation.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="entry_Xname">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="entry_Xname-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|entry_Xname">Name of X variable in trend line equation.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">6</property>
- </packing>
</child>
- <child>
- <object class="GtkLabel" id="label9">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_Trendline|label9">_Y Variable Name</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">entry_Yname</property>
- <property name="xalign">0</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="label9-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|label9">Name of Y variable in trend line equation.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="tp_Trendline|label9">_Y Variable Name</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">entry_Yname</property>
+ <property name="xalign">0</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="label9-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|label9">Name of Y variable in trend line equation.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">7</property>
- </packing>
</child>
- <child>
- <object class="GtkEntry" id="entry_Yname">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="entry_Yname-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|entry_Yname">Name of Y variable in trend line equation.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">7</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="entry_Yname">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="entry_Yname-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_Trendline|extended_tip|entry_Yname">Name of Y variable in trend line equation.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">7</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">7</property>
+ </packing>
</child>
</object>
</child>
diff --git a/chart2/uiconfig/ui/tp_axisLabel.ui b/chart2/uiconfig/ui/tp_axisLabel.ui
index 980e74264417..5d9f2d0a8dbb 100644
--- a/chart2/uiconfig/ui/tp_axisLabel.ui
+++ b/chart2/uiconfig/ui/tp_axisLabel.ui
@@ -49,108 +49,102 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <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>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
- <object class="GtkBox" id="box3">
+ <object class="GtkRadioButton" id="tile">
+ <property name="label" translatable="yes" context="tp_axisLabel|tile">_Tile</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkRadioButton" id="tile">
- <property name="label" translatable="yes" context="tp_axisLabel|tile">_Tile</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="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="tile-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_axisLabel|extended_tip|tile">Arranges numbers on the axis side by side.</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="tile-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_axisLabel|extended_tip|tile">Arranges numbers on the axis side by side.</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="odd">
- <property name="label" translatable="yes" context="tp_axisLabel|odd">St_agger odd</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">tile</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="odd-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_axisLabel|extended_tip|odd">Staggers numbers on the axis, even numbers lower than odd numbers.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="odd">
+ <property name="label" translatable="yes" context="tp_axisLabel|odd">St_agger odd</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">tile</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="odd-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_axisLabel|extended_tip|odd">Staggers numbers on the axis, even numbers lower than odd numbers.</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="even">
- <property name="label" translatable="yes" context="tp_axisLabel|even">Stagger _even</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">tile</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="even-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_axisLabel|extended_tip|even">Stagger numbers on the axes, odd numbers lower than even numbers.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="even">
+ <property name="label" translatable="yes" context="tp_axisLabel|even">Stagger _even</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">tile</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="even-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_axisLabel|extended_tip|even">Stagger numbers on the axes, odd numbers lower than even numbers.</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
</child>
- <child>
- <object class="GtkRadioButton" id="auto">
- <property name="label" translatable="yes" context="tp_axisLabel|auto">A_utomatic</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">tile</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="auto-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_axisLabel|extended_tip|auto">Automatically arranges numbers on the axis.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="auto">
+ <property name="label" translatable="yes" context="tp_axisLabel|auto">A_utomatic</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">tile</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="auto-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_axisLabel|extended_tip|auto">Automatically arranges numbers on the axis.</property>
</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">3</property>
+ </packing>
</child>
</object>
</child>
@@ -178,62 +172,56 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkBox" id="box4">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
- <object class="GtkBox" id="box4">
+ <object class="GtkCheckButton" id="overlapCB">
+ <property name="label" translatable="yes" context="tp_axisLabel|overlapCB">O_verlap</property>
<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="overlapCB">
- <property name="label" translatable="yes" context="tp_axisLabel|overlapCB">O_verlap</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="overlapCB-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_axisLabel|extended_tip|overlapCB">Specifies that the text in cells may overlap other cells.</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="overlapCB-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_axisLabel|extended_tip|overlapCB">Specifies that the text in cells may overlap other cells.</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="breakCB">
- <property name="label" translatable="yes" context="tp_axisLabel|breakCB">_Break</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="breakCB-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_axisLabel|extended_tip|breakCB">Allows a text break.</property>
- </object>
- </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="breakCB">
+ <property name="label" translatable="yes" context="tp_axisLabel|breakCB">_Break</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="breakCB-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_axisLabel|extended_tip|breakCB">Allows a text break.</property>
</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>
</child>
@@ -270,167 +258,161 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment5">
+ <!-- n-columns=1 n-rows=1 -->
+ <object class="GtkGrid" id="grid10">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
<!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid10">
+ <object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid3">
+ <object class="GtkSpinButton" id="OrientDegree">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkSpinButton" id="OrientDegree">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="margin_top">40</property>
- <property name="activates_default">True</property>
- <property name="adjustment">adjustmentSpinDegrees</property>
- <property name="wrap">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="OrientDegree-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_axisLabel|extended_tip|OrientDegree">Allows you to manually enter the orientation angle.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="degreeL">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_top">40</property>
- <property name="label" translatable="yes" context="tp_axisLabel|degreeL">_Degrees</property>
- <property name="use_underline">True</property>
+ <property name="can_focus">True</property>
+ <property name="margin_top">40</property>
+ <property name="activates_default">True</property>
+ <property name="adjustment">adjustmentSpinDegrees</property>
+ <property name="wrap">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="OrientDegree-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_axisLabel|extended_tip|OrientDegree">Allows you to manually enter the orientation angle.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
</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">2</property>
</packing>
</child>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid4">
+ <object class="GtkLabel" id="degreeL">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkCheckButton" id="stackedCB">
- <property name="label" translatable="yes" context="tp_axisLabel|stackedCB">Ve_rtically stacked</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="xalign">0.019999999552965164</property>
- <property name="inconsistent">True</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="stackedCB-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_axisLabel|extended_tip|stackedCB">Assigns vertical text orientation for cell contents.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="labelABCD">
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_axisLabel|labelABCD">ABCD</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
+ <property name="margin_top">40</property>
+ <property name="label" translatable="yes" context="tp_axisLabel|degreeL">_Degrees</property>
+ <property name="use_underline">True</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="textdirL">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="tp_axisLabel|textdirL">Te_xt direction:</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
+ <placeholder/>
</child>
<child>
- <object class="GtkComboBoxText" id="textdirLB">
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <!-- n-columns=1 n-rows=1 -->
+ <object class="GtkGrid" id="grid4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkCheckButton" id="stackedCB">
+ <property name="label" translatable="yes" context="tp_axisLabel|stackedCB">Ve_rtically stacked</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="use_underline">True</property>
+ <property name="xalign">0.019999999552965164</property>
+ <property name="inconsistent">True</property>
+ <property name="draw_indicator">True</property>
<child internal-child="accessible">
- <object class="AtkObject" id="textdirLB-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_axisLabel|extended_tip|textdirLB">Specify the text direction for a paragraph that uses complex text layout (CTL). This feature is only available if complex text layout support is enabled.</property>
+ <object class="AtkObject" id="stackedCB-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_axisLabel|extended_tip|stackedCB">Assigns vertical text orientation for cell contents.</property>
</object>
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- <property name="width">2</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkDrawingArea" id="dialCtrl">
- <property name="visible">True</property>
+ <object class="GtkLabel" id="labelABCD">
<property name="can_focus">False</property>
- <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
- <property name="halign">center</property>
- <property name="valign">center</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="dialCtrl-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="tp_axisLabel|extended_tip|dialCtrl">Clicking anywhere on the wheel defines the variable text orientation.</property>
- </object>
- </child>
+ <property name="label" translatable="yes" context="tp_axisLabel|labelABCD">ABCD</property>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="top_attach">1</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="textdirL">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="tp_axisLabel|textdirL">Te_xt direction:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBoxText" id="textdirLB">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="textdirLB-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_axisLabel|extended_tip|textdirLB">Specify the text direction for a paragraph that uses complex text layout (CTL). This feature is only available if complex text layout support is enabled.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkDrawingArea" id="dialCtrl">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="dialCtrl-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="tp_axisLabel|extended_tip|dialCtrl">Clicking anywhere on the wheel defines the variable text orientation.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
</object>
</child>
diff --git a/chart2/uiconfig/ui/wizelementspage.ui b/chart2/uiconfig/ui/wizelementspage.ui
index 9b1cd00a6df2..30dfe02c6821 100644
--- a/chart2/uiconfig/ui/wizelementspage.ui
+++ b/chart2/uiconfig/ui/wizelementspage.ui
@@ -17,381 +17,368 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <!-- n-columns=1 n-rows=1 -->
+ <object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="column_spacing">18</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
<!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid2">
+ <object class="GtkGrid" id="grid4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="column_spacing">18</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid4">
+ <object class="GtkLabel" id="labelPrimaryXaxis">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="wizelementspage|labelPrimaryXaxis">_X axis</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">primaryXaxis</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="labelPrimaryYaxis">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="wizelementspage|labelPrimaryYaxis">_Y axis</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">primaryYaxis</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="labelPrimaryZaxis">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="wizelementspage|labelPrimaryZaxis">_Z axis</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">primaryZaxis</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="primaryXaxis">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="hexpand">True</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkLabel" id="labelPrimaryXaxis">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="wizelementspage|labelPrimaryXaxis">_X axis</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">primaryXaxis</property>
- <property name="xalign">0</property>
+ <property name="activates_default">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="primaryXaxis-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="wizelementspage|extended_tip|primaryXaxis">Enter a label for the x-axis (horizontal).</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
</child>
- <child>
- <object class="GtkLabel" id="labelPrimaryYaxis">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="wizelementspage|labelPrimaryYaxis">_Y axis</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">primaryYaxis</property>
- <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="primaryYaxis">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="activates_default">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="primaryYaxis-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="wizelementspage|extended_tip|primaryYaxis">Enter a label for the y-axis (vertical).</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- </packing>
</child>
- <child>
- <object class="GtkLabel" id="labelPrimaryZaxis">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="wizelementspage|labelPrimaryZaxis">_Z axis</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">primaryZaxis</property>
- <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="primaryZaxis">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="activates_default">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="primaryZaxis-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="wizelementspage|extended_tip|primaryZaxis">Enter a label for the z-axis. This option is only available for three-dimensional charts.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
- </packing>
</child>
- <child>
- <object class="GtkEntry" id="primaryXaxis">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="activates_default">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="primaryXaxis-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="wizelementspage|extended_tip|primaryXaxis">Enter a label for the x-axis (horizontal).</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="labelMainTitle">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="wizelementspage|labelMainTitle">_Title</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">maintitle</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="labelSubTitle">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" context="wizelementspage|labelSubTitle">_Subtitle</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">subtitle</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="maintitle">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="activates_default">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="maintitle-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="wizelementspage|extended_tip|maintitle">Enter a title for your chart.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- </packing>
</child>
- <child>
- <object class="GtkEntry" id="primaryYaxis">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="activates_default">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="primaryYaxis-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="wizelementspage|extended_tip|primaryYaxis">Enter a label for the y-axis (vertical).</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="subtitle">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="activates_default">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="subtitle-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="wizelementspage|extended_tip|subtitle">Enter a subtitle for your chart.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
- </packing>
</child>
- <child>
- <object class="GtkEntry" id="primaryZaxis">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="activates_default">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="primaryZaxis-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="wizelementspage|extended_tip|primaryZaxis">Enter a label for the z-axis. This option is only available for three-dimensional charts.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="labelSecondaryXAxis">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="label" translatable="yes" context="wizelementspage|labelSecondaryXAxis">X _axis</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">secondaryXaxis</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="labelSecondaryYAxis">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="label" translatable="yes" context="wizelementspage|labelSecondaryYAxis">Y ax_is</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">secondaryYaxis</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="secondaryXaxis">
+ <property name="can_focus">True</property>
+ <property name="no_show_all">True</property>
+ <property name="hexpand">True</property>
+ <property name="activates_default">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="secondaryXaxis-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="wizelementspage|extended_tip|secondaryXaxis">Enter a label for the secondary x-axis. This option is only available for charts that support a secondary x-axis.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">4</property>
- </packing>
</child>
- <child>
- <object class="GtkLabel" id="labelMainTitle">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="wizelementspage|labelMainTitle">_Title</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">maintitle</property>
- <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="secondaryYaxis">
+ <property name="can_focus">True</property>
+ <property name="no_show_all">True</property>
+ <property name="hexpand">True</property>
+ <property name="activates_default">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">6</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <!-- n-columns=1 n-rows=1 -->
+ <object class="GtkGrid" id="grid5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="show">
+ <property name="label" translatable="yes" context="wizelementspage|show">_Display legend</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="show-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="wizelementspage|extended_tip|show">Specifies whether to display a legend for the chart.</property>
</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>
+ </packing>
+ </child>
+ <child>
+ <!-- n-columns=1 n-rows=1 -->
+ <object class="GtkGrid" id="grid6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="margin-start">12</property>
<child>
- <object class="GtkLabel" id="labelSubTitle">
+ <object class="GtkRadioButton" id="left">
+ <property name="label" translatable="yes" context="wizelementspage|left">_Left</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes" context="wizelementspage|labelSubTitle">_Subtitle</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">subtitle</property>
<property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="maintitle">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="activates_default">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
<child internal-child="accessible">
- <object class="AtkObject" id="maintitle-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="wizelementspage|extended_tip|maintitle">Enter a title for your chart.</property>
+ <object class="AtkObject" id="left-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="wizelementspage|extended_tip|left">Positions the legend at the left of the chart.</property>
</object>
</child>
</object>
<packing>
- <property name="left_attach">1</property>
+ <property name="left_attach">0</property>
<property name="top_attach">0</property>
</packing>
</child>
<child>
- <object class="GtkEntry" id="subtitle">
+ <object class="GtkRadioButton" id="right">
+ <property name="label" translatable="yes" context="wizelementspage|right">_Right</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="activates_default">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="subtitle-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="wizelementspage|extended_tip|subtitle">Enter a subtitle for your chart.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="labelSecondaryXAxis">
- <property name="can_focus">False</property>
- <property name="no_show_all">True</property>
- <property name="label" translatable="yes" context="wizelementspage|labelSecondaryXAxis">X _axis</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">secondaryXaxis</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="labelSecondaryYAxis">
- <property name="can_focus">False</property>
- <property name="no_show_all">True</property>
- <property name="label" translatable="yes" context="wizelementspage|labelSecondaryYAxis">Y ax_is</property>
+ <property name="receives_default">False</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">secondaryYaxis</property>
<property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">6</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="secondaryXaxis">
- <property name="can_focus">True</property>
- <property name="no_show_all">True</property>
- <property name="hexpand">True</property>
- <property name="activates_default">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">left</property>
<child internal-child="accessible">
- <object class="AtkObject" id="secondaryXaxis-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="wizelementspage|extended_tip|secondaryXaxis">Enter a label for the secondary x-axis. This option is only available for charts that support a secondary x-axis.</property>
+ <object class="AtkObject" id="right-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="wizelementspage|extended_tip|right">Positions the legend at the right of the chart.</property>
</object>
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry" id="secondaryYaxis">
- <property name="can_focus">True</property>
- <property name="no_show_all">True</property>
- <property name="hexpand">True</property>
- <property name="activates_default">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">6</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">0</property>
- </packing>
- </child>
- <child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
<child>
- <object class="GtkCheckButton" id="show">
- <property name="label" translatable="yes" context="wizelementspage|show">_Display legend</property>
+ <object class="GtkRadioButton" id="top">
+ <property name="label" translatable="yes" context="wizelementspage|top">_Top</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
+ <property name="group">left</property>
<child internal-child="accessible">
- <object class="AtkObject" id="show-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="wizelementspage|extended_tip|show">Specifies whether to display a legend for the chart.</property>
+ <object class="AtkObject" id="top-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="wizelementspage|extended_tip|top">Positions the legend at the top of the chart.</property>
</object>
</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="GtkAlignment" id="alignment3">
+ <object class="GtkRadioButton" id="bottom">
+ <property name="label" translatable="yes" context="wizelementspage|bottom">_Bottom</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <child>
- <object class="GtkRadioButton" id="left">
- <property name="label" translatable="yes" context="wizelementspage|left">_Left</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="left-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="wizelementspage|extended_tip|left">Positions the legend at the left of the chart.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="right">
- <property name="label" translatable="yes" context="wizelementspage|right">_Right</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">left</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="right-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="wizelementspage|extended_tip|right">Positions the legend at the right of the chart.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="top">
- <property name="label" translatable="yes" context="wizelementspage|top">_Top</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">left</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="top-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="wizelementspage|extended_tip|top">Positions the legend at the top of the chart.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="bottom">
- <property name="label" translatable="yes" context="wizelementspage|bottom">_Bottom</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- <property name="group">left</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="bottom-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="wizelementspage|extended_tip|bottom">Positions the legend at the bottom of the chart.</property>
- </object>
- </child>
- </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="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">left</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="bottom-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="wizelementspage|extended_tip|bottom">Positions the legend at the bottom of the chart.</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="top_attach">3</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">1</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
</object>
</child>
@@ -419,79 +406,73 @@
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <!-- n-columns=1 n-rows=1 -->
+ <object class="GtkGrid" id="grid3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="grid3">
+ <object class="GtkCheckButton" id="x">
+ <property name="label" translatable="yes" context="wizelementspage|x">X axis</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkCheckButton" id="x">
- <property name="label" translatable="yes" context="wizelementspage|x">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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="x-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="wizelementspage|extended_tip|x">Displays grid lines that are perpendicular to the x-axis.</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="x-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="wizelementspage|extended_tip|x">Displays grid lines that are perpendicular to the x-axis.</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
</child>
- <child>
- <object class="GtkCheckButton" id="y">
- <property name="label" translatable="yes" context="wizelementspage|y">Y ax_is</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="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="y-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="wizelementspage|extended_tip|y">Displays grid lines that are perpendicular to the y-axis.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="y">
+ <property name="label" translatable="yes" context="wizelementspage|y">Y ax_is</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="y-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="wizelementspage|extended_tip|y">Displays grid lines that are perpendicular to the y-axis.</property>
</object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
</child>
- <child>
- <object class="GtkCheckButton" id="z">
- <property name="label" translatable="yes" context="wizelementspage|z">Z axi_s</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="z-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="wizelementspage|extended_tip|z">Displays grid lines that are perpendicular to the z-axis. This option is only available for three-dimensional charts.</property>
- </object>
- </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="z">
+ <property name="label" translatable="yes" context="wizelementspage|z">Z axi_s</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="z-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="wizelementspage|extended_tip|z">Displays grid lines that are perpendicular to the z-axis. This option is only available for three-dimensional charts.</property>
</object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
</object>
</child>