Skip to content

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

convert Data Field Options Dialog to .ui 

Change-Id: Ie940352828a9b58d35dd1644d030d6fb5b72d386
üst 74b6cd0e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 234 deletions
sc/UIConfig_scalc.mk
Dosyayı görüntüle @ 03497c8b
......@@ -75,6 +75,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/createnamesdialog \
sc/uiconfig/scalc/ui/databaroptions \
sc/uiconfig/scalc/ui/datafielddialog \
sc/uiconfig/scalc/ui/datafieldoptionsdialog \
sc/uiconfig/scalc/ui/dataform \
sc/uiconfig/scalc/ui/datastreams \
sc/uiconfig/scalc/ui/definedatabaserangedialog \
......
sc/inc/helpids.h
Dosyayı görüntüle @ 03497c8b
......@@ -142,8 +142,6 @@
#define HID_SC_DRAW_RENAME "SC_HID_SC_DRAW_RENAME"
#define HID_SC_DPSUBT_OPT "SC_HID_SC_DPSUBT_OPT"
#define HID_SC_DPSUBT_HIDE "SC_HID_SC_DPSUBT_HIDE"
#define HID_SC_DPNUMGROUP "SC_HID_SC_DPNUMGROUP"
#define HID_SC_DPDATEGROUP "SC_HID_SC_DPDATEGROUP"
#define HID_SC_DPDATEGROUP_LB "SC_HID_SC_DPDATEGROUP_LB"
......
sc/inc/sc.hrc
Dosyayı görüntüle @ 03497c8b
......@@ -1070,7 +1070,6 @@
#define RID_SCDLG_DAPISERVICE (SC_DIALOGS_START + 130)
#define RID_SCDLG_DPSUBTOTAL_OPT (SC_DIALOGS_START + 134)
#define RID_SCDLG_DPNUMGROUP (SC_DIALOGS_START + 135)
#define RID_SCDLG_DPDATEGROUP (SC_DIALOGS_START + 136)
#define RID_SCDLG_DPSHOWDETAIL (SC_DIALOGS_START + 137)
......
sc/source/ui/dbgui/pvfundlg.cxx
Dosyayı görüntüle @ 03497c8b
This diff is collapsed.
sc/source/ui/dbgui/pvfundlg.src
Dosyayı görüntüle @ 03497c8b
......@@ -39,210 +39,6 @@ StringArray SCSTR_DPFUNCLISTBOX
// ----------------------------------------------------------------------------
ModalDialog RID_SCDLG_DPSUBTOTAL_OPT
{
OutputSize = TRUE;
HelpId = HID_SC_DPSUBT_OPT;
SVLook = TRUE;
Size = MAP_APPFONT( 266, 240 );
Moveable = TRUE;
Closeable = FALSE;
Hide = TRUE;
FixedLine FL_SORT_BY
{
Pos = MAP_APPFONT( 6, 3 );
Size = MAP_APPFONT( 198, 8 );
Text [ en-US ] = "Sort ~by";
};
ListBox LB_SORT_BY
{
HelpID = "sc:ListBox:RID_SCDLG_DPSUBTOTAL_OPT:LB_SORT_BY";
Pos = MAP_APPFONT( 12, 26 );
Size = MAP_APPFONT( 96, 120 );
TabStop = TRUE;
Border = TRUE;
DropDown = TRUE;
};
RadioButton RB_SORT_ASC
{
HelpID = "sc:RadioButton:RID_SCDLG_DPSUBTOTAL_OPT:RB_SORT_ASC";
Pos = MAP_APPFONT( 114, 14 );
Size = MAP_APPFONT( 84, 10 );
TabStop = TRUE;
Text [ en-US ] = "~Ascending";
};
RadioButton RB_SORT_DESC
{
HelpID = "sc:RadioButton:RID_SCDLG_DPSUBTOTAL_OPT:RB_SORT_DESC";
Pos = MAP_APPFONT( 114, 28 );
Size = MAP_APPFONT( 84, 10 );
TabStop = TRUE;
Text [ en-US ] = "~Descending";
};
RadioButton RB_SORT_MAN
{
HelpID = "sc:RadioButton:RID_SCDLG_DPSUBTOTAL_OPT:RB_SORT_MAN";
Pos = MAP_APPFONT( 114, 42 );
Size = MAP_APPFONT( 84, 10 );
TabStop = TRUE;
Text [ en-US ] = "~Manual";
};
FixedLine FL_LAYOUT
{
Pos = MAP_APPFONT( 6, 56 );
Size = MAP_APPFONT( 198, 8 );
Text [ en-US ] = "Display options";
};
FixedText FT_LAYOUT
{
Pos = MAP_APPFONT( 12, 69 );
Size = MAP_APPFONT( 70, 8 );
Text [ en-US ] = "~Layout";
};
ListBox LB_LAYOUT
{
HelpID = "sc:ListBox:RID_SCDLG_DPSUBTOTAL_OPT:LB_LAYOUT";
Pos = MAP_APPFONT( 84, 67 );
Size = MAP_APPFONT( 114, 120 );
TabStop = TRUE;
Border = TRUE;
DropDown = TRUE;
StringList [ en-US ] =
{
< "Tabular layout"; Default; >;
< "Outline layout with subtotals at the top"; Default; >;
< "Outline layout with subtotals at the bottom"; Default; >;
};
};
CheckBox CB_LAYOUT_EMPTY
{
HelpID = "sc:CheckBox:RID_SCDLG_DPSUBTOTAL_OPT:CB_LAYOUT_EMPTY";
Pos = MAP_APPFONT( 12, 85 );
Size = MAP_APPFONT( 186, 10 );
TabStop = TRUE;
Text [ en-US ] = "~Empty line after each item";
};
FixedLine FL_AUTOSHOW
{
Pos = MAP_APPFONT( 6, 99 );
Size = MAP_APPFONT( 198, 8 );
Text [ en-US ] = "Show automatically";
};
CheckBox CB_SHOW
{
HelpID = "sc:CheckBox:RID_SCDLG_DPSUBTOTAL_OPT:CB_SHOW";
Pos = MAP_APPFONT( 12, 112 );
Size = MAP_APPFONT( 70, 10 );
TabStop = TRUE;
Text[ en-US ] = "~Show";
};
NumericField NF_SHOW
{
HelpID = "sc:NumericField:RID_SCDLG_DPSUBTOTAL_OPT:NF_SHOW";
Pos = MAP_APPFONT( 84, 110 );
Size = MAP_APPFONT( 30, 12 );
TabStop = TRUE;
Border = TRUE;
Repeat = TRUE;
Spin = TRUE;
Minimum = 1;
Maximum = 999;
SpinSize = 1;
StrictFormat = TRUE;
};
FixedText FT_SHOW
{
Pos = MAP_APPFONT( 118, 112 );
Size = MAP_APPFONT( 80, 8 );
Text [ en-US ] = "items";
};
FixedText FT_SHOW_FROM
{
Pos = MAP_APPFONT( 22, 128 );
Size = MAP_APPFONT( 60, 8 );
Text [ en-US ] = "~From";
};
ListBox LB_SHOW_FROM
{
HelpID = "sc:ListBox:RID_SCDLG_DPSUBTOTAL_OPT:LB_SHOW_FROM";
Pos = MAP_APPFONT( 84, 126 );
Size = MAP_APPFONT( 114, 50 );
TabStop = TRUE;
Border = TRUE;
DropDown = TRUE;
StringList [ en-US ] =
{
< "Top"; Default; >;
< "Bottom"; Default; >;
};
};
FixedText FT_SHOW_USING
{
Pos = MAP_APPFONT( 22, 144 );
Size = MAP_APPFONT( 60, 8 );
Text [ en-US ] = "~Using field";
};
ListBox LB_SHOW_USING
{
HelpID = "sc:ListBox:RID_SCDLG_DPSUBTOTAL_OPT:LB_SHOW_USING";
Pos = MAP_APPFONT( 84, 142 );
Size = MAP_APPFONT( 114, 120 );
TabStop = TRUE;
Border = TRUE;
DropDown = TRUE;
};
FixedLine FL_HIDE
{
Pos = MAP_APPFONT( 6, 160 );
Size = MAP_APPFONT( 198, 8 );
Text [ en-US ] = "Hide i~tems";
};
Control CT_HIDE
{
Pos = MAP_APPFONT( 12, 171 );
Size = MAP_APPFONT( 186, 45 );
TabStop = TRUE;
Border = TRUE;
};
FixedText FT_HIERARCHY
{
Pos = MAP_APPFONT( 6, 224 );
Size = MAP_APPFONT( 76, 8 );
Text [ en-US ] = "Hierarch~y";
};
ListBox LB_HIERARCHY
{
HelpID = "sc:ListBox:RID_SCDLG_DPSUBTOTAL_OPT:LB_HIERARCHY";
Pos = MAP_APPFONT( 84, 222 );
Size = MAP_APPFONT( 114, 120 );
TabStop = TRUE;
Border = TRUE;
DropDown = TRUE;
};
OKButton BTN_OK
{
Pos = MAP_APPFONT( 210, 6 );
Size = MAP_APPFONT( 50, 14 );
TabStop = TRUE;
DefButton = TRUE;
};
CancelButton BTN_CANCEL
{
Pos = MAP_APPFONT( 210, 23 );
Size = MAP_APPFONT( 50, 14 );
TabStop = TRUE;
};
HelpButton BTN_HELP
{
Pos = MAP_APPFONT( 210, 43 );
Size = MAP_APPFONT( 50, 14 );
TabStop = TRUE;
};
Text [ en-US ] = "Data Field Options";
};
// ----------------------------------------------------------------------------
ModalDialog RID_SCDLG_DPSHOWDETAIL
{
OutputSize = TRUE;
......
sc/source/ui/inc/pvfundlg.hxx
Dosyayı görüntüle @ 03497c8b
......@@ -20,10 +20,13 @@
#ifndef SC_PVFUNDLG_HXX
#define SC_PVFUNDLG_HXX
#include <boost/scoped_ptr.hpp>
#include <com/sun/star/sheet/DataPilotFieldReference.hpp>
#include <com/sun/star/sheet/DataPilotFieldSortInfo.hpp>
#include <vcl/fixed.hxx>
#include <vcl/layout.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/dialog.hxx>
#include <vcl/button.hxx>
......@@ -162,33 +165,27 @@ private:
DECL_LINK( SelectHdl, ListBox* );
private:
FixedLine maFlSortBy;
ListBox maLbSortBy;
RadioButton maRbSortAsc;
RadioButton maRbSortDesc;
RadioButton maRbSortMan;
FixedLine maFlLayout;
FixedText maFtLayout;
ListBox maLbLayout;
CheckBox maCbLayoutEmpty;
FixedLine maFlAutoShow;
CheckBox maCbShow;
NumericField maNfShow;
FixedText maFtShow;
FixedText maFtShowFrom;
ListBox maLbShowFrom;
FixedText maFtShowUsing;
ListBox maLbShowUsing;
FixedLine maFlHide;
SvxCheckListBox maLbHide;
FixedText maFtHierarchy;
ListBox maLbHierarchy;
OKButton maBtnOk;
CancelButton maBtnCancel;
HelpButton maBtnHelp;
ScDPListBoxWrapper maLbLayoutWrp; /// Wrapper for direct usage of API constants.
ScDPListBoxWrapper maLbShowFromWrp; /// Wrapper for direct usage of API constants.
ListBox* m_pLbSortBy;
RadioButton* m_pRbSortAsc;
RadioButton* m_pRbSortDesc;
RadioButton* m_pRbSortMan;
VclContainer* m_pLayoutFrame;
ListBox* m_pLbLayout;
CheckBox* m_pCbLayoutEmpty;
CheckBox* m_pCbShow;
NumericField* m_pNfShow;
FixedText* m_pFtShow;
FixedText* m_pFtShowFrom;
ListBox* m_pLbShowFrom;
FixedText* m_pFtShowUsing;
ListBox* m_pLbShowUsing;
VclContainer* m_pHideFrame;
SvxCheckListBox* m_pLbHide;
FixedText* m_pFtHierarchy;
ListBox* m_pLbHierarchy;
boost::scoped_ptr<ScDPListBoxWrapper> m_xLbLayoutWrp; /// Wrapper for direct usage of API constants.
boost::scoped_ptr<ScDPListBoxWrapper> m_xLbShowFromWrp; /// Wrapper for direct usage of API constants.
ScDPObject& mrDPObj; /// The DataPilot object (for member names).
ScDPLabelData maLabelData; /// Cache for members data.
......
sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui 0 → 100644
Dosyayı görüntüle @ 03497c8b
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