mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add a new chart type "GL 3D Bar" (working name).

Browse Source 
Change-Id: I0b0a65bf4f9365a8d522e3c439afe19797b2fdd5
This commit is contained in:
Kohei Yoshida
2014-03-20 20:52:11 -04:00
parent 349a5b72bf
commit be89276e63
8 changed files with 94 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
chart2/Library_chartcontroller.mk
View File

@@ -87,6 +87,7 @@ $(eval $(call gb_Library_add_exception_objects,chartcontroller,\
chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty \
chart2/source/controller/dialogs/ChangingResource \
chart2/source/controller/dialogs/ChartTypeDialogController \
chart2/source/controller/dialogs/GL3DBarChartDialogController \
chart2/source/controller/dialogs/DataBrowser \
chart2/source/controller/dialogs/DataBrowserModel \
chart2/source/controller/dialogs/DialogModel \

9
chart2/source/controller/dialogs/Bitmaps.hrc
View File

@@ -39,10 +39,11 @@
#define IMG_TYPE_NET (RID_APP_START + 8)
#define IMG_TYPE_STOCK (RID_APP_START + 9)
#define IMG_TYPE_COLUMN_LINE (RID_APP_START + 10)
#define IMG_STEP_START (RID_APP_START + 11)
#define IMG_STEP_END (RID_APP_START + 12)
#define IMG_STEP_CENTER_X (RID_APP_START + 13)
#define IMG_STEP_CENTER_Y (RID_APP_START + 14)
#define IMG_TYPE_GL3D_BAR (RID_APP_START + 11)
#define IMG_STEP_START (RID_APP_START + 12)
#define IMG_STEP_END (RID_APP_START + 13)
#define IMG_STEP_CENTER_X (RID_APP_START + 14)
#define IMG_STEP_CENTER_Y (RID_APP_START + 15)
//Chart Subtypes

5
chart2/source/controller/dialogs/Bitmaps.src
View File

@@ -68,6 +68,11 @@ Image IMG_TYPE_BUBBLE
ImageBitmap = Bitmap { File = "typebubble_16.png" ; };
MaskColor = STD_MASKCOLOR;
};
Image IMG_TYPE_GL3D_BAR
{
ImageBitmap = Bitmap { File = "typegl3dbar_16.png" ; };
MaskColor = STD_MASKCOLOR;
};
Image IMG_STEP_START
{
ImageBitmap = Bitmap { File = "step_start_30.png" ; };

41
chart2/source/controller/dialogs/GL3DBarChartDialogController.cxx Normal file
View File

@@ -0,0 +1,41 @@
/* -*- 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/.
*/
#include "GL3DBarChartDialogController.hxx"
#include <Strings.hrc>
#include <Bitmaps.hrc>
#include <ResId.hxx>
namespace chart {
GL3DBarChartDialogController::GL3DBarChartDialogController() {}
GL3DBarChartDialogController::~GL3DBarChartDialogController() {}
OUString GL3DBarChartDialogController::getName()
{
return SchResId(STR_TYPE_GL3D_BAR).toString();
}
Image GL3DBarChartDialogController::getImage()
{
return Image(SchResId(IMG_TYPE_GL3D_BAR));
}
const tTemplateServiceChartTypeParameterMap&
GL3DBarChartDialogController::getTemplateMap() const
{
static tTemplateServiceChartTypeParameterMap aMap(
"com.sun.star.chart2.template.GL3DBarRoundedRectangle", ChartTypeParameter(1));
return aMap;
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

32
chart2/source/controller/dialogs/GL3DBarChartDialogController.hxx Normal file
View File

@@ -0,0 +1,32 @@
/* -*- 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/.
*/
#ifndef INCLUDED_CHART2_GL3DBARCHARTDIALOGCONTROLLER_HXX
#define INCLUDED_CHART2_GL3DBARCHARTDIALOGCONTROLLER_HXX
#include "ChartTypeDialogController.hxx"
namespace chart {
class GL3DBarChartDialogController : public ChartTypeDialogController
{
public:
GL3DBarChartDialogController();
virtual ~GL3DBarChartDialogController();
virtual OUString getName();
virtual Image getImage();
virtual const tTemplateServiceChartTypeParameterMap& getTemplateMap() const;
};
}
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

5
chart2/source/controller/dialogs/Strings_ChartTypes.src
View File

@@ -142,6 +142,9 @@ String STR_BUBBLE_1
Text [ en-US ] = "Bubble Chart" ;
};
String STR_TYPE_GL3D_BAR
{
Text [ en-US ] = "GL 3D Bar";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

2
chart2/source/controller/dialogs/tp_ChartType.cxx
View File

@@ -25,6 +25,7 @@
#include "res_BarGeometry.hxx"
#include "ControllerLockGuard.hxx"
#include "macros.hxx"
#include "GL3DBarChartDialogController.hxx"
#include <svtools/controldims.hrc>
@@ -726,6 +727,7 @@ ChartTypeTabPage::ChartTypeTabPage(Window* pParent
m_aChartTypeDialogControllerList.push_back(new StockChartDialogController() );
}
m_aChartTypeDialogControllerList.push_back(new CombiColumnLineChartDialogController() );
m_aChartTypeDialogControllerList.push_back(new GL3DBarChartDialogController());
::std::vector< ChartTypeDialogController* >::const_iterator aIter = m_aChartTypeDialogControllerList.begin();
const ::std::vector< ChartTypeDialogController* >::const_iterator aEnd = m_aChartTypeDialogControllerList.end();

7
chart2/source/inc/Strings.hrc
View File

@@ -64,8 +64,10 @@
#define STR_TYPE_BUBBLE (RID_APP_START + 282)
#define STR_BUBBLE_1 (RID_APP_START + 283)
#define STR_TYPE_GL3D_BAR (RID_APP_START + 127)
//additional strings
#define STR_TEXT_SEPARATOR (RID_APP_START + 20)
#define STR_TEXT_SEPARATOR (RID_APP_START + 20)
//SchStatisticTabPage and SchDataStatisticsDlg
//see Strings_Statistic.src
@@ -94,7 +96,7 @@
#define STR_INVALID_TIME_UNIT (RID_APP_START + 292)
//for range didalog
//for range dialog
#define STR_DATA_ROLE_LABEL (RID_APP_START + 241)
#define STR_DATA_ROLE_X (RID_APP_START + 242)
#define STR_DATA_ROLE_Y (RID_APP_START + 243)
@@ -272,7 +274,6 @@
#define STR_BUTTON_UP (RID_APP_START + 500)
#define STR_BUTTON_DOWN (RID_APP_START + 501)
// ids must not exceed RID_APP_START + 499
// ids >= RID_APP_START + 500 are defined in glob.hrc