chart2/source/controller/dialogs/res_DataLabel.cxx | 6
chart2/source/controller/dialogs/res_DataLabel.hxx | 3
chart2/uiconfig/ui/dlg_DataLabel.ui | 831 ++++++++++-----------
chart2/uiconfig/ui/tp_DataLabel.ui | 806 ++++++++++----------
4 files changed, 854 insertions(+), 792 deletions(-)
New commits:
commit b53232033ed528d0e2c0f9b074c6853d7a3f0ddd
Author: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
AuthorDate: Thu Feb 18 13:02:13 2021 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
CommitDate: Mon Feb 22 08:52:18 2021 +0100
Update Data Label dlg according to UX mockup
Change-Id: Ia9855a4bc9c5211b4510aa1053faac9e65346818
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111118
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbr...@allotropia.de>
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx
b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 57a0d3c9565a..857d2b5295db 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -106,9 +106,7 @@ DataLabelResources::DataLabelResources(weld::Builder*
pBuilder, weld::Window* pP
, m_xCBSymbol(pBuilder->weld_check_button("CB_SYMBOL"))
, m_xCBDataSeries(pBuilder->weld_check_button("CB_DATA_SERIES_NAME"))
, m_xCBWrapText(pBuilder->weld_check_button("CB_WRAP_TEXT"))
- , m_xSeparatorResources(pBuilder->weld_widget("boxSEPARATOR"))
, m_xLB_Separator(pBuilder->weld_combo_box("LB_TEXT_SEPARATOR"))
- , m_xBxLabelPlacement(pBuilder->weld_widget("boxPLACEMENT"))
, m_xLB_LabelPlacement(pBuilder->weld_combo_box("LB_LABEL_PLACEMENT"))
, m_xBxOrientation(pBuilder->weld_widget("boxORIENTATION"))
, m_xFT_Dial(pBuilder->weld_label("CT_LABEL_DIAL"))
@@ -249,12 +247,12 @@ void DataLabelResources::EnableControls()
if (m_xCBDataSeries->get_state() != TRISTATE_FALSE)
++nNumberOfCheckedLabelParts;
- m_xSeparatorResources->set_sensitive( nNumberOfCheckedLabelParts > 1 );
+ m_xLB_Separator->set_sensitive( nNumberOfCheckedLabelParts > 1 );
bool bEnableTextDir = nNumberOfCheckedLabelParts > 0;
m_xBxTextDirection->set_sensitive( bEnableTextDir );
bool bEnablePlacement = nNumberOfCheckedLabelParts > 0 &&
m_xLB_LabelPlacement->get_count()>1;
- m_xBxLabelPlacement->set_sensitive( bEnablePlacement );
+ m_xLB_LabelPlacement->set_sensitive( bEnablePlacement );
}
m_xPB_NumberFormatForValue->set_sensitive( m_pNumberFormatter &&
m_xCBNumber->get_active() );
diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx
b/chart2/source/controller/dialogs/res_DataLabel.hxx
index 1f832a4881a3..dde594b620d6 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.hxx
@@ -68,10 +68,7 @@ private:
std::unique_ptr<weld::CheckButton> m_xCBDataSeries;
std::unique_ptr<weld::CheckButton> m_xCBWrapText;
- std::unique_ptr<weld::Widget> m_xSeparatorResources;
std::unique_ptr<weld::ComboBox> m_xLB_Separator;
-
- std::unique_ptr<weld::Widget> m_xBxLabelPlacement;
std::unique_ptr<weld::ComboBox> m_xLB_LabelPlacement;
std::unique_ptr<weld::Widget> m_xBxOrientation;
diff --git a/chart2/uiconfig/ui/dlg_DataLabel.ui
b/chart2/uiconfig/ui/dlg_DataLabel.ui
index 1851a4f9c7d7..4826c2ee6943 100644
--- a/chart2/uiconfig/ui/dlg_DataLabel.ui
+++ b/chart2/uiconfig/ui/dlg_DataLabel.ui
@@ -1,34 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.38.2 -->
<interface domain="chart">
<requires lib="gtk+" version="3.20"/>
<object class="GtkAdjustment" id="adjustmentDEGREE">
<property name="upper">359</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
+ <property name="step-increment">1</property>
+ <property name="page-increment">10</property>
</object>
<object class="GtkDialog" id="dlg_DataLabels">
- <property name="can_focus">False</property>
- <property name="border_width">6</property>
+ <property name="can-focus">False</property>
+ <property name="border-width">6</property>
<property name="title" translatable="yes"
context="dlg_DataLabel|dlg_DataLabels">Data Labels for all Data
Series</property>
- <property name="type_hint">dialog</property>
+ <property name="type-hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox" id="dialog-action_area1">
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
+ <property name="can-focus">False</property>
+ <property name="layout-style">end</property>
<child>
<object class="GtkButton" id="ok">
<property name="label" translatable="yes"
context="stock">_OK</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="can-default">True</property>
+ <property name="has-default">True</property>
+ <property name="receives-default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -41,8 +41,8 @@
<object class="GtkButton" id="cancel">
<property name="label" translatable="yes"
context="stock">_Cancel</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -55,8 +55,8 @@
<object class="GtkButton" id="help">
<property name="label" translatable="yes"
context="stock">_Help</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -70,249 +70,270 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="pack_type">end</property>
+ <property name="pack-type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="tp_DataLabel">
+ <object class="GtkBox" id="dlg_DataLabel">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="border_width">6</property>
- <property name="orientation">vertical</property>
+ <property name="can-focus">False</property>
+ <property name="border-width">6</property>
<property name="spacing">12</property>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkBox">
+ <property name="name">box_left</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="can-focus">False</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkGrid" id="grid1">
+ <object class="GtkFrame" id="frame1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_start">12</property>
- <property name="margin_top">6</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <property name="row_homogeneous">True</property>
+ <property name="can-focus">False</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</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>
+ <!-- n-columns=2 n-rows=6 -->
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <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>
+ <property name="can-focus">False</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
+ <property name="row-spacing">6</property>
+ <property name="column-spacing">12</property>
+ <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">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="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>
</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>
- <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="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>
+ <child>
+ <object class="GtkCheckButton"
id="CB_VALUE_AS_PERCENTAGE">
+ <property name="label" translatable="yes"
context="dlg_DataLabel|CB_VALUE_AS_PERCENTAGE">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="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">1</property>
+ </packing>
</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="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>
+ <child>
+ <object class="GtkCheckButton" id="CB_CATEGORY">
+ <property name="label" translatable="yes"
context="dlg_DataLabel|CB_CATEGORY">_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="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">2</property>
+ </packing>
</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="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>
+ <child>
+ <object class="GtkCheckButton" id="CB_SYMBOL">
+ <property name="label" translatable="yes"
context="dlg_DataLabel|CB_SYMBOL">_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="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">4</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</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="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</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>
+ <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="draw-indicator">True</property>
</object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">5</property>
+ </packing>
</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>
+ <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>
- </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="GtkLabel" id="FT_TEXT_SEPARATOR">
+ <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">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>
+ <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>
+ </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="GtkComboBoxText"
id="LB_TEXT_SEPARATOR">
+ <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="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>
+ <object class="GtkCheckButton"
id="CB_DATA_SERIES_NAME">
+ <property name="label" translatable="yes"
context="dlg_DataLabel|CB_DATA_SERIES_NAME">_Series name</property>
<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>
+ <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="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 class="AtkObject"
id="CB_DATA_SERIES_NAME-atkobject">
+ <property
name="AtkObject::accessible-description" translatable="yes"
context="dlg_DataLabel|extended_tip|CB_DATA_SERIES_NAME">Shows the data series
name in the label.</property>
</object>
</child>
</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>
+ <child>
+ <placeholder/>
+ </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 type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="dlg_DataLabel|label1">Text Attributes</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame4">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
<child>
- <object class="GtkBox" id="boxPLACEMENT">
+ <!-- n-columns=2 n-rows=2 -->
+ <object class="GtkGrid" id="grid2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
+ <property name="can-focus">False</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
+ <property name="row-spacing">6</property>
+ <property name="column-spacing">12</property>
+ <property name="row-homogeneous">True</property>
<child>
<object class="GtkLabel" id="FT_LABEL_PLACEMENT">
<property name="visible">True</property>
- <property name="can_focus">False</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="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>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText"
id="LB_LABEL_PLACEMENT">
<property name="visible">True</property>
- <property name="can_focus">False</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>
@@ -336,66 +357,66 @@
</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">1</property>
+ </packing>
+ </child>
+ <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="left-attach">0</property>
+ <property name="top-attach">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="left-attach">1</property>
+ <property name="top-attach">0</property>
</packing>
</child>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">7</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>
- <object class="GtkCheckButton" id="CB_DATA_SERIES_NAME">
- <property name="label" translatable="yes"
context="dlg_DataLabel|CB_DATA_SERIES_NAME">Show data _series name</property>
+ <child type="label">
+ <object class="GtkLabel" id="label6">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="dlg_DataLabel|label1">Attribute Options</property>
<property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject"
id="CB_DATA_SERIES_NAME-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes"
context="dlg_DataLabel|extended_tip|CB_DATA_SERIES_NAME">Shows the data series
name in the label.</property>
- </object>
- </child>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
</child>
</object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="dlg_DataLabel|label1">Text Attributes</property>
- <property name="xalign">0</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
<packing>
@@ -405,33 +426,79 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame2">
+ <object class="GtkBox" id="box_right">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="can-focus">False</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkBox" id="box5">
+ <object class="GtkFrame" id="frame2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_start">12</property>
- <property name="margin_top">6</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="can-focus">False</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
<child>
- <object class="GtkBox" id="boxORIENTATION">
+ <object class="GtkBox" id="box5">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
+ <property name="can-focus">False</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkDrawingArea" id="CT_DIAL">
+ <object class="GtkBox" id="boxORIENTATION">
<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>
+ <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="truncate-multiline">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>
+ </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>
@@ -441,18 +508,40 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="NF_LABEL_DEGREES">
+ <object class="GtkBox" id="boxTXT_DIRECTION">
<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>
- <property name="truncate-multiline">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>
+ <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>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
<packing>
@@ -461,145 +550,96 @@
<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 type="label">
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="dlg_DataLabel|label2">Rotate Text</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame3">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
<child>
- <object class="GtkBox" id="boxTXT_DIRECTION">
+ <object class="GtkBox" id="box6">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
+ <property name="can-focus">False</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkLabel" id="FT_LABEL_TEXTDIR">
+ <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="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>
+ <property name="can-focus">True</property>
+ <property name="receives-default">False</property>
+ <property name="use-underline">True</property>
+ <property name="draw-indicator">True</property>
<child internal-child="accessible">
- <object class="AtkObject"
id="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 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>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="dlg_DataLabel|label2">Rotate Text</property>
- <property name="xalign">0</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frame3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkBox" id="box6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_start">12</property>
- <property name="margin_top">6</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>
+ <child type="label">
+ <object class="GtkLabel" id="label3">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <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">False</property>
+ <property name="label" translatable="yes"
context="dlg_DataLabel|label3">Leader Lines</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">12</property>
+ <property name="position">1</property>
+ </packing>
</child>
- <child type="label">
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
context="dlg_DataLabel|label3">Leader Lines</property>
- <property name="xalign">0</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
+ <child>
+ <placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="accessible">
- <object class="AtkObject" id="tp_DataLabel-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="dlg_DataLabel|extended_tip|tp_DataLabel">Opens the
Data Labels dialog, which enables you to set the data labels.</property>
+ <object class="AtkObject" id="dlg_DataLabel-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes" context="dlg_DataLabel|extended_tip|dlg_DataLabel">Opens the
Data Labels dialog, which enables you to set the data labels.</property>
</object>
</child>
</object>
@@ -616,9 +656,6 @@
<action-widget response="-6">cancel</action-widget>
<action-widget response="-11">help</action-widget>
</action-widgets>
- <child type="titlebar">
- <placeholder/>
- </child>
<child internal-child="accessible">
<object class="AtkObject" id="dlg_DataLabels-atkobject">
<property name="AtkObject::accessible-description" translatable="yes"
context="dlg_DataLabel|extended_tip|dlg_DataLabels">Opens the Data Labels
dialog, which enables you to set the data labels.</property>
diff --git a/chart2/uiconfig/ui/tp_DataLabel.ui
b/chart2/uiconfig/ui/tp_DataLabel.ui
index f02c8499d96a..65200213de75 100644
--- a/chart2/uiconfig/ui/tp_DataLabel.ui
+++ b/chart2/uiconfig/ui/tp_DataLabel.ui
@@ -1,250 +1,271 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.38.2 -->
<interface domain="chart">
<requires lib="gtk+" version="3.20"/>
<object class="GtkAdjustment" id="adjustmentDEGREE">
<property name="upper">359</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
+ <property name="step-increment">1</property>
+ <property name="page-increment">10</property>
</object>
<object class="GtkBox" id="tp_DataLabel">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="border_width">6</property>
- <property name="orientation">vertical</property>
+ <property name="can-focus">False</property>
+ <property name="border-width">6</property>
<property name="spacing">12</property>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkBox">
+ <property name="name">box_left</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="can-focus">False</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkGrid" id="grid1">
+ <object class="GtkFrame" id="frame1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_start">12</property>
- <property name="margin_top">6</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <property name="row_homogeneous">True</property>
+ <property name="can-focus">False</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</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>
+ <!-- n-columns=2 n-rows=6 -->
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- <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>
+ <property name="can-focus">False</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
+ <property name="row-spacing">6</property>
+ <property name="column-spacing">12</property>
+ <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">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="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>
</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>
- <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="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>
+ <child>
+ <object class="GtkCheckButton" id="CB_VALUE_AS_PERCENTAGE">
+ <property name="label" translatable="yes"
context="tp_DataLabel|CB_VALUE_AS_PERCENTAGE">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="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">1</property>
+ </packing>
</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="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>
+ <child>
+ <object class="GtkCheckButton" id="CB_CATEGORY">
+ <property name="label" translatable="yes"
context="tp_DataLabel|CB_CATEGORY">_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="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">2</property>
+ </packing>
</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="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>
+ <child>
+ <object class="GtkCheckButton" id="CB_SYMBOL">
+ <property name="label" translatable="yes"
context="tp_DataLabel|CB_SYMBOL">_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="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">4</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</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="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</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>
+ <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="draw-indicator">True</property>
</object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">5</property>
+ </packing>
</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>
+ <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>
- </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="GtkLabel" id="FT_TEXT_SEPARATOR">
+ <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">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>
+ <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>
+ </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="GtkComboBoxText" id="LB_TEXT_SEPARATOR">
+ <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="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>
+ <object class="GtkCheckButton" id="CB_DATA_SERIES_NAME">
+ <property name="label" translatable="yes"
context="tp_DataLabel|CB_DATA_SERIES_NAME">_Series name</property>
<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>
+ <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="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 class="AtkObject"
id="CB_DATA_SERIES_NAME-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes"
context="tp_DataLabel|extended_tip|CB_DATA_SERIES_NAME">Shows the data series
name in the label.</property>
</object>
</child>
</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>
+ <child>
+ <placeholder/>
+ </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 type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="tp_DataLabel|label1">Text Attributes</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame4">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
<child>
- <object class="GtkBox" id="boxPLACEMENT">
+ <!-- n-columns=2 n-rows=2 -->
+ <object class="GtkGrid" id="grid2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
+ <property name="can-focus">False</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">6</property>
+ <property name="row-spacing">6</property>
+ <property name="column-spacing">12</property>
+ <property name="row-homogeneous">True</property>
<child>
<object class="GtkLabel" id="FT_LABEL_PLACEMENT">
<property name="visible">True</property>
- <property name="can_focus">False</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="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>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkComboBoxText" id="LB_LABEL_PLACEMENT">
<property name="visible">True</property>
- <property name="can_focus">False</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>
@@ -268,66 +289,66 @@
</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">1</property>
+ </packing>
+ </child>
+ <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="left-attach">0</property>
+ <property name="top-attach">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="left-attach">1</property>
+ <property name="top-attach">0</property>
</packing>
</child>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">7</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>
- <object class="GtkCheckButton" id="CB_DATA_SERIES_NAME">
- <property name="label" translatable="yes"
context="tp_DataLabel|CB_DATA_SERIES_NAME">Show data _series name</property>
+ <child type="label">
+ <object class="GtkLabel" id="label6">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes"
context="tp_DataLabel|label1">Attribute Options</property>
<property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="CB_DATA_SERIES_NAME-atkobject">
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
