Skip to content

C
core
Kaydet (Commit) 885fd98f authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

convert chart type page to .ui format 

Change-Id: I2e95e0dec66b8985abad81b02722e1bf632a15e0
üst cfe54a71
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 470 deletions
chart2/AllLangResTarget_chartcontroller.mk
Dosyayı görüntüle @ 885fd98f
......@@ -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,\
......
chart2/UIConfig_chart2.mk
Dosyayı görüntüle @ 885fd98f
......@@ -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 \
......
chart2/source/controller/dialogs/ChartTypeDialogController.cxx
Dosyayı görüntüle @ 885fd98f
......@@ -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
......
chart2/source/controller/dialogs/ChartTypeDialogController.hxx
Dosyayı görüntüle @ 885fd98f
......@@ -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
......
chart2/source/controller/dialogs/ResourceIds.hrc
Dosyayı görüntüle @ 885fd98f
......@@ -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: */
chart2/source/controller/dialogs/Strings_AdditionalControls.src
Dosyayı görüntüle @ 885fd98f
......@@ -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: */
chart2/source/controller/dialogs/res_BarGeometry.cxx
Dosyayı görüntüle @ 885fd98f
......@@ -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
......
chart2/source/controller/dialogs/res_BarGeometry.hxx
Dosyayı görüntüle @ 885fd98f
......@@ -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
......
chart2/source/controller/dialogs/res_BarGeometry.src deleted 100644 → 0
Dosyayı görüntüle @ cfe54a71
/* -*- 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: */
chart2/source/controller/dialogs/tp_ChartType.hrc deleted 100644 → 0
Dosyayı görüntüle @ cfe54a71
/* -*- 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: */
chart2/source/controller/dialogs/tp_ChartType.hxx
Dosyayı görüntüle @ 885fd98f
......@@ -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<
......
chart2/source/controller/dialogs/tp_ChartType.src deleted 100644 → 0
Dosyayı görüntüle @ cfe54a71
/* -*- 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: */
chart2/source/controller/dialogs/tp_PointGeometry.cxx
Dosyayı görüntüle @ 885fd98f
......@@ -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,
......
chart2/source/controller/inc/HelpIds.hrc
Dosyayı görüntüle @ 885fd98f
......@@ -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"
......
chart2/source/inc/Strings.hrc
Dosyayı görüntüle @ 885fd98f
......@@ -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
......
chart2/uiconfig/ui/tp_ChartType.ui 0 → 100644
Dosyayı görüntüle @ 885fd98f
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment