diff options
author | Csikós Tamás <csks.tomi@gmail.com> | 2013-07-19 12:59:45 +0200 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-07-19 14:56:27 +0000 |
commit | 6a5a5c98746a08de078ea05d2973806f7e542928 (patch) | |
tree | 4dd33f87182035339e2b2faba42733eaedbba372 /sc | |
parent | 9b0ba41906f69b2364b11621ba2397f6a15a57e7 (diff) |
modern .ui widgetlayout for subtdlg/subtotaloptions
Change-Id: I05ced583bf342a4a688a7a5bbf1bb9a64ebc711c
Reviewed-on: https://gerrit.libreoffice.org/4983
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/UIConfig_scalc.mk | 1 | ||||
-rw-r--r-- | sc/source/ui/dbgui/tpsubt.cxx | 119 | ||||
-rw-r--r-- | sc/source/ui/inc/subtdlg.hrc | 13 | ||||
-rw-r--r-- | sc/source/ui/inc/tpsubt.hxx | 19 | ||||
-rw-r--r-- | sc/source/ui/src/subtdlg.src | 87 | ||||
-rw-r--r-- | sc/uiconfig/scalc/ui/subtotaloptionspage.ui | 243 |
6 files changed, 312 insertions, 170 deletions
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk index dd6c63ef4e97..6164084094d6 100644 --- a/sc/UIConfig_scalc.mk +++ b/sc/UIConfig_scalc.mk @@ -111,6 +111,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ sc/uiconfig/scalc/ui/sortkey \ sc/uiconfig/scalc/ui/sortoptionspage \ sc/uiconfig/scalc/ui/sortwarning \ + sc/uiconfig/scalc/ui/subtotaloptionspage \ sc/uiconfig/scalc/ui/textimportoptions \ sc/uiconfig/scalc/ui/textimportcsv \ sc/uiconfig/scalc/ui/tpviewpage \ diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index b2a9f9a01177..36d4f6d4685b 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -464,18 +464,8 @@ ScTpSubTotalOptions::ScTpSubTotalOptions( Window* pParent, const SfxItemSet& rArgSet ) : SfxTabPage ( pParent, - ScResId( RID_SCPAGE_SUBT_OPTIONS ), + "SubTotalOptionsPage", "modules/scalc/ui/subtotaloptionspage.ui" , rArgSet ), - aFlGroup ( this, ScResId( FL_GROUP ) ), - aBtnPagebreak ( this, ScResId( BTN_PAGEBREAK ) ), - aBtnCase ( this, ScResId( BTN_CASE ) ), - aBtnSort ( this, ScResId( BTN_SORT ) ), - aFlSort ( this, ScResId( FL_SORT ) ), - aBtnAscending ( this, ScResId( BTN_ASCENDING ) ), - aBtnDescending ( this, ScResId( BTN_DESCENDING ) ), - aBtnFormats ( this, ScResId( BTN_FORMATS ) ), - aBtnUserDef ( this, ScResId( BTN_USERDEF ) ), - aLbUserDef ( this, ScResId( LB_USERDEF ) ), pViewData ( NULL ), pDoc ( NULL ), nWhichSubTotals ( rArgSet.GetPool()->GetWhich( SID_SUBTOTALS ) ), @@ -483,11 +473,20 @@ ScTpSubTotalOptions::ScTpSubTotalOptions( Window* pParent, rArgSet.Get( nWhichSubTotals )). GetSubTotalData() ) { + get(pBtnPagebreak,"pagebreak"); + get(pBtnCase,"case"); + get(pBtnSort,"sort"); + get(pFlSort,"label2"); + get(pBtnAscending,"ascending"); + get(pBtnDescending,"descending"); + get(pBtnFormats,"formats"); + get(pBtnUserDef,"btnuserdef"); + get(pLbUserDef,"lbuserdef"); + Init(); - FreeResource(); - aLbUserDef.SetAccessibleRelationLabeledBy(&aBtnUserDef); - aLbUserDef.SetAccessibleName(aBtnUserDef.GetText()); + pLbUserDef->SetAccessibleRelationLabeledBy(pBtnUserDef); + pLbUserDef->SetAccessibleName(pBtnUserDef->GetText()); } // ----------------------------------------------------------------------- @@ -508,8 +507,8 @@ void ScTpSubTotalOptions::Init() OSL_ENSURE( pViewData && pDoc, "ViewData oder Document nicht gefunden!" ); - aBtnSort.SetClickHdl ( LINK( this, ScTpSubTotalOptions, CheckHdl ) ); - aBtnUserDef.SetClickHdl ( LINK( this, ScTpSubTotalOptions, CheckHdl ) ); + pBtnSort->SetClickHdl ( LINK( this, ScTpSubTotalOptions, CheckHdl ) ); + pBtnUserDef->SetClickHdl ( LINK( this, ScTpSubTotalOptions, CheckHdl ) ); FillUserSortListBox(); } @@ -526,27 +525,27 @@ SfxTabPage* ScTpSubTotalOptions::Create( Window* pParent, void ScTpSubTotalOptions::Reset( const SfxItemSet& /* rArgSet */ ) { - aBtnPagebreak.Check ( rSubTotalData.bPagebreak ); - aBtnCase.Check ( rSubTotalData.bCaseSens ); - aBtnFormats.Check ( rSubTotalData.bIncludePattern ); - aBtnSort.Check ( rSubTotalData.bDoSort ); - aBtnAscending.Check ( rSubTotalData.bAscending ); - aBtnDescending.Check( !rSubTotalData.bAscending ); + pBtnPagebreak->Check ( rSubTotalData.bPagebreak ); + pBtnCase->Check ( rSubTotalData.bCaseSens ); + pBtnFormats->Check ( rSubTotalData.bIncludePattern ); + pBtnSort->Check ( rSubTotalData.bDoSort ); + pBtnAscending->Check ( rSubTotalData.bAscending ); + pBtnDescending->Check( !rSubTotalData.bAscending ); if ( rSubTotalData.bUserDef ) { - aBtnUserDef.Check( true ); - aLbUserDef.Enable(); - aLbUserDef.SelectEntryPos( rSubTotalData.nUserIndex ); + pBtnUserDef->Check( true ); + pLbUserDef->Enable(); + pLbUserDef->SelectEntryPos( rSubTotalData.nUserIndex ); } else { - aBtnUserDef.Check( false ); - aLbUserDef.Disable(); - aLbUserDef.SelectEntryPos( 0 ); + pBtnUserDef->Check( false ); + pLbUserDef->Disable(); + pLbUserDef->SelectEntryPos( 0 ); } - CheckHdl( &aBtnSort ); + CheckHdl( pBtnSort ); } // ----------------------------------------------------------------------- @@ -563,15 +562,15 @@ sal_Bool ScTpSubTotalOptions::FillItemSet( SfxItemSet& rArgSet ) theSubTotalData = ((const ScSubTotalItem*)pItem)->GetSubTotalData(); } - theSubTotalData.bPagebreak = aBtnPagebreak.IsChecked(); + theSubTotalData.bPagebreak = pBtnPagebreak->IsChecked(); theSubTotalData.bReplace = true; - theSubTotalData.bCaseSens = aBtnCase.IsChecked(); - theSubTotalData.bIncludePattern = aBtnFormats.IsChecked(); - theSubTotalData.bDoSort = aBtnSort.IsChecked(); - theSubTotalData.bAscending = aBtnAscending.IsChecked(); - theSubTotalData.bUserDef = aBtnUserDef.IsChecked(); - theSubTotalData.nUserIndex = (aBtnUserDef.IsChecked()) - ? aLbUserDef.GetSelectEntryPos() + theSubTotalData.bCaseSens = pBtnCase->IsChecked(); + theSubTotalData.bIncludePattern = pBtnFormats->IsChecked(); + theSubTotalData.bDoSort = pBtnSort->IsChecked(); + theSubTotalData.bAscending = pBtnAscending->IsChecked(); + theSubTotalData.bUserDef = pBtnUserDef->IsChecked(); + theSubTotalData.nUserIndex = (pBtnUserDef->IsChecked()) + ? pLbUserDef->GetSelectEntryPos() : 0; rArgSet.Put( ScSubTotalItem( nWhichSubTotals, &theSubTotalData ) ); @@ -585,12 +584,12 @@ void ScTpSubTotalOptions::FillUserSortListBox() { ScUserList* pUserLists = ScGlobal::GetUserList(); - aLbUserDef.Clear(); + pLbUserDef->Clear(); if ( pUserLists ) { size_t nCount = pUserLists->size(); for ( size_t i=0; i<nCount; ++i ) - aLbUserDef.InsertEntry( (*pUserLists)[i]->GetString() ); + pLbUserDef->InsertEntry( (*pUserLists)[i]->GetString() ); } } @@ -599,38 +598,38 @@ void ScTpSubTotalOptions::FillUserSortListBox() IMPL_LINK( ScTpSubTotalOptions, CheckHdl, CheckBox *, pBox ) { - if ( pBox == &aBtnSort ) + if ( pBox == pBtnSort ) { - if ( aBtnSort.IsChecked() ) + if ( pBtnSort->IsChecked() ) { - aFlSort .Enable(); - aBtnFormats .Enable(); - aBtnUserDef .Enable(); - aBtnAscending .Enable(); - aBtnDescending .Enable(); - - if ( aBtnUserDef.IsChecked() ) - aLbUserDef.Enable(); + pFlSort->Enable(); + pBtnFormats->Enable(); + pBtnUserDef->Enable(); + pBtnAscending->Enable(); + pBtnDescending->Enable(); + + if ( pBtnUserDef->IsChecked() ) + pLbUserDef->Enable(); } else { - aFlSort .Disable(); - aBtnFormats .Disable(); - aBtnUserDef .Disable(); - aBtnAscending .Disable(); - aBtnDescending .Disable(); - aLbUserDef .Disable(); + pFlSort->Disable(); + pBtnFormats->Disable(); + pBtnUserDef->Disable(); + pBtnAscending->Disable(); + pBtnDescending->Disable(); + pLbUserDef->Disable(); } } - else if ( pBox == &aBtnUserDef ) + else if ( pBox == pBtnUserDef ) { - if ( aBtnUserDef.IsChecked() ) + if ( pBtnUserDef->IsChecked() ) { - aLbUserDef.Enable(); - aLbUserDef.GrabFocus(); + pLbUserDef->Enable(); + pLbUserDef->GrabFocus(); } else - aLbUserDef.Disable(); + pLbUserDef->Disable(); } return 0; diff --git a/sc/source/ui/inc/subtdlg.hrc b/sc/source/ui/inc/subtdlg.hrc index 8af127b484d9..a5736cc67d61 100644 --- a/sc/source/ui/inc/subtdlg.hrc +++ b/sc/source/ui/inc/subtdlg.hrc @@ -34,17 +34,4 @@ #define LB_FUNCTIONS 14 #define FT_FUNCTIONS 15 -// Options TabPage -#define FL_GROUP 20 -#define BTN_PAGEBREAK 21 -#define BTN_CASE 22 -#define BTN_SORT 23 - -#define FL_SORT 30 -#define BTN_ASCENDING 31 -#define BTN_DESCENDING 32 -#define BTN_FORMATS 33 -#define BTN_USERDEF 34 -#define LB_USERDEF 35 - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index 08c5854b476a..4b6b1f292203 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -147,16 +147,15 @@ public: virtual void Reset ( const SfxItemSet& rArgSet ); private: - FixedLine aFlGroup; - CheckBox aBtnPagebreak; - CheckBox aBtnCase; - CheckBox aBtnSort; - FixedLine aFlSort; - RadioButton aBtnAscending; - RadioButton aBtnDescending; - CheckBox aBtnFormats; - CheckBox aBtnUserDef; - ListBox aLbUserDef; + CheckBox* pBtnPagebreak; + CheckBox* pBtnCase; + CheckBox* pBtnSort; + FixedText* pFlSort; + RadioButton* pBtnAscending; + RadioButton* pBtnDescending; + CheckBox* pBtnFormats; + CheckBox* pBtnUserDef; + ListBox* pLbUserDef; ScViewData* pViewData; ScDocument* pDoc; diff --git a/sc/source/ui/src/subtdlg.src b/sc/source/ui/src/subtdlg.src index 0ed7ee4a01f0..4fa023f10299 100644 --- a/sc/source/ui/src/subtdlg.src +++ b/sc/source/ui/src/subtdlg.src @@ -18,93 +18,6 @@ */ #include "subtdlg.hrc" - -TabPage RID_SCPAGE_SUBT_OPTIONS -{ - HelpId = HID_SCPAGE_SUBT_OPTIONS ; - Pos = MAP_APPFONT ( 0 , 0 ) ; - Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ; - Hide = TRUE ; - FixedLine FL_GROUP - { - Pos = MAP_APPFONT ( 6 , 3 ) ; - Size = MAP_APPFONT ( 248 , 8 ) ; - Text [ en-US ] = "Groups"; - }; - CheckBox BTN_PAGEBREAK - { - HelpID = "sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_PAGEBREAK"; - Pos = MAP_APPFONT ( 12 , 14 ) ; - Size = MAP_APPFONT ( 239 , 10 ) ; - Text [ en-US ] = "~Page break between groups" ; - TabStop = TRUE ; - }; - CheckBox BTN_CASE - { - HelpID = "sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_CASE"; - Pos = MAP_APPFONT ( 12 , 28 ) ; - Size = MAP_APPFONT ( 239 , 10 ) ; - Text [ en-US ] = "~Case sensitive" ; - TabStop = TRUE ; - }; - CheckBox BTN_SORT - { - HelpID = "sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_SORT"; - Pos = MAP_APPFONT ( 12 , 42 ) ; - Size = MAP_APPFONT ( 239 , 10 ) ; - Text [ en-US ] = "Pre-~sort area according to groups" ; - TabStop = TRUE ; - }; - CheckBox BTN_FORMATS - { - HelpID = "sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_FORMATS"; - Pos = MAP_APPFONT ( 12 , 101 ) ; - Size = MAP_APPFONT ( 239 , 10 ) ; - Text [ en-US ] = "I~nclude formats" ; - TabStop = TRUE ; - }; - CheckBox BTN_USERDEF - { - HelpID = "sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_USERDEF"; - Pos = MAP_APPFONT ( 12 , 115 ) ; - Size = MAP_APPFONT ( 239 , 10 ) ; - Text [ en-US ] = "C~ustom sort order" ; - TabStop = TRUE ; - }; - ListBox LB_USERDEF - { - HelpID = "sc:ListBox:RID_SCPAGE_SUBT_OPTIONS:LB_USERDEF"; - Border = TRUE ; - Pos = MAP_APPFONT ( 20 , 127 ) ; - Size = MAP_APPFONT ( 231 , 90 ) ; - TabStop = TRUE ; - DropDown = TRUE ; - }; - RadioButton BTN_ASCENDING - { - HelpID = "sc:RadioButton:RID_SCPAGE_SUBT_OPTIONS:BTN_ASCENDING"; - Pos = MAP_APPFONT ( 12 , 69 ) ; - Size = MAP_APPFONT ( 239 , 10 ) ; - Text [ en-US ] = "~Ascending" ; - TabStop = TRUE ; - }; - RadioButton BTN_DESCENDING - { - HelpID = "sc:RadioButton:RID_SCPAGE_SUBT_OPTIONS:BTN_DESCENDING"; - Pos = MAP_APPFONT ( 12 , 83 ) ; - Size = MAP_APPFONT ( 239 , 10 ) ; - Text [ en-US ] = "D~escending" ; - TabStop = TRUE ; - }; - FixedLine FL_SORT - { - Pos = MAP_APPFONT ( 6 , 58 ) ; - Size = MAP_APPFONT ( 248 , 8 ) ; - Text [ en-US ] = "Sort" ; - }; -}; - - TabPage RID_SUBTBASE { // Die Elemente haben hart vergebene Hilfe-IDs, weil automatisch generierte diff --git a/sc/uiconfig/scalc/ui/subtotaloptionspage.ui b/sc/uiconfig/scalc/ui/subtotaloptionspage.ui new file mode 100644 index 000000000000..5962bc283a2e --- /dev/null +++ b/sc/uiconfig/scalc/ui/subtotaloptionspage.ui @@ -0,0 +1,243 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <!-- interface-requires gtk+ 3.0 --> + <object class="GtkBox" id="SubTotalOptionsPage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <property name="border_width">6</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="hexpand">True</property> + <property name="vexpand">True</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <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">6</property> + <child> + <object class="GtkCheckButton" id="pagebreak"> + <property name="label" translatable="yes">_Page break between groups</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="hexpand">True</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">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="case"> + <property name="label" translatable="yes">_Case sensitive</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="hexpand">True</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="GtkCheckButton" id="sort"> + <property name="label" translatable="yes">Pre-_sort area according to groups</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="hexpand">True</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">2</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">Groups</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="frame2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">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="hexpand">True</property> + <property name="vexpand">True</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkRadioButton" id="ascending"> + <property name="label" translatable="yes">_Ascending</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="hexpand">True</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">descending</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="descending"> + <property name="label" translatable="yes">D_escending</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="hexpand">True</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">ascending</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="GtkCheckButton" id="formats"> + <property name="label" translatable="yes">I_nclude formats</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="hexpand">True</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">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="btnuserdef"> + <property name="label" translatable="yes">C_ustom sort order</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="hexpand">True</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">3</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="lbuserdef"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_left">12</property> + <property name="entry_text_column">0</property> + <property name="id_column">1</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Sort</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> +</interface> |