diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2015-07-28 16:19:59 +0200 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2015-07-29 15:40:10 +0000 |
| commit | 93d301a287141013c28556570d67ffc9d3286b2a (patch) | |
| tree | 1319e6d08419bfa3e92f08b73e9a7a81553dcc22 /chart2/source | |
| parent | 09aa0d142e9573fac898ea270d659e3ed7ef019c (diff) | |
Some (mostly HIG) tweaks to chart elements panel
As I wanted to represent subsections as frames (it looks kinda
better with bold labels), I tried to emulate grid behaviour by
putting widgets into 2 size groups
Other tweaks include disabling legend position listbox when legend
is not to be shown and missing clear() of that listbox
Change-Id: I0b635fe5aba1580542cf982e2e6be02eb0056352
Reviewed-on: https://gerrit.libreoffice.org/17386
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'chart2/source')
| -rw-r--r-- | chart2/source/controller/sidebar/ChartElementsPanel.cxx | 7 | ||||
| -rw-r--r-- | chart2/source/controller/sidebar/ChartElementsPanel.hxx | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx b/chart2/source/controller/sidebar/ChartElementsPanel.cxx index fd498ff25f46..08d1fea6f367 100644 --- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx +++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx @@ -310,6 +310,7 @@ ChartElementsPanel::ChartElementsPanel( get(mpCBGridHorizontalMinor, "checkbutton_gridline_horizontal_minor"); get(mpLBLegendPosition, "comboboxtext_legend"); + get(mpBoxLegend, "box_legend"); Initialize(); } @@ -342,6 +343,9 @@ void ChartElementsPanel::dispose() mpCBGridVerticalMinor.clear(); mpCBGridHorizontalMinor.clear(); + mpLBLegendPosition.clear(); + mpBoxLegend.clear(); + PanelLayout::dispose(); } @@ -491,7 +495,10 @@ IMPL_LINK(ChartElementsPanel, CheckBoxHdl, CheckBox*, pCheckBox) else if (pCheckBox == mpCB2ndYAxisTitle.get()) setTitleVisible(mxModel, TitleHelper::SECONDARY_Y_AXIS_TITLE, bChecked); else if (pCheckBox == mpCBLegend.get()) + { + mpBoxLegend->Enable( bChecked ); setLegendVisible(mxModel, bChecked); + } else if (pCheckBox == mpCBGridVerticalMajor.get()) setGridVisible(mxModel, GridType::VERT_MAJOR, bChecked); else if (pCheckBox == mpCBGridHorizontalMajor.get()) diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.hxx b/chart2/source/controller/sidebar/ChartElementsPanel.hxx index 766915c1e64e..47265fba4add 100644 --- a/chart2/source/controller/sidebar/ChartElementsPanel.hxx +++ b/chart2/source/controller/sidebar/ChartElementsPanel.hxx @@ -23,6 +23,7 @@ #include <sfx2/sidebar/IContextChangeReceiver.hxx> #include <sfx2/sidebar/SidebarModelUpdate.hxx> #include <svx/sidebar/PanelLayout.hxx> +#include <vcl/layout.hxx> #include "ChartSidebarModifyListener.hxx" #include <com/sun/star/util/XModifyListener.hpp> @@ -95,6 +96,7 @@ private: VclPtr<CheckBox> mpCBGridHorizontalMinor; VclPtr<ListBox> mpLBLegendPosition; + VclPtr<VclHBox> mpBoxLegend; css::uno::Reference<css::frame::XFrame> mxFrame; ::sfx2::sidebar::EnumContext maContext; |