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 m_xCBDataSeries; std::unique_ptr m_xCBWrapText; - std::unique_ptr m_xSeparatorResources; std::unique_ptr m_xLB_Separator; - - std::unique_ptr m_xBxLabelPlacement; std::unique_ptr m_xLB_LabelPlacement; std::unique_ptr 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 @@ - + 359 - 1 - 10 + 1 + 10 - False - 6 + False + 6 Data Labels for all Data Series - dialog + dialog - False + False vertical 12 - False - end + False + end _OK True - True - True - True - True + True + True + True + True True @@ -41,8 +41,8 @@ _Cancel True - True - True + True + True True @@ -55,8 +55,8 @@ _Help True - True - True + True + True True @@ -70,249 +70,270 @@ False True - end + end 0 - + True - False - 6 - vertical + False + 6 12 - + + box_left True - False - 0 - none + False + vertical - + True - False - 12 - 6 - 6 - 12 - True + False + 0 + none - - Show value as _number + + True - True - False - True - True - - - Displays the absolute values of the data points. - - - - - 0 - 0 - - - - - Show value as _percentage - True - True - False - True - True - - - Displays the percentage of the data points in each column. - - - - - 0 - 1 - - - - - Show _category - True - True - False - True - True - - - Shows the data point text labels. - - - - - 0 - 2 - - - - - Show _legend key - True - True - False - True - True - - - Displays the legend icons next to each data point label. - - - - - 0 - 4 - - - - - Auto text _wrap - True - True - False - True - True - - - 0 - 5 - - - - - Number _format... - True - True - True - center - True - - - Opens a dialog to select the number format. - - - - - 1 - 0 - - - - - Percentage f_ormat... - True - True - True - center - True - - - Opens a dialog to select the percentage format. - - - - - 1 - 1 - - - - - False - True - ABCD - - - - - - 1 - 3 - - - - - True - False - 12 + False + 12 + 6 + 6 + 12 + True - + + Value as _number True - False - _Separator - True - LB_TEXT_SEPARATOR - 0 - - - False - True - 0 - - - - - True - False - center - - Space - Comma - Semicolon - New line - Period - + True + False + True + True - - Selects the separator between multiple text strings for the same object. + + Displays the absolute values of the data points. - False - True - 1 + 0 + 0 + + + Value as _percentage + True + True + False + True + True + + + Displays the percentage of the data points in each column. + + + + + 0 + 1 + + + + + _Category + True + True + False + True + True + + + Shows the data point text labels. + + + + + 0 + 2 + + + + + _Legend key + True + True + False + True + True + + + Displays the legend icons next to each data point label. + + + + + 0 + 4 + + + + + Auto text _wrap + True + True + False + True + True + + + 0 + 5 + + + + + Number _format... + True + True + True + center + True + + + Opens a dialog to select the number format. + + + + + 1 + 0 + + + + + Percentage f_ormat... + True + True + True + center + True + + + Opens a dialog to select the percentage format. + + + + + 1 + 1 + + + + + False + True + ABCD + + + + + + 1 + 3 + + + + + False + Number Format for Percentage Value + + + 1 + 2 + + + + + _Series name + True + True + False + True + 0 + True + + + Shows the data series name in the label. + + + + + 0 + 3 + + + + + + + + - - 0 - 6 - 2 - - - + + True - False - 12 + False + Text Attributes + 0 + + + + + + + + False + True + 0 + + + + + True + False + 0 + none + + + + True + False + 12 + 6 + 6 + 12 + True True - False + False Place_ment - True - LB_LABEL_PLACEMENT + True + LB_LABEL_PLACEMENT 0 - False - True - 0 + 0 + 1 True - False + False center Best fit @@ -336,66 +357,66 @@ - False - True - 1 + 1 + 1 + + + + + True + False + _Separator + True + LB_TEXT_SEPARATOR + 0 + + + 0 + 0 + + + + + True + False + center + + Space + Comma + Semicolon + New line + Period + + + + Selects the separator between multiple text strings for the same object. + + + + + 1 + 0 - - 0 - 7 - 2 - - - - False - Number Format for Percentage Value - - - 1 - 2 - - - - - Show data _series name + + True - True - False - True + False + Attribute Options 0 - True - - - Shows the data series name in the label. - - + + + - - 0 - 3 - - - - - - - - - - - True - False - Text Attributes - 0 - - - - + + False + True + 1 + @@ -405,33 +426,79 @@ - + True - False - 0 - none + False + vertical - + True - False - 12 - 6 - vertical - 6 + False + 0 + none - + True - False - 12 + False + 12 + 6 + vertical + 6 - + True - False - GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK - - - Click in the dial to set the text orientation for the data labels. + False + 12 + + + True + False + GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK + + + Click in the dial to set the text orientation for the data labels. + + + + False + True + 0 + + + + + True + True + center + True + True + adjustmentDEGREE + True + + + Enter the counterclockwise rotation angle for the data labels. + + + + + False + True + 1 + + + + + True + False + _Degrees + True + + + False + True + 2 + @@ -441,18 +508,40 @@ - + True - True - center - True - adjustmentDEGREE - True - True - - - Enter the counterclockwise rotation angle for the data labels. + False + 12 + + + True + False + Te_xt direction + True + LB_LABEL_TEXTDIR + + False + True + 0 + + + + + True + False + True + + + 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. + + + + + False + True + 1 + @@ -461,81 +550,82 @@ 1 - - - True - False - _Degrees - True - - - False - True - 2 - - - - False - True - 0 - - - + + True - False - 12 - - - True - False - Te_xt direction - True - LB_LABEL_TEXTDIR - - - False - True - 0 - - - - - True - False - True - - - 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. - - - - - False - True - 1 - - + False + Rotate Text + 0 + + + - - False - True - 1 - + + False + True + 0 + - - + + True - False - Rotate Text - 0 - - - + False + 0 + none + + + True + False + 12 + 6 + vertical + + + _Connect displaced data labels to data points + True + True + False + True + True + + + Draws a line connecting the data labels to the data points + + + + + False + True + 0 + + + + + + + True + False + Leader Lines + 0 + + + + + + + False + True + 12 + 1 + + + + @@ -545,61 +635,11 @@ - - True - False - 0 - none - - - True - False - 12 - 6 - vertical - - - _Connect displaced data labels to data points - True - True - False - True - True - - - Draws a line connecting the data labels to the data points - - - - - False - True - 0 - - - - - - - True - False - Leader Lines - 0 - - - - - - - - False - True - 2 - + - - Opens the Data Labels dialog, which enables you to set the data labels. + + Opens the Data Labels dialog, which enables you to set the data labels. @@ -616,9 +656,6 @@ cancel help - - - Opens the Data Labels dialog, which enables you to set the data labels. 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 @@ - + 359 - 1 - 10 + 1 + 10 True - False - 6 - vertical + False + 6 12 - + + box_left True - False - 0 - none + False + vertical - + True - False - 12 - 6 - 6 - 12 - True + False + 0 + none - - Show value as _number + + True - True - False - True - True - - - Displays the absolute values of the data points. - - - - - 0 - 0 - - - - - Show value as _percentage - True - True - False - True - True - - - Displays the percentage of the data points in each column. - - - - - 0 - 1 - - - - - Show _category - True - True - False - True - True - - - Shows the data point text labels. - - - - - 0 - 2 - - - - - Show _legend key - True - True - False - True - True - - - Displays the legend icons next to each data point label. - - - - - 0 - 4 - - - - - Auto text _wrap - True - True - False - True - True - - - 0 - 5 - - - - - Number _format... - True - True - True - center - True - - - Opens a dialog to select the number format. - - - - - 1 - 0 - - - - - Percentage f_ormat... - True - True - True - center - True - - - Opens a dialog to select the percentage format. - - - - - 1 - 1 - - - - - False - True - ABCD - - - - - - 1 - 3 - - - - - True - False - 12 + False + 12 + 6 + 6 + 12 + True - + + Value as _number True - False - _Separator - True - LB_TEXT_SEPARATOR - 0 - - - False - True - 0 - - - - - True - False - center - - Space - Comma - Semicolon - New line - Period - + True + False + True + True - - Selects the separator between multiple text strings for the same object. + + Displays the absolute values of the data points. - False - True - 1 + 0 + 0 + + + Value as _percentage + True + True + False + True + True + + + Displays the percentage of the data points in each column. + + + + + 0 + 1 + + + + + _Category + True + True + False + True + True + + + Shows the data point text labels. + + + + + 0 + 2 + + + + + _Legend key + True + True + False + True + True + + + Displays the legend icons next to each data point label. + + + + + 0 + 4 + + + + + Auto text _wrap + True + True + False + True + True + + + 0 + 5 + + + + + Number _format... + True + True + True + center + True + + + Opens a dialog to select the number format. + + + + + 1 + 0 + + + + + Percentage f_ormat... + True + True + True + center + True + + + Opens a dialog to select the percentage format. + + + + + 1 + 1 + + + + + False + True + ABCD + + + + + + 1 + 3 + + + + + False + Number Format for Percentage Value + + + 1 + 2 + + + + + _Series name + True + True + False + True + 0 + True + + + Shows the data series name in the label. + + + + + 0 + 3 + + + + + + + + - - 0 - 6 - 2 - - - + + True - False - 12 + False + Text Attributes + 0 + + + + + + + + False + True + 0 + + + + + True + False + 0 + none + + + + True + False + 12 + 6 + 6 + 12 + True True - False + False Place_ment - True - LB_LABEL_PLACEMENT + True + LB_LABEL_PLACEMENT 0 - False - True - 0 + 0 + 1 True - False + False center Best fit @@ -268,66 +289,66 @@ - False - True - 1 + 1 + 1 + + + + + True + False + _Separator + True + LB_TEXT_SEPARATOR + 0 + + + 0 + 0 + + + + + True + False + center + + Space + Comma + Semicolon + New line + Period + + + + Selects the separator between multiple text strings for the same object. + + + + + 1 + 0 - - 0 - 7 - 2 - - - - False - Number Format for Percentage Value - - - 1 - 2 - - - - - Show data _series name + + True - True - False - True + False + Attribute Options 0 - True - - - Shows the data series name in the label. - - + + + - - 0 - 3 - - - - - - - - - - - True - False - Text Attributes - 0 - - - - + + False + True + 1 + @@ -337,33 +358,79 @@ - + True - False - 0 - none + False + vertical - + True - False - 12 - 6 - vertical - 6 + False + 0 + none - + True - False - 12 + False + 12 + 6 + vertical + 6 - + True - False - GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK - - - Click in the dial to set the text orientation for the data labels. + False + 12 + + + True + False + GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK + + + Click in the dial to set the text orientation for the data labels. + + + + False + True + 0 + + + + + True + True + center + True + True + adjustmentDEGREE + True + + + Enter the counterclockwise rotation angle for the data labels. + + + + + False + True + 1 + + + + + True + False + _Degrees + True + + + False + True + 2 + @@ -373,18 +440,40 @@ - + True - True - center - True - adjustmentDEGREE - True - True - - - Enter the counterclockwise rotation angle for the data labels. + False + 12 + + + True + False + Te_xt direction + True + LB_LABEL_TEXTDIR + + False + True + 0 + + + + + True + False + True + + + 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. + + + + + False + True + 1 + @@ -393,81 +482,82 @@ 1 - - - True - False - _Degrees - True - - - False - True - 2 - - - - False - True - 0 - - - + + True - False - 12 - - - True - False - Te_xt direction - True - LB_LABEL_TEXTDIR - - - False - True - 0 - - - - - True - False - True - - - 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. - - - - - False - True - 1 - - + False + Rotate Text + 0 + + + - - False - True - 1 - + + False + True + 0 + - - + + True - False - Rotate Text - 0 - - - + False + 0 + none + + + True + False + 12 + 6 + vertical + + + _Connect displaced data labels to data points + True + True + False + True + True + + + Draws a line connecting the data labels to the data points + + + + + False + True + 0 + + + + + + + True + False + Leader Lines + 0 + + + + + + + False + True + 12 + 1 + + + + @@ -477,57 +567,7 @@ - - True - False - 0 - none - - - True - False - 12 - 6 - vertical - - - _Connect displaced data labels to data points - True - True - False - True - True - - - Draws a line connecting the data labels to the data points - - - - - False - True - 0 - - - - - - - True - False - Leader Lines - 0 - - - - - - - - False - True - 2 - + @@ -535,16 +575,6 @@ - - - - - - - - - - - - + +