diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index ac2f383aaf36..29bf45659764 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -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 \ diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h index b93ca2289d32..6e5ec3bd0818 100644 --- a/sc/inc/helpids.h +++ b/sc/inc/helpids.h @@ -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" diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 4cbfb88f04c0..3ed851abd2d8 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -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) diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx index 3f5839e22975..a6c7f7b051f7 100644 --- a/sc/source/ui/dbgui/pvfundlg.cxx +++ b/sc/source/ui/dbgui/pvfundlg.cxx @@ -523,38 +523,36 @@ IMPL_LINK( ScDPSubtotalDlg, ClickHdl, PushButton*, pBtn ) ScDPSubtotalOptDlg::ScDPSubtotalOptDlg( Window* pParent, ScDPObject& rDPObj, const ScDPLabelData& rLabelData, const ScDPNameVec& rDataFields, - bool bEnableLayout ) : - ModalDialog ( pParent, ScResId( RID_SCDLG_DPSUBTOTAL_OPT ) ), - maFlSortBy ( this, ScResId( FL_SORT_BY ) ), - maLbSortBy ( this, ScResId( LB_SORT_BY ) ), - maRbSortAsc ( this, ScResId( RB_SORT_ASC ) ), - maRbSortDesc ( this, ScResId( RB_SORT_DESC ) ), - maRbSortMan ( this, ScResId( RB_SORT_MAN ) ), - maFlLayout ( this, ScResId( FL_LAYOUT ) ), - maFtLayout ( this, ScResId( FT_LAYOUT ) ), - maLbLayout ( this, ScResId( LB_LAYOUT ) ), - maCbLayoutEmpty ( this, ScResId( CB_LAYOUT_EMPTY ) ), - maFlAutoShow ( this, ScResId( FL_AUTOSHOW ) ), - maCbShow ( this, ScResId( CB_SHOW ) ), - maNfShow ( this, ScResId( NF_SHOW ) ), - maFtShow ( this, ScResId( FT_SHOW ) ), - maFtShowFrom ( this, ScResId( FT_SHOW_FROM ) ), - maLbShowFrom ( this, ScResId( LB_SHOW_FROM ) ), - maFtShowUsing ( this, ScResId( FT_SHOW_USING ) ), - maLbShowUsing ( this, ScResId( LB_SHOW_USING ) ), - maFlHide ( this, ScResId( FL_HIDE ) ), - maLbHide ( this, ScResId( CT_HIDE ) ), - maFtHierarchy ( this, ScResId( FT_HIERARCHY ) ), - maLbHierarchy ( this, ScResId( LB_HIERARCHY ) ), - maBtnOk ( this, ScResId( BTN_OK ) ), - maBtnCancel ( this, ScResId( BTN_CANCEL ) ), - maBtnHelp ( this, ScResId( BTN_HELP ) ), - maLbLayoutWrp ( maLbLayout, spLayoutMap ), - maLbShowFromWrp ( maLbShowFrom, spShowFromMap ), - mrDPObj ( rDPObj ), - maLabelData ( rLabelData ) + bool bEnableLayout ) + : ModalDialog(pParent, "DataFieldOptionsDialog", + "modules/scalc/ui/datafieldoptionsdialog.ui") + , mrDPObj(rDPObj) + , maLabelData(rLabelData) { - FreeResource(); + get(m_pLbSortBy, "sortby"); + m_pLbSortBy->set_width_request(m_pLbSortBy->approximate_char_width() * 20); + get(m_pRbSortAsc, "ascending"); + get(m_pRbSortDesc, "descending"); + get(m_pRbSortMan, "manual"); + get(m_pLayoutFrame, "layoutframe"); + get(m_pLbLayout, "layout"); + get(m_pCbLayoutEmpty, "emptyline"); + get(m_pCbShow, "show"); + get(m_pNfShow, "items"); + get(m_pFtShow, "showft"); + get(m_pFtShowFrom, "showfromft"); + get(m_pLbShowFrom, "from"); + get(m_pFtShowUsing, "usingft"); + get(m_pLbShowUsing, "using"); + get(m_pHideFrame, "hideframe"); + get(m_pLbHide, "hideitems"); + m_pLbHide->set_height_request(GetTextHeight() * 5); + get(m_pFtHierarchy, "hierarchyft"); + get(m_pLbHierarchy, "hierarchy"); + + m_xLbLayoutWrp.reset(new ScDPListBoxWrapper(*m_pLbLayout, spLayoutMap)); + m_xLbShowFromWrp.reset(new ScDPListBoxWrapper(*m_pLbShowFrom, spShowFromMap)); + Init( rDataFields, bEnableLayout ); } @@ -562,34 +560,34 @@ void ScDPSubtotalOptDlg::FillLabelData( ScDPLabelData& rLabelData ) const { // *** SORTING *** - if( maRbSortMan.IsChecked() ) + if( m_pRbSortMan->IsChecked() ) rLabelData.maSortInfo.Mode = DataPilotFieldSortMode::MANUAL; - else if( maLbSortBy.GetSelectEntryPos() == SC_SORTNAME_POS ) + else if( m_pLbSortBy->GetSelectEntryPos() == SC_SORTNAME_POS ) rLabelData.maSortInfo.Mode = DataPilotFieldSortMode::NAME; else rLabelData.maSortInfo.Mode = DataPilotFieldSortMode::DATA; - ScDPName aFieldName = GetFieldName(maLbSortBy.GetSelectEntry()); + ScDPName aFieldName = GetFieldName(m_pLbSortBy->GetSelectEntry()); if (!aFieldName.maName.isEmpty()) { rLabelData.maSortInfo.Field = ScDPUtil::createDuplicateDimensionName(aFieldName.maName, aFieldName.mnDupCount); - rLabelData.maSortInfo.IsAscending = maRbSortAsc.IsChecked(); + rLabelData.maSortInfo.IsAscending = m_pRbSortAsc->IsChecked(); } // *** LAYOUT MODE *** - rLabelData.maLayoutInfo.LayoutMode = maLbLayoutWrp.GetControlValue(); - rLabelData.maLayoutInfo.AddEmptyLines = maCbLayoutEmpty.IsChecked(); + rLabelData.maLayoutInfo.LayoutMode = m_xLbLayoutWrp->GetControlValue(); + rLabelData.maLayoutInfo.AddEmptyLines = m_pCbLayoutEmpty->IsChecked(); // *** AUTO SHOW *** - aFieldName = GetFieldName(maLbShowUsing.GetSelectEntry()); + aFieldName = GetFieldName(m_pLbShowUsing->GetSelectEntry()); if (!aFieldName.maName.isEmpty()) { - rLabelData.maShowInfo.IsEnabled = maCbShow.IsChecked(); - rLabelData.maShowInfo.ShowItemsMode = maLbShowFromWrp.GetControlValue(); - rLabelData.maShowInfo.ItemCount = sal::static_int_cast( maNfShow.GetValue() ); + rLabelData.maShowInfo.IsEnabled = m_pCbShow->IsChecked(); + rLabelData.maShowInfo.ShowItemsMode = m_xLbShowFromWrp->GetControlValue(); + rLabelData.maShowInfo.ItemCount = sal::static_int_cast( m_pNfShow->GetValue() ); rLabelData.maShowInfo.DataField = ScDPUtil::createDuplicateDimensionName(aFieldName.maName, aFieldName.mnDupCount); } @@ -597,13 +595,13 @@ void ScDPSubtotalOptDlg::FillLabelData( ScDPLabelData& rLabelData ) const // *** HIDDEN ITEMS *** rLabelData.maMembers = maLabelData.maMembers; - sal_uLong nVisCount = maLbHide.GetEntryCount(); + sal_uLong nVisCount = m_pLbHide->GetEntryCount(); for( sal_uInt16 nPos = 0; nPos < nVisCount; ++nPos ) - rLabelData.maMembers[nPos].mbVisible = !maLbHide.IsChecked(nPos); + rLabelData.maMembers[nPos].mbVisible = !m_pLbHide->IsChecked(nPos); // *** HIERARCHY *** - rLabelData.mnUsedHier = maLbHierarchy.GetSelectEntryCount() ? maLbHierarchy.GetSelectEntryPos() : 0; + rLabelData.mnUsedHier = m_pLbHierarchy->GetSelectEntryCount() ? m_pLbHierarchy->GetSelectEntryPos() : 0; } void ScDPSubtotalOptDlg::Init( const ScDPNameVec& rDataFields, bool bEnableLayout ) @@ -613,110 +611,105 @@ void ScDPSubtotalOptDlg::Init( const ScDPNameVec& rDataFields, bool bEnableLayou sal_Int32 nSortMode = maLabelData.maSortInfo.Mode; // sort fields list box - maLbSortBy.InsertEntry(maLabelData.getDisplayName()); + m_pLbSortBy->InsertEntry(maLabelData.getDisplayName()); for( ScDPNameVec::const_iterator aIt = rDataFields.begin(), aEnd = rDataFields.end(); aIt != aEnd; ++aIt ) { // Cache names for later lookup. maDataFieldNameMap.insert(NameMapType::value_type(aIt->maLayoutName, *aIt)); - maLbSortBy.InsertEntry( aIt->maLayoutName ); - maLbShowUsing.InsertEntry( aIt->maLayoutName ); // for AutoShow + m_pLbSortBy->InsertEntry( aIt->maLayoutName ); + m_pLbShowUsing->InsertEntry( aIt->maLayoutName ); // for AutoShow } - if( maLbSortBy.GetEntryCount() > SC_SORTDATA_POS ) - maLbSortBy.SetSeparatorPos( SC_SORTDATA_POS - 1 ); + if( m_pLbSortBy->GetEntryCount() > SC_SORTDATA_POS ) + m_pLbSortBy->SetSeparatorPos( SC_SORTDATA_POS - 1 ); sal_uInt16 nSortPos = SC_SORTNAME_POS; if( nSortMode == DataPilotFieldSortMode::DATA ) { - nSortPos = FindListBoxEntry( maLbSortBy, maLabelData.maSortInfo.Field, SC_SORTDATA_POS ); - if( nSortPos >= maLbSortBy.GetEntryCount() ) + nSortPos = FindListBoxEntry( *m_pLbSortBy, maLabelData.maSortInfo.Field, SC_SORTDATA_POS ); + if( nSortPos >= m_pLbSortBy->GetEntryCount() ) { nSortPos = SC_SORTNAME_POS; nSortMode = DataPilotFieldSortMode::MANUAL; } } - maLbSortBy.SelectEntryPos( nSortPos ); + m_pLbSortBy->SelectEntryPos( nSortPos ); // sorting mode - maRbSortAsc.SetClickHdl( LINK( this, ScDPSubtotalOptDlg, RadioClickHdl ) ); - maRbSortDesc.SetClickHdl( LINK( this, ScDPSubtotalOptDlg, RadioClickHdl ) ); - maRbSortMan.SetClickHdl( LINK( this, ScDPSubtotalOptDlg, RadioClickHdl ) ); + m_pRbSortAsc->SetClickHdl( LINK( this, ScDPSubtotalOptDlg, RadioClickHdl ) ); + m_pRbSortDesc->SetClickHdl( LINK( this, ScDPSubtotalOptDlg, RadioClickHdl ) ); + m_pRbSortMan->SetClickHdl( LINK( this, ScDPSubtotalOptDlg, RadioClickHdl ) ); RadioButton* pRBtn = 0; switch( nSortMode ) { case DataPilotFieldSortMode::NONE: case DataPilotFieldSortMode::MANUAL: - pRBtn = &maRbSortMan; + pRBtn = m_pRbSortMan; break; default: - pRBtn = maLabelData.maSortInfo.IsAscending ? &maRbSortAsc : &maRbSortDesc; + pRBtn = maLabelData.maSortInfo.IsAscending ? m_pRbSortAsc : m_pRbSortDesc; } pRBtn->Check(); RadioClickHdl( pRBtn ); // *** LAYOUT MODE *** - maFlLayout.Enable( bEnableLayout ); - maFtLayout.Enable( bEnableLayout ); - maLbLayout.Enable( bEnableLayout ); - maCbLayoutEmpty.Enable( bEnableLayout ); + m_pLayoutFrame->Enable(bEnableLayout); - maLbLayoutWrp.SetControlValue( maLabelData.maLayoutInfo.LayoutMode ); - maCbLayoutEmpty.Check( maLabelData.maLayoutInfo.AddEmptyLines ); + m_xLbLayoutWrp->SetControlValue( maLabelData.maLayoutInfo.LayoutMode ); + m_pCbLayoutEmpty->Check( maLabelData.maLayoutInfo.AddEmptyLines ); // *** AUTO SHOW *** - maCbShow.Check( maLabelData.maShowInfo.IsEnabled ); - maCbShow.SetClickHdl( LINK( this, ScDPSubtotalOptDlg, CheckHdl ) ); + m_pCbShow->Check( maLabelData.maShowInfo.IsEnabled ); + m_pCbShow->SetClickHdl( LINK( this, ScDPSubtotalOptDlg, CheckHdl ) ); - maLbShowFromWrp.SetControlValue( maLabelData.maShowInfo.ShowItemsMode ); + m_xLbShowFromWrp->SetControlValue( maLabelData.maShowInfo.ShowItemsMode ); long nCount = static_cast< long >( maLabelData.maShowInfo.ItemCount ); if( nCount < 1 ) nCount = SC_SHOW_DEFAULT; - maNfShow.SetValue( nCount ); + m_pNfShow->SetValue( nCount ); - // maLbShowUsing already filled above - maLbShowUsing.SelectEntry( maLabelData.maShowInfo.DataField ); - if( maLbShowUsing.GetSelectEntryPos() >= maLbShowUsing.GetEntryCount() ) - maLbShowUsing.SelectEntryPos( 0 ); + // m_pLbShowUsing already filled above + m_pLbShowUsing->SelectEntry( maLabelData.maShowInfo.DataField ); + if( m_pLbShowUsing->GetSelectEntryPos() >= m_pLbShowUsing->GetEntryCount() ) + m_pLbShowUsing->SelectEntryPos( 0 ); - CheckHdl( &maCbShow ); // enable/disable dependent controls + CheckHdl(m_pCbShow); // enable/disable dependent controls // *** HIDDEN ITEMS *** - maLbHide.SetHelpId( HID_SC_DPSUBT_HIDE ); InitHideListBox(); // *** HIERARCHY *** if( maLabelData.maHiers.getLength() > 1 ) { - lclFillListBox( maLbHierarchy, maLabelData.maHiers ); + lclFillListBox( *m_pLbHierarchy, maLabelData.maHiers ); sal_Int32 nHier = maLabelData.mnUsedHier; if( (nHier < 0) || (nHier >= maLabelData.maHiers.getLength()) ) nHier = 0; - maLbHierarchy.SelectEntryPos( static_cast< sal_uInt16 >( nHier ) ); - maLbHierarchy.SetSelectHdl( LINK( this, ScDPSubtotalOptDlg, SelectHdl ) ); + m_pLbHierarchy->SelectEntryPos( static_cast< sal_uInt16 >( nHier ) ); + m_pLbHierarchy->SetSelectHdl( LINK( this, ScDPSubtotalOptDlg, SelectHdl ) ); } else { - maFtHierarchy.Disable(); - maLbHierarchy.Disable(); + m_pFtHierarchy->Disable(); + m_pLbHierarchy->Disable(); } } void ScDPSubtotalOptDlg::InitHideListBox() { - maLbHide.Clear(); - lclFillListBox( maLbHide, maLabelData.maMembers ); + m_pLbHide->Clear(); + lclFillListBox( *m_pLbHide, maLabelData.maMembers ); size_t n = maLabelData.maMembers.size(); for (size_t i = 0; i < n; ++i) - maLbHide.CheckEntryPos(static_cast(i), !maLabelData.maMembers[i].mbVisible); - bool bEnable = maLbHide.GetEntryCount() > 0; - maFlHide.Enable( bEnable ); - maLbHide.Enable( bEnable ); + m_pLbHide->CheckEntryPos(static_cast(i), !maLabelData.maMembers[i].mbVisible); + bool bEnable = m_pLbHide->GetEntryCount() > 0; + m_pHideFrame->Enable(bEnable); } ScDPName ScDPSubtotalOptDlg::GetFieldName(const OUString& rLayoutName) const @@ -747,32 +740,32 @@ sal_uInt16 ScDPSubtotalOptDlg::FindListBoxEntry( IMPL_LINK( ScDPSubtotalOptDlg, RadioClickHdl, RadioButton*, pBtn ) { - maLbSortBy.Enable( pBtn != &maRbSortMan ); + m_pLbSortBy->Enable( pBtn != m_pRbSortMan ); return 0; } IMPL_LINK( ScDPSubtotalOptDlg, CheckHdl, CheckBox*, pCBox ) { - if( pCBox == &maCbShow ) + if (pCBox == m_pCbShow) { - bool bEnable = maCbShow.IsChecked(); - maNfShow.Enable( bEnable ); - maFtShow.Enable( bEnable ); - maFtShowFrom.Enable( bEnable ); - maLbShowFrom.Enable( bEnable ); + bool bEnable = m_pCbShow->IsChecked(); + m_pNfShow->Enable( bEnable ); + m_pFtShow->Enable( bEnable ); + m_pFtShowFrom->Enable( bEnable ); + m_pLbShowFrom->Enable( bEnable ); - bool bEnableUsing = bEnable && (maLbShowUsing.GetEntryCount() > 0); - maFtShowUsing.Enable( bEnableUsing ); - maLbShowUsing.Enable( bEnableUsing ); + bool bEnableUsing = bEnable && (m_pLbShowUsing->GetEntryCount() > 0); + m_pFtShowUsing->Enable(bEnableUsing); + m_pLbShowUsing->Enable(bEnableUsing); } return 0; } IMPL_LINK( ScDPSubtotalOptDlg, SelectHdl, ListBox*, pLBox ) { - if( pLBox == &maLbHierarchy ) + if (pLBox == m_pLbHierarchy) { - mrDPObj.GetMembers(maLabelData.mnCol, maLbHierarchy.GetSelectEntryPos(), maLabelData.maMembers); + mrDPObj.GetMembers(maLabelData.mnCol, m_pLbHierarchy->GetSelectEntryPos(), maLabelData.maMembers); InitHideListBox(); } return 0; diff --git a/sc/source/ui/dbgui/pvfundlg.src b/sc/source/ui/dbgui/pvfundlg.src index 3fc2210dc6a5..98af0ca57cf7 100644 --- a/sc/source/ui/dbgui/pvfundlg.src +++ b/sc/source/ui/dbgui/pvfundlg.src @@ -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; diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx index 44e6300a2e49..f1de479b2f8a 100644 --- a/sc/source/ui/inc/pvfundlg.hxx +++ b/sc/source/ui/inc/pvfundlg.hxx @@ -20,10 +20,13 @@ #ifndef SC_PVFUNDLG_HXX #define SC_PVFUNDLG_HXX +#include + #include #include #include +#include #include #include #include @@ -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; + 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; - ScDPListBoxWrapper maLbLayoutWrp; /// Wrapper for direct usage of API constants. - ScDPListBoxWrapper maLbShowFromWrp; /// Wrapper for direct usage of API constants. + boost::scoped_ptr m_xLbLayoutWrp; /// Wrapper for direct usage of API constants. + boost::scoped_ptr m_xLbShowFromWrp; /// Wrapper for direct usage of API constants. ScDPObject& mrDPObj; /// The DataPilot object (for member names). ScDPLabelData maLabelData; /// Cache for members data. diff --git a/sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui b/sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui new file mode 100644 index 000000000000..e71439af5a83 --- /dev/null +++ b/sc/uiconfig/scalc/ui/datafieldoptionsdialog.ui @@ -0,0 +1,574 @@ + + + + + + + 1 + 999 + 1 + 1 + 10 + + + False + 6 + Data Field Options + dialog + + + False + vertical + 12 + + + False + end + + + gtk-add + True + True + True + True + True + True + + + False + True + 0 + + + + + gtk-close + True + True + True + True + + + False + True + 1 + + + + + gtk-help + True + True + True + True + + + False + True + 2 + + + + + False + True + end + 0 + + + + + True + False + True + True + 12 + + + True + False + True + 0 + none + + + True + False + True + 6 + 12 + + + True + False + True + 6 + 12 + + + _Ascending + True + True + False + True + 0 + True + True + descending + + + 1 + 0 + 1 + 1 + + + + + _Descending + True + True + False + True + 0 + True + manual + + + 1 + 1 + 1 + 1 + + + + + _Manual + True + True + False + True + 0 + True + ascending + + + 1 + 2 + 1 + 1 + + + + + True + False + center + True + + + 0 + 0 + 1 + 2 + + + + + + + + + + + + True + False + Sort by + + + + + + + + 0 + 0 + 1 + 1 + + + + + True + False + 0 + none + + + True + False + 6 + 12 + + + True + False + 6 + 12 + + + _Empty line after each item + True + True + False + True + 0 + True + + + 0 + 1 + 2 + 1 + + + + + True + False + 0 + _Layout + True + layout + + + 0 + 0 + 1 + 1 + + + + + True + False + True + + Tabular layout + Outline layout with subtotals at the top + Outline layout with subtotals at the bottom + + + + 1 + 0 + 1 + 1 + + + + + + + + + True + False + Display options + + + + + + + + 0 + 1 + 1 + 1 + + + + + True + False + 0 + none + + + True + False + 6 + 12 + + + True + False + 6 + 12 + + + _Show + True + True + False + True + 0 + True + + + + + + 0 + 0 + 1 + 1 + + + + + True + False + 0 + _From + True + from + + + 0 + 1 + 1 + 1 + + + + + True + False + 0 + _Using field + True + using + + + 0 + 2 + 1 + 1 + + + + + True + False + 12 + + + True + False + 0 + items + True + layout + + + 1 + 0 + 1 + 1 + + + + + True + True + adjustment1 + + + + + + 0 + 0 + 1 + 1 + + + + + 1 + 0 + 1 + 1 + + + + + True + False + + Top + Bottom + + + + 1 + 1 + 1 + 1 + + + + + True + False + + + 1 + 2 + 1 + 1 + + + + + + + + + True + False + Show automatically + + + + + + + + 0 + 2 + 1 + 1 + + + + + True + False + True + True + 0 + none + + + True + False + True + True + 6 + 12 + + + True + True + True + True + + + + + + + + + + True + False + Hide items + + + + + + + + 0 + 3 + 1 + 1 + + + + + True + False + 12 + + + True + False + + + 1 + 0 + 1 + 1 + + + + + True + False + 0 + Hierarch_y + True + hierarchy + + + 0 + 0 + 1 + 1 + + + + + 0 + 4 + 1 + 1 + + + + + False + True + 1 + + + + + + add + close + help + + + + + + + + + + + + + + + + +