chart2/source/controller/dialogs/res_BarGeometry.cxx | 2
chart2/source/controller/dialogs/tp_ChartType.cxx | 568 -----------------
chart2/source/inc/ChartResourceGroups.hxx | 600 +++++++++++++++++++
chart2/source/inc/res_BarGeometry.hxx | 7
4 files changed, 606 insertions(+), 571 deletions(-)
New commits:
commit 15487a6451ae854963d7770ef412c6ffb4c51e71
Author: Muhammet Kara <muhammet.k...@collabora.com>
AuthorDate: Mon Oct 28 10:02:23 2019 +0300
Commit: Muhammet Kara <muhammet.k...@collabora.com>
CommitDate: Mon Oct 28 19:56:21 2019 +0100
chart2: Separate ChartResourceGroups to reuse
Change-Id: I0ca2ea9cd520013250faaba0e17e713da1e6fca3
Reviewed-on: https://gerrit.libreoffice.org/81581
Reviewed-by: Muhammet Kara <muhammet.k...@collabora.com>
Tested-by: Muhammet Kara <muhammet.k...@collabora.com>
diff --git a/chart2/source/controller/dialogs/res_BarGeometry.cxx
b/chart2/source/controller/dialogs/res_BarGeometry.cxx
index d067ae711978..c5f358d0d33b 100644
--- a/chart2/source/controller/dialogs/res_BarGeometry.cxx
+++ b/chart2/source/controller/dialogs/res_BarGeometry.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "res_BarGeometry.hxx"
+#include <res_BarGeometry.hxx>
#include <vcl/builder.hxx>
#include <ResId.hxx>
#include <chart.hrc>
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx
b/chart2/source/controller/dialogs/tp_ChartType.cxx
index bec21d752cf1..74b3c610d5b0 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -18,11 +18,12 @@
*/
#include "tp_ChartType.hxx"
+#include <ChartResourceGroups.hxx>
#include <strings.hrc>
#include <ResId.hxx>
#include <ChartModelHelper.hxx>
#include <DiagramHelper.hxx>
-#include "res_BarGeometry.hxx"
+#include <res_BarGeometry.hxx>
#include <ControllerLockGuard.hxx>
#include <unonames.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -38,571 +39,6 @@
namespace chart
{
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::chart2;
-
-enum {
- POS_3DSCHEME_SIMPLE = 0,
- POS_3DSCHEME_REALISTIC = 1
-};
-
-class Dim3DLookResourceGroup : public ChangingResource
-{
-public:
- explicit Dim3DLookResourceGroup(weld::Builder* pBuilder);
-
- void showControls( bool bShow );
-
- void fillControls( const ChartTypeParameter& rParameter );
- void fillParameter( ChartTypeParameter& rParameter );
-
-private:
- DECL_LINK( Dim3DLookCheckHdl, weld::ToggleButton&, void );
- DECL_LINK( SelectSchemeHdl, weld::ComboBox&, void );
-
-private:
- std::unique_ptr<weld::CheckButton> m_xCB_3DLook;
- std::unique_ptr<weld::ComboBox> m_xLB_Scheme;
-};
-
-Dim3DLookResourceGroup::Dim3DLookResourceGroup(weld::Builder* pBuilder)
- : ChangingResource()
- , m_xCB_3DLook(pBuilder->weld_check_button("3dlook"))
- , m_xLB_Scheme(pBuilder->weld_combo_box("3dscheme"))
-{
- m_xCB_3DLook->connect_toggled( LINK( this, Dim3DLookResourceGroup,
Dim3DLookCheckHdl ) );
- m_xLB_Scheme->connect_changed( LINK( this, Dim3DLookResourceGroup,
SelectSchemeHdl ) );
-}
-
-void Dim3DLookResourceGroup::showControls( bool bShow )
-{
- m_xCB_3DLook->show(bShow);
- m_xLB_Scheme->show(bShow);
-}
-
-void Dim3DLookResourceGroup::fillControls( const ChartTypeParameter&
rParameter )
-{
- m_xCB_3DLook->set_active(rParameter.b3DLook);
- m_xLB_Scheme->set_sensitive(rParameter.b3DLook);
-
- if( rParameter.eThreeDLookScheme == ThreeDLookScheme_Simple )
- m_xLB_Scheme->set_active(POS_3DSCHEME_SIMPLE);
- else if( rParameter.eThreeDLookScheme == ThreeDLookScheme_Realistic )
- m_xLB_Scheme->set_active(POS_3DSCHEME_REALISTIC);
- else
- m_xLB_Scheme->set_active(-1);
-}
-
-void Dim3DLookResourceGroup::fillParameter( ChartTypeParameter& rParameter )
-{
- rParameter.b3DLook = m_xCB_3DLook->get_active();
- const int nPos = m_xLB_Scheme->get_active();
- if( nPos == POS_3DSCHEME_SIMPLE )
- rParameter.eThreeDLookScheme = ThreeDLookScheme_Simple;
- else if( nPos == POS_3DSCHEME_REALISTIC )
- rParameter.eThreeDLookScheme = ThreeDLookScheme_Realistic;
- else
- rParameter.eThreeDLookScheme = ThreeDLookScheme_Unknown;
-}
-
-IMPL_LINK_NOARG(Dim3DLookResourceGroup, Dim3DLookCheckHdl,
weld::ToggleButton&, void)
-{
- if(m_pChangeListener)
- m_pChangeListener->stateChanged(this);
-}
-
-IMPL_LINK_NOARG(Dim3DLookResourceGroup, SelectSchemeHdl, weld::ComboBox&, void)
-{
- if(m_pChangeListener)
- m_pChangeListener->stateChanged(this);
-}
-
-class SortByXValuesResourceGroup : public ChangingResource
-{
-public:
- explicit SortByXValuesResourceGroup(weld::Builder* pBuilder);
-
- void showControls( bool bShow );
-
- void fillControls( const ChartTypeParameter& rParameter );
- void fillParameter( ChartTypeParameter& rParameter );
-
-private:
- DECL_LINK(SortByXValuesCheckHdl, weld::ToggleButton&, void);
-
-private:
- std::unique_ptr<weld::CheckButton> m_xCB_XValueSorting;
-};
-
-SortByXValuesResourceGroup::SortByXValuesResourceGroup(weld::Builder* pBuilder)
- : ChangingResource()
- , m_xCB_XValueSorting(pBuilder->weld_check_button("sort"))
-{
- m_xCB_XValueSorting->connect_toggled(LINK(this,
SortByXValuesResourceGroup, SortByXValuesCheckHdl));
-}
-
-void SortByXValuesResourceGroup::showControls( bool bShow )
-{
- m_xCB_XValueSorting->show(bShow);
-}
-
-void SortByXValuesResourceGroup::fillControls( const ChartTypeParameter&
rParameter )
-{
- m_xCB_XValueSorting->set_active(rParameter.bSortByXValues);
-}
-
-void SortByXValuesResourceGroup::fillParameter( ChartTypeParameter& rParameter
)
-{
- rParameter.bSortByXValues = m_xCB_XValueSorting->get_active();
-}
-
-IMPL_LINK_NOARG(SortByXValuesResourceGroup, SortByXValuesCheckHdl,
weld::ToggleButton&, void)
-{
- if(m_pChangeListener)
- m_pChangeListener->stateChanged(this);
-}
-
-class StackingResourceGroup : public ChangingResource
-{
-public:
- explicit StackingResourceGroup(weld::Builder* pBuilder);
-
- void showControls( bool bShow, bool bShowDeepStacking );
-
- void fillControls( const ChartTypeParameter& rParameter );
- void fillParameter( ChartTypeParameter& rParameter );
-
-private:
- DECL_LINK( StackingChangeHdl, weld::ToggleButton&, void );
- DECL_LINK( StackingEnableHdl, weld::ToggleButton&, void );
-
-private:
- std::unique_ptr<weld::CheckButton> m_xCB_Stacked;
- std::unique_ptr<weld::RadioButton> m_xRB_Stack_Y;
- std::unique_ptr<weld::RadioButton> m_xRB_Stack_Y_Percent;
- std::unique_ptr<weld::RadioButton> m_xRB_Stack_Z;
-};
-
-StackingResourceGroup::StackingResourceGroup(weld::Builder* pBuilder)
- : ChangingResource()
- , m_xCB_Stacked(pBuilder->weld_check_button("stack"))
- , m_xRB_Stack_Y(pBuilder->weld_radio_button("ontop"))
- , m_xRB_Stack_Y_Percent(pBuilder->weld_radio_button("percent"))
- , m_xRB_Stack_Z(pBuilder->weld_radio_button("deep"))
-{
- m_xCB_Stacked->connect_toggled( LINK( this, StackingResourceGroup,
StackingEnableHdl ) );
- m_xRB_Stack_Y->connect_toggled( LINK( this, StackingResourceGroup,
StackingChangeHdl ) );
- m_xRB_Stack_Y_Percent->connect_toggled( LINK( this, StackingResourceGroup,
StackingChangeHdl ) );
- m_xRB_Stack_Z->connect_toggled( LINK( this, StackingResourceGroup,
StackingChangeHdl ) );
-}
-
-void StackingResourceGroup::showControls( bool bShow, bool bShowDeepStacking )
-{
- m_xCB_Stacked->show(bShow);
- m_xRB_Stack_Y->show(bShow);
- m_xRB_Stack_Y_Percent->show(bShow);
- m_xRB_Stack_Z->show(bShow&&bShowDeepStacking);
-}
-
-void StackingResourceGroup::fillControls( const ChartTypeParameter& rParameter
)
-{
- m_xCB_Stacked->set_active( rParameter.eStackMode!=GlobalStackMode_NONE
- && rParameter.eStackMode!=GlobalStackMode_STACK_Z ); //todo remove
this condition if z stacking radio button is really used
- switch( rParameter.eStackMode )
- {
- case GlobalStackMode_STACK_Y:
- m_xRB_Stack_Y->set_active(true);
- break;
- case GlobalStackMode_STACK_Y_PERCENT:
- m_xRB_Stack_Y_Percent->set_active(true);
- break;
- case GlobalStackMode_STACK_Z:
- //todo uncomment this condition if z stacking radio button is
really used
- /*
- if( rParameter.b3DLook )
- m_xRB_Stack_Z->set_active(true);
- else
- */
- m_xRB_Stack_Y->set_active(true);
- break;
- default:
- m_xRB_Stack_Y->set_active(true);
- break;
- }
- //dis/enabling
- m_xCB_Stacked->set_sensitive( !rParameter.bXAxisWithValues );
- m_xRB_Stack_Y->set_sensitive( m_xCB_Stacked->get_active() &&
!rParameter.bXAxisWithValues );
- m_xRB_Stack_Y_Percent->set_sensitive( m_xCB_Stacked->get_active() &&
!rParameter.bXAxisWithValues );
- m_xRB_Stack_Z->set_sensitive( m_xCB_Stacked->get_active() &&
rParameter.b3DLook );
-}
-
-void StackingResourceGroup::fillParameter( ChartTypeParameter& rParameter )
-{
- if(!m_xCB_Stacked->get_active())
- rParameter.eStackMode = GlobalStackMode_NONE;
- else if(m_xRB_Stack_Y->get_active())
- rParameter.eStackMode = GlobalStackMode_STACK_Y;
- else if(m_xRB_Stack_Y_Percent->get_active())
- rParameter.eStackMode = GlobalStackMode_STACK_Y_PERCENT;
- else if(m_xRB_Stack_Z->get_active())
- rParameter.eStackMode = GlobalStackMode_STACK_Z;
-}
-
-IMPL_LINK( StackingResourceGroup, StackingChangeHdl, weld::ToggleButton&,
rRadio, void )
-{
- //for each radio click there are coming two change events
- //first uncheck of previous button -> ignore that call
- //the second call gives the check of the new button
- if (m_pChangeListener && rRadio.get_active())
- m_pChangeListener->stateChanged(this);
-}
-
-IMPL_LINK_NOARG(StackingResourceGroup, StackingEnableHdl, weld::ToggleButton&,
void)
-{
- if( m_pChangeListener )
- m_pChangeListener->stateChanged(this);
-}
-
-class SplinePropertiesDialog : public weld::GenericDialogController
-{
-public:
- explicit SplinePropertiesDialog(weld::Window* pParent);
-
- void fillControls( const ChartTypeParameter& rParameter );
- void fillParameter( ChartTypeParameter& rParameter, bool bSmoothLines );
-
-private:
- DECL_LINK(SplineTypeListBoxHdl, weld::ComboBox&, void);
-
-private:
- std::unique_ptr<weld::ComboBox> m_xLB_Spline_Type;
- std::unique_ptr<weld::SpinButton> m_xMF_SplineResolution;
- std::unique_ptr<weld::Label> m_xFT_SplineOrder;
- std::unique_ptr<weld::SpinButton> m_xMF_SplineOrder;
-};
-
-const sal_uInt16 CUBIC_SPLINE_POS = 0;
-const sal_uInt16 B_SPLINE_POS = 1;
-
-SplinePropertiesDialog::SplinePropertiesDialog(weld::Window* pParent)
- : GenericDialogController(pParent, "modules/schart/ui/smoothlinesdlg.ui",
"SmoothLinesDialog")
- , m_xLB_Spline_Type(m_xBuilder->weld_combo_box("SplineTypeComboBox"))
- ,
m_xMF_SplineResolution(m_xBuilder->weld_spin_button("ResolutionSpinbutton"))
- , m_xFT_SplineOrder(m_xBuilder->weld_label("PolynomialsLabel"))
- , m_xMF_SplineOrder(m_xBuilder->weld_spin_button("PolynomialsSpinButton"))
-{
- m_xDialog->set_title(SchResId(STR_DLG_SMOOTH_LINE_PROPERTIES));
-
- m_xLB_Spline_Type->connect_changed(LINK(this, SplinePropertiesDialog,
SplineTypeListBoxHdl));
-}
-
-void SplinePropertiesDialog::fillControls( const ChartTypeParameter&
rParameter )
-{
- switch(rParameter.eCurveStyle)
- {
- case CurveStyle_CUBIC_SPLINES:
- m_xLB_Spline_Type->set_active(CUBIC_SPLINE_POS);
- break;
- case CurveStyle_B_SPLINES:
- m_xLB_Spline_Type->set_active(B_SPLINE_POS);
- break;
- default:
- m_xLB_Spline_Type->set_active(CUBIC_SPLINE_POS);
- break;
- }
- m_xMF_SplineOrder->set_value( rParameter.nSplineOrder );
- m_xMF_SplineResolution->set_value( rParameter.nCurveResolution );
-
- //dis/enabling
- m_xFT_SplineOrder->set_sensitive(m_xLB_Spline_Type->get_active() ==
B_SPLINE_POS);
- m_xMF_SplineOrder->set_sensitive(m_xLB_Spline_Type->get_active() ==
B_SPLINE_POS);
-}
-
-void SplinePropertiesDialog::fillParameter( ChartTypeParameter& rParameter,
bool bSmoothLines )
-{
- if(!bSmoothLines)
- rParameter.eCurveStyle=CurveStyle_LINES;
- else if(m_xLB_Spline_Type->get_active() == CUBIC_SPLINE_POS)
- rParameter.eCurveStyle=CurveStyle_CUBIC_SPLINES;
- else if(m_xLB_Spline_Type->get_active() == B_SPLINE_POS)
- rParameter.eCurveStyle=CurveStyle_B_SPLINES;
-
- rParameter.nCurveResolution = m_xMF_SplineResolution->get_value();
- rParameter.nSplineOrder = m_xMF_SplineOrder->get_value();
-}
-
-IMPL_LINK_NOARG(SplinePropertiesDialog, SplineTypeListBoxHdl, weld::ComboBox&,
void)
-{
- m_xFT_SplineOrder->set_sensitive(m_xLB_Spline_Type->get_active() ==
B_SPLINE_POS);
- m_xMF_SplineOrder->set_sensitive(m_xLB_Spline_Type->get_active() ==
B_SPLINE_POS);
-}
-
-class SteppedPropertiesDialog : public weld::GenericDialogController
-{
-public:
- explicit SteppedPropertiesDialog(weld::Window* pParent);
-
- void fillControls( const ChartTypeParameter& rParameter );
- void fillParameter( ChartTypeParameter& rParameter, bool bSteppedLines );
-
-private:
- std::unique_ptr<weld::RadioButton> m_xRB_Start;
- std::unique_ptr<weld::RadioButton> m_xRB_End;
- std::unique_ptr<weld::RadioButton> m_xRB_CenterX;
- std::unique_ptr<weld::RadioButton> m_xRB_CenterY;
-};
-
-SteppedPropertiesDialog::SteppedPropertiesDialog(weld::Window* pParent)
- : GenericDialogController(pParent, "modules/schart/ui/steppedlinesdlg.ui",
"SteppedLinesDialog")
- , m_xRB_Start(m_xBuilder->weld_radio_button("step_start_rb"))
- , m_xRB_End(m_xBuilder->weld_radio_button("step_end_rb"))
- , m_xRB_CenterX(m_xBuilder->weld_radio_button("step_center_x_rb"))
- , m_xRB_CenterY(m_xBuilder->weld_radio_button("step_center_y_rb"))
-{
- m_xDialog->set_title(SchResId(STR_DLG_STEPPED_LINE_PROPERTIES));
-}
-
-void SteppedPropertiesDialog::fillControls( const ChartTypeParameter&
rParameter )
-{
- switch(rParameter.eCurveStyle)
- {
- case CurveStyle_STEP_END:
- m_xRB_End->set_active(true);
- break;
- case CurveStyle_STEP_CENTER_X:
- m_xRB_CenterX->set_active(true);
- break;
- case CurveStyle_STEP_CENTER_Y:
- m_xRB_CenterY->set_active(true);
- break;
- default: // includes CurveStyle_STEP_START
- m_xRB_Start->set_active(true);
- break;
- }
-}
-void SteppedPropertiesDialog::fillParameter( ChartTypeParameter& rParameter,
bool bSteppedLines )
-{
- if (!bSteppedLines)
- rParameter.eCurveStyle=CurveStyle_LINES;
- else if(m_xRB_CenterY->get_active())
- rParameter.eCurveStyle=CurveStyle_STEP_CENTER_Y;
- else if(m_xRB_Start->get_active())
- rParameter.eCurveStyle=CurveStyle_STEP_START;
- else if(m_xRB_End->get_active())
- rParameter.eCurveStyle=CurveStyle_STEP_END;
- else if(m_xRB_CenterX->get_active())
- rParameter.eCurveStyle=CurveStyle_STEP_CENTER_X;
-}
-
-#define POS_LINETYPE_STRAIGHT 0
-#define POS_LINETYPE_SMOOTH 1
-#define POS_LINETYPE_STEPPED 2
-
-class SplineResourceGroup : public ChangingResource
-{
-public:
- explicit SplineResourceGroup(weld::Builder* pBuilder, TabPageParent
pParent);
-
- void showControls( bool bShow );
-
- void fillControls( const ChartTypeParameter& rParameter );
- void fillParameter( ChartTypeParameter& rParameter );
-
-private:
- DECL_LINK( LineTypeChangeHdl, weld::ComboBox&, void );
- DECL_LINK( SplineDetailsDialogHdl, weld::Button&, void );
- DECL_LINK( SteppedDetailsDialogHdl, weld::Button&, void );
- SplinePropertiesDialog& getSplinePropertiesDialog();
- SteppedPropertiesDialog& getSteppedPropertiesDialog();
-
-private:
- TabPageParent m_pParent;
- std::unique_ptr<weld::Label> m_xFT_LineType;
- std::unique_ptr<weld::ComboBox> m_xLB_LineType;
- std::unique_ptr<weld::Button> m_xPB_DetailsDialog;
- std::unique_ptr<SplinePropertiesDialog> m_xSplinePropertiesDialog;
- std::unique_ptr<SteppedPropertiesDialog> m_xSteppedPropertiesDialog;
-};
-
-SplineResourceGroup::SplineResourceGroup(weld::Builder* pBuilder,
TabPageParent pParent)
- : ChangingResource()
- , m_pParent(pParent)
- , m_xFT_LineType(pBuilder->weld_label("linetypeft"))
- , m_xLB_LineType(pBuilder->weld_combo_box("linetype"))
- , m_xPB_DetailsDialog(pBuilder->weld_button("properties"))
-{
- m_xLB_LineType->connect_changed(LINK(this, SplineResourceGroup,
LineTypeChangeHdl));
-}
-
-SplinePropertiesDialog& SplineResourceGroup::getSplinePropertiesDialog()
-{
- if (!m_xSplinePropertiesDialog)
- {
- m_xSplinePropertiesDialog.reset(new
SplinePropertiesDialog(m_pParent.GetFrameWeld()));
- }
- return *m_xSplinePropertiesDialog;
-}
-
-SteppedPropertiesDialog& SplineResourceGroup::getSteppedPropertiesDialog()
-{
- if (!m_xSteppedPropertiesDialog)
- {
- m_xSteppedPropertiesDialog.reset(new
SteppedPropertiesDialog(m_pParent.GetFrameWeld()));
- }
- return *m_xSteppedPropertiesDialog;
-}
-
-void SplineResourceGroup::showControls( bool bShow )
-{
- m_xFT_LineType->show(bShow);
- m_xLB_LineType->show(bShow);
- m_xPB_DetailsDialog->show(bShow);
-}
-
-void SplineResourceGroup::fillControls( const ChartTypeParameter& rParameter )
-{
- switch (rParameter.eCurveStyle)
- {
- case CurveStyle_LINES:
- m_xLB_LineType->set_active(POS_LINETYPE_STRAIGHT);
- m_xPB_DetailsDialog->set_sensitive(false);
- break;
- case CurveStyle_CUBIC_SPLINES:
- case CurveStyle_B_SPLINES:
- m_xLB_LineType->set_active(POS_LINETYPE_SMOOTH);
- m_xPB_DetailsDialog->set_sensitive(true);
- m_xPB_DetailsDialog->connect_clicked( LINK( this,
SplineResourceGroup, SplineDetailsDialogHdl ) );
-
m_xPB_DetailsDialog->set_tooltip_text(SchResId(STR_DLG_SMOOTH_LINE_PROPERTIES));
- getSplinePropertiesDialog().fillControls( rParameter );
- break;
- case CurveStyle_STEP_START:
- case CurveStyle_STEP_END:
- case CurveStyle_STEP_CENTER_X:
- case CurveStyle_STEP_CENTER_Y:
- m_xLB_LineType->set_active(POS_LINETYPE_STEPPED);
- m_xPB_DetailsDialog->set_sensitive(true);
- m_xPB_DetailsDialog->connect_clicked( LINK( this,
SplineResourceGroup, SteppedDetailsDialogHdl ) );
- m_xPB_DetailsDialog->set_tooltip_text(
SchResId(STR_DLG_STEPPED_LINE_PROPERTIES) );
- getSteppedPropertiesDialog().fillControls( rParameter );
- break;
- default:
- m_xLB_LineType->set_active(-1);
- m_xPB_DetailsDialog->set_sensitive(false);
- }
-}
-void SplineResourceGroup::fillParameter( ChartTypeParameter& rParameter )
-{
- switch (m_xLB_LineType->get_active())
- {
- case POS_LINETYPE_SMOOTH:
- getSplinePropertiesDialog().fillParameter( rParameter, true );
- break;
- case POS_LINETYPE_STEPPED:
- getSteppedPropertiesDialog().fillParameter( rParameter, true );
- break;
- default: // includes POS_LINETYPE_STRAIGHT
- rParameter.eCurveStyle = CurveStyle_LINES;
- break;
- }
-}
-
-IMPL_LINK_NOARG(SplineResourceGroup, LineTypeChangeHdl, weld::ComboBox&, void)
-{
- if( m_pChangeListener )
- m_pChangeListener->stateChanged(this);
-}
-
-IMPL_LINK_NOARG(SplineResourceGroup, SplineDetailsDialogHdl, weld::Button&,
void)
-{
-
- ChartTypeParameter aOldParameter;
- getSplinePropertiesDialog().fillParameter( aOldParameter,
m_xLB_LineType->get_active() == POS_LINETYPE_SMOOTH );
-
- const sal_Int32 iOldLineTypePos = m_xLB_LineType->get_active();
- m_xLB_LineType->set_active(POS_LINETYPE_SMOOTH);
- if (getSplinePropertiesDialog().run() == RET_OK)
- {
- if( m_pChangeListener )
- m_pChangeListener->stateChanged(this);
- }
- else
- {
- //restore old state:
- m_xLB_LineType->set_active( iOldLineTypePos );
- getSplinePropertiesDialog().fillControls( aOldParameter );
- }
-}
-
-IMPL_LINK_NOARG(SplineResourceGroup, SteppedDetailsDialogHdl, weld::Button&,
void)
-{
-
- ChartTypeParameter aOldParameter;
- getSteppedPropertiesDialog().fillParameter( aOldParameter,
m_xLB_LineType->get_active() == POS_LINETYPE_STEPPED );
-
- const sal_Int32 iOldLineTypePos = m_xLB_LineType->get_active();
- m_xLB_LineType->set_active(POS_LINETYPE_STEPPED);
- if (getSteppedPropertiesDialog().run() == RET_OK)
- {
- if( m_pChangeListener )
- m_pChangeListener->stateChanged(this);
- }
- else
- {
- //restore old state:
- m_xLB_LineType->set_active(iOldLineTypePos);
- getSteppedPropertiesDialog().fillControls( aOldParameter );
- }
-}
-
-class GeometryResourceGroup : public ChangingResource
-{
-public:
- explicit GeometryResourceGroup(weld::Builder* pBuilder);
-
- void showControls( bool bShow );
-
- void fillControls( const ChartTypeParameter& rParameter );
- void fillParameter( ChartTypeParameter& rParameter );
-
-private:
- DECL_LINK( GeometryChangeHdl, weld::TreeView&, void );
-
-private:
- BarGeometryResources m_aGeometryResources;
-};
-
-GeometryResourceGroup::GeometryResourceGroup(weld::Builder* pBuilder)
- : ChangingResource()
- , m_aGeometryResources(pBuilder)
-{
- m_aGeometryResources.connect_changed( LINK( this, GeometryResourceGroup,
GeometryChangeHdl ) );
-}
-
-void GeometryResourceGroup::showControls(bool bShow)
-{
- m_aGeometryResources.show(bShow);
-}
-
-void GeometryResourceGroup::fillControls(const ChartTypeParameter& rParameter)
-{
- sal_uInt16 nGeometry3D = static_cast<sal_uInt16>(rParameter.nGeometry3D);
- m_aGeometryResources.select(nGeometry3D);
- m_aGeometryResources.set_sensitive(rParameter.b3DLook);
-}
-
-void GeometryResourceGroup::fillParameter(ChartTypeParameter& rParameter)
-{
- rParameter.nGeometry3D = 1;
- int nSelected = m_aGeometryResources.get_selected_index();
- if (nSelected != -1)
- rParameter.nGeometry3D = nSelected;
-}
-
-IMPL_LINK_NOARG(GeometryResourceGroup, GeometryChangeHdl, weld::TreeView&,
void)
-{
- if( m_pChangeListener )
- m_pChangeListener->stateChanged(this);
-}
ChartTypeTabPage::ChartTypeTabPage(TabPageParent pParent , const
uno::Reference< XChartDocument >& xChartModel,
bool bShowDescription)
diff --git a/chart2/source/inc/ChartResourceGroups.hxx
b/chart2/source/inc/ChartResourceGroups.hxx
new file mode 100644
index 000000000000..01b23c732141
--- /dev/null
+++ b/chart2/source/inc/ChartResourceGroups.hxx
@@ -0,0 +1,600 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_CHART2_SOURCE_CHARTRESOURCEGROUPS_HXX
+#define INCLUDED_CHART2_SOURCE_CHARTRESOURCEGROUPS_HXX
+
+#include <strings.hrc>
+#include <ResId.hxx>
+
+#include <res_BarGeometry.hxx>
+
+namespace chart
+{
+using namespace ::com::sun::star;
+using namespace ::com::sun::star::chart2;
+
+enum
+{
+ POS_3DSCHEME_SIMPLE = 0,
+ POS_3DSCHEME_REALISTIC = 1
+};
+
+class Dim3DLookResourceGroup : public ChangingResource
+{
+public:
+ explicit Dim3DLookResourceGroup(weld::Builder* pBuilder);
+
+ void showControls(bool bShow);
+
+ void fillControls(const ChartTypeParameter& rParameter);
+ void fillParameter(ChartTypeParameter& rParameter);
+
+private:
+ DECL_LINK(Dim3DLookCheckHdl, weld::ToggleButton&, void);
+ DECL_LINK(SelectSchemeHdl, weld::ComboBox&, void);
+
+private:
+ std::unique_ptr<weld::CheckButton> m_xCB_3DLook;
+ std::unique_ptr<weld::ComboBox> m_xLB_Scheme;
+};
+
+Dim3DLookResourceGroup::Dim3DLookResourceGroup(weld::Builder* pBuilder)
+ : ChangingResource()
+ , m_xCB_3DLook(pBuilder->weld_check_button("3dlook"))
+ , m_xLB_Scheme(pBuilder->weld_combo_box("3dscheme"))
+{
+ m_xCB_3DLook->connect_toggled(LINK(this, Dim3DLookResourceGroup,
Dim3DLookCheckHdl));
+ m_xLB_Scheme->connect_changed(LINK(this, Dim3DLookResourceGroup,
SelectSchemeHdl));
+}
+
+void Dim3DLookResourceGroup::showControls(bool bShow)
+{
+ m_xCB_3DLook->show(bShow);
+ m_xLB_Scheme->show(bShow);
+}
+
+void Dim3DLookResourceGroup::fillControls(const ChartTypeParameter& rParameter)
+{
+ m_xCB_3DLook->set_active(rParameter.b3DLook);
+ m_xLB_Scheme->set_sensitive(rParameter.b3DLook);
+
+ if (rParameter.eThreeDLookScheme == ThreeDLookScheme_Simple)
+ m_xLB_Scheme->set_active(POS_3DSCHEME_SIMPLE);
+ else if (rParameter.eThreeDLookScheme == ThreeDLookScheme_Realistic)
+ m_xLB_Scheme->set_active(POS_3DSCHEME_REALISTIC);
+ else
+ m_xLB_Scheme->set_active(-1);
+}
+
+void Dim3DLookResourceGroup::fillParameter(ChartTypeParameter& rParameter)
+{
+ rParameter.b3DLook = m_xCB_3DLook->get_active();
+ const int nPos = m_xLB_Scheme->get_active();
+ if (nPos == POS_3DSCHEME_SIMPLE)
+ rParameter.eThreeDLookScheme = ThreeDLookScheme_Simple;
+ else if (nPos == POS_3DSCHEME_REALISTIC)
+ rParameter.eThreeDLookScheme = ThreeDLookScheme_Realistic;
+ else
+ rParameter.eThreeDLookScheme = ThreeDLookScheme_Unknown;
+}
+
+IMPL_LINK_NOARG(Dim3DLookResourceGroup, Dim3DLookCheckHdl,
weld::ToggleButton&, void)
+{
+ if (m_pChangeListener)
+ m_pChangeListener->stateChanged(this);
+}
+
+IMPL_LINK_NOARG(Dim3DLookResourceGroup, SelectSchemeHdl, weld::ComboBox&, void)
+{
+ if (m_pChangeListener)
+ m_pChangeListener->stateChanged(this);
+}
+
+class SortByXValuesResourceGroup : public ChangingResource
+{
+public:
+ explicit SortByXValuesResourceGroup(weld::Builder* pBuilder);
+
+ void showControls(bool bShow);
+
+ void fillControls(const ChartTypeParameter& rParameter);
+ void fillParameter(ChartTypeParameter& rParameter);
+
+private:
+ DECL_LINK(SortByXValuesCheckHdl, weld::ToggleButton&, void);
+
+private:
+ std::unique_ptr<weld::CheckButton> m_xCB_XValueSorting;
+};
+
+SortByXValuesResourceGroup::SortByXValuesResourceGroup(weld::Builder* pBuilder)
+ : ChangingResource()
+ , m_xCB_XValueSorting(pBuilder->weld_check_button("sort"))
+{
+ m_xCB_XValueSorting->connect_toggled(
+ LINK(this, SortByXValuesResourceGroup, SortByXValuesCheckHdl));
+}
+
+void SortByXValuesResourceGroup::showControls(bool bShow) {
m_xCB_XValueSorting->show(bShow); }
+
+void SortByXValuesResourceGroup::fillControls(const ChartTypeParameter&
rParameter)
+{
+ m_xCB_XValueSorting->set_active(rParameter.bSortByXValues);
+}
+
+void SortByXValuesResourceGroup::fillParameter(ChartTypeParameter& rParameter)
+{
+ rParameter.bSortByXValues = m_xCB_XValueSorting->get_active();
+}
+
+IMPL_LINK_NOARG(SortByXValuesResourceGroup, SortByXValuesCheckHdl,
weld::ToggleButton&, void)
+{
+ if (m_pChangeListener)
+ m_pChangeListener->stateChanged(this);
+}
+
+class StackingResourceGroup : public ChangingResource
+{
+public:
+ explicit StackingResourceGroup(weld::Builder* pBuilder);
+
+ void showControls(bool bShow, bool bShowDeepStacking);
+
+ void fillControls(const ChartTypeParameter& rParameter);
+ void fillParameter(ChartTypeParameter& rParameter);
+
+private:
+ DECL_LINK(StackingChangeHdl, weld::ToggleButton&, void);
+ DECL_LINK(StackingEnableHdl, weld::ToggleButton&, void);
+
+private:
+ std::unique_ptr<weld::CheckButton> m_xCB_Stacked;
+ std::unique_ptr<weld::RadioButton> m_xRB_Stack_Y;
+ std::unique_ptr<weld::RadioButton> m_xRB_Stack_Y_Percent;
+ std::unique_ptr<weld::RadioButton> m_xRB_Stack_Z;
+};
+
+StackingResourceGroup::StackingResourceGroup(weld::Builder* pBuilder)
+ : ChangingResource()
+ , m_xCB_Stacked(pBuilder->weld_check_button("stack"))
+ , m_xRB_Stack_Y(pBuilder->weld_radio_button("ontop"))
+ , m_xRB_Stack_Y_Percent(pBuilder->weld_radio_button("percent"))
+ , m_xRB_Stack_Z(pBuilder->weld_radio_button("deep"))
+{
+ m_xCB_Stacked->connect_toggled(LINK(this, StackingResourceGroup,
StackingEnableHdl));
+ m_xRB_Stack_Y->connect_toggled(LINK(this, StackingResourceGroup,
StackingChangeHdl));
+ m_xRB_Stack_Y_Percent->connect_toggled(LINK(this, StackingResourceGroup,
StackingChangeHdl));
+ m_xRB_Stack_Z->connect_toggled(LINK(this, StackingResourceGroup,
StackingChangeHdl));
+}
+
+void StackingResourceGroup::showControls(bool bShow, bool bShowDeepStacking)
+{
+ m_xCB_Stacked->show(bShow);
+ m_xRB_Stack_Y->show(bShow);
+ m_xRB_Stack_Y_Percent->show(bShow);
+ m_xRB_Stack_Z->show(bShow && bShowDeepStacking);
+}
+
+void StackingResourceGroup::fillControls(const ChartTypeParameter& rParameter)
+{
+ m_xCB_Stacked->set_active(
+ rParameter.eStackMode != GlobalStackMode_NONE
+ && rParameter.eStackMode
+ != GlobalStackMode_STACK_Z); //todo remove this condition if z
stacking radio button is really used
+ switch (rParameter.eStackMode)
+ {
+ case GlobalStackMode_STACK_Y:
+ m_xRB_Stack_Y->set_active(true);
+ break;
+ case GlobalStackMode_STACK_Y_PERCENT:
+ m_xRB_Stack_Y_Percent->set_active(true);
+ break;
+ case GlobalStackMode_STACK_Z:
+ //todo uncomment this condition if z stacking radio button is
really used
+ /*
+ if( rParameter.b3DLook )
+ m_xRB_Stack_Z->set_active(true);
+ else
+ */
+ m_xRB_Stack_Y->set_active(true);
+ break;
+ default:
+ m_xRB_Stack_Y->set_active(true);
+ break;
+ }
+ //dis/enabling
+ m_xCB_Stacked->set_sensitive(!rParameter.bXAxisWithValues);
+ m_xRB_Stack_Y->set_sensitive(m_xCB_Stacked->get_active() &&
!rParameter.bXAxisWithValues);
+ m_xRB_Stack_Y_Percent->set_sensitive(m_xCB_Stacked->get_active()
+ && !rParameter.bXAxisWithValues);
+ m_xRB_Stack_Z->set_sensitive(m_xCB_Stacked->get_active() &&
rParameter.b3DLook);
+}
+
+void StackingResourceGroup::fillParameter(ChartTypeParameter& rParameter)
+{
+ if (!m_xCB_Stacked->get_active())
+ rParameter.eStackMode = GlobalStackMode_NONE;
+ else if (m_xRB_Stack_Y->get_active())
+ rParameter.eStackMode = GlobalStackMode_STACK_Y;
+ else if (m_xRB_Stack_Y_Percent->get_active())
+ rParameter.eStackMode = GlobalStackMode_STACK_Y_PERCENT;
+ else if (m_xRB_Stack_Z->get_active())
+ rParameter.eStackMode = GlobalStackMode_STACK_Z;
+}
+
+IMPL_LINK(StackingResourceGroup, StackingChangeHdl, weld::ToggleButton&,
rRadio, void)
+{
+ //for each radio click there are coming two change events
+ //first uncheck of previous button -> ignore that call
+ //the second call gives the check of the new button
+ if (m_pChangeListener && rRadio.get_active())
+ m_pChangeListener->stateChanged(this);
+}
+
+IMPL_LINK_NOARG(StackingResourceGroup, StackingEnableHdl, weld::ToggleButton&,
void)
+{
+ if (m_pChangeListener)
+ m_pChangeListener->stateChanged(this);
+}
+
+class SplinePropertiesDialog : public weld::GenericDialogController
+{
+public:
+ explicit SplinePropertiesDialog(weld::Window* pParent);
+
+ void fillControls(const ChartTypeParameter& rParameter);
+ void fillParameter(ChartTypeParameter& rParameter, bool bSmoothLines);
+
+private:
+ DECL_LINK(SplineTypeListBoxHdl, weld::ComboBox&, void);
+
+private:
+ std::unique_ptr<weld::ComboBox> m_xLB_Spline_Type;
+ std::unique_ptr<weld::SpinButton> m_xMF_SplineResolution;
+ std::unique_ptr<weld::Label> m_xFT_SplineOrder;
+ std::unique_ptr<weld::SpinButton> m_xMF_SplineOrder;
+};
+
+const sal_uInt16 CUBIC_SPLINE_POS = 0;
+const sal_uInt16 B_SPLINE_POS = 1;
+
+SplinePropertiesDialog::SplinePropertiesDialog(weld::Window* pParent)
+ : GenericDialogController(pParent, "modules/schart/ui/smoothlinesdlg.ui",
"SmoothLinesDialog")
+ , m_xLB_Spline_Type(m_xBuilder->weld_combo_box("SplineTypeComboBox"))
+ ,
m_xMF_SplineResolution(m_xBuilder->weld_spin_button("ResolutionSpinbutton"))
+ , m_xFT_SplineOrder(m_xBuilder->weld_label("PolynomialsLabel"))
+ , m_xMF_SplineOrder(m_xBuilder->weld_spin_button("PolynomialsSpinButton"))
+{
+ m_xDialog->set_title(SchResId(STR_DLG_SMOOTH_LINE_PROPERTIES));
+
+ m_xLB_Spline_Type->connect_changed(LINK(this, SplinePropertiesDialog,
SplineTypeListBoxHdl));
+}
+
+void SplinePropertiesDialog::fillControls(const ChartTypeParameter& rParameter)
+{
+ switch (rParameter.eCurveStyle)
+ {
+ case CurveStyle_CUBIC_SPLINES:
+ m_xLB_Spline_Type->set_active(CUBIC_SPLINE_POS);
+ break;
+ case CurveStyle_B_SPLINES:
+ m_xLB_Spline_Type->set_active(B_SPLINE_POS);
+ break;
+ default:
+ m_xLB_Spline_Type->set_active(CUBIC_SPLINE_POS);
+ break;
+ }
+ m_xMF_SplineOrder->set_value(rParameter.nSplineOrder);
+ m_xMF_SplineResolution->set_value(rParameter.nCurveResolution);
+
+ //dis/enabling
+ m_xFT_SplineOrder->set_sensitive(m_xLB_Spline_Type->get_active() ==
B_SPLINE_POS);
+ m_xMF_SplineOrder->set_sensitive(m_xLB_Spline_Type->get_active() ==
B_SPLINE_POS);
+}
+
+void SplinePropertiesDialog::fillParameter(ChartTypeParameter& rParameter,
bool bSmoothLines)
+{
+ if (!bSmoothLines)
+ rParameter.eCurveStyle = CurveStyle_LINES;
+ else if (m_xLB_Spline_Type->get_active() == CUBIC_SPLINE_POS)
+ rParameter.eCurveStyle = CurveStyle_CUBIC_SPLINES;
+ else if (m_xLB_Spline_Type->get_active() == B_SPLINE_POS)
+ rParameter.eCurveStyle = CurveStyle_B_SPLINES;
+
+ rParameter.nCurveResolution = m_xMF_SplineResolution->get_value();
+ rParameter.nSplineOrder = m_xMF_SplineOrder->get_value();
+}
+
+IMPL_LINK_NOARG(SplinePropertiesDialog, SplineTypeListBoxHdl, weld::ComboBox&,
void)
+{
+ m_xFT_SplineOrder->set_sensitive(m_xLB_Spline_Type->get_active() ==
B_SPLINE_POS);
+ m_xMF_SplineOrder->set_sensitive(m_xLB_Spline_Type->get_active() ==
B_SPLINE_POS);
+}
+
+class SteppedPropertiesDialog : public weld::GenericDialogController
+{
+public:
+ explicit SteppedPropertiesDialog(weld::Window* pParent);
+
+ void fillControls(const ChartTypeParameter& rParameter);
+ void fillParameter(ChartTypeParameter& rParameter, bool bSteppedLines);
+
+private:
+ std::unique_ptr<weld::RadioButton> m_xRB_Start;
+ std::unique_ptr<weld::RadioButton> m_xRB_End;
+ std::unique_ptr<weld::RadioButton> m_xRB_CenterX;
+ std::unique_ptr<weld::RadioButton> m_xRB_CenterY;
+};
+
+SteppedPropertiesDialog::SteppedPropertiesDialog(weld::Window* pParent)
+ : GenericDialogController(pParent, "modules/schart/ui/steppedlinesdlg.ui",
"SteppedLinesDialog")
+ , m_xRB_Start(m_xBuilder->weld_radio_button("step_start_rb"))
+ , m_xRB_End(m_xBuilder->weld_radio_button("step_end_rb"))
+ , m_xRB_CenterX(m_xBuilder->weld_radio_button("step_center_x_rb"))
+ , m_xRB_CenterY(m_xBuilder->weld_radio_button("step_center_y_rb"))
+{
+ m_xDialog->set_title(SchResId(STR_DLG_STEPPED_LINE_PROPERTIES));
+}
+
+void SteppedPropertiesDialog::fillControls(const ChartTypeParameter&
rParameter)
+{
+ switch (rParameter.eCurveStyle)
+ {
+ case CurveStyle_STEP_END:
+ m_xRB_End->set_active(true);
+ break;
+ case CurveStyle_STEP_CENTER_X:
+ m_xRB_CenterX->set_active(true);
+ break;
+ case CurveStyle_STEP_CENTER_Y:
+ m_xRB_CenterY->set_active(true);
+ break;
+ default: // includes CurveStyle_STEP_START
+ m_xRB_Start->set_active(true);
+ break;
+ }
+}
+void SteppedPropertiesDialog::fillParameter(ChartTypeParameter& rParameter,
bool bSteppedLines)
+{
+ if (!bSteppedLines)
+ rParameter.eCurveStyle = CurveStyle_LINES;
+ else if (m_xRB_CenterY->get_active())
+ rParameter.eCurveStyle = CurveStyle_STEP_CENTER_Y;
+ else if (m_xRB_Start->get_active())
+ rParameter.eCurveStyle = CurveStyle_STEP_START;
+ else if (m_xRB_End->get_active())
+ rParameter.eCurveStyle = CurveStyle_STEP_END;
+ else if (m_xRB_CenterX->get_active())
+ rParameter.eCurveStyle = CurveStyle_STEP_CENTER_X;
+}
+
+#define POS_LINETYPE_STRAIGHT 0
+#define POS_LINETYPE_SMOOTH 1
+#define POS_LINETYPE_STEPPED 2
+
+class SplineResourceGroup : public ChangingResource
+{
+public:
+ explicit SplineResourceGroup(weld::Builder* pBuilder, TabPageParent
pParent);
+
+ void showControls(bool bShow);
+
+ void fillControls(const ChartTypeParameter& rParameter);
+ void fillParameter(ChartTypeParameter& rParameter);
+
+private:
+ DECL_LINK(LineTypeChangeHdl, weld::ComboBox&, void);
+ DECL_LINK(SplineDetailsDialogHdl, weld::Button&, void);
+ DECL_LINK(SteppedDetailsDialogHdl, weld::Button&, void);
+ SplinePropertiesDialog& getSplinePropertiesDialog();
+ SteppedPropertiesDialog& getSteppedPropertiesDialog();
+
+private:
+ TabPageParent m_pParent;
+ std::unique_ptr<weld::Label> m_xFT_LineType;
+ std::unique_ptr<weld::ComboBox> m_xLB_LineType;
+ std::unique_ptr<weld::Button> m_xPB_DetailsDialog;
+ std::unique_ptr<SplinePropertiesDialog> m_xSplinePropertiesDialog;
+ std::unique_ptr<SteppedPropertiesDialog> m_xSteppedPropertiesDialog;
+};
+
+SplineResourceGroup::SplineResourceGroup(weld::Builder* pBuilder,
TabPageParent pParent)
+ : ChangingResource()
+ , m_pParent(pParent)
+ , m_xFT_LineType(pBuilder->weld_label("linetypeft"))
+ , m_xLB_LineType(pBuilder->weld_combo_box("linetype"))
+ , m_xPB_DetailsDialog(pBuilder->weld_button("properties"))
+{
+ m_xLB_LineType->connect_changed(LINK(this, SplineResourceGroup,
LineTypeChangeHdl));
+}
+
+SplinePropertiesDialog& SplineResourceGroup::getSplinePropertiesDialog()
+{
+ if (!m_xSplinePropertiesDialog)
+ {
+ m_xSplinePropertiesDialog.reset(new
SplinePropertiesDialog(m_pParent.GetFrameWeld()));
+ }
+ return *m_xSplinePropertiesDialog;
+}
+
+SteppedPropertiesDialog& SplineResourceGroup::getSteppedPropertiesDialog()
+{
+ if (!m_xSteppedPropertiesDialog)
+ {
+ m_xSteppedPropertiesDialog.reset(new
SteppedPropertiesDialog(m_pParent.GetFrameWeld()));
+ }
+ return *m_xSteppedPropertiesDialog;
+}
+
+void SplineResourceGroup::showControls(bool bShow)
+{
+ m_xFT_LineType->show(bShow);
+ m_xLB_LineType->show(bShow);
+ m_xPB_DetailsDialog->show(bShow);
+}
+
+void SplineResourceGroup::fillControls(const ChartTypeParameter& rParameter)
+{
+ switch (rParameter.eCurveStyle)
+ {
+ case CurveStyle_LINES:
+ m_xLB_LineType->set_active(POS_LINETYPE_STRAIGHT);
+ m_xPB_DetailsDialog->set_sensitive(false);
+ break;
+ case CurveStyle_CUBIC_SPLINES:
+ case CurveStyle_B_SPLINES:
+ m_xLB_LineType->set_active(POS_LINETYPE_SMOOTH);
+ m_xPB_DetailsDialog->set_sensitive(true);
+ m_xPB_DetailsDialog->connect_clicked(
+ LINK(this, SplineResourceGroup, SplineDetailsDialogHdl));
+
m_xPB_DetailsDialog->set_tooltip_text(SchResId(STR_DLG_SMOOTH_LINE_PROPERTIES));
+ getSplinePropertiesDialog().fillControls(rParameter);
+ break;
+ case CurveStyle_STEP_START:
+ case CurveStyle_STEP_END:
+ case CurveStyle_STEP_CENTER_X:
+ case CurveStyle_STEP_CENTER_Y:
+ m_xLB_LineType->set_active(POS_LINETYPE_STEPPED);
+ m_xPB_DetailsDialog->set_sensitive(true);
+ m_xPB_DetailsDialog->connect_clicked(
+ LINK(this, SplineResourceGroup, SteppedDetailsDialogHdl));
+
m_xPB_DetailsDialog->set_tooltip_text(SchResId(STR_DLG_STEPPED_LINE_PROPERTIES));
+ getSteppedPropertiesDialog().fillControls(rParameter);
+ break;
+ default:
+ m_xLB_LineType->set_active(-1);
+ m_xPB_DetailsDialog->set_sensitive(false);
+ }
+}
+void SplineResourceGroup::fillParameter(ChartTypeParameter& rParameter)
+{
+ switch (m_xLB_LineType->get_active())
+ {
+ case POS_LINETYPE_SMOOTH:
+ getSplinePropertiesDialog().fillParameter(rParameter, true);
+ break;
+ case POS_LINETYPE_STEPPED:
+ getSteppedPropertiesDialog().fillParameter(rParameter, true);
+ break;
+ default: // includes POS_LINETYPE_STRAIGHT
+ rParameter.eCurveStyle = CurveStyle_LINES;
+ break;
+ }
+}
+
+IMPL_LINK_NOARG(SplineResourceGroup, LineTypeChangeHdl, weld::ComboBox&, void)
+{
+ if (m_pChangeListener)
+ m_pChangeListener->stateChanged(this);
+}
+
+IMPL_LINK_NOARG(SplineResourceGroup, SplineDetailsDialogHdl, weld::Button&,
void)
+{
+ ChartTypeParameter aOldParameter;
+ getSplinePropertiesDialog().fillParameter(aOldParameter,
+ m_xLB_LineType->get_active() ==
POS_LINETYPE_SMOOTH);
+
+ const sal_Int32 iOldLineTypePos = m_xLB_LineType->get_active();
+ m_xLB_LineType->set_active(POS_LINETYPE_SMOOTH);
+ if (getSplinePropertiesDialog().run() == RET_OK)
+ {
+ if (m_pChangeListener)
+ m_pChangeListener->stateChanged(this);
+ }
+ else
+ {
+ //restore old state:
+ m_xLB_LineType->set_active(iOldLineTypePos);
+ getSplinePropertiesDialog().fillControls(aOldParameter);
+ }
+}
+
+IMPL_LINK_NOARG(SplineResourceGroup, SteppedDetailsDialogHdl, weld::Button&,
void)
+{
+ ChartTypeParameter aOldParameter;
+ getSteppedPropertiesDialog().fillParameter(aOldParameter,
m_xLB_LineType->get_active()
+ ==
POS_LINETYPE_STEPPED);
+
+ const sal_Int32 iOldLineTypePos = m_xLB_LineType->get_active();
+ m_xLB_LineType->set_active(POS_LINETYPE_STEPPED);
+ if (getSteppedPropertiesDialog().run() == RET_OK)
+ {
+ if (m_pChangeListener)
+ m_pChangeListener->stateChanged(this);
+ }
+ else
+ {
+ //restore old state:
+ m_xLB_LineType->set_active(iOldLineTypePos);
+ getSteppedPropertiesDialog().fillControls(aOldParameter);
+ }
+}
+
+class GeometryResourceGroup : public ChangingResource
+{
+public:
+ explicit GeometryResourceGroup(weld::Builder* pBuilder);
+
+ void showControls(bool bShow);
+
+ void fillControls(const ChartTypeParameter& rParameter);
+ void fillParameter(ChartTypeParameter& rParameter);
+
+private:
+ DECL_LINK(GeometryChangeHdl, weld::TreeView&, void);
+
+private:
+ BarGeometryResources m_aGeometryResources;
+};
+
+GeometryResourceGroup::GeometryResourceGroup(weld::Builder* pBuilder)
+ : ChangingResource()
+ , m_aGeometryResources(pBuilder)
+{
+ m_aGeometryResources.connect_changed(LINK(this, GeometryResourceGroup,
GeometryChangeHdl));
+}
+
+void GeometryResourceGroup::showControls(bool bShow) {
m_aGeometryResources.show(bShow); }
+
+void GeometryResourceGroup::fillControls(const ChartTypeParameter& rParameter)
+{
+ sal_uInt16 nGeometry3D = static_cast<sal_uInt16>(rParameter.nGeometry3D);
+ m_aGeometryResources.select(nGeometry3D);
+ m_aGeometryResources.set_sensitive(rParameter.b3DLook);
+}
+
+void GeometryResourceGroup::fillParameter(ChartTypeParameter& rParameter)
+{
+ rParameter.nGeometry3D = 1;
+ int nSelected = m_aGeometryResources.get_selected_index();
+ if (nSelected != -1)
+ rParameter.nGeometry3D = nSelected;
+}
+
+IMPL_LINK_NOARG(GeometryResourceGroup, GeometryChangeHdl, weld::TreeView&,
void)
+{
+ if (m_pChangeListener)
+ m_pChangeListener->stateChanged(this);
+}
+
+} //namespace chart
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/controller/dialogs/res_BarGeometry.hxx
b/chart2/source/inc/res_BarGeometry.hxx
similarity index 91%
rename from chart2/source/controller/dialogs/res_BarGeometry.hxx
rename to chart2/source/inc/res_BarGeometry.hxx
index e63bf9160ee2..2de887530d83 100644
--- a/chart2/source/controller/dialogs/res_BarGeometry.hxx
+++ b/chart2/source/inc/res_BarGeometry.hxx
@@ -23,19 +23,18 @@
namespace chart
{
-
class BarGeometryResources
{
public:
explicit BarGeometryResources(weld::Builder* pParent);
- void show( bool bShow );
- void set_sensitive( bool bEnable );
+ void show(bool bShow);
+ void set_sensitive(bool bEnable);
sal_Int32 get_selected_index() const;
void select(sal_Int32 nPos);
- void connect_changed(const Link<weld::TreeView&,void>& rLink);
+ void connect_changed(const Link<weld::TreeView&, void>& rLink);
private:
std::unique_ptr<weld::Label> m_xFT_Geometry;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
