Skip to content

C
core
Kaydet (Commit) 151cc01f authored tarafından Katarina Behrens's avatar Katarina Behrens
Dosyalara gözat
Seçenekler

Converted subtotals group tab page to .ui 

+ translated some German comments :P

Change-Id: I2e3aa8bbdb1fc39c963ed5c59ef4511dce0044f9
üst 4256491f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 180 additions and 90 deletions
sc/UIConfig_scalc.mk
Dosyayı görüntüle @ 151cc01f
...@@ -133,6 +133,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\ ...@@ -133,6 +133,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/sortoptionspage \ sc/uiconfig/scalc/ui/sortoptionspage \
sc/uiconfig/scalc/ui/sortwarning \ sc/uiconfig/scalc/ui/sortwarning \
sc/uiconfig/scalc/ui/subtotaloptionspage \ sc/uiconfig/scalc/ui/subtotaloptionspage \
sc/uiconfig/scalc/ui/subtotalgrppage \
sc/uiconfig/scalc/ui/statisticsinfopage \ sc/uiconfig/scalc/ui/statisticsinfopage \
sc/uiconfig/scalc/ui/textimportoptions \ sc/uiconfig/scalc/ui/textimportoptions \
sc/uiconfig/scalc/ui/textimportcsv \ sc/uiconfig/scalc/ui/textimportcsv \
......
sc/source/ui/dbgui/tpsubt.cxx
Dosyayı görüntüle @ 151cc01f
This diff is collapsed.
sc/source/ui/inc/tpsubt.hxx
Dosyayı görüntüle @ 151cc01f
...@@ -39,7 +39,7 @@ struct ScSubTotalParam; ...@@ -39,7 +39,7 @@ struct ScSubTotalParam;
class ScTpSubTotalGroup : public SfxTabPage class ScTpSubTotalGroup : public SfxTabPage
{ {
protected: protected:
ScTpSubTotalGroup( Window* pParent, sal_uInt16 nResId, ScTpSubTotalGroup( Window* pParent,
const SfxItemSet& rArgSet ); const SfxItemSet& rArgSet );
public: public:
...@@ -50,12 +50,9 @@ public: ...@@ -50,12 +50,9 @@ public:
bool DoFillItemSet ( sal_uInt16 nGroupNo, bool DoFillItemSet ( sal_uInt16 nGroupNo,
SfxItemSet& rArgSet ); SfxItemSet& rArgSet );
protected: protected:
FixedText aFtGroup; ListBox* mpLbGroup;
ListBox aLbGroup; SvxCheckListBox* mpLbColumns;
FixedText aFtColumns; ListBox* mpLbFunctions;
SvxCheckListBox aLbColumns;
FixedText aFtFunctions;
ListBox aLbFunctions;
const OUString aStrNone; const OUString aStrNone;
const OUString aStrColumn; const OUString aStrColumn;
......
sc/source/ui/src/subtdlg.src
Dosyayı görüntüle @ 151cc01f
...@@ -18,89 +18,6 @@ ...@@ -18,89 +18,6 @@
*/ */
#include "subtdlg.hrc" #include "subtdlg.hrc"
TabPage RID_SUBTBASE
{
// Die Elemente haben hart vergebene Hilfe-IDs, weil automatisch generierte
// aus den Ableitungen nicht in der HID-Liste auftauchen wuerden
HelpId = HID_SCPAGE_SUBT_GROUP ;
Pos = MAP_APPFONT ( 0 , 0 ) ;
Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
Hide = TRUE ;
FixedText FT_GROUP
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( 121 , 8 ) ;
Text [ en-US ] = "~Group by" ;
};
ListBox LB_GROUP
{
HelpId = HID_SC_SUBT_GROUP ;
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 14 ) ;
Size = MAP_APPFONT ( 121 , 90 ) ;
TabStop = TRUE ;
DropDown = TRUE ;
};
FixedText FT_COLUMNS
{
Pos = MAP_APPFONT ( 6 , 32 ) ;
Size = MAP_APPFONT ( 121 , 8 ) ;
Text [ en-US ] = "~Calculate subtotals for" ;
};
Control WND_COLUMNS
{
HelpId = HID_SC_SUBT_COLS ;
Border = TRUE ;
Pos = MAP_APPFONT ( 6 , 43 ) ;
Size = MAP_APPFONT ( 121 , 136 ) ;
TabStop = TRUE ;
};
FixedText FT_FUNCTIONS
{
Pos = MAP_APPFONT ( 133 , 32 ) ;
Size = MAP_APPFONT ( 121 , 8 ) ;
Text [ en-US ] = "Use ~function" ;
};
ListBox LB_FUNCTIONS
{
HelpId = HID_SC_SUBT_FUNC ;
Border = TRUE ;
Pos = MAP_APPFONT ( 133 , 43 ) ;
Size = MAP_APPFONT ( 121 , 136 ) ;
TabStop = TRUE ;
StringList [ en-US ] =
{
< "Sum" ; Default ; > ;
< "Count" ; Default ; > ;
< "Average" ; Default ; > ;
< "Max" ; Default ; > ;
< "Min" ; Default ; > ;
< "Product" ; Default ; > ;
< "Count (numbers only)" ; Default ; > ;
< "StDev (Sample)" ; Default ; > ;
< "StDevP (Population)" ; Default ; > ;
< "Var (Sample)" ; Default ; > ;
< "VarP (Population)" ; Default ; > ;
};
};
};
// "Control" braucht immer eigene HelpId - ansonsten aus RID_SUBTBASE kopiert
TabPage RID_SCPAGE_SUBT_GROUP1 < RID_SUBTBASE
{
HelpId = HID_SCPAGE_SUBT_GROUP1 ;
};
TabPage RID_SCPAGE_SUBT_GROUP2 < RID_SUBTBASE
{
HelpId = HID_SCPAGE_SUBT_GROUP2 ;
};
TabPage RID_SCPAGE_SUBT_GROUP3 < RID_SUBTBASE
{
HelpId = HID_SCPAGE_SUBT_GROUP3 ;
};
TabDialog RID_SCDLG_SUBTOTALS TabDialog RID_SCDLG_SUBTOTALS
{ {
......
sc/uiconfig/scalc/ui/subtotalgrppage.ui 0 → 100644
Dosyayı görüntüle @ 151cc01f
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkListStore" id="liststore1">
<columns>
<!-- column-name gchararray1 -->
<column type="gchararray"/>
</columns>
<data>
<row>
<col id="0" translatable="yes">Sum</col>
</row>
<row>
<col id="0" translatable="yes">Count</col>
</row>
<row>
<col id="0" translatable="yes">Average</col>
</row>
<row>
<col id="0" translatable="yes">Max</col>
</row>
<row>
<col id="0" translatable="yes">Min</col>
</row>
<row>
<col id="0" translatable="yes">Count (numbers only)</col>
</row>
<row>
<col id="0" translatable="yes">StDev (Sample)</col>
</row>
<row>
<col id="0" translatable="yes">StDevP (Population)</col>
</row>
<row>
<col id="0" translatable="yes">Var (Sample)</col>
</row>
<row>
<col id="0" translatable="yes">VarP (Sample)</col>
</row>
</data>
</object>
<object class="GtkBox" id="SubTotalGrpPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="border_width">6</property>
<property name="spacing">12</property>
<child>
<object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Group by:</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="group_by">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</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">6</property>
<property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Calculate subtotals for:</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="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Use function:</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>
<child>
<object class="svxcorelo-SvxCheckListBox" id="columns">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">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="GtkTreeView" id="functions">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="model">liststore1</property>
<property name="search_column">0</property>
<items>
<item translatable="yes">Sum</item>
<item translatable="yes">Count</item>
<item translatable="yes">Average</item>
<item translatable="yes">Max</item>
<item translatable="yes">Min</item>
<item translatable="yes">Product</item>
<item translatable="yes">Count (numbers only)</item>
<item translatable="yes">StDev (Sample)</item>
<item translatable="yes">StDevP (Population)</item>
<item translatable="yes">Var (Sample)</item>
<item translatable="yes">VarP (Population)</item>
</items>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection2"/>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">1</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>
</interface>
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