Skip to content

C
core
Kaydet (Commit) e6a87e17 authored tarafından Olivier Hallot's avatar Olivier Hallot Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

Convert insert error bars dialog to widget UI 

Change-Id: Ie2fbcb0bacb968a784698908c8cc62f73a80cf32
Reviewed-on: https://gerrit.libreoffice.org/7219Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 5be7ec41
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 435 deletions
chart2/AllLangResTarget_chartcontroller.mk
Dosyayı görüntüle @ e6a87e17
......@@ -46,7 +46,6 @@ $(eval $(call gb_SrsTarget_add_nonlocalizable_files,chart2/res,\
chart2/source/controller/dialogs/Bitmaps.src \
chart2/source/controller/dialogs/dlg_ChartType.src \
chart2/source/controller/dialogs/dlg_CreationWizard.src \
chart2/source/controller/dialogs/dlg_InsertErrorBars.src \
chart2/source/controller/dialogs/tp_PointGeometry.src \
chart2/source/controller/menus/ShapeContextMenu.src \
chart2/source/controller/menus/ShapeEditContextMenu.src \
......
chart2/UIConfig_chart2.mk
Dosyayı görüntüle @ e6a87e17
......@@ -33,6 +33,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\
chart2/uiconfig/ui/3dviewdialog \
chart2/uiconfig/ui/attributedialog \
chart2/uiconfig/ui/dlg_DataLabel \
chart2/uiconfig/ui/dlg_InsertErrorBars \
chart2/uiconfig/ui/insertaxisdlg \
chart2/uiconfig/ui/insertgriddlg \
chart2/uiconfig/ui/inserttitledlg \
......
chart2/source/controller/dialogs/ResourceIds.hrc
Dosyayı görüntüle @ e6a87e17
......@@ -31,7 +31,6 @@
#define DLG_DATA_DESCR 836
#define DLG_LEGEND 835
#define DLG_SPLINE_PROPERTIES 904
#define DLG_DATA_YERRORBAR 842
#define DLG_SHAPE_FONT 921
#define DLG_SHAPE_PARAGRAPH 922
......
chart2/source/controller/dialogs/Strings.src
Dosyayı görüntüle @ e6a87e17
......@@ -586,16 +586,6 @@ String STR_DATA_SELECT_RANGE_FOR_DATALABELS
{
Text [ en-US ] = "Select Range for data labels" ;
};
//TODO: ohallot: String inserted into tp_ErrorBars.ui
String STR_DATA_SELECT_RANGE_FOR_POSITIVE_ERRORBARS
{
Text [ en-US ] = "Select Range for Positive Error Bars" ;
};
//TODO: ohallot: String inserted into tp_ErrorBars.ui
String STR_DATA_SELECT_RANGE_FOR_NEGATIVE_ERRORBARS
{
Text [ en-US ] = "Select Range for Negative Error Bars" ;
};
String STR_DATA_EDITOR_INCORRECT_INPUT
{
......
chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
Dosyayı görüntüle @ e6a87e17
......@@ -18,11 +18,8 @@
*/
#include "dlg_InsertErrorBars.hxx"
#include "dlg_InsertErrorBars.hrc"
#include "res_ErrorBar.hxx"
#include "ResourceIds.hrc"
#include "ResId.hxx"
#include "Strings.hrc"
#include "chartview/ExplicitValueProvider.hxx"
#include "ChartModelHelper.hxx"
#include "ObjectIdentifier.hxx"
......@@ -43,18 +40,16 @@ namespace chart
InsertErrorBarsDialog::InsertErrorBarsDialog(
Window* pParent, const SfxItemSet& rMyAttrs,
const uno::Reference< chart2::XChartDocument > & xChartDocument,
oldErrorBarResources::tErrorBarType eType /* = ErrorBarResources::ERROR_BAR_Y */ ) :
ModalDialog( pParent, SchResId( DLG_DATA_YERRORBAR )),
ErrorBarResources::tErrorBarType eType /* = ErrorBarResources::ERROR_BAR_Y */ ) :
ModalDialog( pParent
,"dlg_InsertErrorBars"
,"modules/schart/ui/dlg_InsertErrorBars.ui"),
rInAttrs( rMyAttrs ),
aBtnOK( this, SchResId( BTN_OK )),
aBtnCancel( this, SchResId( BTN_CANCEL )),
aBtnHelp( this, SchResId( BTN_HELP )),
m_apErrorBarResources( new oldErrorBarResources(
m_apErrorBarResources( new ErrorBarResources(
this, this, rInAttrs,
/* bNoneAvailable = */ true, eType ))
{
FreeResource();
ObjectType objType = eType == oldErrorBarResources::ERROR_BAR_Y ? OBJECTTYPE_DATA_ERRORS_Y : OBJECTTYPE_DATA_ERRORS_X;
ObjectType objType = eType == ErrorBarResources::ERROR_BAR_Y ? OBJECTTYPE_DATA_ERRORS_Y : OBJECTTYPE_DATA_ERRORS_X;
this->SetText( ObjectNameProvider::getName_ObjectForAllSeries(objType) );
......
chart2/source/controller/dialogs/dlg_InsertErrorBars.hrc deleted 100644 → 0
Dosyayı görüntüle @ 5be7ec41
/* -*- 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
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
chart2/source/controller/dialogs/dlg_InsertErrorBars.src deleted 100644 → 0
Dosyayı görüntüle @ 5be7ec41
/* -*- 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 "dlg_InsertErrorBars.hrc"
#include "HelpIds.hrc"
#include "CommonResources.hrc"
#include "res_ErrorBar.hrc"
ModalDialog DLG_DATA_YERRORBAR
{
HelpID = "chart2:ModalDialog:DLG_DATA_YERRORBAR";
OutputSize = TRUE ;
SVLook = TRUE ;
Size = MAP_APPFONT ( 300 , 156 ) ;
Moveable = TRUE ;
BUTTONS_OK_CANCEL_HELP_STACKED( 244 )
RESOURCE_ERRORBARS( 244 - 6, 14 )
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
chart2/source/controller/dialogs/res_ErrorBar_tmpl.hrc deleted 100644 → 0
Dosyayı görüntüle @ 5be7ec41
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef _CHART2_RESOURCE_ERRORBARS_HXX
#define _CHART2_RESOURCE_ERRORBARS_HXX
#include "res_ErrorBar_IDs.hrc"
#define WORKAROUND \
StringList [ en-US ] = \
{ \
< "Standard Error" ; CHART_LB_FUNCTION_STD_ERROR ; >; \
< "Standard Deviation" ; CHART_LB_FUNCTION_STD_DEV ; >; \
< "Variance" ; CHART_LB_FUNCTION_VARIANCE ; >; \
< "Error Margin" ; CHART_LB_FUNCTION_ERROR_MARGIN ; >; \
};
#define RESOURCE_ERRORBARS(availablewidth, yoffset) \
FixedLine FL_ERROR \
{ \
Pos = MAP_APPFONT ( 6 , 6 ) ; \
Size = MAP_APPFONT ( 116 , 8 ) ; \
Text [ en-US ] = "Error Category" ; \
}; \
RadioButton RB_NONE \
{ \
HelpID = HID_SCH_STATISTIK_NO_ERROR; \
Pos = MAP_APPFONT ( 12 , 20 ) ; \
Size = MAP_APPFONT ( 110 , 10 ) ; \
Text [ en-US ] = "~None" ; \
TabStop = TRUE ; \
}; \
RadioButton RB_CONST \
{ \
HelpID = HID_SCH_STATISTIK_CONSTERROR; \
Pos = MAP_APPFONT ( 12 , 20 + yoffset ) ; \
Size = MAP_APPFONT ( 110 , 10 ) ; \
Text [ en-US ] = "~Constant Value" ; \
TabStop = TRUE ; \
}; \
RadioButton RB_PERCENT \
{ \
HelpID = HID_SCH_STATISTIK_PERCENT; \
Pos = MAP_APPFONT ( 12 , 34 + yoffset ) ; \
Size = MAP_APPFONT ( 110 , 10 ) ; \
Text [ en-US ] = "~Percentage" ; \
TabStop = TRUE ; \
}; \
RadioButton RB_FUNCTION \
{ \
HelpID = HID_SCH_STATISTIK_FUNCTION; \
Pos = MAP_APPFONT ( 12 , 48 + yoffset ) ; \
Size = MAP_APPFONT ( 12 , 10 ) ; \
Text [ en-US ] = "" ; \
TabStop = TRUE ; \
}; \
RadioButton RB_RANGE \
{ \
HelpID = HID_SCH_STATISTIK_RANGE; \
Pos = MAP_APPFONT( 12, 62 + yoffset ) ; \
Size = MAP_APPFONT( 110, 10 ) ; \
Text [ en-US ] = "Cell ~Range" ; \
TabStop = TRUE ; \
}; \
ListBox LB_FUNCTION \
{ \
HelpID = HID_SCH_STATISTIK_FUNCTION_LB; \
Pos = MAP_APPFONT ( 22 , 46 + yoffset ) ; \
Size = MAP_APPFONT ( 94 , 59 ) ; \
DropDown = TRUE; \
Border = TRUE; \
WORKAROUND\
}; \
FixedLine FL_PARAMETERS \
{ \
Pos = MAP_APPFONT ( 6 , 82 + yoffset ) ; \
Size = MAP_APPFONT ( availablewidth - 12, 8 ) ; \
Text [ en-US ] = "Parameters" ; \
}; \
FixedText FT_POSITIVE \
{ \
Pos = MAP_APPFONT ( 12 , 94 + yoffset ) ; \
Size = MAP_APPFONT ( 46 , 8 ) ; \
Text [ en-US ] = "P~ositive (+)"; \
}; \
MetricField MF_POSITIVE \
{ \
HelpID = HID_SCH_STATISTIK_POSITIVE_VALUE; \
Border = TRUE ; \
Pos = MAP_APPFONT ( 60 , 92 + yoffset ) ; \
Size = MAP_APPFONT ( 56 , 12 ) ; \
TabStop = TRUE ; \
Repeat = TRUE ; \
Spin = TRUE ; \
Minimum = 0 ; \
StrictFormat = TRUE ; \
Unit = FUNIT_CUSTOM ; \
SpinSize = 100 ; \
DecimalDigits = 2 ; \
}; \
Edit ED_RANGE_POSITIVE \
{ \
HelpID = HID_SCH_STATISTIK_POSITIVE_RANGE; \
Border = TRUE ; \
Hide = TRUE; \
Pos = MAP_APPFONT ( 60 , 92 + yoffset ) ; \
Size = MAP_APPFONT ( 90 , 12 ) ; \
}; \
ImageButton IB_RANGE_POSITIVE \
{ \
HelpID = HID_SCH_STATISTIK_POSITIVE_RANGE_CHOOSER; \
Hide = TRUE; \
Pos = MAP_APPFONT ( 152 , 91 + yoffset ) ; \
Size = MAP_APPFONT ( 14 , 14 ) ; \
TabStop = TRUE ; \
}; \
FixedText FT_NEGATIVE \
{ \
Pos = MAP_APPFONT ( 12 , 110 + yoffset ) ; \
Size = MAP_APPFONT ( 46 , 8 ) ; \
Text [ en-US ] = "~Negative (-)"; \
}; \
MetricField MF_NEGATIVE \
{ \
HelpID = HID_SCH_STATISTIK_NEGATIVE_VALUE; \
Border = TRUE ; \
Pos = MAP_APPFONT ( 60 , 108 + yoffset ) ; \
Size = MAP_APPFONT ( 56 , 12 ) ; \
TabStop = TRUE ; \
Repeat = TRUE ; \
Spin = TRUE ; \
Minimum = 0 ; \
StrictFormat = TRUE ; \
Unit = FUNIT_CUSTOM ; \
SpinSize = 100 ; \
DecimalDigits = 2 ; \
}; \
Edit ED_RANGE_NEGATIVE \
{ \
HelpID = HID_SCH_STATISTIK_NEGATIVE_RANGE; \
Border = TRUE ; \
Hide = TRUE; \
Pos = MAP_APPFONT ( 60 , 108 + yoffset ) ; \
Size = MAP_APPFONT ( 90 , 12 ) ; \
}; \
ImageButton IB_RANGE_NEGATIVE \
{ \
HelpID = HID_SCH_STATISTIK_NEGATIVE_RANGE_CHOOSER; \
Hide = TRUE; \
Pos = MAP_APPFONT ( 152 , 107 + yoffset ) ; \
Size = MAP_APPFONT ( 14 , 14 ) ; \
TabStop = TRUE ; \
}; \
CheckBox CB_SYN_POS_NEG \
{ \
HelpID = HID_SCH_STATISTIK_SAME_FOR_BOTH; \
Pos = MAP_APPFONT ( 12 , 126 + yoffset ); \
Size = MAP_APPFONT ( availablewidth - 12 , 10 ); \
TabStop = TRUE; \
Text[ en-US ] = "Same value for both"; \
}; \
FixedLine FL_INDICATE \
{ \
Pos = MAP_APPFONT ( 130 , 6 ) ; \
Size = MAP_APPFONT ( availablewidth - 136 , 8 ) ; \
Text [ en-US ] = "Error Indicator" ; \
}; \
RadioButton RB_BOTH \
{ \
HelpID = HID_SCH_STATISTIK_SHOW_BOTH; \
Pos = MAP_APPFONT ( 154 , 22 ); \
Size = MAP_APPFONT ( 90 , 10 ); \
Text[ en-US ] = "Positive ~and Negative"; \
}; \
RadioButton RB_POSITIVE \
{ \
HelpID = HID_SCH_STATISTIK_SHOW_POSITIVE; \
Pos = MAP_APPFONT ( 154 , 43 ); \
Size = MAP_APPFONT ( 90 , 10 ); \
Text[ en-US ] = "Pos~itive"; \
}; \
RadioButton RB_NEGATIVE \
{ \
HelpID = HID_SCH_STATISTIK_SHOW_NEGATIVE; \
Pos = MAP_APPFONT ( 154 , 64 ); \
Size = MAP_APPFONT ( 90 , 10 ); \
Text[ en-US ] = "Ne~gative"; \
}; \
FixedImage FI_BOTH \
{ \
Pos = MAP_APPFONT ( 134 , 18 ); \
Size = MAP_APPFONT ( 18 , 18 ); \
}; \
FixedImage FI_POSITIVE \
{ \
Pos = MAP_APPFONT ( 134 , 39 ); \
Size = MAP_APPFONT ( 18 , 18 ); \
}; \
FixedImage FI_NEGATIVE \
{ \
Pos = MAP_APPFONT ( 134 , 60 ); \
Size = MAP_APPFONT ( 18 , 18 ); \
};
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
chart2/source/controller/inc/HelpIds.hrc
Dosyayı görüntüle @ e6a87e17
......@@ -53,28 +53,11 @@
#define HID_SCH_LEGEND_POS_BOTTOM "CHART2_HID_SCH_LEGEND_POS_BOTTOM"
#define HID_SCH_STATISTIK_MEANVALUE "CHART2_HID_SCH_STATISTIK_MEANVALUE"
#define HID_SCH_STATISTIK_NO_ERROR "CHART2_HID_SCH_STATISTIK_NO_ERROR"
#define HID_SCH_STATISTIK_PERCENT "CHART2_HID_SCH_STATISTIK_PERCENT"
#define HID_SCH_STATISTIK_CONSTERROR "CHART2_HID_SCH_STATISTIK_CONSTERROR"
#define HID_SCH_WIZARD_ROADMAP "CHART2_HID_SCH_WIZARD_ROADMAP"
#define HID_SCH_LEGEND_SHOW "CHART2_HID_SCH_LEGEND_SHOW"
#define HID_SCH_DATA_SERIES_LABEL "CHART2_HID_SCH_DATA_SERIES_LABEL"
#define HID_SCH_STATISTIK_FUNCTION "CHART2_HID_SCH_STATISTIK_FUNCTION"
#define HID_SCH_STATISTIK_RANGE "CHART2_HID_SCH_STATISTIK_RANGE"
#define HID_SCH_STATISTIK_FUNCTION_LB "CHART2_HID_SCH_STATISTIK_FUNCTION_LB"
#define HID_SCH_STATISTIK_POSITIVE_VALUE "CHART2_HID_SCH_STATISTIK_POSITIVE_VALUE"
#define HID_SCH_STATISTIK_POSITIVE_RANGE "CHART2_HID_SCH_STATISTIK_POSITIVE_RANGE"
#define HID_SCH_STATISTIK_POSITIVE_RANGE_CHOOSER "CHART2_HID_SCH_STATISTIK_POSITIVE_RANGE_CHOOSER"
#define HID_SCH_STATISTIK_NEGATIVE_VALUE "CHART2_HID_SCH_STATISTIK_NEGATIVE_VALUE"
#define HID_SCH_STATISTIK_NEGATIVE_RANGE "CHART2_HID_SCH_STATISTIK_NEGATIVE_RANGE"
#define HID_SCH_STATISTIK_NEGATIVE_RANGE_CHOOSER "CHART2_HID_SCH_STATISTIK_NEGATIVE_RANGE_CHOOSER"
#define HID_SCH_STATISTIK_SAME_FOR_BOTH "CHART2_HID_SCH_STATISTIK_SAME_FOR_BOTH"
#define HID_SCH_STATISTIK_SHOW_BOTH "CHART2_HID_SCH_STATISTIK_SHOW_BOTH"
#define HID_SCH_STATISTIK_SHOW_POSITIVE "CHART2_HID_SCH_STATISTIK_SHOW_POSITIVE"
#define HID_SCH_STATISTIK_SHOW_NEGATIVE "CHART2_HID_SCH_STATISTIK_SHOW_NEGATIVE"
#define HID_DIAGRAM_TYPE "CHART2_HID_DIAGRAM_TYPE"
#define HID_DIAGRAM_DATA "CHART2_HID_DIAGRAM_DATA"
#define HID_INSERT_STATISTICS "CHART2_HID_INSERT_STATISTICS"
......
chart2/source/controller/inc/dlg_InsertErrorBars.hxx
Dosyayı görüntüle @ e6a87e17
......@@ -36,7 +36,7 @@ public:
InsertErrorBarsDialog( Window* pParent, const SfxItemSet& rMyAttrs,
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartDocument > & xChartDocument,
oldErrorBarResources::tErrorBarType eType );
ErrorBarResources::tErrorBarType eType );
virtual ~InsertErrorBarsDialog();
void SetAxisMinorStepWidthForErrorBarDecimals( double fMinorStepWidth );
......@@ -54,11 +54,7 @@ public:
private:
const SfxItemSet & rInAttrs;
OKButton aBtnOK;
CancelButton aBtnCancel;
HelpButton aBtnHelp;
boost::scoped_ptr< oldErrorBarResources > m_apErrorBarResources;
boost::scoped_ptr< ErrorBarResources > m_apErrorBarResources;
};
} //namespace chart
......
chart2/source/controller/inc/res_ErrorBar.hxx
Dosyayı görüntüle @ e6a87e17
......@@ -20,7 +20,6 @@
#define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_RES_ERRORBAR_HXX
#include <vcl/button.hxx>
// #include <vcl/dialog.hxx>
#include <sfx2/tabdlg.hxx>
#include <vcl/fixed.hxx>
#include <vcl/field.hxx>
......@@ -30,7 +29,7 @@
#include "chartview/ChartSfxItemIds.hxx"
#include "RangeSelectionButton.hxx"
#include "RangeSelectionListener.hxx"
#include "RangeEdit.hxx"
#include <com/sun/star/chart2/XChartDocument.hpp>
......@@ -53,7 +52,7 @@ public:
};
ErrorBarResources(
SfxTabPage* pParent, Dialog* pParentDialog, const SfxItemSet& rInAttrs, bool bNoneAvailable, chart::ErrorBarResources::tErrorBarType eType = ERROR_BAR_Y );
VclBuilderContainer* pParent, Dialog* pParentDialog, const SfxItemSet& rInAttrs, bool bNoneAvailable, chart::ErrorBarResources::tErrorBarType eType = ERROR_BAR_Y );
virtual ~ErrorBarResources();
void SetAxisMinorStepWidthForErrorBarDecimals( double fMinorStepWidth );
......@@ -72,7 +71,6 @@ public:
private:
// category
// FixedLine m_pFlErrorCategory;
RadioButton* m_pRbNone;
RadioButton* m_pRbConst;
RadioButton* m_pRbPercent;
......@@ -93,7 +91,6 @@ private:
CheckBox* m_pCbSyncPosNeg;
// indicator
// FixedLine* m_pFlIndicate;
RadioButton* m_pRbBoth;
RadioButton* m_pRbPositive;
RadioButton* m_pRbNegative;
......@@ -121,7 +118,7 @@ private:
sal_uInt16 m_nConstDecimalDigits;
sal_Int64 m_nConstSpinSize;
SfxTabPage* m_pParentWindow;
VclBuilderContainer* m_pParentWindow;
Dialog * m_pParentDialog;
boost::scoped_ptr< RangeSelectionHelper > m_apRangeSelectionHelper;
Edit * m_pCurrentRangeChoosingField;
......@@ -139,101 +136,6 @@ private:
bool isRangeFieldContentValid( Edit & rEdit );
};
class oldErrorBarResources : public RangeSelectionListenerParent
{
public:
enum tErrorBarType
{
ERROR_BAR_X,
ERROR_BAR_Y
};
oldErrorBarResources(
Window* pParent, Dialog * pParentDialog, const SfxItemSet& rInAttrst,
bool bNoneAvailable,
tErrorBarType eType = ERROR_BAR_Y );
virtual ~oldErrorBarResources();
void SetAxisMinorStepWidthForErrorBarDecimals( double fMinorStepWidth );
void SetErrorBarType( tErrorBarType eNewType );
void SetChartDocumentForRangeChoosing(
const ::com::sun::star::uno::Reference<
::com::sun::star::chart2::XChartDocument > & xChartDocument );
void Reset(const SfxItemSet& rInAttrs);
sal_Bool FillItemSet(SfxItemSet& rOutAttrs) const;
void FillValueSets();
// ____ RangeSelectionListenerParent ____
virtual void listeningFinished( const OUString & rNewRange );
virtual void disposingRangeSelection();
private:
// category
FixedLine m_aFlErrorCategory;
RadioButton m_aRbNone;
RadioButton m_aRbConst;
RadioButton m_aRbPercent;
RadioButton m_aRbFunction;
RadioButton m_aRbRange;
ListBox m_aLbFunction;
// parameters
FixedLine m_aFlParameters;
FixedText m_aFtPositive;
MetricField m_aMfPositive;
RangeEdit m_aEdRangePositive;
RangeSelectionButton m_aIbRangePositive;
FixedText m_aFtNegative;
MetricField m_aMfNegative;
RangeEdit m_aEdRangeNegative;
RangeSelectionButton m_aIbRangeNegative;
CheckBox m_aCbSyncPosNeg;
// indicator
FixedLine m_aFlIndicate;
RadioButton m_aRbBoth;
RadioButton m_aRbPositive;
RadioButton m_aRbNegative;
FixedImage m_aFiBoth;
FixedImage m_aFiPositive;
FixedImage m_aFiNegative;
SvxChartKindError m_eErrorKind;
SvxChartIndicate m_eIndicate;
bool m_bErrorKindUnique;
bool m_bIndicatorUnique;
bool m_bPlusUnique;
bool m_bMinusUnique;
bool m_bRangePosUnique;
bool m_bRangeNegUnique;
bool m_bNoneAvailable;
tErrorBarType m_eErrorBarType;
sal_uInt16 m_nConstDecimalDigits;
sal_Int64 m_nConstSpinSize;
Window * m_pParentWindow;
Dialog * m_pParentDialog;
::std::auto_ptr< RangeSelectionHelper >
m_apRangeSelectionHelper;
Edit * m_pCurrentRangeChoosingField;
bool m_bHasInternalDataProvider;
bool m_bDisableDataTableDialog;
DECL_LINK( CategoryChosen, void * );
DECL_LINK( SynchronizePosAndNeg, void * );
DECL_LINK( PosValueChanged, void * );
DECL_LINK( IndicatorChanged, void * );
DECL_LINK( ChooseRange, RangeSelectionButton * );
DECL_LINK( RangeChanged, Edit * );
void UpdateControlStates();
bool isRangeFieldContentValid( Edit & rEdit );
};
} //namespace chart
#endif
......
chart2/source/controller/main/ChartController_Insert.cxx
Dosyayı görüntüle @ e6a87e17
......@@ -496,7 +496,7 @@ void ChartController::executeDispatch_InsertErrorBars( bool bYError )
InsertErrorBarsDialog aDlg(
m_pChartWindow, aItemSet,
uno::Reference< chart2::XChartDocument >( getModel(), uno::UNO_QUERY ),
bYError ? oldErrorBarResources::ERROR_BAR_Y : oldErrorBarResources::ERROR_BAR_X);
bYError ? ErrorBarResources::ERROR_BAR_Y : ErrorBarResources::ERROR_BAR_X);
aDlg.SetAxisMinorStepWidthForErrorBarDecimals(
InsertErrorBarsDialog::getAxisMinorStepWidthForErrorBarDecimals( getModel(), m_xChartView, OUString() ) );
......
chart2/source/inc/Strings.hrc
Dosyayı görüntüle @ e6a87e17
......@@ -134,8 +134,6 @@
#define STR_DATA_SELECT_RANGE_FOR_SERIES (RID_APP_START + 252)
#define STR_DATA_SELECT_RANGE_FOR_CATEGORIES (RID_APP_START + 253)
#define STR_DATA_SELECT_RANGE_FOR_DATALABELS (RID_APP_START + 195)
#define STR_DATA_SELECT_RANGE_FOR_POSITIVE_ERRORBARS (RID_APP_START + 21)
#define STR_DATA_SELECT_RANGE_FOR_NEGATIVE_ERRORBARS (RID_APP_START + 267)
//-----------------------------------------------------------------------------
//chart objects
......
chart2/uiconfig/ui/dlg_InsertErrorBars.ui 0 → 100644
Dosyayı görüntüle @ e6a87e17
This diff is collapsed.
chart2/uiconfig/ui/tp_ErrorBars.ui
Dosyayı görüntüle @ e6a87e17
......@@ -6,12 +6,12 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkImage" id="imageRANGE_SELECT_POSITIVE">
<object class="GtkImage" id="imageRANGE_SELECT_NEG">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">chart2/res/selectrange.png</property>
</object>
<object class="GtkImage" id="imageRANGE_SELECT_NEG">
<object class="GtkImage" id="imageRANGE_SELECT_POSITIVE">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">chart2/res/selectrange.png</property>
......@@ -416,6 +416,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Select data range</property>
<property name="image">imageRANGE_SELECT_POSITIVE</property>
</object>
<packing>
......
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