[Libreoffice-commits] core.git: 3 commits - extras/source sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk
Jan Holesovsky
kendy at suse.cz
Tue Jun 18 03:16:31 PDT 2013
extras/source/glade/libreoffice-catalog.xml.in | 10
sc/UIConfig_scalc.mk | 2
sc/inc/globstr.hrc | 8
sc/source/ui/inc/optdlg.hrc | 20 -
sc/source/ui/inc/tpformula.hxx | 38 -
sc/source/ui/inc/tpusrlst.hxx | 26 -
sc/source/ui/optdlg/tpformula.cxx | 162 +++-----
sc/source/ui/optdlg/tpusrlst.cxx | 312 +++++++--------
sc/source/ui/src/globstr.src | 20 +
sc/source/ui/src/optdlg.src | 270 -------------
sc/uiconfig/scalc/ui/optformula.ui | 497 +++++++++++++++++++++++++
sc/uiconfig/scalc/ui/optsortlists.ui | 231 +++++++++++
12 files changed, 1024 insertions(+), 572 deletions(-)
New commits:
commit 20b274edb5a7c73722b9c644157f0be5d7ccee27
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Jun 17 13:47:38 2013 +0200
Convert Formula tabpage to .ui and adapt code.
Change-Id: I258fd2711764efe7eac8aa30d642e64245288611
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 708203d..4a1797c 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -85,6 +85,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/optcompatibilitypage \
sc/uiconfig/scalc/ui/optdefaultpage \
sc/uiconfig/scalc/ui/optdlg \
+ sc/uiconfig/scalc/ui/optformula \
sc/uiconfig/scalc/ui/optsortlists \
sc/uiconfig/scalc/ui/printeroptions \
sc/uiconfig/scalc/ui/protectsheetdlg \
diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx
index 0b61316..acd554f 100644
--- a/sc/source/ui/inc/tpformula.hxx
+++ b/sc/source/ui/inc/tpformula.hxx
@@ -56,30 +56,20 @@ private:
DECL_LINK( SepEditOnFocusHdl, Edit* );
private:
- FixedLine maFlFormulaOpt;
- FixedText maFtFormulaSyntax;
- ListBox maLbFormulaSyntax;
- CheckBox maCbEnglishFuncName;
-
- FixedLine maFlCustomCalcOpt;
- RadioButton maBtnCustomCalcDefault;
- RadioButton maBtnCustomCalcCustom;
- PushButton maBtnCustomCalcDetails;
-
- FixedLine maFlFormulaSeps;
- FixedText maFtSepFuncArg;
- Edit maEdSepFuncArg;
- FixedText maFtSepArrayCol;
- Edit maEdSepArrayCol;
- FixedText maFtSepArrayRow;
- Edit maEdSepArrayRow;
- PushButton maBtnSepReset;
-
- FixedLine maFlRecalcOptions;
- FixedText maFtOOXMLRecalc;
- ListBox maLbOOXMLRecalcOptions;
- FixedText maFtODFRecalc;
- ListBox maLbODFRecalcOptions;
+ ListBox* mpLbFormulaSyntax;
+ CheckBox* mpCbEnglishFuncName;
+
+ RadioButton* mpBtnCustomCalcDefault;
+ RadioButton* mpBtnCustomCalcCustom;
+ PushButton* mpBtnCustomCalcDetails;
+
+ Edit* mpEdSepFuncArg;
+ Edit* mpEdSepArrayCol;
+ Edit* mpEdSepArrayRow;
+ PushButton* mpBtnSepReset;
+
+ ListBox* mpLbOOXMLRecalcOptions;
+ ListBox* mpLbODFRecalcOptions;
/** Stores old separator value of currently focused separator edit box.
This value is used to revert undesired value change. */
diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx
index 4e30ebd..737ffe8 100644
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -41,54 +41,40 @@ using ::com::sun::star::lang::Locale;
using ::com::sun::star::i18n::LocaleDataItem;
ScTpFormulaOptions::ScTpFormulaOptions(Window* pParent, const SfxItemSet& rCoreAttrs) :
- SfxTabPage(pParent, ScResId(RID_SCPAGE_FORMULA), rCoreAttrs),
-
- maFlFormulaOpt(this, ScResId(FL_FORMULA_OPTIONS)),
- maFtFormulaSyntax(this, ScResId(FT_FORMULA_SYNTAX)),
- maLbFormulaSyntax(this, ScResId(LB_FORMULA_SYNTAX)),
- maCbEnglishFuncName(this, ScResId(CB_ENGLISH_FUNC_NAME)),
-
- maFlCustomCalcOpt(this, ScResId(FL_CUSTOM_CALC_OPTIONS)),
- maBtnCustomCalcDefault(this, ScResId(BTN_CUSTOM_CALC_DEFAULT)),
- maBtnCustomCalcCustom(this, ScResId(BTN_CUSTOM_CALC_CUSTOM)),
- maBtnCustomCalcDetails(this, ScResId(BTN_CUSTOM_CALC_DETAILS)),
-
- maFlFormulaSeps(this, ScResId(FL_FORMULA_SEPS)),
- maFtSepFuncArg(this, ScResId(FT_FORMULA_SEP_ARG)),
- maEdSepFuncArg(this, ScResId(ED_FORMULA_SEP_ARG)),
- maFtSepArrayCol(this, ScResId(FT_FORMULA_SEP_ARRAY_C)),
- maEdSepArrayCol(this, ScResId(ED_FORMULA_SEP_ARRAY_C)),
- maFtSepArrayRow(this, ScResId(FT_FORMULA_SEP_ARRAY_R)),
- maEdSepArrayRow(this, ScResId(ED_FORMULA_SEP_ARRAY_R)),
- maBtnSepReset(this, ScResId(BTN_FORMULA_SEP_RESET)),
- maFlRecalcOptions(this, ScResId(FL_RECALC_OPTIONS)),
- maFtOOXMLRecalc(this, ScResId(FT_OOXML_RECALC)),
- maLbOOXMLRecalcOptions(this, ScResId(LB_OOXML_RECALC)),
- maFtODFRecalc(this, ScResId(FT_ODF_RECALC)),
- maLbODFRecalcOptions(this, ScResId(LB_ODF_RECALC)),
+ SfxTabPage(pParent, "OptFormula", "modules/scalc/ui/optformula.ui", rCoreAttrs),
mnDecSep(0)
{
- maLbFormulaSyntax.InsertEntry(ScResId(SCSTR_FORMULA_SYNTAX_CALC_A1).toString());
- maLbFormulaSyntax.InsertEntry(ScResId(SCSTR_FORMULA_SYNTAX_XL_A1).toString());
- maLbFormulaSyntax.InsertEntry(ScResId(SCSTR_FORMULA_SYNTAX_XL_R1C1).toString());
-
- FreeResource();
+ get(mpLbFormulaSyntax, "formulasyntax");
+ get(mpCbEnglishFuncName, "englishfuncname");
+ get(mpBtnCustomCalcDefault, "calcdefault");
+ get(mpBtnCustomCalcCustom, "calccustom");
+ get(mpBtnCustomCalcDetails, "details");
+ get(mpEdSepFuncArg, "function");
+ get(mpEdSepArrayCol, "arraycolumn");
+ get(mpEdSepArrayRow, "arrayrow");
+ get(mpBtnSepReset, "reset");
+ get(mpLbOOXMLRecalcOptions, "ooxmlrecalc");
+ get(mpLbODFRecalcOptions, "odfrecalc");
+
+ mpLbFormulaSyntax->InsertEntry(ScResId(SCSTR_FORMULA_SYNTAX_CALC_A1).toString());
+ mpLbFormulaSyntax->InsertEntry(ScResId(SCSTR_FORMULA_SYNTAX_XL_A1).toString());
+ mpLbFormulaSyntax->InsertEntry(ScResId(SCSTR_FORMULA_SYNTAX_XL_R1C1).toString());
Link aLink = LINK( this, ScTpFormulaOptions, ButtonHdl );
- maBtnSepReset.SetClickHdl(aLink);
- maBtnCustomCalcDefault.SetClickHdl(aLink);
- maBtnCustomCalcCustom.SetClickHdl(aLink);
- maBtnCustomCalcDetails.SetClickHdl(aLink);
+ mpBtnSepReset->SetClickHdl(aLink);
+ mpBtnCustomCalcDefault->SetClickHdl(aLink);
+ mpBtnCustomCalcCustom->SetClickHdl(aLink);
+ mpBtnCustomCalcDetails->SetClickHdl(aLink);
aLink = LINK( this, ScTpFormulaOptions, SepModifyHdl );
- maEdSepFuncArg.SetModifyHdl(aLink);
- maEdSepArrayCol.SetModifyHdl(aLink);
- maEdSepArrayRow.SetModifyHdl(aLink);
+ mpEdSepFuncArg->SetModifyHdl(aLink);
+ mpEdSepArrayCol->SetModifyHdl(aLink);
+ mpEdSepArrayRow->SetModifyHdl(aLink);
aLink = LINK( this, ScTpFormulaOptions, SepEditOnFocusHdl );
- maEdSepFuncArg.SetGetFocusHdl(aLink);
- maEdSepArrayCol.SetGetFocusHdl(aLink);
- maEdSepArrayRow.SetGetFocusHdl(aLink);
+ mpEdSepFuncArg->SetGetFocusHdl(aLink);
+ mpEdSepArrayCol->SetGetFocusHdl(aLink);
+ mpEdSepArrayRow->SetGetFocusHdl(aLink);
// Get the decimal separator for current locale.
OUString aSep = ScGlobal::GetpLocaleData()->getNumDecimalSep();
@@ -103,9 +89,9 @@ void ScTpFormulaOptions::ResetSeparators()
{
OUString aFuncArg, aArrayCol, aArrayRow;
ScFormulaOptions::GetDefaultFormulaSeparators(aFuncArg, aArrayCol, aArrayRow);
- maEdSepFuncArg.SetText(aFuncArg);
- maEdSepArrayCol.SetText(aArrayCol);
- maEdSepArrayRow.SetText(aArrayRow);
+ mpEdSepFuncArg->SetText(aFuncArg);
+ mpEdSepArrayCol->SetText(aArrayCol);
+ mpEdSepArrayRow->SetText(aArrayRow);
}
void ScTpFormulaOptions::OnFocusSeparatorInput(Edit* pEdit)
@@ -124,15 +110,15 @@ void ScTpFormulaOptions::UpdateCustomCalcRadioButtons(bool bDefault)
{
if (bDefault)
{
- maBtnCustomCalcDefault.Check(true);
- maBtnCustomCalcCustom.Check(false);
- maBtnCustomCalcDetails.Disable();
+ mpBtnCustomCalcDefault->Check(true);
+ mpBtnCustomCalcCustom->Check(false);
+ mpBtnCustomCalcDetails->Disable();
}
else
{
- maBtnCustomCalcDefault.Check(false);
- maBtnCustomCalcCustom.Check(true);
- maBtnCustomCalcDetails.Enable();
+ mpBtnCustomCalcDefault->Check(false);
+ mpBtnCustomCalcCustom->Check(true);
+ mpBtnCustomCalcDetails->Enable();
}
}
@@ -186,8 +172,8 @@ bool ScTpFormulaOptions::IsValidSeparator(const OUString& rSep) const
bool ScTpFormulaOptions::IsValidSeparatorSet() const
{
// Make sure the column and row separators are different.
- String aColStr = maEdSepArrayCol.GetText();
- String aRowStr = maEdSepArrayRow.GetText();
+ String aColStr = mpEdSepArrayCol->GetText();
+ String aRowStr = mpEdSepArrayRow->GetText();
if (aColStr == aRowStr)
return false;
@@ -196,13 +182,13 @@ bool ScTpFormulaOptions::IsValidSeparatorSet() const
IMPL_LINK( ScTpFormulaOptions, ButtonHdl, Button*, pBtn )
{
- if (pBtn == &maBtnSepReset)
+ if (pBtn == mpBtnSepReset)
ResetSeparators();
- else if (pBtn == &maBtnCustomCalcDefault)
+ else if (pBtn == mpBtnCustomCalcDefault)
UpdateCustomCalcRadioButtons(true);
- else if (pBtn == &maBtnCustomCalcCustom)
+ else if (pBtn == mpBtnCustomCalcCustom)
UpdateCustomCalcRadioButtons(false);
- else if (pBtn == &maBtnCustomCalcDetails)
+ else if (pBtn == mpBtnCustomCalcDetails)
LaunchCustomCalcSettings();
return 0;
@@ -245,27 +231,27 @@ sal_Bool ScTpFormulaOptions::FillItemSet(SfxItemSet& rCoreSet)
{
bool bRet = false;
ScFormulaOptions aOpt;
- sal_Bool bEnglishFuncName = maCbEnglishFuncName.IsChecked();
- sal_Int16 aSyntaxPos = maLbFormulaSyntax.GetSelectEntryPos();
- OUString aSep = maEdSepFuncArg.GetText();
- OUString aSepArrayCol = maEdSepArrayCol.GetText();
- OUString aSepArrayRow = maEdSepArrayRow.GetText();
- sal_Int16 nOOXMLRecalcMode = maLbOOXMLRecalcOptions.GetSelectEntryPos();
- sal_Int16 nODFRecalcMode = maLbODFRecalcOptions.GetSelectEntryPos();
-
- if (maBtnCustomCalcDefault.IsChecked())
+ sal_Bool bEnglishFuncName = mpCbEnglishFuncName->IsChecked();
+ sal_Int16 aSyntaxPos = mpLbFormulaSyntax->GetSelectEntryPos();
+ OUString aSep = mpEdSepFuncArg->GetText();
+ OUString aSepArrayCol = mpEdSepArrayCol->GetText();
+ OUString aSepArrayRow = mpEdSepArrayRow->GetText();
+ sal_Int16 nOOXMLRecalcMode = mpLbOOXMLRecalcOptions->GetSelectEntryPos();
+ sal_Int16 nODFRecalcMode = mpLbODFRecalcOptions->GetSelectEntryPos();
+
+ if (mpBtnCustomCalcDefault->IsChecked())
{
// When Default is selected, reset all the calc config settings to default.
maCurrentConfig.reset();
}
- if ( maLbFormulaSyntax.GetSavedValue() != aSyntaxPos
- || maCbEnglishFuncName.GetSavedValue() != bEnglishFuncName
- || static_cast<OUString>(maEdSepFuncArg.GetSavedValue()) != aSep
- || static_cast<OUString>(maEdSepArrayCol.GetSavedValue()) != aSepArrayCol
- || static_cast<OUString>(maEdSepArrayRow.GetSavedValue()) != aSepArrayRow
- || maLbOOXMLRecalcOptions.GetSavedValue() != nOOXMLRecalcMode
- || maLbODFRecalcOptions.GetSavedValue() != nODFRecalcMode
+ if ( mpLbFormulaSyntax->GetSavedValue() != aSyntaxPos
+ || mpCbEnglishFuncName->GetSavedValue() != bEnglishFuncName
+ || static_cast<OUString>(mpEdSepFuncArg->GetSavedValue()) != aSep
+ || static_cast<OUString>(mpEdSepArrayCol->GetSavedValue()) != aSepArrayCol
+ || static_cast<OUString>(mpEdSepArrayRow->GetSavedValue()) != aSepArrayRow
+ || mpLbOOXMLRecalcOptions->GetSavedValue() != nOOXMLRecalcMode
+ || mpLbODFRecalcOptions->GetSavedValue() != nODFRecalcMode
|| maSavedConfig != maCurrentConfig )
{
::formula::FormulaGrammar::Grammar eGram = ::formula::FormulaGrammar::GRAM_DEFAULT;
@@ -315,31 +301,31 @@ void ScTpFormulaOptions::Reset(const SfxItemSet& rCoreSet)
switch (eGram)
{
case ::formula::FormulaGrammar::GRAM_NATIVE:
- maLbFormulaSyntax.SelectEntryPos(0);
+ mpLbFormulaSyntax->SelectEntryPos(0);
break;
case ::formula::FormulaGrammar::GRAM_NATIVE_XL_A1:
- maLbFormulaSyntax.SelectEntryPos(1);
+ mpLbFormulaSyntax->SelectEntryPos(1);
break;
case ::formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1:
- maLbFormulaSyntax.SelectEntryPos(2);
+ mpLbFormulaSyntax->SelectEntryPos(2);
break;
default:
- maLbFormulaSyntax.SelectEntryPos(0);
+ mpLbFormulaSyntax->SelectEntryPos(0);
}
- maLbFormulaSyntax.SaveValue();
+ mpLbFormulaSyntax->SaveValue();
ScRecalcOptions eOOXMLRecalc = aOpt.GetOOXMLRecalcOptions();
- maLbOOXMLRecalcOptions.SelectEntryPos(static_cast<sal_uInt16>(eOOXMLRecalc));
- maLbOOXMLRecalcOptions.SaveValue();
+ mpLbOOXMLRecalcOptions->SelectEntryPos(static_cast<sal_uInt16>(eOOXMLRecalc));
+ mpLbOOXMLRecalcOptions->SaveValue();
ScRecalcOptions eODFRecalc = aOpt.GetODFRecalcOptions();
- maLbODFRecalcOptions.SelectEntryPos(static_cast<sal_uInt16>(eODFRecalc));
- maLbODFRecalcOptions.SaveValue();
+ mpLbODFRecalcOptions->SelectEntryPos(static_cast<sal_uInt16>(eODFRecalc));
+ mpLbODFRecalcOptions->SaveValue();
// english function name.
- maCbEnglishFuncName.Check( aOpt.GetUseEnglishFuncName() );
- maCbEnglishFuncName.SaveValue();
+ mpCbEnglishFuncName->Check( aOpt.GetUseEnglishFuncName() );
+ mpCbEnglishFuncName->SaveValue();
// Separators
OUString aSep = aOpt.GetFormulaSepArg();
@@ -349,13 +335,13 @@ void ScTpFormulaOptions::Reset(const SfxItemSet& rCoreSet)
if (aSep.getLength() == 1 && aSepArrayRow.getLength() == 1 && aSepArrayCol.getLength() == 1)
{
// Each separator must be one character long.
- maEdSepFuncArg.SetText(aSep);
- maEdSepArrayCol.SetText(aSepArrayCol);
- maEdSepArrayRow.SetText(aSepArrayRow);
+ mpEdSepFuncArg->SetText(aSep);
+ mpEdSepArrayCol->SetText(aSepArrayCol);
+ mpEdSepArrayRow->SetText(aSepArrayRow);
- maEdSepFuncArg.SaveValue();
- maEdSepArrayCol.SaveValue();
- maEdSepArrayRow.SaveValue();
+ mpEdSepFuncArg->SaveValue();
+ mpEdSepArrayCol->SaveValue();
+ mpEdSepArrayRow->SaveValue();
}
else
ResetSeparators();
diff --git a/sc/source/ui/src/optdlg.src b/sc/source/ui/src/optdlg.src
index 65e5467..9fc7478 100644
--- a/sc/source/ui/src/optdlg.src
+++ b/sc/source/ui/src/optdlg.src
@@ -18,177 +18,6 @@
*/
#include "optdlg.hrc"
-TabPage RID_SCPAGE_FORMULA
-{
- HelpId = HID_SCPAGE_FORMULA ;
- SVLook = TRUE ;
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-
- FixedLine FL_FORMULA_OPTIONS
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- Text [ en-US ] = "Formula options";
- };
-
- FixedText FT_FORMULA_SYNTAX
- {
- Pos = MAP_APPFONT ( 21, 16 ) ;
- Size = MAP_APPFONT ( 80, 8 ) ;
- Text [ en-US ] = "Formula ~syntax" ;
- };
-
- ListBox LB_FORMULA_SYNTAX
- {
- Border = TRUE ;
- Pos = MAP_APPFONT ( 105, 14 ) ;
- Size = MAP_APPFONT ( 60, 46 ) ;
- DropDown = TRUE ;
- };
-
- CheckBox CB_ENGLISH_FUNC_NAME
- {
- Pos = MAP_APPFONT ( 12, 31 ) ;
- Size = MAP_APPFONT ( 120, 8 ) ;
- Text [ en-US ] = "Use English function names" ;
- };
-
- FixedLine FL_CUSTOM_CALC_OPTIONS
- {
- Pos = MAP_APPFONT ( 6 , 47 ) ;
- Size = MAP_APPFONT ( 140 , 8 ) ;
- Text [ en-US ] = "Detailed calculation settings";
- };
-
- RadioButton BTN_CUSTOM_CALC_DEFAULT
- {
- Pos = MAP_APPFONT ( 21 , 62 ) ;
- Size = MAP_APPFONT ( 60, 14 ) ;
- Text [ en-US ] = "Default";
- };
-
- RadioButton BTN_CUSTOM_CALC_CUSTOM
- {
- Pos = MAP_APPFONT ( 21 , 76 ) ;
- Size = MAP_APPFONT ( 60, 14 ) ;
- Text [ en-US ] = "Custom";
- };
-
- PushButton BTN_CUSTOM_CALC_DETAILS
- {
- Pos = MAP_APPFONT ( 83 , 74 ) ;
- Size = MAP_APPFONT ( 58, 14 ) ;
- Text [ en-US ] = "Details...";
- };
-
- FixedLine FL_FORMULA_SEPS
- {
- Pos = MAP_APPFONT ( 154 , 47 ) ;
- Size = MAP_APPFONT ( 100 , 8 ) ;
- Text [ en-US ] = "Separators";
- };
-
- FixedText FT_FORMULA_SEP_ARG
- {
- Pos = MAP_APPFONT ( 169, 60 );
- Size = MAP_APPFONT ( 60, 8 );
- Text [ en-US ] = "~Function";
- };
-
- Edit ED_FORMULA_SEP_ARG
- {
- Border = TRUE;
- Pos = MAP_APPFONT ( 233, 58 );
- Size = MAP_APPFONT ( 10, 12 );
- };
-
- FixedText FT_FORMULA_SEP_ARRAY_C
- {
- Pos = MAP_APPFONT ( 169, 78 );
- Size = MAP_APPFONT ( 60, 8 );
- Text [ en-US ] = "Array co~lumn";
- };
-
- Edit ED_FORMULA_SEP_ARRAY_C
- {
- Border = TRUE;
- Pos = MAP_APPFONT ( 233, 76 );
- Size = MAP_APPFONT ( 10, 12 );
- };
-
- FixedText FT_FORMULA_SEP_ARRAY_R
- {
- Pos = MAP_APPFONT ( 169, 96 );
- Size = MAP_APPFONT ( 60, 8 );
- Text [ en-US ] = "Array ~row";
- };
-
- Edit ED_FORMULA_SEP_ARRAY_R
- {
- Border = TRUE;
- Pos = MAP_APPFONT ( 233, 94 );
- Size = MAP_APPFONT ( 10, 12 );
- };
-
- PushButton BTN_FORMULA_SEP_RESET
- {
- Pos = MAP_APPFONT ( 169, 114 );
- Size = MAP_APPFONT ( 50, 14 );
- Text [ en-US ] = "Rese~t";
- };
-
- FixedLine FL_RECALC_OPTIONS
- {
- Pos = MAP_APPFONT ( 6, 132 );
- Size = MAP_APPFONT( 248, 8 );
- Text [ en-US ] = "Recalculation on file load";
- };
-
- FixedText FT_OOXML_RECALC
- {
- Pos = MAP_APPFONT ( 21, 149 );
- Size = MAP_APPFONT ( 120, 8 );
- Text [ en-US ] = "Excel 2007 and newer";
- };
-
- ListBox LB_OOXML_RECALC
- {
- Pos = MAP_APPFONT( 151, 147 );
- Size = MAP_APPFONT( 80, 50 );
- Border = TRUE;
- DropDown = TRUE;
- StringList [ en-US ] =
- {
- "Always recalculate";
- "Never recalculate";
- "Prompt user";
- };
- };
-
- FixedText FT_ODF_RECALC
- {
- Pos = MAP_APPFONT ( 21, 165 );
- Size = MAP_APPFONT ( 120, 8 );
- Text [ en-US ] = "ODF Spreadsheet (not saved by %PRODUCTNAME)";
- };
-
- ListBox LB_ODF_RECALC
- {
- Pos = MAP_APPFONT( 151, 163 );
- Size = MAP_APPFONT( 80, 50 );
- Border = TRUE;
- DropDown = TRUE;
- StringList [ en-US ] =
- {
- "Always recalculate";
- "Never recalculate";
- "Prompt user";
- };
- };
-};
-
TabPage RID_SCPAGE_CONTENT
{
HelpId = HID_SCPAGE_CONTENT ;
diff --git a/sc/uiconfig/scalc/ui/optformula.ui b/sc/uiconfig/scalc/ui/optformula.ui
new file mode 100644
index 0000000..743ef34
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/optformula.ui
@@ -0,0 +1,497 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkBox" id="OptFormula">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkBox" id="box3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkBox" id="box4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="formulasyntaxlabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Formula _syntax:</property>
+ <property name="use_underline">True</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="formulasyntax">
+ <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="GtkCheckButton" id="englishfuncname">
+ <property name="label" translatable="yes">Use English function names</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">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">Formula options</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="GtkBox" id="box2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkBox" id="box5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkRadioButton" id="calcdefault">
+ <property name="label" translatable="yes">Default</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkRadioButton" id="calccustom">
+ <property name="label" translatable="yes">Custom</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">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="details">
+ <property name="label" translatable="yes">Details...</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">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">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">Detailed calculation settings</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="frame3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkBox" id="box7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Function</property>
+ <property name="use_underline">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="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Array co_lumn</property>
+ <property name="use_underline">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="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Array _row</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="GtkEntry" id="function">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="invisible_char_set">True</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="GtkEntry" id="arraycolumn">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="invisible_char_set">True</property>
+ </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>
+ <child>
+ <object class="GtkEntry" id="arrayrow">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â—</property>
+ <property name="invisible_char_set">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</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">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="reset">
+ <property name="label" translatable="yes">Rese_t</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="halign">center</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Separators</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>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Excel 2007 and newer</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="label10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">ODF Spreadsheet (not saved by %PRODUCTNAME)</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="GtkComboBoxText" id="ooxmlrecalc">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ <items>
+ <item translatable="yes">Always recalculate</item>
+ <item translatable="yes">Never recalculate</item>
+ <item translatable="yes">Prompt user</item>
+ </items>
+ </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="GtkComboBoxText" id="odfrecalc">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ <items>
+ <item translatable="yes">Always recalculate</item>
+ <item translatable="yes">Never recalculate</item>
+ <item translatable="yes">Prompt user</item>
+ </items>
+ </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>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Recalculation on file load</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">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="lower">1</property>
+ <property name="upper">32000</property>
+ <property name="value">1</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+</interface>
commit 24ae770205eef6f0dd2dd86f6723f049004bfc9b
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Jun 17 12:51:08 2013 +0200
Convert Sort lists tabpage to .ui and adapt code.
Change-Id: I6251d764385ce76deb79606dcada9842544867b2
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 4c36b57..708203d 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -85,6 +85,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/optcompatibilitypage \
sc/uiconfig/scalc/ui/optdefaultpage \
sc/uiconfig/scalc/ui/optdlg \
+ sc/uiconfig/scalc/ui/optsortlists \
sc/uiconfig/scalc/ui/printeroptions \
sc/uiconfig/scalc/ui/protectsheetdlg \
sc/uiconfig/scalc/ui/rightfooterdialog \
diff --git a/sc/inc/globstr.hrc b/sc/inc/globstr.hrc
index 7dc6cd6..41b6c47 100644
--- a/sc/inc/globstr.hrc
+++ b/sc/inc/globstr.hrc
@@ -673,7 +673,13 @@
#define STR_FUN_TEXT_SELECTION_COUNT 546
-#define STR_COUNT 547
+#define STR_DISMISS 547
+#define STR_QUERYREMOVE 548
+#define STR_COPYLIST 549
+#define STR_COPYFROM 550
+#define STR_COPYERR 551
+
+#define STR_COUNT 552
#endif
diff --git a/sc/source/ui/inc/optdlg.hrc b/sc/source/ui/inc/optdlg.hrc
index d815de1..7b0d234 100644
--- a/sc/source/ui/inc/optdlg.hrc
+++ b/sc/source/ui/inc/optdlg.hrc
@@ -37,26 +37,6 @@
#define BTN_NULLVALS 21
#define BTN_NOTES 22
-
-// TP_USERLISTS:
-#define FT_LISTS 1
-#define LB_LISTS 1
-#define FT_ENTRIES 2
-#define ED_ENTRIES 2
-#define FT_COPYFROM 3
-#define ED_COPYFROM 3
-#define BTN_NEW 1
-#define BTN_ADD 2
-#define BTN_REMOVE 3
-#define BTN_COPY 4
-#define STR_QUERYREMOVE 5
-#define STR_DISMISS 6
-#define STR_COPYLIST 7
-#define STR_COPYFROM 8
-#define STR_COPYERR 9
-
-// TP_PRINT:
-
// TP_LCONTENT
#define GB_DISPLAY 20
diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx
index e40af4a..331c1a40 100644
--- a/sc/source/ui/inc/tpusrlst.hxx
+++ b/sc/source/ui/inc/tpusrlst.hxx
@@ -23,7 +23,7 @@
#include <sfx2/tabdlg.hxx>
#include <vcl/fixed.hxx>
#include <vcl/lstbox.hxx>
-#include <svtools/svmedit.hxx>
+#include <vcl/vclmedit.hxx>
//========================================================================
@@ -48,19 +48,19 @@ private:
~ScTpUserLists();
private:
- FixedText aFtLists;
- ListBox aLbLists;
- FixedText aFtEntries;
- MultiLineEdit aEdEntries;
- FixedText aFtCopyFrom;
- Edit aEdCopyFrom;
- PushButton aBtnNew;
- PushButton aBtnAdd;
- PushButton aBtnRemove;
- PushButton aBtnCopy;
+ FixedText* mpFtLists;
+ ListBox* mpLbLists;
+ FixedText* mpFtEntries;
+ VclMultiLineEdit* mpEdEntries;
+ FixedText* mpFtCopyFrom;
+ Edit* mpEdCopyFrom;
+ PushButton* mpBtnNew;
+ PushButton* mpBtnAdd;
+ PushButton* mpBtnRemove;
+ PushButton* mpBtnCopy;
const String aStrQueryRemove;
- const String aStrNew;
+ String aStrNew;
const String aStrCancel;
const String aStrAdd;
const String aStrModify;
@@ -97,7 +97,7 @@ private:
// Handler:
DECL_LINK( LbSelectHdl, ListBox* );
DECL_LINK( BtnClickHdl, PushButton* );
- DECL_LINK( EdEntriesModHdl, MultiLineEdit* );
+ DECL_LINK( EdEntriesModHdl, VclMultiLineEdit* );
#endif
};
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index 35675b5..b0e92ca 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -55,26 +55,15 @@ ScTpUserLists::ScTpUserLists( Window* pParent,
const SfxItemSet& rCoreAttrs )
: SfxTabPage ( pParent,
- ScResId( RID_SCPAGE_USERLISTS ),
+ "OptSortLists", "modules/scalc/ui/optsortlists.ui",
rCoreAttrs ),
- aFtLists ( this, ScResId( FT_LISTS ) ),
- aLbLists ( this, ScResId( LB_LISTS ) ),
- aFtEntries ( this, ScResId( FT_ENTRIES ) ),
- aEdEntries ( this, ScResId( ED_ENTRIES ) ),
- aFtCopyFrom ( this, ScResId( FT_COPYFROM ) ),
- aEdCopyFrom ( this, ScResId( ED_COPYFROM ) ),
- aBtnNew ( this, ScResId( BTN_NEW ) ),
- aBtnAdd ( this, ScResId( BTN_ADD ) ),
- aBtnRemove ( this, ScResId( BTN_REMOVE ) ),
- aBtnCopy ( this, ScResId( BTN_COPY ) ),
- aStrQueryRemove ( ScResId( STR_QUERYREMOVE ) ),
- aStrNew ( aBtnNew.GetText() ),
- aStrCancel ( ScResId( STR_DISMISS ) ),
+ aStrQueryRemove ( ScGlobal::GetRscString( STR_QUERYREMOVE ) ),
+ aStrCancel ( ScGlobal::GetRscString( STR_DISMISS ) ),
aStrAdd ( ScResId( SCSTR_ADD ) ),
aStrModify ( ScResId( SCSTR_MODIFY ) ),
- aStrCopyList ( ScResId( STR_COPYLIST ) ),
- aStrCopyFrom ( ScResId( STR_COPYFROM ) ),
- aStrCopyErr ( ScResId( STR_COPYERR ) ),
+ aStrCopyList ( ScGlobal::GetRscString( STR_COPYLIST ) ),
+ aStrCopyFrom ( ScGlobal::GetRscString( STR_COPYFROM ) ),
+ aStrCopyErr ( ScGlobal::GetRscString( STR_COPYERR ) ),
nWhichUserLists ( GetWhich( SID_SCUSERLISTS ) ),
pUserLists ( NULL ),
pDoc ( NULL ),
@@ -85,10 +74,22 @@ ScTpUserLists::ScTpUserLists( Window* pParent,
bCopyDone ( false ),
nCancelPos ( 0 )
{
+ get(mpFtLists, "listslabel");
+ get(mpLbLists, "lists");
+ get(mpFtEntries, "entrieslabel");
+ get(mpEdEntries, "entries");
+ get(mpFtCopyFrom, "copyfromlabel");
+ get(mpEdCopyFrom, "copyfrom");
+ get(mpBtnNew, "new");
+ get(mpBtnAdd, "add");
+ get(mpBtnRemove, "delete");
+ get(mpBtnCopy, "copy");
+
+ aStrNew = mpBtnNew->GetText();
+
SetExchangeSupport();
Init();
Reset(rCoreAttrs);
- FreeResource();
}
// -----------------------------------------------------------------------
@@ -106,13 +107,12 @@ void ScTpUserLists::Init()
SfxViewShell* pSh = SfxViewShell::Current();
ScTabViewShell* pViewSh = PTR_CAST(ScTabViewShell, pSh);
- aLbLists.SetSelectHdl ( LINK( this, ScTpUserLists, LbSelectHdl ) );
- aBtnNew.SetClickHdl ( LINK( this, ScTpUserLists, BtnClickHdl ) );
- aBtnNew.SetClickHdl ( LINK( this, ScTpUserLists, BtnClickHdl ) );
- aBtnAdd.SetClickHdl ( LINK( this, ScTpUserLists, BtnClickHdl ) );
- aBtnRemove.SetClickHdl ( LINK( this, ScTpUserLists, BtnClickHdl ) );
- aEdEntries.SetModifyHdl ( LINK( this, ScTpUserLists, EdEntriesModHdl ) );
-
+ mpLbLists->SetSelectHdl ( LINK( this, ScTpUserLists, LbSelectHdl ) );
+ mpBtnNew->SetClickHdl ( LINK( this, ScTpUserLists, BtnClickHdl ) );
+ mpBtnNew->SetClickHdl ( LINK( this, ScTpUserLists, BtnClickHdl ) );
+ mpBtnAdd->SetClickHdl ( LINK( this, ScTpUserLists, BtnClickHdl ) );
+ mpBtnRemove->SetClickHdl ( LINK( this, ScTpUserLists, BtnClickHdl ) );
+ mpEdEntries->SetModifyHdl ( LINK( this, ScTpUserLists, EdEntriesModHdl ) );
if ( pViewSh )
{
@@ -136,14 +136,14 @@ void ScTpUserLists::Init()
ScRange( nStartCol, nStartRow, nStartTab, nEndCol, nEndRow, nEndTab
).Format( aStrSelectedArea, SCR_ABS_3D, pDoc );
- aBtnCopy.SetClickHdl ( LINK( this, ScTpUserLists, BtnClickHdl ) );
- aBtnCopy.Enable();
+ mpBtnCopy->SetClickHdl ( LINK( this, ScTpUserLists, BtnClickHdl ) );
+ mpBtnCopy->Enable();
}
else
{
- aBtnCopy.Disable();
- aFtCopyFrom.Disable();
- aEdCopyFrom.Disable();
+ mpBtnCopy->Disable();
+ mpFtCopyFrom->Disable();
+ mpEdCopyFrom->Disable();
}
}
@@ -174,33 +174,33 @@ void ScTpUserLists::Reset( const SfxItemSet& rCoreAttrs )
if ( UpdateUserListBox() > 0 )
{
- aLbLists.SelectEntryPos( 0 );
+ mpLbLists->SelectEntryPos( 0 );
UpdateEntries( 0 );
}
}
else if ( !pUserLists )
pUserLists = new ScUserList;
- aEdCopyFrom.SetText( aStrSelectedArea );
+ mpEdCopyFrom->SetText( aStrSelectedArea );
- if ( aLbLists.GetEntryCount() == 0 )
+ if ( mpLbLists->GetEntryCount() == 0 )
{
- aFtLists .Disable();
- aLbLists .Disable();
- aFtEntries .Disable();
- aEdEntries .Disable();
- aBtnRemove .Disable();
+ mpFtLists->Disable();
+ mpLbLists->Disable();
+ mpFtEntries->Disable();
+ mpEdEntries->Disable();
+ mpBtnRemove->Disable();
}
- aBtnNew.SetText( aStrNew );
- aBtnAdd.SetText( aStrAdd );
- aBtnAdd.Disable();
+ mpBtnNew->SetText( aStrNew );
+ mpBtnAdd->SetText( aStrAdd );
+ mpBtnAdd->Disable();
if ( !bCopyDone && pViewData )
{
- aFtCopyFrom .Enable();
- aEdCopyFrom .Enable();
- aBtnCopy .Enable();
+ mpFtCopyFrom->Enable();
+ mpEdCopyFrom->Enable();
+ mpBtnCopy->Enable();
}
}
@@ -212,7 +212,7 @@ sal_Bool ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs )
// -> Click auf Add-Button simulieren
if ( bModifyMode || bCancelMode )
- BtnClickHdl( &aBtnAdd );
+ BtnClickHdl( mpBtnAdd );
const ScUserListItem& rUserListItem = (const ScUserListItem&)
GetItemSet().Get( nWhichUserLists );
@@ -259,7 +259,7 @@ int ScTpUserLists::DeactivatePage( SfxItemSet* pSetP )
sal_uInt16 ScTpUserLists::UpdateUserListBox()
{
- aLbLists.Clear();
+ mpLbLists->Clear();
if ( !pUserLists ) return 0;
@@ -272,7 +272,7 @@ sal_uInt16 ScTpUserLists::UpdateUserListBox()
{
aEntry = (*pUserLists)[i]->GetString();
OSL_ENSURE( aEntry.Len() > 0, "Empty UserList-entry :-/" );
- aLbLists.InsertEntry( aEntry );
+ mpLbLists->InsertEntry( aEntry );
}
return nCount;
@@ -299,7 +299,7 @@ void ScTpUserLists::UpdateEntries( size_t nList )
aEntryListStr += String(pList->GetSubStr(i));
}
- aEdEntries.SetText(convertLineEnd(aEntryListStr, GetSystemLineEnd()));
+ mpEdEntries->SetText(convertLineEnd(aEntryListStr, GetSystemLineEnd()));
}
else
{
@@ -485,15 +485,15 @@ void ScTpUserLists::RemoveList( size_t nList )
IMPL_LINK( ScTpUserLists, LbSelectHdl, ListBox*, pLb )
{
- if ( pLb == &aLbLists )
+ if ( pLb == mpLbLists )
{
- sal_uInt16 nSelPos = aLbLists.GetSelectEntryPos();
+ sal_uInt16 nSelPos = mpLbLists->GetSelectEntryPos();
if ( nSelPos != LISTBOX_ENTRY_NOTFOUND )
{
- if ( !aFtEntries.IsEnabled() ) aFtEntries.Enable();
- if ( !aEdEntries.IsEnabled() ) aEdEntries.Enable();
- if ( !aBtnRemove.IsEnabled() ) aBtnRemove.Enable();
- if ( aBtnAdd.IsEnabled() ) aBtnAdd.Disable();
+ if ( !mpFtEntries->IsEnabled() ) mpFtEntries->Enable();
+ if ( !mpEdEntries->IsEnabled() ) mpEdEntries->Enable();
+ if ( !mpBtnRemove->IsEnabled() ) mpBtnRemove->Enable();
+ if ( mpBtnAdd->IsEnabled() ) mpBtnAdd->Disable();
UpdateEntries( nSelPos );
}
@@ -506,64 +506,64 @@ IMPL_LINK( ScTpUserLists, LbSelectHdl, ListBox*, pLb )
IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
{
- if ( pBtn == &aBtnNew )
+ if ( pBtn == mpBtnNew )
{
if ( !bCancelMode )
{
- nCancelPos = ( aLbLists.GetEntryCount() > 0 )
- ? aLbLists.GetSelectEntryPos()
+ nCancelPos = ( mpLbLists->GetEntryCount() > 0 )
+ ? mpLbLists->GetSelectEntryPos()
: 0;
- aLbLists.SetNoSelection();
- aFtLists.Disable();
- aLbLists.Disable();
- aFtEntries.Enable();
- aEdEntries.Enable();
- aEdEntries.SetText( EMPTY_STRING );
- aEdEntries.GrabFocus();
- aBtnAdd.Disable();
- aBtnRemove.Disable();
+ mpLbLists->SetNoSelection();
+ mpFtLists->Disable();
+ mpLbLists->Disable();
+ mpFtEntries->Enable();
+ mpEdEntries->Enable();
+ mpEdEntries->SetText( EMPTY_STRING );
+ mpEdEntries->GrabFocus();
+ mpBtnAdd->Disable();
+ mpBtnRemove->Disable();
//-----------------------------
- if ( aBtnCopy.IsEnabled() )
+ if ( mpBtnCopy->IsEnabled() )
{
- aBtnCopy.Disable();
- aFtCopyFrom.Disable();
- aEdCopyFrom.Disable();
+ mpBtnCopy->Disable();
+ mpFtCopyFrom->Disable();
+ mpEdCopyFrom->Disable();
}
- aBtnNew.SetText( aStrCancel );
+ mpBtnNew->SetText( aStrCancel );
bCancelMode = sal_True;
}
else // if ( bCancelMode )
{
- if ( aLbLists.GetEntryCount() > 0 )
+ if ( mpLbLists->GetEntryCount() > 0 )
{
- aLbLists.SelectEntryPos( nCancelPos );
- LbSelectHdl( &aLbLists );
- aFtLists.Enable();
- aLbLists.Enable();
+ mpLbLists->SelectEntryPos( nCancelPos );
+ LbSelectHdl( mpLbLists );
+ mpFtLists->Enable();
+ mpLbLists->Enable();
}
else
{
- aFtEntries.Disable();
- aEdEntries.Disable();
- aEdEntries.SetText( EMPTY_STRING );
- aBtnRemove.Disable();
+ mpFtEntries->Disable();
+ mpEdEntries->Disable();
+ mpEdEntries->SetText( EMPTY_STRING );
+ mpBtnRemove->Disable();
}
- aBtnAdd.Disable();
+ mpBtnAdd->Disable();
//-----------------------------
if ( pViewData && !bCopyDone )
{
- aBtnCopy.Enable();
- aFtCopyFrom.Enable();
- aEdCopyFrom.Enable();
+ mpBtnCopy->Enable();
+ mpFtCopyFrom->Enable();
+ mpEdCopyFrom->Enable();
}
- aBtnNew.SetText( aStrNew );
+ mpBtnNew->SetText( aStrNew );
bCancelMode = false;
bModifyMode = false;
}
}
- else if ( pBtn == &aBtnAdd )
+ else if ( pBtn == mpBtnAdd )
{
- String theEntriesStr( aEdEntries.GetText() );
+ String theEntriesStr( mpEdEntries->GetText() );
if ( !bModifyMode )
{
@@ -571,30 +571,30 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
{
AddNewList( theEntriesStr );
UpdateUserListBox();
- aLbLists.SelectEntryPos( aLbLists.GetEntryCount()-1 );
- LbSelectHdl( &aLbLists );
- aFtLists.Enable();
- aLbLists.Enable();
+ mpLbLists->SelectEntryPos( mpLbLists->GetEntryCount()-1 );
+ LbSelectHdl( mpLbLists );
+ mpFtLists->Enable();
+ mpLbLists->Enable();
}
else
{
- if ( aLbLists.GetEntryCount() > 0 )
+ if ( mpLbLists->GetEntryCount() > 0 )
{
- aLbLists.SelectEntryPos( nCancelPos );
- LbSelectHdl( &aLbLists );
- aLbLists.Enable();
- aLbLists.Enable();
+ mpLbLists->SelectEntryPos( nCancelPos );
+ LbSelectHdl( mpLbLists );
+ mpLbLists->Enable();
+ mpLbLists->Enable();
}
}
- aBtnAdd.Disable();
- aBtnRemove.Enable();
- aBtnNew.SetText( aStrNew );
+ mpBtnAdd->Disable();
+ mpBtnRemove->Enable();
+ mpBtnNew->SetText( aStrNew );
bCancelMode = false;
}
else // if ( bModifyMode )
{
- sal_uInt16 nSelList = aLbLists.GetSelectEntryPos();
+ sal_uInt16 nSelList = mpLbLists->GetSelectEntryPos();
OSL_ENSURE( nSelList != LISTBOX_ENTRY_NOTFOUND, "Modify without List :-/" );
@@ -602,37 +602,37 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
{
ModifyList( nSelList, theEntriesStr );
UpdateUserListBox();
- aLbLists.SelectEntryPos( nSelList );
+ mpLbLists->SelectEntryPos( nSelList );
}
else
{
- aLbLists.SelectEntryPos( 0 );
- LbSelectHdl( &aLbLists );
+ mpLbLists->SelectEntryPos( 0 );
+ LbSelectHdl( mpLbLists );
}
- aBtnNew.SetText( aStrNew ); bCancelMode = false;
- aBtnAdd.SetText( aStrAdd ); bModifyMode = false;
- aBtnAdd.Disable();
- aBtnRemove.Enable();
- aFtLists.Enable();
- aLbLists.Enable();
+ mpBtnNew->SetText( aStrNew ); bCancelMode = false;
+ mpBtnAdd->SetText( aStrAdd ); bModifyMode = false;
+ mpBtnAdd->Disable();
+ mpBtnRemove->Enable();
+ mpFtLists->Enable();
+ mpLbLists->Enable();
}
if ( pViewData && !bCopyDone )
{
- aBtnCopy.Enable();
- aFtCopyFrom.Enable();
- aEdCopyFrom.Enable();
+ mpBtnCopy->Enable();
+ mpFtCopyFrom->Enable();
+ mpEdCopyFrom->Enable();
}
}
- else if ( pBtn == &aBtnRemove )
+ else if ( pBtn == mpBtnRemove )
{
- if ( aLbLists.GetEntryCount() > 0 )
+ if ( mpLbLists->GetEntryCount() > 0 )
{
- sal_uInt16 nRemovePos = aLbLists.GetSelectEntryPos();
+ sal_uInt16 nRemovePos = mpLbLists->GetSelectEntryPos();
String aMsg ( aStrQueryRemove.GetToken( 0, '#' ) );
- aMsg += aLbLists.GetEntry( nRemovePos );
+ aMsg += mpLbLists->GetEntry( nRemovePos );
aMsg += aStrQueryRemove.GetToken( 1, '#' );
@@ -644,34 +644,34 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
RemoveList( nRemovePos );
UpdateUserListBox();
- if ( aLbLists.GetEntryCount() > 0 )
+ if ( mpLbLists->GetEntryCount() > 0 )
{
- aLbLists.SelectEntryPos(
- ( nRemovePos >= aLbLists.GetEntryCount() )
- ? aLbLists.GetEntryCount()-1
+ mpLbLists->SelectEntryPos(
+ ( nRemovePos >= mpLbLists->GetEntryCount() )
+ ? mpLbLists->GetEntryCount()-1
: nRemovePos );
- LbSelectHdl( &aLbLists );
+ LbSelectHdl( mpLbLists );
}
else
{
- aFtLists.Disable();
- aLbLists.Disable();
- aFtEntries.Disable();
- aEdEntries.Disable();
- aEdEntries.SetText( EMPTY_STRING );
- aBtnRemove.Disable();
+ mpFtLists->Disable();
+ mpLbLists->Disable();
+ mpFtEntries->Disable();
+ mpEdEntries->Disable();
+ mpEdEntries->SetText( EMPTY_STRING );
+ mpBtnRemove->Disable();
}
}
- if ( pViewData && !bCopyDone && !aBtnCopy.IsEnabled() )
+ if ( pViewData && !bCopyDone && !mpBtnCopy->IsEnabled() )
{
- aBtnCopy.Enable();
- aFtCopyFrom.Enable();
- aEdCopyFrom.Enable();
+ mpBtnCopy->Enable();
+ mpFtCopyFrom->Enable();
+ mpEdCopyFrom->Enable();
}
}
}
- else if ( pViewData && (pBtn == &aBtnCopy) )
+ else if ( pViewData && (pBtn == mpBtnCopy) )
{
if ( bCopyDone )
return 0;
@@ -680,7 +680,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
ScRefAddress theStartPos;
ScRefAddress theEndPos;
- String theAreaStr( aEdCopyFrom.GetText() );
+ String theAreaStr( mpEdCopyFrom->GetText() );
sal_Bool bAreaOk = false;
if ( theAreaStr.Len() > 0 )
@@ -708,20 +708,20 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
{
CopyListFromArea( theStartPos, theEndPos );
UpdateUserListBox();
- aLbLists.SelectEntryPos( aLbLists.GetEntryCount()-1 );
- LbSelectHdl( &aLbLists );
- aEdCopyFrom .SetText( theAreaStr );
- aEdCopyFrom .Disable();
- aBtnCopy .Disable();
- aFtCopyFrom .Disable();
+ mpLbLists->SelectEntryPos( mpLbLists->GetEntryCount()-1 );
+ LbSelectHdl( mpLbLists );
+ mpEdCopyFrom->SetText( theAreaStr );
+ mpEdCopyFrom->Disable();
+ mpBtnCopy->Disable();
+ mpFtCopyFrom->Disable();
}
else
{
ErrorBox( this, WinBits( WB_OK | WB_DEF_OK ),
ScGlobal::GetRscString( STR_INVALID_TABREF )
).Execute();
- aEdCopyFrom.GrabFocus();
- aEdCopyFrom.SetSelection( Selection( 0, SELECTION_MAX ) );
+ mpEdCopyFrom->GrabFocus();
+ mpEdCopyFrom->SetSelection( Selection( 0, SELECTION_MAX ) );
}
}
@@ -730,39 +730,39 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn )
// -----------------------------------------------------------------------
-IMPL_LINK( ScTpUserLists, EdEntriesModHdl, MultiLineEdit*, pEd )
+IMPL_LINK( ScTpUserLists, EdEntriesModHdl, VclMultiLineEdit*, pEd )
{
- if ( pEd != &aEdEntries )
+ if ( pEd != mpEdEntries )
return 0;
//-----------------------------------------------------------
- if ( aBtnCopy.IsEnabled() )
+ if ( mpBtnCopy->IsEnabled() )
{
- aBtnCopy .Disable();
- aFtCopyFrom .Disable();
- aEdCopyFrom .Disable();
+ mpBtnCopy->Disable();
+ mpFtCopyFrom->Disable();
+ mpEdCopyFrom->Disable();
}
- if ( !aEdEntries.GetText().isEmpty() )
+ if ( !mpEdEntries->GetText().isEmpty() )
{
if ( !bCancelMode && !bModifyMode )
{
- aBtnNew.SetText( aStrCancel ); bCancelMode = sal_True;
- aBtnAdd.SetText( aStrModify ); bModifyMode = sal_True;
- aBtnAdd.Enable();
- aBtnRemove.Disable();
- aFtLists.Disable();
- aLbLists.Disable();
+ mpBtnNew->SetText( aStrCancel ); bCancelMode = sal_True;
+ mpBtnAdd->SetText( aStrModify ); bModifyMode = sal_True;
+ mpBtnAdd->Enable();
+ mpBtnRemove->Disable();
+ mpFtLists->Disable();
+ mpLbLists->Disable();
}
else // if ( bCancelMode || bModifyMode )
{
- if ( !aBtnAdd.IsEnabled() ) aBtnAdd.Enable();
+ if ( !mpBtnAdd->IsEnabled() ) mpBtnAdd->Enable();
}
}
else
{
- if ( aBtnAdd.IsEnabled() ) aBtnAdd.Disable();
+ if ( mpBtnAdd->IsEnabled() ) mpBtnAdd->Disable();
}
return 0;
diff --git a/sc/source/ui/src/globstr.src b/sc/source/ui/src/globstr.src
index b9ffd2a..759d295 100644
--- a/sc/source/ui/src/globstr.src
+++ b/sc/source/ui/src/globstr.src
@@ -2065,6 +2065,26 @@ Resource RID_GLOBSTR
{
Text [ en-US ] = "Invalid condition." ;
};
+ String STR_DISMISS
+ {
+ Text [ en-US ] = "~Discard" ;
+ };
+ String STR_QUERYREMOVE
+ {
+ Text [ en-US ] = "Should the entry\n#\nbe deleted?" ;
+ };
+ String STR_COPYLIST
+ {
+ Text [ en-US ] = "Copy List" ;
+ };
+ String STR_COPYFROM
+ {
+ Text [ en-US ] = "List from" ;
+ };
+ String STR_COPYERR
+ {
+ Text [ en-US ] = "Cells without text have been ignored." ;
+ };
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/src/optdlg.src b/sc/source/ui/src/optdlg.src
index 16fe5b9..65e5467 100644
--- a/sc/source/ui/src/optdlg.src
+++ b/sc/source/ui/src/optdlg.src
@@ -189,105 +189,6 @@ TabPage RID_SCPAGE_FORMULA
};
};
-TabPage RID_SCPAGE_USERLISTS
-{
- HelpId = HID_SCPAGE_USERLISTS ;
- SVLook = TRUE ;
- Hide = TRUE ;
- Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
- FixedText FT_LISTS
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 93 , 8 ) ;
- Text [ en-US ] = "~Lists" ;
- };
- ListBox LB_LISTS
- {
- HelpID = "sc:ListBox:RID_SCPAGE_USERLISTS:LB_LISTS";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 6 , 15 ) ;
- Size = MAP_APPFONT ( 93 , 148 ) ;
- };
- FixedText FT_ENTRIES
- {
- Pos = MAP_APPFONT ( 105 , 3 ) ;
- Size = MAP_APPFONT ( 93 , 8 ) ;
- Text [ en-US ] = "~Entries" ;
- };
- MultiLineEdit ED_ENTRIES
- {
- HelpID = "sc:MultiLineEdit:RID_SCPAGE_USERLISTS:ED_ENTRIES";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 105 , 15 ) ;
- Size = MAP_APPFONT ( 93 , 148 ) ;
- VScroll = TRUE ;
- IgnoreTab = TRUE ;
- };
- Edit ED_COPYFROM
- {
- HelpID = "sc:Edit:RID_SCPAGE_USERLISTS:ED_COPYFROM";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 70 , 167 ) ;
- Size = MAP_APPFONT ( 128 , 12 ) ;
- };
- FixedText FT_COPYFROM
- {
- Pos = MAP_APPFONT ( 6 , 168 ) ;
- Size = MAP_APPFONT ( 62 , 8 ) ;
- Text [ en-US ] = "Copy list ~from" ;
- };
- PushButton BTN_NEW
- {
- HelpID = "sc:PushButton:RID_SCPAGE_USERLISTS:BTN_NEW";
- Pos = MAP_APPFONT ( 204 , 15 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "~New" ;
- };
- PushButton BTN_ADD
- {
- HelpID = "sc:PushButton:RID_SCPAGE_USERLISTS:BTN_ADD";
- Pos = MAP_APPFONT ( 204 , 36 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "~Add" ;
- Disable = TRUE ;
- };
- PushButton BTN_REMOVE
- {
- HelpID = "sc:PushButton:RID_SCPAGE_USERLISTS:BTN_REMOVE";
- Pos = MAP_APPFONT ( 204 , 54 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "~Delete" ;
- };
- PushButton BTN_COPY
- {
- HelpID = "sc:PushButton:RID_SCPAGE_USERLISTS:BTN_COPY";
- Pos = MAP_APPFONT ( 204 , 166 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- Text [ en-US ] = "~Copy" ;
- };
- String STR_DISMISS
- {
- Text [ en-US ] = "~Discard" ;
- };
- String STR_QUERYREMOVE
- {
- Text [ en-US ] = "Should the entry\n#\nbe deleted?" ;
- };
- String STR_COPYLIST
- {
- Text [ en-US ] = "Copy List" ;
- };
- String STR_COPYFROM
- {
- Text [ en-US ] = "List from" ;
- };
- String STR_COPYERR
- {
- Text [ en-US ] = "Cells without text have been ignored." ;
- };
-};
-
TabPage RID_SCPAGE_CONTENT
{
HelpId = HID_SCPAGE_CONTENT ;
diff --git a/sc/uiconfig/scalc/ui/optsortlists.ui b/sc/uiconfig/scalc/ui/optsortlists.ui
new file mode 100644
index 0000000..ce603c9
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/optsortlists.ui
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="lower">1</property>
+ <property name="upper">32000</property>
+ <property name="value">1</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkBox" id="OptSortLists">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="orientation">vertical</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">12</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkButton" id="new">
+ <property name="label" translatable="yes">_New</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">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="add">
+ <property name="label" translatable="yes">_Add</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">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="delete">
+ <property name="label" translatable="yes">_Delete</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </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="GtkButton" id="copy">
+ <property name="label" translatable="yes">_Copy</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ </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>
+ <child>
+ <object class="GtkBox" id="box2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="copyfromlabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Copy list _from:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">copyfrom</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="copyfrom">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">â—</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </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="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>
+ <property name="column_spacing">12</property>
+ <property name="column_homogeneous">True</property>
+ <child>
+ <object class="GtkLabel" id="listslabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Lists</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">lists</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="entrieslabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Entries</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">entries</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="GtkTextView" id="entries">
+ <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">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTreeView" id="lists">
+ <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="treeview-selection1"/>
+ </child>
+ </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>
+ </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>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+</interface>
commit dd11bf883b49ca38de44c5cd7f888678a418c0a1
Author: Jan Holesovsky <kendy at suse.cz>
Date: Mon Jun 17 10:29:29 2013 +0200
Catalog widgets for sidebar custom widgets.
Change-Id: I073fe30127fcf0b97656198f55197d9533f44f55
diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in
index 145b71c..768f155 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -39,6 +39,9 @@
<glade-widget-class title="Font Name ListBox" name="svtlo-FontNameBox"
generic-name="Font name ListBox" parent="GtkComboBox"
icon-name="widget-gtk-combobox"/>
+ <glade-widget-class title="Sidebar Font Name ListBox" name="svxlo-SvxSBFontNameBox"
+ generic-name="Sidebar Font name ListBox" parent="GtkComboBox"
+ icon-name="widget-gtk-combobox"/>
<glade-widget-class title="Font Size ListBox" name="svtlo-FontSizeBox"
generic-name="Font Size ListBox" parent="GtkComboBox"
icon-name="widget-gtk-combobox"/>
@@ -183,6 +186,9 @@
<glade-widget-class title="Dial Control" name="svxlo-DialControl"
generic-name="Dial Control" parent="GtkSpinner"
icon-name="widget-gtk-spinner"/>
+ <glade-widget-class title="Sidebar Dial Control" name="svxlo-SidebarDialControl"
+ generic-name="Sidebar Dial Control" parent="GtkSpinner"
+ icon-name="widget-gtk-spinner"/>
<glade-widget-class title="Wrap Field" name="svxlo-WrapField"
generic-name="Wrap Field" parent="GtkSpinButton"
icon-name="widget-gtk-spinbutton"/>
@@ -263,5 +269,9 @@
generic-name="Open Document Button" parent="GtkButton"
icon-name="widget-gtk-button"/>
+ <glade-widget-class title="Sidebar ToolBox" name="sfxlo-SidebarToolBox"
+ generic-name="Sidebar ToolBox" parent="GtkToolbar"
+ icon-name="widget-gtk-toolbar"/>
+
</glade-widget-classes>
</glade-catalog>
More information about the Libreoffice-commits
mailing list