[Libreoffice-commits] core.git: sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk
Caolán McNamara
caolanm at redhat.com
Fri Jan 17 03:17:11 PST 2014
sc/UIConfig_scalc.mk | 1
sc/inc/helpids.h | 1
sc/inc/sc.hrc | 1
sc/inc/scabstdlg.hxx | 2
sc/source/ui/attrdlg/scdlgfact.cxx | 16 -
sc/source/ui/attrdlg/scdlgfact.hxx | 2
sc/source/ui/dbgui/pvfundlg.cxx | 72 +++----
sc/source/ui/dbgui/pvfundlg.src | 100 ----------
sc/source/ui/dbgui/pvlaydlg.cxx | 2
sc/source/ui/inc/pvfundlg.hxx | 28 +--
sc/uiconfig/scalc/ui/pivotfielddialog.ui | 282 +++++++++++++++++++++++++++++++
11 files changed, 335 insertions(+), 172 deletions(-)
New commits:
commit 8634c127d488a5aa8e994664b9ebc80860055fbf
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Jan 17 11:01:13 2014 +0000
convert pivot table subtotals data field dialog to .ui
Change-Id: I4ac7fb3a13cdc03d3c75cdd730bf39a7d814de99
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 729ae69..f688073 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -119,6 +119,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/pagetemplatedialog \
sc/uiconfig/scalc/ui/paradialog \
sc/uiconfig/scalc/ui/paratemplatedialog \
+ sc/uiconfig/scalc/ui/pivotfielddialog \
sc/uiconfig/scalc/ui/printareasdialog \
sc/uiconfig/scalc/ui/printeroptions \
sc/uiconfig/scalc/ui/protectsheetdlg \
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 2e0cf5e..f9fd155 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -53,7 +53,6 @@
// Hilfe IDs fuer Dialoge / Pages (max.70) -----------------------------------
#define HID_SC_PIVOTFILTER "SC_HID_SC_PIVOTFILTER"
#define HID_SC_INPORTOPT "SC_HID_SC_INPORTOPT"
-#define HID_SC_PIVOTSUBT "SC_HID_SC_PIVOTSUBT"
#define HID_SC_NAVIGATOR "SC_HID_SC_NAVIGATOR"
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 97630f8..9c51d90 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1017,7 +1017,6 @@
#define RID_SCDLG_PIVOTFILTER (SC_DIALOGS_START + 33)
#define RID_SCDLG_PIVOT_LAYOUT (SC_DIALOGS_START + 34)
#define RID_SCDLG_CONSOLIDATE (SC_DIALOGS_START + 35)
-#define RID_SCDLG_PIVOTSUBT (SC_DIALOGS_START + 38)
#define RID_SCDLG_NEWSCENARIO (SC_DIALOGS_START + 39)
#define RID_SCDLG_INSERT_TABLE (SC_DIALOGS_START + 42)
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 9b63ee0..068e544 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -421,7 +421,7 @@ public:
const ScDPLabelData& rLabelData,
const ScPivotFuncData& rFuncData ) = 0;
- virtual AbstractScDPSubtotalDlg * CreateScDPSubtotalDlg( Window* pParent, int nId,
+ virtual AbstractScDPSubtotalDlg * CreateScDPSubtotalDlg( Window* pParent,
ScDPObject& rDPObj,
const ScDPLabelData& rLabelData,
const ScPivotFuncData& rFuncData,
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index 01a2c54..0229bfb 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -890,26 +890,14 @@ AbstractScDPFunctionDlg * ScAbstractDialogFactory_Impl::CreateScDPFunctionDlg (
}
AbstractScDPSubtotalDlg * ScAbstractDialogFactory_Impl::CreateScDPSubtotalDlg ( Window* pParent,
- int nId,
ScDPObject& rDPObj,
const ScDPLabelData& rLabelData,
const ScPivotFuncData& rFuncData,
const ScDPNameVec& rDataFields,
bool bEnableLayout )
{
- ScDPSubtotalDlg * pDlg=NULL;
- switch ( nId )
- {
- case RID_SCDLG_PIVOTSUBT :
- pDlg = new ScDPSubtotalDlg( pParent, rDPObj, rLabelData, rFuncData, rDataFields, bEnableLayout );
- break;
- default:
- break;
- }
-
- if ( pDlg )
- return new AbstractScDPSubtotalDlg_Impl( pDlg );
- return 0;
+ ScDPSubtotalDlg * pDlg = new ScDPSubtotalDlg( pParent, rDPObj, rLabelData, rFuncData, rDataFields, bEnableLayout );
+ return new AbstractScDPSubtotalDlg_Impl( pDlg );
}
AbstractScDPNumGroupDlg * ScAbstractDialogFactory_Impl::CreateScDPNumGroupDlg(
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index 69443d0..c819c28 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -490,7 +490,7 @@ public:
const ScDPLabelData& rLabelData,
const ScPivotFuncData& rFuncData );
- virtual AbstractScDPSubtotalDlg * CreateScDPSubtotalDlg( Window* pParent, int nId,
+ virtual AbstractScDPSubtotalDlg * CreateScDPSubtotalDlg( Window* pParent,
ScDPObject& rDPObj,
const ScDPLabelData& rLabelData,
const ScPivotFuncData& rFuncData,
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index 6ca97fe..c6f5e13 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -425,26 +425,24 @@ IMPL_LINK_NOARG(ScDPFunctionDlg, DblClickHdl)
ScDPSubtotalDlg::ScDPSubtotalDlg( Window* pParent, ScDPObject& rDPObj,
const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData,
- const ScDPNameVec& rDataFields, bool bEnableLayout ) :
- ModalDialog ( pParent, ScResId( RID_SCDLG_PIVOTSUBT ) ),
- maFlSubt ( this, ScResId( FL_FUNC ) ),
- maRbNone ( this, ScResId( RB_NONE ) ),
- maRbAuto ( this, ScResId( RB_AUTO ) ),
- maRbUser ( this, ScResId( RB_USER ) ),
- maLbFunc ( this, ScResId( LB_FUNC ) ),
- maFtNameLabel ( this, ScResId( FT_NAMELABEL ) ),
- maFtName ( this, ScResId( FT_NAME ) ),
- maCbShowAll ( this, ScResId( CB_SHOWALL ) ),
- maBtnOk ( this, ScResId( BTN_OK ) ),
- maBtnCancel ( this, ScResId( BTN_CANCEL ) ),
- maBtnHelp ( this, ScResId( BTN_HELP ) ),
- maBtnOptions ( this, ScResId( BTN_OPTIONS ) ),
- mrDPObj ( rDPObj ),
- mrDataFields ( rDataFields ),
- maLabelData ( rLabelData ),
- mbEnableLayout ( bEnableLayout )
+ const ScDPNameVec& rDataFields, bool bEnableLayout )
+ : ModalDialog(pParent, "PivotFieldDialog",
+ "modules/scalc/ui/pivotfielddialog.ui")
+ , mrDPObj(rDPObj)
+ , mrDataFields(rDataFields)
+ , maLabelData(rLabelData)
+ , mbEnableLayout(bEnableLayout)
{
- FreeResource();
+ get(mpBtnOk, "ok");
+ get(mpBtnOptions, "options");
+ get(mpCbShowAll, "showall");
+ get(mpFtName, "name");
+ get(mpLbFunc, "functions");
+ mpLbFunc->set_height_request(mpLbFunc->GetTextHeight() * 8);
+ get(mpRbNone, "none");
+ get(mpRbAuto, "auto");
+ get(mpRbUser, "user");
+
Init( rLabelData, rFuncData );
}
@@ -452,10 +450,10 @@ sal_uInt16 ScDPSubtotalDlg::GetFuncMask() const
{
sal_uInt16 nFuncMask = PIVOT_FUNC_NONE;
- if( maRbAuto.IsChecked() )
+ if( mpRbAuto->IsChecked() )
nFuncMask = PIVOT_FUNC_AUTO;
- else if( maRbUser.IsChecked() )
- nFuncMask = maLbFunc.GetSelection();
+ else if( mpRbUser->IsChecked() )
+ nFuncMask = mpLbFunc->GetSelection();
return nFuncMask;
}
@@ -464,7 +462,7 @@ void ScDPSubtotalDlg::FillLabelData( ScDPLabelData& rLabelData ) const
{
rLabelData.mnFuncMask = GetFuncMask();
rLabelData.mnUsedHier = maLabelData.mnUsedHier;
- rLabelData.mbShowAll = maCbShowAll.IsChecked();
+ rLabelData.mbShowAll = mpCbShowAll->IsChecked();
rLabelData.maMembers = maLabelData.maMembers;
rLabelData.maSortInfo = maLabelData.maSortInfo;
rLabelData.maLayoutInfo = maLabelData.maLayoutInfo;
@@ -474,51 +472,51 @@ void ScDPSubtotalDlg::FillLabelData( ScDPLabelData& rLabelData ) const
void ScDPSubtotalDlg::Init( const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData )
{
// field name
- maFtName.SetText(rLabelData.getDisplayName());
+ mpFtName->SetText(rLabelData.getDisplayName());
// radio buttons
- maRbNone.SetClickHdl( LINK( this, ScDPSubtotalDlg, RadioClickHdl ) );
- maRbAuto.SetClickHdl( LINK( this, ScDPSubtotalDlg, RadioClickHdl ) );
- maRbUser.SetClickHdl( LINK( this, ScDPSubtotalDlg, RadioClickHdl ) );
+ mpRbNone->SetClickHdl( LINK( this, ScDPSubtotalDlg, RadioClickHdl ) );
+ mpRbAuto->SetClickHdl( LINK( this, ScDPSubtotalDlg, RadioClickHdl ) );
+ mpRbUser->SetClickHdl( LINK( this, ScDPSubtotalDlg, RadioClickHdl ) );
RadioButton* pRBtn = 0;
switch( rFuncData.mnFuncMask )
{
- case PIVOT_FUNC_NONE: pRBtn = &maRbNone; break;
- case PIVOT_FUNC_AUTO: pRBtn = &maRbAuto; break;
- default: pRBtn = &maRbUser;
+ case PIVOT_FUNC_NONE: pRBtn = mpRbNone; break;
+ case PIVOT_FUNC_AUTO: pRBtn = mpRbAuto; break;
+ default: pRBtn = mpRbUser;
}
pRBtn->Check();
RadioClickHdl( pRBtn );
// list box
- maLbFunc.SetSelection( rFuncData.mnFuncMask );
- maLbFunc.SetDoubleClickHdl( LINK( this, ScDPSubtotalDlg, DblClickHdl ) );
+ mpLbFunc->SetSelection( rFuncData.mnFuncMask );
+ mpLbFunc->SetDoubleClickHdl( LINK( this, ScDPSubtotalDlg, DblClickHdl ) );
// show all
- maCbShowAll.Check( rLabelData.mbShowAll );
+ mpCbShowAll->Check( rLabelData.mbShowAll );
// options
- maBtnOptions.SetClickHdl( LINK( this, ScDPSubtotalDlg, ClickHdl ) );
+ mpBtnOptions->SetClickHdl( LINK( this, ScDPSubtotalDlg, ClickHdl ) );
}
// ----------------------------------------------------------------------------
IMPL_LINK( ScDPSubtotalDlg, RadioClickHdl, RadioButton*, pBtn )
{
- maLbFunc.Enable( pBtn == &maRbUser );
+ mpLbFunc->Enable( pBtn == mpRbUser );
return 0;
}
IMPL_LINK_NOARG(ScDPSubtotalDlg, DblClickHdl)
{
- maBtnOk.Click();
+ mpBtnOk->Click();
return 0;
}
IMPL_LINK( ScDPSubtotalDlg, ClickHdl, PushButton*, pBtn )
{
- if( pBtn == &maBtnOptions )
+ if (pBtn == mpBtnOptions)
{
ScDPSubtotalOptDlg* pDlg = new ScDPSubtotalOptDlg( this, mrDPObj, maLabelData, mrDataFields, mbEnableLayout );
if( pDlg->Execute() == RET_OK )
diff --git a/sc/source/ui/dbgui/pvfundlg.src b/sc/source/ui/dbgui/pvfundlg.src
index a826665..3fc2210 100644
--- a/sc/source/ui/dbgui/pvfundlg.src
+++ b/sc/source/ui/dbgui/pvfundlg.src
@@ -39,106 +39,6 @@ StringArray SCSTR_DPFUNCLISTBOX
// ----------------------------------------------------------------------------
-ModalDialog RID_SCDLG_PIVOTSUBT
-{
- OutputSize = TRUE ;
- HelpId = HID_SC_PIVOTSUBT ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 220 , 155 ) ;
- Text [ en-US ] = "Data Field" ;
- Moveable = TRUE ;
- Closeable = FALSE ;
- Hide = TRUE ;
- RadioButton RB_NONE
- {
- HelpID = "sc:RadioButton:RID_SCDLG_PIVOTSUBT:RB_NONE";
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 140 , 10 ) ;
- Text [ en-US ] = "~None" ;
- TabStop = TRUE ;
- };
- RadioButton RB_AUTO
- {
- HelpID = "sc:RadioButton:RID_SCDLG_PIVOTSUBT:RB_AUTO";
- Pos = MAP_APPFONT ( 12 , 28 ) ;
- Size = MAP_APPFONT ( 140 , 10 ) ;
- Text [ en-US ] = "~Automatic" ;
- TabStop = TRUE ;
- };
- RadioButton RB_USER
- {
- HelpID = "sc:RadioButton:RID_SCDLG_PIVOTSUBT:RB_USER";
- Pos = MAP_APPFONT ( 12 , 42 ) ;
- Size = MAP_APPFONT ( 140 , 10 ) ;
- Text [ en-US ] = "~User-defined" ;
- TabStop = TRUE ;
- };
- MultiListBox LB_FUNC
- {
- HelpID = "sc:MultiListBox:RID_SCDLG_PIVOTSUBT:LB_FUNC";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 12 , 56 ) ;
- Size = MAP_APPFONT ( 140 , 65 ) ;
- TabStop = TRUE ;
- AutoHScroll = TRUE ;
- SimpleMode = TRUE ;
- };
- FixedLine FL_FUNC
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 152 , 8 ) ;
- Text [ en-US ] = "Subtotals" ;
- };
- CheckBox CB_SHOWALL
- {
- HelpID = "sc:CheckBox:RID_SCDLG_PIVOTSUBT:CB_SHOWALL";
- Pos = MAP_APPFONT ( 6 , 127 ) ;
- Size = MAP_APPFONT ( 152 , 10 ) ;
- Text [ en-US ] = "Show it~ems without data";
- TabStop = TRUE ;
- };
- FixedText FT_NAMELABEL
- {
- Pos = MAP_APPFONT ( 6 , 141 ) ;
- Size = MAP_APPFONT ( 25 , 8 ) ;
- Text [ en-US ] = "Name:" ;
- };
- FixedText FT_NAME
- {
- Pos = MAP_APPFONT ( 32 , 141 ) ;
- Size = MAP_APPFONT ( 126 , 8 ) ;
- };
- OKButton BTN_OK
- {
- Pos = MAP_APPFONT ( 164 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- DefButton = TRUE ;
- };
- CancelButton BTN_CANCEL
- {
- Pos = MAP_APPFONT ( 164 , 23 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- HelpButton BTN_HELP
- {
- Pos = MAP_APPFONT ( 164 , 43 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- PushButton BTN_OPTIONS
- {
- HelpID = "sc:PushButton:RID_SCDLG_PIVOTSUBT:BTN_OPTIONS";
- Pos = MAP_APPFONT ( 164 , 135 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "~Options...";
- };
-};
-
-// ----------------------------------------------------------------------------
-
ModalDialog RID_SCDLG_DPSUBTOTAL_OPT
{
OutputSize = TRUE;
diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx
index ec09af1..d7e43d5 100644
--- a/sc/source/ui/dbgui/pvlaydlg.cxx
+++ b/sc/source/ui/dbgui/pvlaydlg.cxx
@@ -790,7 +790,7 @@ void ScPivotLayoutDlg::NotifyDoubleClick( ScPivotFieldType eType, size_t nFieldI
boost::scoped_ptr<AbstractScDPSubtotalDlg> pDlg(
pFact->CreateScDPSubtotalDlg(
- this, RID_SCDLG_PIVOTSUBT, *mxDlgDPObject, *pData, rFunc,
+ this, *mxDlgDPObject, *pData, rFunc,
aDataFieldNames, bLayout));
if ( pDlg->Execute() == RET_OK )
diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx
index e30798f..a885541 100644
--- a/sc/source/ui/inc/pvfundlg.hxx
+++ b/sc/source/ui/inc/pvfundlg.hxx
@@ -122,24 +122,20 @@ private:
DECL_LINK( ClickHdl, PushButton* );
private:
- FixedLine maFlSubt;
- RadioButton maRbNone;
- RadioButton maRbAuto;
- RadioButton maRbUser;
- ScDPFunctionListBox maLbFunc;
- FixedText maFtNameLabel;
- FixedInfo maFtName;
- CheckBox maCbShowAll;
- OKButton maBtnOk;
- CancelButton maBtnCancel;
- HelpButton maBtnHelp;
- PushButton maBtnOptions;
+ RadioButton* mpRbNone;
+ RadioButton* mpRbAuto;
+ RadioButton* mpRbUser;
+ ScDPFunctionListBox* mpLbFunc;
+ FixedText* mpFtName;
+ CheckBox* mpCbShowAll;
+ OKButton* mpBtnOk;
+ PushButton* mpBtnOptions;
- ScDPObject& mrDPObj; /// The DataPilot object (for member names).
- const ScDPNameVec& mrDataFields; /// The list of all data field names.
+ ScDPObject& mrDPObj; /// The DataPilot object (for member names).
+ const ScDPNameVec& mrDataFields; /// The list of all data field names.
- ScDPLabelData maLabelData; /// Cache for sub dialog.
- bool mbEnableLayout; /// true = Enable Layout mode controls.
+ ScDPLabelData maLabelData; /// Cache for sub dialog.
+ bool mbEnableLayout; /// true = Enable Layout mode controls.
};
// ============================================================================
diff --git a/sc/uiconfig/scalc/ui/pivotfielddialog.ui b/sc/uiconfig/scalc/ui/pivotfielddialog.ui
new file mode 100644
index 0000000..dcf9127
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/pivotfielddialog.ui
@@ -0,0 +1,282 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Fri Jan 17 10:58:52 2014 -->
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <!-- interface-requires LibreOffice 1.0 -->
+ <object class="GtkDialog" id="PivotFieldDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Data Field</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="options">
+ <property name="label" translatable="yes">_Options...</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="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ <property name="secondary">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</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="row_spacing">12</property>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">6</property>
+ <property name="hexpand">True</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkRadioButton" id="none">
+ <property name="label" translatable="yes">_None</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">auto</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="auto">
+ <property name="label" translatable="yes">_Automatic</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">user</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="user">
+ <property name="label" translatable="yes">_User-defined</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">none</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>
+ <child>
+ <object class="scuilo-ScDPFunctionListBox" id="functions:border">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="DPFunctionListBox-selection4"/>
+ </child>
+ </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>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Subtotals</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </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="GtkCheckButton" id="showall">
+ <property name="label" translatable="yes">Show it_ems without data</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">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Name:</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="GtkLabel" id="name">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</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">2</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>
+ </child>
+ <action-widgets>
+ <action-widget response="0">ok</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ </action-widgets>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list