diff options
17 files changed, 663 insertions, 884 deletions
diff --git a/chart2/AllLangResTarget_chartcontroller.mk b/chart2/AllLangResTarget_chartcontroller.mk index 5f6126dbf3e9..0a0a31dd5af3 100644 --- a/chart2/AllLangResTarget_chartcontroller.mk +++ b/chart2/AllLangResTarget_chartcontroller.mk @@ -27,13 +27,11 @@ $(eval $(call gb_SrsTarget_set_include,chart2/res,\ )) $(eval $(call gb_SrsTarget_add_files,chart2/res,\ - chart2/source/controller/dialogs/res_BarGeometry.src \ chart2/source/controller/dialogs/Strings_AdditionalControls.src \ chart2/source/controller/dialogs/Strings_ChartTypes.src \ chart2/source/controller/dialogs/Strings_Scale.src \ chart2/source/controller/dialogs/Strings.src \ chart2/source/controller/dialogs/Strings_Statistic.src \ - chart2/source/controller/dialogs/tp_ChartType.src \ )) $(eval $(call gb_SrsTarget_add_nonlocalizable_files,chart2/res,\ diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk index b9a728c12567..44f86746cacf 100644 --- a/chart2/UIConfig_chart2.mk +++ b/chart2/UIConfig_chart2.mk @@ -52,6 +52,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\ chart2/uiconfig/ui/tp_3D_SceneIllumination \ chart2/uiconfig/ui/tp_axisLabel \ chart2/uiconfig/ui/tp_AxisPositions \ + chart2/uiconfig/ui/tp_ChartType \ chart2/uiconfig/ui/tp_DataLabel \ chart2/uiconfig/ui/tp_DataSource \ chart2/uiconfig/ui/tp_ErrorBars \ diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index 43f560fa1d28..c3faa7454439 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -34,10 +34,9 @@ #include <svtools/controldims.hrc> #include <svtools/valueset.hxx> -// header for class Image -#include <vcl/image.hxx> -// header for class Bitmap #include <vcl/bitmap.hxx> +#include <vcl/builder.hxx> +#include <vcl/image.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> @@ -348,10 +347,6 @@ void ChartTypeDialogController::fillSubTypeList( ValueSet& rSubTypeList, const C { rSubTypeList.Clear(); } -bool ChartTypeDialogController::shouldShow_XAxisTypeControl() const -{ - return false; -} bool ChartTypeDialogController::shouldShow_3DLookControl() const { return false; @@ -377,7 +372,7 @@ bool ChartTypeDialogController::shouldShow_SortByXValuesResourceGroup() const return false; } -void ChartTypeDialogController::showExtraControls( Window* /*pParent*/, const Point& /*rPosition*/, const Size& /*rSize*/ ) +void ChartTypeDialogController::showExtraControls( VclBuilderContainer* /*pParent*/ ) { } void ChartTypeDialogController::hideExtraControls() const @@ -1073,6 +1068,7 @@ const tTemplateServiceChartTypeParameterMap& StockChartDialogController::getTemp ; return m_aTemplateMap; } + void StockChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ ) { rSubTypeList.Clear(); @@ -1086,26 +1082,20 @@ void StockChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const rSubTypeList.SetItemText( 3, SCH_RESSTR(STR_STOCK_3) ); rSubTypeList.SetItemText( 4, SCH_RESSTR(STR_STOCK_4) ); } + void StockChartDialogController::adjustParameterToSubType( ChartTypeParameter& rParameter ) { rParameter.b3DLook = false; rParameter.eStackMode = GlobalStackMode_NONE; } + CombiColumnLineChartDialogController::CombiColumnLineChartDialogController() - : m_pFT_NumberOfLines(0) - , m_pMF_NumberOfLines(0) + : m_pFT_NumberOfLines(0) + , m_pMF_NumberOfLines(0) { bSupports3D = false; } -CombiColumnLineChartDialogController::~CombiColumnLineChartDialogController() -{ - if(m_pFT_NumberOfLines) - delete m_pFT_NumberOfLines; - if(m_pMF_NumberOfLines) - delete m_pMF_NumberOfLines; -} - OUString CombiColumnLineChartDialogController::getName() { return SCH_RESSTR(STR_TYPE_COMBI_COLUMN_LINE); @@ -1125,6 +1115,7 @@ const tTemplateServiceChartTypeParameterMap& CombiColumnLineChartDialogControlle ; return m_aTemplateMap; } + void CombiColumnLineChartDialogController::fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& /*rParameter*/ ) { rSubTypeList.Clear(); @@ -1134,43 +1125,30 @@ void CombiColumnLineChartDialogController::fillSubTypeList( ValueSet& rSubTypeLi rSubTypeList.SetItemText(1, SCH_RESSTR(STR_LINE_COLUMN)); rSubTypeList.SetItemText(2, SCH_RESSTR(STR_LINE_STACKEDCOLUMN)); } -void CombiColumnLineChartDialogController::showExtraControls( Window* pParent, const Point& rPosition, const Size& rSize ) + +void CombiColumnLineChartDialogController::showExtraControls( VclBuilderContainer* pParent ) { - if(!m_pFT_NumberOfLines) + if (!m_pFT_NumberOfLines) { - m_pFT_NumberOfLines = new FixedText(pParent,pParent->GetStyle()); - m_pFT_NumberOfLines->SetText(SCH_RESSTR(STR_NUMBER_OF_LINES)); + pParent->get(m_pFT_NumberOfLines, "nolinesft"); } - if(!m_pMF_NumberOfLines) + if (!m_pMF_NumberOfLines) { - m_pMF_NumberOfLines = new MetricField(pParent,pParent->GetStyle() | WB_SPIN | WB_REPEAT | WB_BORDER ); - m_pMF_NumberOfLines->SetDefaultUnit( FUNIT_CUSTOM ); - m_pMF_NumberOfLines->SetUnit( FUNIT_CUSTOM ); + pParent->get(m_pMF_NumberOfLines, "nolines"); + m_pMF_NumberOfLines->SetSpinSize(1); - m_pMF_NumberOfLines->SetFirst( 1, FUNIT_CUSTOM ); - m_pMF_NumberOfLines->SetLast( 100, FUNIT_CUSTOM ); - m_pMF_NumberOfLines->SetMin( 1, FUNIT_CUSTOM ); - m_pMF_NumberOfLines->SetMax( 100, FUNIT_CUSTOM ); - m_pMF_NumberOfLines->SetHelpId( HID_SCH_NUM_OF_LINES ); + m_pMF_NumberOfLines->SetFirst( 1 ); + m_pMF_NumberOfLines->SetLast( 100 ); + m_pMF_NumberOfLines->SetMin( 1 ); + m_pMF_NumberOfLines->SetMax( 100 ); m_pMF_NumberOfLines->SetModifyHdl( LINK( this, CombiColumnLineChartDialogController, ChangeLineCountHdl ) ); } - Size aDistanceSize( pParent->LogicToPixel( Size(RSC_SP_CTRL_DESC_X,2), MapMode(MAP_APPFONT) ) ); - Size aMFSize( pParent->LogicToPixel( Size(20,RSC_CD_TEXTBOX_HEIGHT), MapMode(MAP_APPFONT) ) ); - m_pMF_NumberOfLines->SetSizePixel( aMFSize ); - - Size aFTSize(m_pFT_NumberOfLines->CalcMinimumSize(rSize.Width()-aMFSize.Width()-aDistanceSize.Width())); - m_pFT_NumberOfLines->SetSizePixel(aFTSize); - - m_pFT_NumberOfLines->SetPosPixel( Point( rPosition.X(), rPosition.Y()+aDistanceSize.Height()) ); - m_pMF_NumberOfLines->SetPosPixel( Point( rPosition.X()+aFTSize.Width()+aDistanceSize.Width(), rPosition.Y()) ); - m_pFT_NumberOfLines->Show(); m_pMF_NumberOfLines->Show(); - m_pMF_NumberOfLines->SetAccessibleName(m_pFT_NumberOfLines->GetText()); - m_pMF_NumberOfLines->SetAccessibleRelationLabeledBy(m_pFT_NumberOfLines); } + void CombiColumnLineChartDialogController::hideExtraControls() const { if(m_pFT_NumberOfLines) @@ -1178,6 +1156,7 @@ void CombiColumnLineChartDialogController::hideExtraControls() const if(m_pMF_NumberOfLines) m_pMF_NumberOfLines->Hide(); } + void CombiColumnLineChartDialogController::fillExtraControls( const ChartTypeParameter& /*rParameter*/ , const uno::Reference< XChartDocument >& xChartModel , const uno::Reference< beans::XPropertySet >& xTemplateProps ) const diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx index e3bde0a256ca..4d450b0b836d 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx @@ -27,12 +27,10 @@ #include <com/sun/star/chart2/CurveStyle.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart2/XChartTypeTemplate.hpp> -// header for class CheckBox +#include <vcl/builder.hxx> #include <vcl/button.hxx> -// header for class FixedText -#include <vcl/fixed.hxx> -// header for class MetricField #include <vcl/field.hxx> +#include <vcl/fixed.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> class ValueSet; @@ -96,7 +94,6 @@ public: virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const = 0; virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); - virtual bool shouldShow_XAxisTypeControl() const; virtual bool shouldShow_3DLookControl() const; virtual bool shouldShow_StackingControl() const; virtual bool shouldShow_DeepStackingControl() const; @@ -104,7 +101,7 @@ public: virtual bool shouldShow_GeometryControl() const; virtual bool shouldShow_SortByXValuesResourceGroup() const; - virtual void showExtraControls( Window* pParent, const Point& rPosition, const Size& rSize ); + virtual void showExtraControls(VclBuilderContainer* pParent); virtual void hideExtraControls() const; virtual void fillExtraControls( const ChartTypeParameter& rParameter , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartModel @@ -262,7 +259,6 @@ class CombiColumnLineChartDialogController : public ChartTypeDialogController { public: CombiColumnLineChartDialogController(); - virtual ~CombiColumnLineChartDialogController(); virtual OUString getName(); virtual Image getImage(); @@ -270,7 +266,7 @@ public: virtual void fillSubTypeList( ValueSet& rSubTypeList, const ChartTypeParameter& rParameter ); virtual void adjustParameterToSubType( ChartTypeParameter& rParameter ); - virtual void showExtraControls( Window* pParent, const Point& rPosition, const Size& rSize ); + virtual void showExtraControls(VclBuilderContainer* pParent); virtual void hideExtraControls() const; virtual void fillExtraControls( const ChartTypeParameter& rParameter , const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >& xChartModel @@ -282,8 +278,8 @@ private: DECL_LINK( ChangeLineCountHdl, void* ); private: - FixedText* m_pFT_NumberOfLines; - MetricField* m_pMF_NumberOfLines; + FixedText* m_pFT_NumberOfLines; + NumericField* m_pMF_NumberOfLines; }; class BubbleChartDialogController : public ChartTypeDialogController diff --git a/chart2/source/controller/dialogs/ResourceIds.hrc b/chart2/source/controller/dialogs/ResourceIds.hrc index 09a4c05abf19..309f7f76e3e3 100644 --- a/chart2/source/controller/dialogs/ResourceIds.hrc +++ b/chart2/source/controller/dialogs/ResourceIds.hrc @@ -52,13 +52,6 @@ #define TP_YERRORBAR 919 #define TP_XERRORBAR 923 - -//listbox Ids: -#define LB_BAR_GEOMETRY 1000 -#define LB_TEXT_SEPARATOR 1001 - - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/Strings_AdditionalControls.src b/chart2/source/controller/dialogs/Strings_AdditionalControls.src index e7972d872efb..43c3d0f9f26e 100644 --- a/chart2/source/controller/dialogs/Strings_AdditionalControls.src +++ b/chart2/source/controller/dialogs/Strings_AdditionalControls.src @@ -18,49 +18,9 @@ */ #include "Strings.hrc" -String STR_3DSCHEME_SIMPLE -{ - Text [ en-US ] = "Simple"; -}; -String STR_3DSCHEME_REALISTIC -{ - Text [ en-US ] = "Realistic"; -}; -String STR_3DSCHEME_CUSTOM -{ - Text [ en-US ] = "Custom"; -}; - -String STR_BAR_GEOMETRY -{ - Text [ en-US ] = "Shape"; -}; - -String STR_NUMBER_OF_LINES -{ - Text [ en-US ] = "~Number of lines"; -}; - String STR_TEXT_SEPARATOR { Text [ en-US ] = "Separator"; }; -String STR_LINETYPE_STRAIGHT -{ - Text [ en-US ] = "Straight"; -}; - -String STR_LINETYPE_SMOOTH -{ - Text [ en-US ] = "Smooth"; -}; - -String STR_LINETYPE_STEPPED -{ - Text [ en-US ] = "Stepped"; -}; - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/res_BarGeometry.cxx b/chart2/source/controller/dialogs/res_BarGeometry.cxx index fc4b3add5769..13a16e72e5d9 100644 --- a/chart2/source/controller/dialogs/res_BarGeometry.cxx +++ b/chart2/source/controller/dialogs/res_BarGeometry.cxx @@ -18,79 +18,46 @@ */ #include "res_BarGeometry.hxx" -#include "ResourceIds.hrc" -#include "Strings.hrc" -#include "ResId.hxx" - -#include <svtools/controldims.hrc> namespace chart { -BarGeometryResources::BarGeometryResources( Window* pWindow ) - : m_aFT_Geometry( pWindow, pWindow->GetStyle() ) - , m_aLB_Geometry( pWindow, SchResId( LB_BAR_GEOMETRY ) ) -{ - m_aFT_Geometry.SetText( SCH_RESSTR( STR_BAR_GEOMETRY ) ); - m_aFT_Geometry.SetSizePixel( m_aFT_Geometry.CalcMinimumSize() ); - m_aLB_Geometry.SetAccessibleName(m_aFT_Geometry.GetText()); - m_aLB_Geometry.SetAccessibleRelationLabeledBy(&m_aFT_Geometry); -} -void BarGeometryResources::SetPosPixel( const Point& rPosition ) -{ - Window* pWindow( m_aFT_Geometry.GetParent() ); - - Size aDistanceSize( 2,2 ); - if( pWindow ) - aDistanceSize = Size( pWindow->LogicToPixel( Size(0,RSC_SP_CTRL_DESC_Y), MapMode(MAP_APPFONT) ) ); - - m_aFT_Geometry.SetPosPixel( rPosition ); - m_aLB_Geometry.SetPosPixel( Point( rPosition.X()+aDistanceSize.Width(), rPosition.Y()+m_aFT_Geometry.GetSizePixel().Height()+aDistanceSize.Height()) ); -} -Size BarGeometryResources::GetSizePixel() const -{ - long nHeight = m_aLB_Geometry.GetPosPixel().Y() - - m_aFT_Geometry.GetPosPixel().Y(); - nHeight += m_aLB_Geometry.GetSizePixel().Height(); - - long nWidth = m_aLB_Geometry.GetSizePixel().Width(); - if( nWidth < m_aFT_Geometry.GetSizePixel().Width() ) - nWidth = m_aFT_Geometry.GetSizePixel().Width(); - - return Size( nWidth, nHeight ); -} -BarGeometryResources::~BarGeometryResources() +BarGeometryResources::BarGeometryResources(VclBuilderContainer* pWindow) { + pWindow->get(m_pFT_Geometry, "shapeft"); + pWindow->get(m_pLB_Geometry, "shape"); } void BarGeometryResources::SetSelectHdl( const Link& rLink ) { - m_aLB_Geometry.SetSelectHdl( rLink ); + m_pLB_Geometry->SetSelectHdl( rLink ); } void BarGeometryResources::Show( bool bShow ) { - m_aFT_Geometry.Show( bShow ); - m_aLB_Geometry.Show( bShow ); + m_pFT_Geometry->Show( bShow ); + m_pLB_Geometry->Show( bShow ); } void BarGeometryResources::Enable( bool bEnable ) { - m_aFT_Geometry.Enable( bEnable ); - m_aLB_Geometry.Enable( bEnable ); + m_pFT_Geometry->Enable( bEnable ); + m_pLB_Geometry->Enable( bEnable ); } sal_uInt16 BarGeometryResources::GetSelectEntryCount() const { - return m_aLB_Geometry.GetSelectEntryCount(); + return m_pLB_Geometry->GetSelectEntryCount(); } + sal_uInt16 BarGeometryResources::GetSelectEntryPos() const { - return m_aLB_Geometry.GetSelectEntryPos(); + return m_pLB_Geometry->GetSelectEntryPos(); } + void BarGeometryResources::SelectEntryPos( sal_uInt16 nPos ) { - if( nPos < m_aLB_Geometry.GetEntryCount() ) - m_aLB_Geometry.SelectEntryPos( nPos ); + if( nPos < m_pLB_Geometry->GetEntryCount() ) + m_pLB_Geometry->SelectEntryPos( nPos ); } } //namespace chart diff --git a/chart2/source/controller/dialogs/res_BarGeometry.hxx b/chart2/source/controller/dialogs/res_BarGeometry.hxx index 6eddd8b7576a..b74e1ccec402 100644 --- a/chart2/source/controller/dialogs/res_BarGeometry.hxx +++ b/chart2/source/controller/dialogs/res_BarGeometry.hxx @@ -19,9 +19,8 @@ #ifndef INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_RES_BARGEOMETRY_HXX #define INCLUDED_CHART2_SOURCE_CONTROLLER_DIALOGS_RES_BARGEOMETRY_HXX -// header for class FixedText +#include <vcl/builder.hxx> #include <vcl/fixed.hxx> -// header for class ListBox #include <vcl/lstbox.hxx> namespace chart @@ -30,11 +29,7 @@ namespace chart class BarGeometryResources { public: - BarGeometryResources( Window* pParent ); - virtual ~BarGeometryResources(); - - void SetPosPixel( const Point& rPosition ); - Size GetSizePixel() const; + BarGeometryResources(VclBuilderContainer* pParent); void Show( bool bShow ); void Enable( bool bEnable ); @@ -46,8 +41,8 @@ public: void SetSelectHdl( const Link& rLink ); private: - FixedText m_aFT_Geometry; - ListBox m_aLB_Geometry; + FixedText* m_pFT_Geometry; + ListBox* m_pLB_Geometry; }; } //namespace chart diff --git a/chart2/source/controller/dialogs/res_BarGeometry.src b/chart2/source/controller/dialogs/res_BarGeometry.src deleted file mode 100644 index d996484cad7c..000000000000 --- a/chart2/source/controller/dialogs/res_BarGeometry.src +++ /dev/null @@ -1,43 +0,0 @@ -/* -*- 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 . - */ -#include "ResourceIds.hrc" -#include "HelpIds.hrc" - -ListBox LB_BAR_GEOMETRY -{ - Border = TRUE ; - AutoHScroll = TRUE ; - Pos = MAP_APPFONT ( 6 , 17 ) ; - Size = MAP_APPFONT ( 89 , 38 ) ; - TabStop = TRUE ; - Group = TRUE ; - DropDown=FALSE; - DDExtraWidth = TRUE ; - HelpID = HID_SCH_LB_BAR_GEOMETRY; - - StringList [ en-US ] = - { - "Box" ; - "Cylinder" ; - "Cone" ; - "Pyramid" ; - }; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index 8fa152a4fcc4..610b5a292bb7 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -18,7 +18,6 @@ */ #include "tp_ChartType.hxx" -#include "tp_ChartType.hrc" #include "Strings.hrc" #include "ResId.hxx" #include "ChartModelHelper.hxx" @@ -29,7 +28,7 @@ #include <svtools/controldims.hrc> -// header for define RET_OK +#include <vcl/layout.hxx> #include <vcl/msgbox.hxx> namespace chart @@ -63,77 +62,15 @@ namespace } } -class AxisTypeResourceGroup : public ChangingResource -{ -public: - AxisTypeResourceGroup( Window* pWindow ); - virtual ~AxisTypeResourceGroup(); - - void showControls( bool bShow ); - Point getPosition(); - long getHeight(); - void setPosition( const Point& rPoint ); - - void fillControls( const ChartTypeParameter& rParameter ); - void fillParameter( ChartTypeParameter& rParameter ); - -private: - DECL_LINK( AxisTypeCheckHdl, void* ); -private: - CheckBox m_aCB_XAxis_Categories; -}; -AxisTypeResourceGroup::AxisTypeResourceGroup( Window* pWindow ) - : ChangingResource() - , m_aCB_XAxis_Categories( pWindow, SchResId( CB_X_AXIS_CATEGORIES ) ) -{ - m_aCB_XAxis_Categories.SetToggleHdl( LINK( this, AxisTypeResourceGroup, AxisTypeCheckHdl ) ); -} -AxisTypeResourceGroup::~AxisTypeResourceGroup() -{ -} -void AxisTypeResourceGroup::showControls( bool bShow ) -{ - m_aCB_XAxis_Categories.Show(bShow); -} -Point AxisTypeResourceGroup::getPosition() -{ - return m_aCB_XAxis_Categories.GetPosPixel(); -} -long AxisTypeResourceGroup::getHeight() -{ - return m_aCB_XAxis_Categories.GetSizePixel().Height(); -} -void AxisTypeResourceGroup::setPosition( const Point& rPoint ) -{ - m_aCB_XAxis_Categories.SetPosPixel(rPoint); -} -void AxisTypeResourceGroup::fillControls( const ChartTypeParameter& rParameter ) -{ - m_aCB_XAxis_Categories.Check(!rParameter.bXAxisWithValues); -} -void AxisTypeResourceGroup::fillParameter( ChartTypeParameter& rParameter ) -{ - rParameter.bXAxisWithValues = !m_aCB_XAxis_Categories.IsChecked(); -} -IMPL_LINK_NOARG(AxisTypeResourceGroup, AxisTypeCheckHdl) -{ - if( m_pChangeListener ) - m_pChangeListener->stateChanged(this); - return 0; -} - #define POS_3DSCHEME_SIMPLE 0 #define POS_3DSCHEME_REALISTIC 1 class Dim3DLookResourceGroup : public ChangingResource { public: - Dim3DLookResourceGroup( Window* pWindow ); - virtual ~Dim3DLookResourceGroup(); + Dim3DLookResourceGroup(VclBuilderContainer* pWindow); - void showControls( bool bShow ); - long getHeight(); - void setPosition( const Point& rPoint ); + void showControls( bool bShow ); void fillControls( const ChartTypeParameter& rParameter ); void fillParameter( ChartTypeParameter& rParameter ); @@ -143,63 +80,43 @@ private: DECL_LINK( SelectSchemeHdl, void* ); private: - CheckBox m_aCB_3DLook; - ListBox m_aLB_Scheme; + CheckBox* m_pCB_3DLook; + ListBox* m_pLB_Scheme; }; -Dim3DLookResourceGroup::Dim3DLookResourceGroup( Window* pWindow ) - : ChangingResource() - , m_aCB_3DLook( pWindow, SchResId( CB_3D_LOOK ) ) - , m_aLB_Scheme( pWindow, SchResId( LB_3D_SCHEME ) ) -{ - m_aCB_3DLook.SetToggleHdl( LINK( this, Dim3DLookResourceGroup, Dim3DLookCheckHdl ) ); - m_aLB_Scheme.InsertEntry(SCH_RESSTR(STR_3DSCHEME_SIMPLE)); - m_aLB_Scheme.InsertEntry(SCH_RESSTR(STR_3DSCHEME_REALISTIC)); - m_aLB_Scheme.SetDropDownLineCount(2); - - m_aLB_Scheme.SetSelectHdl( LINK( this, Dim3DLookResourceGroup, SelectSchemeHdl ) ); - m_aLB_Scheme.SetAccessibleName(m_aCB_3DLook.GetText()); - m_aLB_Scheme.SetAccessibleRelationLabeledBy(&m_aCB_3DLook); -} -Dim3DLookResourceGroup::~Dim3DLookResourceGroup() +Dim3DLookResourceGroup::Dim3DLookResourceGroup(VclBuilderContainer* pWindow) + : ChangingResource() { + pWindow->get(m_pCB_3DLook, "3dlook"); + pWindow->get(m_pLB_Scheme, "3dscheme"); + + m_pCB_3DLook->SetToggleHdl( LINK( this, Dim3DLookResourceGroup, Dim3DLookCheckHdl ) ); + m_pLB_Scheme->SetSelectHdl( LINK( this, Dim3DLookResourceGroup, SelectSchemeHdl ) ); } + void Dim3DLookResourceGroup::showControls( bool bShow ) { - m_aCB_3DLook.Show(bShow); - m_aLB_Scheme.Show(bShow); -} -long Dim3DLookResourceGroup::getHeight() -{ - return m_aCB_3DLook.GetSizePixel().Height() + m_aLB_Scheme.LogicToPixel( Size(0,2), MapMode(MAP_APPFONT) ).Height(); -} -void Dim3DLookResourceGroup::setPosition( const Point& rPoint ) -{ - m_aCB_3DLook.SetPosPixel(rPoint); - Size aSize( m_aCB_3DLook.CalcMinimumSize() ); - m_aCB_3DLook.SetPosSizePixel(rPoint,aSize); - Point aLBPos(rPoint); - aLBPos.X() += aSize.Width() - + m_aLB_Scheme.LogicToPixel( Size(6,0), MapMode(MAP_APPFONT) ).Width(); - aLBPos.Y() -= m_aLB_Scheme.LogicToPixel( Size(0,2), MapMode(MAP_APPFONT) ).Height(); - m_aLB_Scheme.SetPosPixel(aLBPos); + m_pCB_3DLook->Show(bShow); + m_pLB_Scheme->Show(bShow); } + void Dim3DLookResourceGroup::fillControls( const ChartTypeParameter& rParameter ) { - m_aCB_3DLook.Check(rParameter.b3DLook); - m_aLB_Scheme.Enable(rParameter.b3DLook); + m_pCB_3DLook->Check(rParameter.b3DLook); + m_pLB_Scheme->Enable(rParameter.b3DLook); if( rParameter.eThreeDLookScheme == ThreeDLookScheme_Simple ) - m_aLB_Scheme.SelectEntryPos(POS_3DSCHEME_SIMPLE); + m_pLB_Scheme->SelectEntryPos(POS_3DSCHEME_SIMPLE); else if( rParameter.eThreeDLookScheme == ThreeDLookScheme_Realistic ) - m_aLB_Scheme.SelectEntryPos(POS_3DSCHEME_REALISTIC); + m_pLB_Scheme->SelectEntryPos(POS_3DSCHEME_REALISTIC); else - m_aLB_Scheme.SetNoSelection(); + m_pLB_Scheme->SetNoSelection(); } + void Dim3DLookResourceGroup::fillParameter( ChartTypeParameter& rParameter ) { - rParameter.b3DLook = m_aCB_3DLook.IsChecked(); - sal_uInt16 nPos = m_aLB_Scheme.GetSelectEntryPos(); + rParameter.b3DLook = m_pCB_3DLook->IsChecked(); + sal_uInt16 nPos = m_pLB_Scheme->GetSelectEntryPos(); if( POS_3DSCHEME_SIMPLE == nPos ) rParameter.eThreeDLookScheme = ThreeDLookScheme_Simple; else if( POS_3DSCHEME_REALISTIC == nPos ) @@ -207,12 +124,14 @@ void Dim3DLookResourceGroup::fillParameter( ChartTypeParameter& rParameter ) else rParameter.eThreeDLookScheme = ThreeDLookScheme_Unknown; } + IMPL_LINK_NOARG(Dim3DLookResourceGroup, Dim3DLookCheckHdl) { if(m_pChangeListener) m_pChangeListener->stateChanged(this); return 0; } + IMPL_LINK_NOARG(Dim3DLookResourceGroup, SelectSchemeHdl) { if(m_pChangeListener) @@ -223,12 +142,9 @@ IMPL_LINK_NOARG(Dim3DLookResourceGroup, SelectSchemeHdl) class SortByXValuesResourceGroup : public ChangingResource { public: - SortByXValuesResourceGroup( Window* pWindow ); - virtual ~SortByXValuesResourceGroup(); + SortByXValuesResourceGroup(VclBuilderContainer* pWindow); - void showControls( bool bShow ); - long getHeight(); - void setPosition( const Point& rPoint ); + void showControls( bool bShow ); void fillControls( const ChartTypeParameter& rParameter ); void fillParameter( ChartTypeParameter& rParameter ); @@ -237,53 +153,44 @@ private: DECL_LINK( SortByXValuesCheckHdl, void* ); private: - CheckBox m_aCB_XValueSorting; + CheckBox* m_pCB_XValueSorting; }; -SortByXValuesResourceGroup::SortByXValuesResourceGroup( Window* pWindow ) - : ChangingResource() - , m_aCB_XValueSorting( pWindow, SchResId( CB_XVALUE_SORTING ) ) -{ - m_aCB_XValueSorting.SetToggleHdl( LINK( this, SortByXValuesResourceGroup, SortByXValuesCheckHdl ) ); -} -SortByXValuesResourceGroup::~SortByXValuesResourceGroup() + +SortByXValuesResourceGroup::SortByXValuesResourceGroup(VclBuilderContainer* pWindow ) + : ChangingResource() { + pWindow->get(m_pCB_XValueSorting, "sort"); + m_pCB_XValueSorting->SetToggleHdl( LINK( this, SortByXValuesResourceGroup, SortByXValuesCheckHdl ) ); } + void SortByXValuesResourceGroup::showControls( bool bShow ) { - m_aCB_XValueSorting.Show(bShow); -} -long SortByXValuesResourceGroup::getHeight() -{ - return m_aCB_XValueSorting.GetSizePixel().Height(); -} -void SortByXValuesResourceGroup::setPosition( const Point& rPoint ) -{ - m_aCB_XValueSorting.SetPosPixel(rPoint); + m_pCB_XValueSorting->Show(bShow); } + void SortByXValuesResourceGroup::fillControls( const ChartTypeParameter& rParameter ) { - m_aCB_XValueSorting.Check( rParameter.bSortByXValues ); + m_pCB_XValueSorting->Check( rParameter.bSortByXValues ); } + void SortByXValuesResourceGroup::fillParameter( ChartTypeParameter& rParameter ) { - rParameter.bSortByXValues = m_aCB_XValueSorting.IsChecked(); + rParameter.bSortByXValues = m_pCB_XValueSorting->IsChecked(); } + IMPL_LINK_NOARG(SortByXValuesResourceGroup, SortByXValuesCheckHdl) { if(m_pChangeListener) m_pChangeListener->stateChanged(this); return 0; } + class StackingResourceGroup : public ChangingResource { public: - StackingResourceGroup( Window* pWindow ); - virtual ~StackingResourceGroup(); + StackingResourceGroup(VclBuilderContainer* pWindow); - void showControls( bool bShow, bool bShowDeepStacking ); - Point getPosition(); - long getHeight(); - void setPosition( const Point& rPoint ); + void showControls( bool bShow, bool bShowDeepStacking ); void fillControls( const ChartTypeParameter& rParameter ); void fillParameter( ChartTypeParameter& rParameter ); @@ -293,109 +200,78 @@ private: DECL_LINK( StackingEnableHdl, void* ); private: - CheckBox m_aCB_Stacked; - RadioButton m_aRB_Stack_Y; - RadioButton m_aRB_Stack_Y_Percent; - RadioButton m_aRB_Stack_Z; + CheckBox* m_pCB_Stacked; + RadioButton* m_pRB_Stack_Y; + RadioButton* m_pRB_Stack_Y_Percent; + RadioButton* m_pRB_Stack_Z; bool m_bShowDeepStacking; }; -StackingResourceGroup::StackingResourceGroup( Window* pWindow ) + +StackingResourceGroup::StackingResourceGroup(VclBuilderContainer* pWindow) : ChangingResource() - , m_aCB_Stacked( pWindow, SchResId( CB_STACKED ) ) - , m_aRB_Stack_Y( pWindow, SchResId( RB_STACK_Y ) ) - , m_aRB_Stack_Y_Percent( pWindow, SchResId( RB_STACK_Y_PERCENT ) ) - , m_aRB_Stack_Z( pWindow, SchResId( RB_STACK_Z ) ) , m_bShowDeepStacking(true) { - m_aCB_Stacked.SetToggleHdl( LINK( this, StackingResourceGroup, StackingEnableHdl ) ); - m_aRB_Stack_Y.SetToggleHdl( LINK( this, StackingResourceGroup, StackingChangeHdl ) ); - m_aRB_Stack_Y_Percent.SetToggleHdl( LINK( this, StackingResourceGroup, StackingChangeHdl ) ); - m_aRB_Stack_Z.SetToggleHdl( LINK( this, StackingResourceGroup, StackingChangeHdl ) ); - m_aRB_Stack_Y.SetAccessibleRelationMemberOf(&m_aCB_Stacked); - m_aRB_Stack_Y_Percent.SetAccessibleRelationMemberOf(&m_aCB_Stacked); - m_aRB_Stack_Z.SetAccessibleRelationMemberOf(&m_aCB_Stacked); -} -StackingResourceGroup::~StackingResourceGroup() -{ + pWindow->get(m_pCB_Stacked, "stack"); + pWindow->get(m_pRB_Stack_Y, "ontop"); + pWindow->get(m_pRB_Stack_Y_Percent, "percent"); + pWindow->get(m_pRB_Stack_Z, "deep"); + + m_pCB_Stacked->SetToggleHdl( LINK( this, StackingResourceGroup, StackingEnableHdl ) ); + m_pRB_Stack_Y->SetToggleHdl( LINK( this, StackingResourceGroup, StackingChangeHdl ) ); + m_pRB_Stack_Y_Percent->SetToggleHdl( LINK( this, StackingResourceGroup, StackingChangeHdl ) ); + m_pRB_Stack_Z->SetToggleHdl( LINK( this, StackingResourceGroup, StackingChangeHdl ) ); } + void StackingResourceGroup::showControls( bool bShow, bool bShowDeepStacking ) { m_bShowDeepStacking = bShowDeepStacking; - m_aCB_Stacked.Show(bShow); - m_aRB_Stack_Y.Show(bShow); - m_aRB_Stack_Y_Percent.Show(bShow); - m_aRB_Stack_Z.Show(bShow&&bShowDeepStacking); -} -Point StackingResourceGroup::getPosition() -{ - return m_aCB_Stacked.GetPosPixel(); + m_pCB_Stacked->Show(bShow); + m_pRB_Stack_Y->Show(bShow); + m_pRB_Stack_Y_Percent->Show(bShow); + m_pRB_Stack_Z->Show(bShow&&bShowDeepStacking); } -long StackingResourceGroup::getHeight() -{ - RadioButton& rLastButton = m_bShowDeepStacking ? m_aRB_Stack_Z : m_aRB_Stack_Y_Percent; - - long nHeight = rLastButton.GetPosPixel().Y() - - m_aCB_Stacked.GetPosPixel().Y(); - nHeight += rLastButton.GetSizePixel().Height(); - return nHeight; -} -void StackingResourceGroup::setPosition( const Point& rPoint ) -{ - Point aOld = this->getPosition(); - long nDiffY = rPoint.Y() - aOld.Y(); - long nDiffX = rPoint.X() - aOld.X(); - m_aCB_Stacked.SetPosPixel( Point( aOld.X()+nDiffX, aOld.Y()+nDiffY ) ); - aOld = m_aRB_Stack_Y.GetPosPixel(); - m_aRB_Stack_Y.SetPosPixel( Point( aOld.X()+nDiffX, aOld.Y()+nDiffY ) ); - - aOld = m_aRB_Stack_Y_Percent.GetPosPixel(); - m_aRB_Stack_Y_Percent.SetPosPixel( Point( aOld.X()+nDiffX, aOld.Y()+nDiffY ) ); - - aOld = m_aRB_Stack_Z.GetPosPixel(); - m_aRB_Stack_Z.SetPosPixel( Point( aOld.X()+nDiffX, aOld.Y()+nDiffY ) ); -} void StackingResourceGroup::fillControls( const ChartTypeParameter& rParameter ) { - m_aCB_Stacked.Check( rParameter.eStackMode!=GlobalStackMode_NONE + m_pCB_Stacked->Check( 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_aRB_Stack_Y.Check(); + m_pRB_Stack_Y->Check(); break; case GlobalStackMode_STACK_Y_PERCENT: - m_aRB_Stack_Y_Percent.Check(); + m_pRB_Stack_Y_Percent->Check(); break; case GlobalStackMode_STACK_Z: //todo uncomment this condition if z stacking radio button is really used /* if( rParameter.b3DLook ) - m_aRB_Stack_Z.Check(); + m_pRB_Stack_Z->Check(); else */ - m_aRB_Stack_Y.Check(); + m_pRB_Stack_Y->Check(); break; default: - m_aRB_Stack_Y.Check(); + m_pRB_Stack_Y->Check(); break; } //dis/enabling - m_aCB_Stacked.Enable( !rParameter.bXAxisWithValues ); - m_aRB_Stack_Y.Enable( m_aCB_Stacked.IsChecked() && !rParameter.bXAxisWithValues ); - m_aRB_Stack_Y_Percent.Enable( m_aCB_Stacked.IsChecked() && !rParameter.bXAxisWithValues ); - m_aRB_Stack_Z.Enable( m_aCB_Stacked.IsChecked() && rParameter.b3DLook ); + m_pCB_Stacked->Enable( !rParameter.bXAxisWithValues ); + m_pRB_Stack_Y->Enable( m_pCB_Stacked->IsChecked() && !rParameter.bXAxisWithValues ); + m_pRB_Stack_Y_Percent->Enable( m_pCB_Stacked->IsChecked() && !rParameter.bXAxisWithValues ); + m_pRB_Stack_Z->Enable( m_pCB_Stacked->IsChecked() && rParameter.b3DLook ); } void StackingResourceGroup::fillParameter( ChartTypeParameter& rParameter ) { - if(!m_aCB_Stacked.IsChecked()) + if(!m_pCB_Stacked->IsChecked()) rParameter.eStackMode = GlobalStackMode_NONE; - else if(m_aRB_Stack_Y.IsChecked()) + else if(m_pRB_Stack_Y->IsChecked()) rParameter.eStackMode = GlobalStackMode_STACK_Y; - else if(m_aRB_Stack_Y_Percent.IsChecked()) + else if(m_pRB_Stack_Y_Percent->IsChecked()) rParameter.eStackMode = GlobalStackMode_STACK_Y_PERCENT; - else if(m_aRB_Stack_Z.IsChecked()) + else if(m_pRB_Stack_Z->IsChecked()) rParameter.eStackMode = GlobalStackMode_STACK_Z; } IMPL_LINK( StackingResourceGroup, StackingChangeHdl, RadioButton*, pRadio ) @@ -579,13 +455,9 @@ void SteppedPropertiesDialog::fillParameter( ChartTypeParameter& rParameter, boo class SplineResourceGroup : public ChangingResource { public: - SplineResourceGroup( Window* pWindow ); - virtual ~SplineResourceGroup(); + SplineResourceGroup(VclBuilderContainer* pWindow); - void showControls( bool bShow ); - Point getPosition(); - long getHeight(); - void setPosition( const Point& rPoint ); + void showControls( bool bShow ); void fillControls( const ChartTypeParameter& rParameter ); void fillParameter( ChartTypeParameter& rParameter ); @@ -598,92 +470,44 @@ private: SteppedPropertiesDialog& getSteppedPropertiesDialog(); private: - FixedText m_aFT_LineType; - ListBox m_aLB_LineType; - PushButton m_aPB_DetailsDialog; + FixedText* m_pFT_LineType; + ListBox* m_pLB_LineType; + PushButton* m_pPB_DetailsDialog; boost::scoped_ptr< SplinePropertiesDialog > m_pSplinePropertiesDialog; boost::scoped_ptr< SteppedPropertiesDialog > m_pSteppedPropertiesDialog; }; -SplineResourceGroup::SplineResourceGroup( Window* pWindow ) - : ChangingResource() - , m_aFT_LineType( pWindow, SchResId( FT_LINETYPE ) ) - , m_aLB_LineType( pWindow, SchResId( LB_LINETYPE ) ) - , m_aPB_DetailsDialog( pWindow, SchResId( PB_SPLINE_DIALOG ) ) -{ - m_aLB_LineType.InsertEntry(SCH_RESSTR(STR_LINETYPE_STRAIGHT)); - m_aLB_LineType.InsertEntry(SCH_RESSTR(STR_LINETYPE_SMOOTH)); - m_aLB_LineType.InsertEntry(SCH_RESSTR(STR_LINETYPE_STEPPED)); - m_aLB_LineType.SetDropDownLineCount(3); - m_aLB_LineType.SetSelectHdl( LINK( this, SplineResourceGroup, LineTypeChangeHdl ) ); - m_aLB_LineType.SetAccessibleName(m_aFT_LineType.GetText()); - m_aLB_LineType.SetAccessibleRelationLabeledBy(&m_aFT_LineType); - - Size aButtonSize( m_aPB_DetailsDialog.GetSizePixel() ); - Size aMinSize( m_aPB_DetailsDialog.CalcMinimumSize() ); - sal_Int32 nDistance = 10; - if( pWindow ) - { - Size aDistanceSize( pWindow->LogicToPixel( Size(RSC_SP_CTRL_DESC_X,2), MapMode(MAP_APPFONT) ) ); - nDistance = 2*aDistanceSize.Width(); - } - aButtonSize.Width() = aMinSize.Width() + nDistance; - m_aPB_DetailsDialog.SetSizePixel( aButtonSize ); -} -SplineResourceGroup::~SplineResourceGroup() + +SplineResourceGroup::SplineResourceGroup(VclBuilderContainer* pWindow) + : ChangingResource() { + pWindow->get(m_pFT_LineType, "linetypeft"); + pWindow->get(m_pLB_LineType, "linetype"); + pWindow->get(m_pPB_DetailsDialog, "properties"); + + m_pLB_LineType->SetSelectHdl( LINK( this, SplineResourceGroup, LineTypeChangeHdl ) ); } + SplinePropertiesDialog& SplineResourceGroup::getSplinePropertiesDialog() { if( !m_pSplinePropertiesDialog.get() ) - m_pSplinePropertiesDialog.reset( new SplinePropertiesDialog( m_aPB_DetailsDialog.GetParent() ) ); + m_pSplinePropertiesDialog.reset( new SplinePropertiesDialog( m_pPB_DetailsDialog->GetParentDialog() ) ); return *m_pSplinePropertiesDialog; } + SteppedPropertiesDialog& SplineResourceGroup::getSteppedPropertiesDialog() { if( !m_pSteppedPropertiesDialog.get() ) { - m_pSteppedPropertiesDialog.reset( new SteppedPropertiesDialog( m_aPB_DetailsDialog.GetParent() ) ); + m_pSteppedPropertiesDialog.reset( new SteppedPropertiesDialog( m_pPB_DetailsDialog->GetParentDialog() ) ); } return *m_pSteppedPropertiesDialog; } + void SplineResourceGroup::showControls( bool bShow ) { - m_aFT_LineType.Show(bShow); - m_aLB_LineType.Show(bShow); - m_aPB_DetailsDialog.Show(bShow); -} -Point SplineResourceGroup::getPosition() -{ - return m_aLB_LineType.GetPosPixel(); -} -long SplineResourceGroup::getHeight() -{ - return m_aLB_LineType.GetSizePixel().Height() + m_aPB_DetailsDialog.LogicToPixel( Size(0,2), MapMode(MAP_APPFONT) ).Height(); -} -void SplineResourceGroup::setPosition( const Point& rPoint ) -{ - Size aSizeFT( m_aFT_LineType.CalcMinimumSize() ); - Size aDistanceSizeFT( m_aFT_LineType.LogicToPixel( Size(RSC_SP_CTRL_GROUP_X,1), MapMode(MAP_APPFONT) ) ); - m_aFT_LineType.SetSizePixel( aSizeFT ); - - Size aSizeLB( m_aLB_LineType.CalcMinimumSize() ); - Size aDistanceSizeLB( m_aLB_LineType.LogicToPixel( Size(RSC_SP_CTRL_GROUP_X,1), MapMode(MAP_APPFONT) ) ); - m_aLB_LineType.SetSizePixel( aSizeLB ); - - Point aOld = this->getPosition(); - long nDiffY = rPoint.Y() - aOld.Y(); - long nDiffX = rPoint.X() - aOld.X(); - - Point aNew( aOld.X()+nDiffX, aOld.Y()+nDiffY ); - m_aFT_LineType.SetPosPixel( aNew ); - - aNew.X() += ( aSizeFT.Width() + aDistanceSizeFT.Width() ); - aNew.Y() -= 3*aDistanceSizeFT.Height(); - m_aLB_LineType.SetPosPixel( aNew ); - - aNew.X() += ( aSizeLB.Width() + aDistanceSizeLB.Width() ); - aNew.Y() -= 3*aDistanceSizeLB.Height(); - m_aPB_DetailsDialog.SetPosPixel( aNew ); + m_pFT_LineType->Show(bShow); + m_pLB_LineType->Show(bShow); + m_pPB_DetailsDialog->Show(bShow); } void SplineResourceGroup::fillControls( const ChartTypeParameter& rParameter ) @@ -691,35 +515,35 @@ void SplineResourceGroup::fillControls( const ChartTypeParameter& rParameter ) switch (rParameter.eCurveStyle) { case CurveStyle_LINES: - m_aLB_LineType.SelectEntryPos(POS_LINETYPE_STRAIGHT); - m_aPB_DetailsDialog.Enable(false); + m_pLB_LineType->SelectEntryPos(POS_LINETYPE_STRAIGHT); + m_pPB_DetailsDialog->Enable(false); break; case CurveStyle_CUBIC_SPLINES: case CurveStyle_B_SPLINES: - m_aLB_LineType.SelectEntryPos(POS_LINETYPE_SMOOTH); - m_aPB_DetailsDialog.Enable(true); - m_aPB_DetailsDialog.SetClickHdl( LINK( this, SplineResourceGroup, SplineDetailsDialogHdl ) ); - m_aPB_DetailsDialog.SetQuickHelpText( SCH_RESSTR(STR_DLG_SMOOTH_LINE_PROPERTIES) ); + m_pLB_LineType->SelectEntryPos(POS_LINETYPE_SMOOTH); + m_pPB_DetailsDialog->Enable(true); + m_pPB_DetailsDialog->SetClickHdl( LINK( this, SplineResourceGroup, SplineDetailsDialogHdl ) ); + m_pPB_DetailsDialog->SetQuickHelpText( SCH_RESSTR(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_aLB_LineType.SelectEntryPos(POS_LINETYPE_STEPPED); - m_aPB_DetailsDialog.Enable(true); - m_aPB_DetailsDialog.SetClickHdl( LINK( this, SplineResourceGroup, SteppedDetailsDialogHdl ) ); - m_aPB_DetailsDialog.SetQuickHelpText( SCH_RESSTR(STR_DLG_STEPPED_LINE_PROPERTIES) ); + m_pLB_LineType->SelectEntryPos(POS_LINETYPE_STEPPED); + m_pPB_DetailsDialog->Enable(true); + m_pPB_DetailsDialog->SetClickHdl( LINK( this, SplineResourceGroup, SteppedDetailsDialogHdl ) ); + m_pPB_DetailsDialog->SetQuickHelpText( SCH_RESSTR(STR_DLG_STEPPED_LINE_PROPERTIES) ); getSteppedPropertiesDialog().fillControls( rParameter ); break; default: - m_aLB_LineType.SetNoSelection(); - m_aPB_DetailsDialog.Enable(false); + m_pLB_LineType->SetNoSelection(); + m_pPB_DetailsDialog->Enable(false); } } void SplineResourceGroup::fillParameter( ChartTypeParameter& rParameter ) { - switch (m_aLB_LineType.GetSelectEntryPos()) + switch (m_pLB_LineType->GetSelectEntryPos()) { case POS_LINETYPE_SMOOTH: getSplinePropertiesDialog().fillParameter( rParameter, true ); @@ -742,10 +566,10 @@ IMPL_LINK_NOARG(SplineResourceGroup, SplineDetailsDialogHdl) { ChartTypeParameter aOldParameter; - getSplinePropertiesDialog().fillParameter( aOldParameter, POS_LINETYPE_SMOOTH == m_aLB_LineType.GetSelectEntryPos() ); + getSplinePropertiesDialog().fillParameter( aOldParameter, POS_LINETYPE_SMOOTH == m_pLB_LineType->GetSelectEntryPos() ); - sal_uInt16 iOldLineTypePos = m_aLB_LineType.GetSelectEntryPos(); - m_aLB_LineType.SelectEntryPos(POS_LINETYPE_SMOOTH); + sal_uInt16 iOldLineTypePos = m_pLB_LineType->GetSelectEntryPos(); + m_pLB_LineType->SelectEntryPos(POS_LINETYPE_SMOOTH); if( RET_OK == getSplinePropertiesDialog().Execute() ) { if( m_pChangeListener ) @@ -754,7 +578,7 @@ IMPL_LINK_NOARG(SplineResourceGroup, SplineDetailsDialogHdl) else { //restore old state: - m_aLB_LineType.SelectEntryPos( iOldLineTypePos ); + m_pLB_LineType->SelectEntryPos( iOldLineTypePos ); getSplinePropertiesDialog().fillControls( aOldParameter ); } return 0; @@ -763,10 +587,10 @@ IMPL_LINK_NOARG(SplineResourceGroup, SteppedDetailsDialogHdl) { ChartTypeParameter aOldParameter; - getSteppedPropertiesDialog().fillParameter( aOldParameter, POS_LINETYPE_STEPPED == m_aLB_LineType.GetSelectEntryPos() ); + getSteppedPropertiesDialog().fillParameter( aOldParameter, POS_LINETYPE_STEPPED == m_pLB_LineType->GetSelectEntryPos() ); - sal_uInt16 iOldLineTypePos = m_aLB_LineType.GetSelectEntryPos(); - m_aLB_LineType.SelectEntryPos(POS_LINETYPE_STEPPED); + sal_uInt16 iOldLineTypePos = m_pLB_LineType->GetSelectEntryPos(); + m_pLB_LineType->SelectEntryPos(POS_LINETYPE_STEPPED); if( RET_OK == getSteppedPropertiesDialog().Execute() ) { if( m_pChangeListener ) @@ -775,7 +599,7 @@ IMPL_LINK_NOARG(SplineResourceGroup, SteppedDetailsDialogHdl) else { //restore old state: - m_aLB_LineType.SelectEntryPos( iOldLineTypePos ); + m_pLB_LineType->SelectEntryPos( iOldLineTypePos ); getSteppedPropertiesDialog().fillControls( aOldParameter ); } return 0; @@ -784,12 +608,9 @@ IMPL_LINK_NOARG(SplineResourceGroup, SteppedDetailsDialogHdl) class GeometryResourceGroup : public ChangingResource { public: - GeometryResourceGroup( Window* pWindow ); - virtual ~GeometryResourceGroup(); + GeometryResourceGroup(VclBuilderContainer* pWindow); - void showControls( bool bShow ); - long getHeight(); - void setPosition( const Point& rPoint ); + void showControls( bool bShow ); void fillControls( const ChartTypeParameter& rParameter ); void fillParameter( ChartTypeParameter& rParameter ); @@ -798,29 +619,20 @@ private: DECL_LINK( GeometryChangeHdl, void* ); private: - BarGeometryResources m_aGeometryResources; + BarGeometryResources m_aGeometryResources; }; -GeometryResourceGroup::GeometryResourceGroup( Window* pWindow ) - : ChangingResource() - , m_aGeometryResources( pWindow ) + +GeometryResourceGroup::GeometryResourceGroup(VclBuilderContainer* pWindow ) + : ChangingResource() + , m_aGeometryResources( pWindow ) { m_aGeometryResources.SetSelectHdl( LINK( this, GeometryResourceGroup, GeometryChangeHdl ) ); } -GeometryResourceGroup::~GeometryResourceGroup() -{ -} + void GeometryResourceGroup::showControls( bool bShow ) { m_aGeometryResources.Show(bShow); } -long GeometryResourceGroup::getHeight() -{ - return m_aGeometryResources.GetSizePixel().Height(); -} -void GeometryResourceGroup::setPosition( const Point& rPoint ) -{ - m_aGeometryResources.SetPosPixel( rPoint ); -} void GeometryResourceGroup::fillControls( const ChartTypeParameter& rParameter ) { @@ -828,12 +640,14 @@ void GeometryResourceGroup::fillControls( const ChartTypeParameter& rParameter ) m_aGeometryResources.SelectEntryPos(nGeometry3D); m_aGeometryResources.Enable(rParameter.b3DLook); } + void GeometryResourceGroup::fillParameter( ChartTypeParameter& rParameter ) { rParameter.nGeometry3D = 1; if( m_aGeometryResources.GetSelectEntryCount() ) rParameter.nGeometry3D = m_aGeometryResources.GetSelectEntryPos(); } + IMPL_LINK_NOARG(GeometryResourceGroup, GeometryChangeHdl) { if( m_pChangeListener ) @@ -841,21 +655,17 @@ IMPL_LINK_NOARG(GeometryResourceGroup, GeometryChangeHdl) return 0; } -ChartTypeTabPage::ChartTypeTabPage( Window* pParent +ChartTypeTabPage::ChartTypeTabPage(Window* pParent , const uno::Reference< XChartDocument >& xChartModel , const uno::Reference< uno::XComponentContext >& xContext - , bool bDoLiveUpdate, bool bHideDescription ) - : OWizardPage( pParent, SchResId(TP_CHARTTYPE) ) - , m_aFT_ChooseType( this, SchResId( FT_CHARTTYPE ) ) - , m_aMainTypeList( this, SchResId( LB_CHARTTYPE ) ) - , m_aSubTypeList( this, SchResId( CT_CHARTVARIANT ) ) - , m_pAxisTypeResourceGroup( new AxisTypeResourceGroup(this) ) + , bool bDoLiveUpdate, bool bHideDescription) + : OWizardPage(pParent, "tp_ChartType", + "modules/schart/ui/tp_ChartType.ui") , m_pDim3DLookResourceGroup( new Dim3DLookResourceGroup(this) ) , m_pStackingResourceGroup( new StackingResourceGroup(this) ) , m_pSplineResourceGroup( new SplineResourceGroup(this) ) , m_pGeometryResourceGroup( new GeometryResourceGroup( this ) ) , m_pSortByXValuesResourceGroup( new SortByXValuesResourceGroup( this ) ) - , m_nYTopPos(0) , m_xChartModel( xChartModel ) , m_xCC( xContext ) , m_aChartTypeDialogControllerList(0) @@ -864,44 +674,32 @@ ChartTypeTabPage::ChartTypeTabPage( Window* pParent , m_bDoLiveUpdate(bDoLiveUpdate) , m_aTimerTriggeredControllerLock( uno::Reference< frame::XModel >( m_xChartModel, uno::UNO_QUERY ) ) { - FreeResource(); + get(m_pFT_ChooseType, "FT_CAPTION_FOR_WIZARD"); + get(m_pMainTypeList, "charttype"); + get(m_pSubTypeList, "subtype"); + Size aSize(m_pSubTypeList->LogicToPixel(Size(150, 50), MAP_APPFONT)); + m_pSubTypeList->set_width_request(aSize.Width()); + m_pSubTypeList->set_height_request(aSize.Height()); if( bHideDescription ) { - m_aFT_ChooseType.Hide(); - long nYDiff = m_aMainTypeList.GetPosPixel().Y() - m_aFT_ChooseType.GetPosPixel().Y(); - - Point aOldPos( m_aMainTypeList.GetPosPixel() ); - m_aMainTypeList.SetPosPixel( Point( aOldPos.X(), aOldPos.Y() - nYDiff ) ); - - aOldPos = m_aSubTypeList.GetPosPixel(); - m_aSubTypeList.SetPosPixel( Point( aOldPos.X(), aOldPos.Y() - nYDiff ) ); - - aOldPos = m_pAxisTypeResourceGroup->getPosition(); - m_pAxisTypeResourceGroup->setPosition( Point( aOldPos.X(), aOldPos.Y() - nYDiff ) ); - - Size aSize( this->GetSizePixel() ); - this->SetSizePixel( Size( aSize.Width(), aSize.Height()-nYDiff+3 ) ); + m_pFT_ChooseType->Hide(); } else { - Font aFont( m_aFT_ChooseType.GetControlFont() ); - aFont.SetWeight( WEIGHT_BOLD ); - m_aFT_ChooseType.SetControlFont( aFont ); - - m_aFT_ChooseType.SetStyle( m_aFT_ChooseType.GetStyle() | WB_NOLABEL ); + m_pFT_ChooseType->SetStyle(m_pFT_ChooseType->GetStyle() | WB_NOLABEL); } this->SetText( SCH_RESSTR(STR_PAGE_CHARTTYPE) ); - m_aMainTypeList.SetStyle(m_aMainTypeList.GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER | WB_FLATVALUESET | WB_3DLOOK ); - m_aMainTypeList.SetSelectHdl( LINK( this, ChartTypeTabPage, SelectMainTypeHdl ) ); - m_aSubTypeList.SetSelectHdl( LINK( this, ChartTypeTabPage, SelectSubTypeHdl ) ); + m_pMainTypeList->SetStyle(m_pMainTypeList->GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER | WB_FLATVALUESET | WB_3DLOOK ); + m_pMainTypeList->SetSelectHdl( LINK( this, ChartTypeTabPage, SelectMainTypeHdl ) ); + m_pSubTypeList->SetSelectHdl( LINK( this, ChartTypeTabPage, SelectSubTypeHdl ) ); - m_aSubTypeList.SetStyle(m_aSubTypeList.GetStyle() | + m_pSubTypeList->SetStyle(m_pSubTypeList->GetStyle() | WB_ITEMBORDER | WB_DOUBLEBORDER | WB_NAMEFIELD | WB_FLATVALUESET | WB_3DLOOK ); - m_aSubTypeList.SetColCount(4); - m_aSubTypeList.SetLineCount(1); + m_pSubTypeList->SetColCount(4); + m_pSubTypeList->SetLineCount(1); bool bDisableComplexChartTypes = false; uno::Reference< beans::XPropertySet > xProps( m_xChartModel, uno::UNO_QUERY ); @@ -938,13 +736,10 @@ ChartTypeTabPage::ChartTypeTabPage( Window* pParent const ::std::vector< ChartTypeDialogController* >::const_iterator aEnd = m_aChartTypeDialogControllerList.end(); for( ; aIter != aEnd; ++aIter ) { - m_aMainTypeList.InsertEntry( (*aIter)->getName(), (*aIter)->getImage() ); + m_pMainTypeList->InsertEntry( (*aIter)->getName(), (*aIter)->getImage() ); (*aIter)->setChangeListener( this ); } - m_nYTopPos = m_pAxisTypeResourceGroup->getPosition().Y(); - - m_pAxisTypeResourceGroup->setChangeListener( this ); m_pDim3DLookResourceGroup->setChangeListener( this ); m_pStackingResourceGroup->setChangeListener( this ); m_pSplineResourceGroup->setChangeListener( this ); @@ -964,7 +759,6 @@ ChartTypeTabPage::~ChartTypeTabPage() m_aChartTypeDialogControllerList.clear(); //delete all resource helper - delete m_pAxisTypeResourceGroup; delete m_pDim3DLookResourceGroup; delete m_pStackingResourceGroup; delete m_pSplineResourceGroup; @@ -974,8 +768,7 @@ ChartTypeTabPage::~ChartTypeTabPage() ChartTypeParameter ChartTypeTabPage::getCurrentParamter() const { ChartTypeParameter aParameter; - aParameter.nSubTypeIndex = static_cast<sal_Int32>( m_aSubTypeList.GetSelectItemId() ); - m_pAxisTypeResourceGroup->fillParameter( aParameter ); + aParameter.nSubTypeIndex = static_cast<sal_Int32>( m_pSubTypeList->GetSelectItemId() ); m_pDim3DLookResourceGroup->fillParameter( aParameter ); m_pStackingResourceGroup->fillParameter( aParameter ); m_pSplineResourceGroup->fillParameter( aParameter ); @@ -1019,7 +812,7 @@ ChartTypeDialogController* ChartTypeTabPage::getSelectedMainType() { ChartTypeDialogController* pTypeController = 0; ::std::vector< ChartTypeDialogController* >::size_type nM = static_cast< ::std::vector< ChartTypeDialogController* >::size_type >( - m_aMainTypeList.GetSelectEntryPos() ); + m_pMainTypeList->GetSelectEntryPos() ); if( nM<m_aChartTypeDialogControllerList.size() ) pTypeController = m_aChartTypeDialogControllerList[nM]; return pTypeController; @@ -1070,66 +863,19 @@ IMPL_LINK_NOARG(ChartTypeTabPage, SelectMainTypeHdl) void ChartTypeTabPage::showAllControls( ChartTypeDialogController& rTypeController ) { - m_aSubTypeList.Show(); - - long nYPos = m_nYTopPos; - - - bool bShow = rTypeController.shouldShow_XAxisTypeControl(); - long nXPos = m_pAxisTypeResourceGroup->getPosition().X(); - m_pAxisTypeResourceGroup->showControls( bShow ); - if(bShow) - { - m_pAxisTypeResourceGroup->setPosition( Point( nXPos, nYPos ) ); - nYPos += m_pAxisTypeResourceGroup->getHeight() + lcl_getDistance(); - } + m_pSubTypeList->Show(); - bShow = rTypeController.shouldShow_3DLookControl(); + bool bShow = rTypeController.shouldShow_3DLookControl(); m_pDim3DLookResourceGroup->showControls( bShow ); - if(bShow) - { - m_pDim3DLookResourceGroup->setPosition( Point( nXPos, nYPos ) ); - nYPos += m_pDim3DLookResourceGroup->getHeight() + lcl_getDistance(); - } - bShow = rTypeController.shouldShow_StackingControl(); m_pStackingResourceGroup->showControls( bShow, rTypeController.shouldShow_DeepStackingControl() ); - if(bShow) - { - long nStackingXPos = nXPos; - if( rTypeController.shouldShow_XAxisTypeControl() ) - nStackingXPos += this->LogicToPixel( Size(RSC_SP_CHK_TEXTINDENT,0), MapMode(MAP_APPFONT) ).Width(); - m_pStackingResourceGroup->setPosition( Point( nStackingXPos, nYPos ) ); - nYPos += m_pStackingResourceGroup->getHeight() + lcl_getDistance(); - } - bShow = rTypeController.shouldShow_SplineControl(); m_pSplineResourceGroup->showControls( bShow ); - if(bShow) - { - m_pSplineResourceGroup->setPosition( Point( nXPos, nYPos ) ); - nYPos += m_pSplineResourceGroup->getHeight() + lcl_getDistance(); - } - bShow = rTypeController.shouldShow_GeometryControl(); m_pGeometryResourceGroup->showControls( bShow ); - if(bShow) - { - m_pGeometryResourceGroup->setPosition( Point( nXPos+17, nYPos ) ); - nYPos += m_pGeometryResourceGroup->getHeight() + lcl_getDistance(); - } - bShow = rTypeController.shouldShow_SortByXValuesResourceGroup(); m_pSortByXValuesResourceGroup->showControls( bShow ); - if(bShow) - { - m_pSortByXValuesResourceGroup->setPosition( Point( nXPos, nYPos ) ); - nYPos += m_pSortByXValuesResourceGroup->getHeight() + lcl_getDistance(); - } - - Size aPageSize( this->GetSizePixel() ); - Size aRemainingSize = Size( aPageSize.Width()-nXPos, aPageSize.Height()-nYPos ); - rTypeController.showExtraControls( this, Point( nXPos, nYPos ), aRemainingSize ); + rTypeController.showExtraControls(this); } void ChartTypeTabPage::fillAllControls( const ChartTypeParameter& rParameter, bool bAlsoResetSubTypeList ) @@ -1137,10 +883,9 @@ void ChartTypeTabPage::fillAllControls( const ChartTypeParameter& rParameter, bo m_nChangingCalls++; if( m_pCurrentMainType && bAlsoResetSubTypeList ) { - m_pCurrentMainType->fillSubTypeList( m_aSubTypeList, rParameter ); + m_pCurrentMainType->fillSubTypeList(*m_pSubTypeList, rParameter); } - m_aSubTypeList.SelectItem( static_cast<sal_uInt16>( rParameter.nSubTypeIndex) ); - m_pAxisTypeResourceGroup->fillControls( rParameter ); + m_pSubTypeList->SelectItem( static_cast<sal_uInt16>( rParameter.nSubTypeIndex) ); m_pDim3DLookResourceGroup->fillControls( rParameter ); m_pStackingResourceGroup->fillControls( rParameter ); m_pSplineResourceGroup->fillControls( rParameter ); @@ -1170,7 +915,7 @@ void ChartTypeTabPage::initializePage() { bFound = true; - m_aMainTypeList.SelectEntryPos( nM ); + m_pMainTypeList->SelectEntryPos( nM ); this->showAllControls( **aIter ); uno::Reference< beans::XPropertySet > xTemplateProps( aTemplate.first, uno::UNO_QUERY ); ChartTypeParameter aParameter = (*aIter)->getChartTypeParameterForService( aServiceName, xTemplateProps ); @@ -1192,8 +937,7 @@ void ChartTypeTabPage::initializePage() if( !bFound ) { - m_aSubTypeList.Hide(); - m_pAxisTypeResourceGroup->showControls( false ); + m_pSubTypeList->Hide(); m_pDim3DLookResourceGroup->showControls( false ); m_pStackingResourceGroup->showControls( false, false ); m_pSplineResourceGroup->showControls( false ); diff --git a/chart2/source/controller/dialogs/tp_ChartType.hrc b/chart2/source/controller/dialogs/tp_ChartType.hrc deleted file mode 100644 index 3a356a8a49c6..000000000000 --- a/chart2/source/controller/dialogs/tp_ChartType.hrc +++ /dev/null @@ -1,46 +0,0 @@ -/* -*- 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 . - */ - -#include "ResourceIds.hrc" - -#define BTN_OK 1 -#define BTN_CANCEL 1 -#define BTN_HELP 1 - -#define LB_3D_SCHEME 1 -#define LB_CHARTTYPE 2 -#define CT_CHARTVARIANT 3 -#define LB_LINETYPE 4 - -#define FT_CHARTTYPE 1 -#define FT_LINETYPE 2 - -#define CB_X_AXIS_CATEGORIES 1 -#define CB_3D_LOOK 2 -#define CB_STACKED 3 -#define CB_SPLINES 4 -#define CB_XVALUE_SORTING 5 - -#define PB_SPLINE_DIALOG 1 - -#define RB_STACK_Y 2 -#define RB_STACK_Y_PERCENT 3 -#define RB_STACK_Z 4 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx index 47d9bef7b17d..c7962767ba79 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.hxx +++ b/chart2/source/controller/dialogs/tp_ChartType.hxx @@ -39,7 +39,6 @@ namespace chart { -class AxisTypeResourceGroup; class Dim3DLookResourceGroup; class StackingResourceGroup; class SplineResourceGroup; @@ -78,19 +77,16 @@ protected: DECL_LINK( SelectSubTypeHdl, void* ); protected: - FixedText m_aFT_ChooseType; - ListBox m_aMainTypeList; - ValueSet m_aSubTypeList; + FixedText* m_pFT_ChooseType; + ListBox* m_pMainTypeList; + ValueSet* m_pSubTypeList; - AxisTypeResourceGroup* m_pAxisTypeResourceGroup; Dim3DLookResourceGroup* m_pDim3DLookResourceGroup; StackingResourceGroup* m_pStackingResourceGroup; SplineResourceGroup* m_pSplineResourceGroup; GeometryResourceGroup* m_pGeometryResourceGroup; SortByXValuesResourceGroup* m_pSortByXValuesResourceGroup; - long m_nYTopPos;//top y position of the different ResourceGroups (AxisTypeResourceGroup, etc) - ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument > m_xChartModel; ::com::sun::star::uno::Reference< diff --git a/chart2/source/controller/dialogs/tp_ChartType.src b/chart2/source/controller/dialogs/tp_ChartType.src deleted file mode 100644 index 2942578838a4..000000000000 --- a/chart2/source/controller/dialogs/tp_ChartType.src +++ /dev/null @@ -1,190 +0,0 @@ -/* -*- 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 . - */ -#include "HelpIds.hrc" -#include "tp_ChartType.hrc" -#include "dlg_CreationWizard.hrc" -#include "CommonResources.hrc" -#include <svtools/controldims.hrc> - -#define MASKCOLOR MaskColor = Color { Red = 0xC000 ; Green = 0xC000 ; Blue = 0xC000 ; } - -#define WIDTH_MAINLIST 75 -#define HEIGHT_MAINLIST 122 -#define WIDTH_IMAGELIST 150 -#define HEIGHT_IMAGELIST 50 -#define WIDTH_3D 100 -#define POS_X_MAINLIST 6 -#define POS_X_IMAGELIST (POS_X_MAINLIST+WIDTH_MAINLIST+6) -#define POS_Y1 8 -#define POS_Y_LIST (POS_Y1+RSC_CD_FIXEDTEXT_HEIGHT+4) -#define POS_Y_VALUE_X_AXIS (POS_Y_LIST+HEIGHT_IMAGELIST+RSC_SP_CTRL_Y+2) -#define POS_Y_3D_LOOK (POS_Y_VALUE_X_AXIS+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_Y) -#define POS_Y_STACKING (POS_Y_3D_LOOK+RSC_CD_CHECKBOX_HEIGHT+RSC_SP_CTRL_Y) -#define POS_Y_SPLINES (POS_Y_STACKING+4*12+12) -#define POS_Y_XVALUE_SORTING (POS_Y_SPLINES+4+12) - -#define POS_X_SPLINES_1 (8) -#define POS_Y_SPLINES_2 (8) -#define POS_Y_SPLINES_3 (POS_Y_SPLINES_2+13) -#define POS_Y_SPLINES_4 (POS_Y_SPLINES_3+13) -#define POS_Y_SPLINES_5 (POS_Y_SPLINES_4+RSC_CD_FIXEDTEXT_HEIGHT) - -#define SPLINES_WIDTH_RADIO 45 -#define SPLINES_WIDTH_METRIC_TEXT 60 -#define POS_X_SPLINE_EXTRAS (POS_X_SPLINES_1+SPLINES_WIDTH_RADIO+RSC_SP_FLGR_SPACE_X+RSC_CD_FIXEDLINE_WIDTH+2*RSC_SP_FLGR_SPACE_X) -#define WIZ_FIXEDLINE_WIDTH (CHART_WIZARD_PAGEWIDTH-POS_X_MAINLIST-6) -#define WIDTH_XVALUE_SORTING (WIDTH_IMAGELIST) - -#define SPLINE_DIALOG_WIDTH 172 -#define SPLINE_DIALOG_HEIGHT 59 - -TabPage TP_CHARTTYPE -{ - Hide = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( CHART_WIZARD_PAGEWIDTH , CHART_WIZARD_PAGEHEIGHT ) ; - - FixedText FT_CHARTTYPE - { - Pos = MAP_APPFONT ( POS_X_MAINLIST-1 , POS_Y1 ) ; - Size = MAP_APPFONT ( WIZ_FIXEDLINE_WIDTH , RSC_CD_FIXEDTEXT_HEIGHT ) ; - TabStop = FALSE ; - Text [ en-US ] = "Choose a chart type"; - }; - ListBox LB_CHARTTYPE - { - HelpId = HID_SCH_CTL_TYPE ; - Border = TRUE ; - TabStop = TRUE ; - Pos = MAP_APPFONT ( POS_X_MAINLIST , POS_Y_LIST ) ; - Size = MAP_APPFONT ( WIDTH_MAINLIST, HEIGHT_MAINLIST ) ; - }; - Control CT_CHARTVARIANT - { - HelpId = HID_SCH_CTL_VARIANT ; - Border = TRUE ; - Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_LIST ) ; - Size = MAP_APPFONT ( WIDTH_IMAGELIST , HEIGHT_IMAGELIST ) ; - TabStop = TRUE ; - }; - - CheckBox CB_X_AXIS_CATEGORIES - { - HelpID = "chart2:CheckBox:TP_CHARTTYPE:CB_X_AXIS_CATEGORIES"; - Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_VALUE_X_AXIS ) ; - Size = MAP_APPFONT ( 150 , 10 ) ; - Text [ en-US ] = "X axis with Categories" ; - }; - CheckBox CB_3D_LOOK - { - HelpID = "chart2:CheckBox:TP_CHARTTYPE:CB_3D_LOOK"; - Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_3D_LOOK ) ; - Size = MAP_APPFONT ( WIDTH_3D , 10 ) ; - Text [ en-US ] = "~3D Look" ; - }; - ListBox LB_3D_SCHEME - { - HelpID = "chart2:ListBox:TP_CHARTTYPE:LB_3D_SCHEME"; - Border = TRUE; - TabStop = TRUE; - DropDown = TRUE; - Pos = MAP_APPFONT ( POS_X_IMAGELIST+WIDTH_3D+4 , POS_Y_3D_LOOK ) ; - Size = MAP_APPFONT ( 60, 12 ) ; - }; - - CheckBox CB_STACKED - { - HelpID = "chart2:CheckBox:TP_CHARTTYPE:CB_STACKED"; - Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_STACKING ) ; - Size = MAP_APPFONT ( 150 , 10 ) ; - Text [ en-US ] = "~Stack series" ; - }; - RadioButton RB_STACK_Y - { - HelpID = "chart2:RadioButton:TP_CHARTTYPE:RB_STACK_Y"; - Pos = MAP_APPFONT ( POS_X_IMAGELIST+RSC_SP_CHK_TEXTINDENT, POS_Y_STACKING+12 ) ; - Size = MAP_APPFONT ( 80 , 10 ) ; - TabStop = TRUE ; - //Uebereinander (summiere Y-Werte) - //On top (sum Y-values) - Text [ en-US ] = "On top"; - }; - RadioButton RB_STACK_Y_PERCENT - { - HelpID = "chart2:RadioButton:TP_CHARTTYPE:RB_STACK_Y_PERCENT"; - Pos = MAP_APPFONT ( POS_X_IMAGELIST+RSC_SP_CHK_TEXTINDENT, POS_Y_STACKING+2*12 ) ; - Size = MAP_APPFONT ( 80 , 10 ) ; - TabStop = TRUE ; - Text [ en-US ] = "Percent"; - }; - RadioButton RB_STACK_Z - { - HelpID = "chart2:RadioButton:TP_CHARTTYPE:RB_STACK_Z"; - Pos = MAP_APPFONT ( POS_X_IMAGELIST+RSC_SP_CHK_TEXTINDENT, POS_Y_STACKING+3*12 ) ; - Size = MAP_APPFONT ( 80 , 10 ) ; - TabStop = TRUE ; - //Hintereinander (verteile Datenreihen auf der Z-Achse) - //Deep (spread series on Z-Axis) - Text [ en-US ] = "Deep"; - }; - - FixedText FT_LINETYPE - { - Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_SPLINES ) ; - Size = MAP_APPFONT ( 150 , 10 ) ; - TabStop = TRUE ; - Text [ en-US ] = "~Line type"; - }; - ListBox LB_LINETYPE - { - HelpID = "chart2:ListBox:TP_CHARTTYPE:LB_LINETYPE"; - Border = TRUE; - TabStop = TRUE; - DropDown = TRUE; - Pos = MAP_APPFONT ( POS_X_IMAGELIST, POS_Y_SPLINES ) ; - Size = MAP_APPFONT ( 150 , 10 ) ; - }; - CheckBox CB_SPLINES - { - HelpID = "chart2:CheckBox:TP_CHARTTYPE:CB_SPLINES"; - Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_SPLINES ) ; - Size = MAP_APPFONT ( 150 , 10 ) ; - Text [ en-US ] = "S~mooth lines" ; - }; - PushButton PB_SPLINE_DIALOG - { - HelpID = "chart2:PushButton:TP_CHARTTYPE:PB_SPLINE_DIALOG"; - TabStop = TRUE ; - Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_SPLINES ) ; - Size = MAP_APPFONT ( 12 , 14 ) ; - Text [ en-US ] = "Properties..." ; - }; - - CheckBox CB_XVALUE_SORTING - { - HelpID = "chart2:CheckBox:TP_CHARTTYPE:CB_XVALUE_SORTING"; - TabStop = TRUE ; - Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_XVALUE_SORTING ) ; - Size = MAP_APPFONT ( WIDTH_XVALUE_SORTING , 10 ) ; - Text [ en-US ] = "~Sort by X values" ; - }; - -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx index e78b5ec05741..16ba4039ac94 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx +++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx @@ -36,15 +36,12 @@ SchLayoutTabPage::SchLayoutTabPage(Window* pWindow,const SfxItemSet& rInAttrs) : SfxTabPage(pWindow, SchResId(TP_LAYOUT), rInAttrs) , m_pGeometryResources(0) { - Point aPos( this->LogicToPixel( Point(6,6), MapMode(MAP_APPFONT) ) ); m_pGeometryResources = new BarGeometryResources( this ); - m_pGeometryResources->SetPosPixel( aPos ); } SchLayoutTabPage::~SchLayoutTabPage() { - if( m_pGeometryResources ) - delete m_pGeometryResources; + delete m_pGeometryResources; } SfxTabPage* SchLayoutTabPage::Create(Window* pWindow, diff --git a/chart2/source/controller/inc/HelpIds.hrc b/chart2/source/controller/inc/HelpIds.hrc index d87dc697bd74..717d2e316444 100644 --- a/chart2/source/controller/inc/HelpIds.hrc +++ b/chart2/source/controller/inc/HelpIds.hrc @@ -21,14 +21,7 @@ #define HID_SCH_WIN_DOCUMENT "CHART2_HID_SCH_WIN_DOCUMENT" -//for chart type dialog: -#define HID_SCH_CTL_TYPE "CHART2_HID_SCH_CTL_TYPE" -#define HID_SCH_CTL_VARIANT "CHART2_HID_SCH_CTL_VARIANT" -#define HID_SCH_NUM_OF_LINES "CHART2_HID_SCH_NUM_OF_LINES" - - #define HID_SCH_CHART_AUTO_FORMAT "CHART2_HID_SCH_CHART_AUTO_FORMAT" -#define HID_SCH_LB_BAR_GEOMETRY "CHART2_HID_SCH_LB_BAR_GEOMETRY" #define HID_SCH_CB_SECONDARY_XAXIS "CHART2_HID_SCH_CB_SECONDARY_XAXIS" #define HID_SCH_CB_SECONDARY_YAXIS "CHART2_HID_SCH_CB_SECONDARY_YAXIS" diff --git a/chart2/source/inc/Strings.hrc b/chart2/source/inc/Strings.hrc index c3d5b44591ec..ae5c320ea83e 100644 --- a/chart2/source/inc/Strings.hrc +++ b/chart2/source/inc/Strings.hrc @@ -65,24 +65,9 @@ #define STR_TYPE_BUBBLE (RID_APP_START + 282) #define STR_BUBBLE_1 (RID_APP_START + 283) - -//additional controls for wizard: - -#define STR_BAR_GEOMETRY (RID_APP_START + 127) -#define STR_NUMBER_OF_LINES (RID_APP_START + 128) - -#define STR_3DSCHEME_SIMPLE (RID_APP_START + 231) -#define STR_3DSCHEME_REALISTIC (RID_APP_START + 232) -#define STR_3DSCHEME_CUSTOM (RID_APP_START + 259) - -#define STR_LINETYPE_STRAIGHT (RID_APP_START + 297) -#define STR_LINETYPE_SMOOTH (RID_APP_START + 298) -#define STR_LINETYPE_STEPPED (RID_APP_START + 299) - //additional strings #define STR_TEXT_SEPARATOR (RID_APP_START + 20) - //SchStatisticTabPage and SchDataStatisticsDlg //see Strings_Statistic.src diff --git a/chart2/uiconfig/ui/tp_ChartType.ui b/chart2/uiconfig/ui/tp_ChartType.ui new file mode 100644 index 000000000000..27067d0137a6 --- /dev/null +++ b/chart2/uiconfig/ui/tp_ChartType.ui @@ -0,0 +1,454 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.16.1 --> +<interface> + <requires lib="gtk+" version="3.0"/> + <!-- interface-requires LibreOffice 1.0 --> + <object class="GtkAdjustment" id="adjustment1"> + <property name="lower">1</property> + <property name="upper">100</property> + <property name="value">1</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkListStore" id="liststore1"> + <columns> + <!-- column-name gchararray1 --> + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">Bar</col> + </row> + <row> + <col id="0" translatable="yes">Cylinder</col> + </row> + <row> + <col id="0" translatable="yes">Cone</col> + </row> + <row> + <col id="0" translatable="yes">Pyramid</col> + </row> + </data> + </object> + <object class="GtkBox" id="tp_ChartType"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="border_width">6</property> + <property name="spacing">12</property> + <child> + <object class="GtkBox" id="box1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="FT_CAPTION_FOR_WIZARD"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Choose a chart type</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> + <child> + <object class="GtkGrid" id="grid1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkGrid" id="grid2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="row_spacing">6</property> + <child> + <object class="svtlo-ValueSet" id="subtype:border"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkGrid" id="3dblock"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkGrid" id="grid9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkCheckButton" id="3dlook"> + <property name="label" translatable="yes">_3D Look</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="xalign">0</property> + <property name="draw_indicator">True</property> + <accessibility> + <relation type="label-for" target="3dscheme"/> + </accessibility> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="3dscheme"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item translatable="yes">Simple</item> + <item translatable="yes">Realistic</item> + </items> + <accessibility> + <relation type="labelled-by" target="3dlook"/> + </accessibility> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="shapeft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Sh_ape</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">shape:border</property> + <property name="angle">0.02</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkTreeView" id="shape:border"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="model">liststore1</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection"/> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkGrid" id="stackblock"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkCheckButton" id="stack"> + <property name="label" translatable="yes">_Stack series</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="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="left_padding">12</property> + <child> + <object class="GtkGrid" id="grid6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkRadioButton" id="ontop"> + <property name="label" translatable="yes">On top</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="xalign">0</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <property name="group">percent</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="percent"> + <property name="label" translatable="yes">Percent</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="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">deep</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="deep"> + <property name="label" translatable="yes">Deep</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="xalign">0</property> + <property name="draw_indicator">True</property> + <property name="group">ontop</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + </object> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkGrid" id="grid7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="linetypeft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Line type</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">linetype</property> + <property name="ellipsize">end</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="linetype"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <items> + <item translatable="yes">Straight</item> + <item translatable="yes">Smooth</item> + <item translatable="yes">Stepped</item> + </items> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="properties"> + <property name="label" translatable="yes">Properties...</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="sort"> + <property name="label" translatable="yes">_Sort by X values</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="xalign">0.029999999329447746</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkGrid" id="grid8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="nolinesft"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Number of lines</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">nolines</property> + <property name="ellipsize">end</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="nolines"> + <property name="can_focus">True</property> + <property name="no_show_all">True</property> + <property name="adjustment">adjustment1</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + </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> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkTreeView" id="charttype:border"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="vexpand">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> +</interface> |