diff options
| author | Marco Cecchetti <marco.cecchetti@collabora.com> | 2015-07-19 18:18:00 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-09-09 07:41:51 +0000 |
| commit | 9ed1dd01be8afa0961e388a79e9ff4c1235820c2 (patch) | |
| tree | 366cad6bae91e791be462e4c03f499ab0ba3e2f2 /chart2/uiconfig/ui | |
| parent | sw: use std::unique_ptr<> in undo (diff) | |
| download | core-9ed1dd01be8afa0961e388a79e9ff4c1235820c2.tar.gz core-9ed1dd01be8afa0961e388a79e9ff4c1235820c2.zip | |
tdf#90839: support for wrapped text in data labels and for centered data value
Now in a pie chart the text of a label can be wrapped, the wrapping is
automatic and the maximum text width is fixed to almost half the pie
radius. This feature is used to import correctly the relative text
wrapping property provided by MSO.
Moreover the data value and percent value of a label are now centered
horizontally, respect with the label text.
Conflicts:
chart2/qa/extras/xshape/chart2xshape.cxx
Change-Id: Ie10d6184365436f763cd9693a5bbefcfa9b3862b
Reviewed-on: https://gerrit.libreoffice.org/17193
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'chart2/uiconfig/ui')
| -rw-r--r-- | chart2/uiconfig/ui/dlg_DataLabel.ui | 19 | ||||
| -rw-r--r-- | chart2/uiconfig/ui/tp_DataLabel.ui | 21 |
2 files changed, 36 insertions, 4 deletions
diff --git a/chart2/uiconfig/ui/dlg_DataLabel.ui b/chart2/uiconfig/ui/dlg_DataLabel.ui index 7824b4a8e9a9..51f38590950c 100644 --- a/chart2/uiconfig/ui/dlg_DataLabel.ui +++ b/chart2/uiconfig/ui/dlg_DataLabel.ui @@ -250,6 +250,21 @@ </packing> </child> <child> + <object class="GtkCheckButton" id="CB_WRAP_TEXT"> + <property name="label" translatable="yes">Auto text _wrap</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> + </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">Number _format...</property> <property name="visible">True</property> @@ -327,7 +342,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">4</property> + <property name="top_attach">5</property> <property name="width">2</property> </packing> </child> @@ -367,7 +382,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">5</property> + <property name="top_attach">6</property> <property name="width">2</property> </packing> </child> diff --git a/chart2/uiconfig/ui/tp_DataLabel.ui b/chart2/uiconfig/ui/tp_DataLabel.ui index b31bb2e1f895..476a2ec3d809 100644 --- a/chart2/uiconfig/ui/tp_DataLabel.ui +++ b/chart2/uiconfig/ui/tp_DataLabel.ui @@ -190,6 +190,23 @@ </packing> </child> <child> + <object class="GtkCheckButton" id="CB_WRAP_TEXT"> + <property name="label" translatable="yes">Auto text _wrap</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> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> <object class="GtkButton" id="PB_NUMBERFORMAT"> <property name="label" translatable="yes">Number _format...</property> <property name="visible">True</property> @@ -273,7 +290,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">4</property> + <property name="top_attach">5</property> <property name="width">2</property> <property name="height">1</property> </packing> @@ -314,7 +331,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">5</property> + <property name="top_attach">6</property> <property name="width">2</property> <property name="height">1</property> </packing> |