[Libreoffice-commits] core.git: sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk
Manal Alhassoun
malhassoun at kacst.edu.sa
Wed Jul 24 09:00:34 PDT 2013
sc/UIConfig_scalc.mk | 1
sc/inc/sc.hrc | 1
sc/inc/scabstdlg.hxx | 3
sc/source/ui/attrdlg/scdlgfact.cxx | 16 -
sc/source/ui/attrdlg/scdlgfact.hxx | 3
sc/source/ui/inc/filldlg.hxx | 56 +--
sc/source/ui/inc/miscdlgs.hrc | 21 -
sc/source/ui/miscdlgs/filldlg.cxx | 209 ++++++-------
sc/source/ui/src/miscdlgs.src | 197 ------------
sc/source/ui/view/cellsh1.cxx | 3
sc/uiconfig/scalc/ui/filldlg.ui | 576 +++++++++++++++++++++++++++++++++++++
11 files changed, 705 insertions(+), 381 deletions(-)
New commits:
commit e9d6d410893ec8baa9decbfe810bf914e1008ea0
Author: Manal Alhassoun <malhassoun at kacst.edu.sa>
Date: Mon Jul 22 13:16:36 2013 +0300
Convert Fill Series to Widget UI
Change-Id: I42d2adcb36e863c5da09ca2e2230b0f30d85a795
Reviewed-on: https://gerrit.libreoffice.org/5022
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 208f97c..5a10ddf 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -70,6 +70,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/deletecontents \
sc/uiconfig/scalc/ui/descriptivestatisticsdialog \
sc/uiconfig/scalc/ui/externaldata \
+ sc/uiconfig/scalc/ui/filldlg \
sc/uiconfig/scalc/ui/footerdialog \
sc/uiconfig/scalc/ui/formatcellsdialog \
sc/uiconfig/scalc/ui/formulacalculationoptions \
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 5b0ec00..6df1a87 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -985,7 +985,6 @@
#define RID_SCDLG_STRINPUT (SC_DIALOGS_START + 16)
#define RID_SCDLG_MTRINPUT (SC_DIALOGS_START + 17)
#define RID_SCDLG_SELENTRY (SC_DIALOGS_START + 18)
-#define RID_SCDLG_FILLSERIES (SC_DIALOGS_START + 19)
#define RID_SCDLG_AUTOFORMAT (SC_DIALOGS_START + 20)
#define RID_SCDLG_NAMES (SC_DIALOGS_START + 22)
#define RID_SCDLG_DBNAMES (SC_DIALOGS_START + 23)
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index a1966f5..738865f 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -381,8 +381,7 @@ public:
String aStartStr,
double fStep,
double fMax,
- sal_uInt16 nPossDir,
- int nId) = 0;
+ sal_uInt16 nPossDir) = 0;
virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( Window* pParent, //add for ScGroupDlg
bool bUnGroup = false,
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index fe7dd50..3cecf6f 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -834,22 +834,10 @@ AbstractScFillSeriesDlg* ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg( Wi
String aStartStr,
double fStep,
double fMax,
- sal_uInt16 nPossDir,
- int nId)
+ sal_uInt16 nPossDir)
{
- ScFillSeriesDlg * pDlg=NULL;
- switch ( nId )
- {
- case RID_SCDLG_FILLSERIES :
- pDlg = new ScFillSeriesDlg( pParent, rDocument,eFillDir, eFillCmd,eFillDateCmd, aStartStr,fStep,fMax,nPossDir);
- break;
- default:
- break;
- }
-
- if ( pDlg )
+ ScFillSeriesDlg * pDlg = new ScFillSeriesDlg( pParent, rDocument,eFillDir, eFillCmd,eFillDateCmd, aStartStr,fStep,fMax,nPossDir);
return new AbstractScFillSeriesDlg_Impl( pDlg );
- return 0;
}
AbstractScGroupDlg* ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg( Window* pParent,
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index 349d518..d2155db 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -449,8 +449,7 @@ public:
String aStartStr,
double fStep,
double fMax,
- sal_uInt16 nPossDir,
- int nId);
+ sal_uInt16 nPossDir);
virtual AbstractScGroupDlg * CreateAbstractScGroupDlg( Window* pParent, //add for ScGroupDlg
bool bUnGroup = false,
bool bRows = true);
diff --git a/sc/source/ui/inc/filldlg.hxx b/sc/source/ui/inc/filldlg.hxx
index 9329c7e..7fcd1b0 100644
--- a/sc/source/ui/inc/filldlg.hxx
+++ b/sc/source/ui/inc/filldlg.hxx
@@ -54,43 +54,37 @@ public:
double GetStep() const { return fIncrement; }
double GetMax() const { return fEndVal; }
- OUString GetStartStr() const { return aEdStartVal.GetText(); }
+ OUString GetStartStr() const { return m_pEdStartVal->GetText(); }
void SetEdStartValEnabled(bool bFlag = false);
private:
- FixedText aFtStartVal;
- Edit aEdStartVal;
+ FixedText* m_pFtStartVal;
+ Edit* m_pEdStartVal;
const OUString aStartStrVal;
- FixedText aFtEndVal;
- Edit aEdEndVal;
-
- FixedText aFtIncrement;
- Edit aEdIncrement;
- FixedLine aFlDirection;
- RadioButton aBtnDown;
- RadioButton aBtnRight;
- RadioButton aBtnUp;
- RadioButton aBtnLeft;
-
- FixedLine aFlSep1;
- FixedLine aFlType;
- RadioButton aBtnArithmetic;
- RadioButton aBtnGeometric;
- RadioButton aBtnDate;
- RadioButton aBtnAutoFill;
-
- FixedLine aFlSep2;
- FixedLine aFlTimeUnit;
- RadioButton aBtnDay;
- RadioButton aBtnDayOfWeek;
- RadioButton aBtnMonth;
- RadioButton aBtnYear;
-
- OKButton aBtnOk;
- CancelButton aBtnCancel;
- HelpButton aBtnHelp;
+ FixedText* m_pFtEndVal;
+ Edit* m_pEdEndVal;
+
+ FixedText* m_pFtIncrement;
+ Edit* m_pEdIncrement;
+ RadioButton* m_pBtnDown;
+ RadioButton* m_pBtnRight;
+ RadioButton* m_pBtnUp;
+ RadioButton* m_pBtnLeft;
+
+ RadioButton* m_pBtnArithmetic;
+ RadioButton* m_pBtnGeometric;
+ RadioButton* m_pBtnDate;
+ RadioButton* m_pBtnAutoFill;
+
+ FixedText* m_pFtTimeUnit;
+ RadioButton* m_pBtnDay;
+ RadioButton* m_pBtnDayOfWeek;
+ RadioButton* m_pBtnMonth;
+ RadioButton* m_pBtnYear;
+
+ OKButton* m_pBtnOk;
const OUString aErrMsgInvalidVal;
diff --git a/sc/source/ui/inc/miscdlgs.hrc b/sc/source/ui/inc/miscdlgs.hrc
index 8bb4816..ff0b8ad 100644
--- a/sc/source/ui/inc/miscdlgs.hrc
+++ b/sc/source/ui/inc/miscdlgs.hrc
@@ -76,28 +76,7 @@
#define LB_ENTRYLIST 11
// Row fillers
-#define FL_DIRECTION 1
-#define BTN_LEFT 2
-#define BTN_RIGHT 3
-#define BTN_TOP 4
-#define BTN_BOTTOM 5
-#define FL_TYPE 11
-#define BTN_ARITHMETIC 12
-#define BTN_GEOMETRIC 13
-#define BTN_DATE 14
-#define BTN_AUTOFILL 15
-#define FL_TIME_UNIT 21
-#define BTN_DAY 22
-#define BTN_DAY_OF_WEEK 23
-#define BTN_MONTH 24
-#define BTN_YEAR 25
-#define FT_INCREMENT 30
-#define ED_INCREMENT 39
-#define FT_END_VALUE 40
-#define ED_END_VALUES 49
#define STR_VALERR 50
-#define FT_START_VALUE 51
-#define ED_START_VALUES 52
// Auto format
#define LB_FORMAT 1
diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx
index f174afd..1e275fe 100644
--- a/sc/source/ui/miscdlgs/filldlg.cxx
+++ b/sc/source/ui/miscdlgs/filldlg.cxx
@@ -52,40 +52,8 @@ ScFillSeriesDlg::ScFillSeriesDlg( Window* pParent,
double fStep,
double fMax,
sal_uInt16 nPossDir )
-
- : ModalDialog ( pParent, ScResId( RID_SCDLG_FILLSERIES ) ),
-
- aFtStartVal ( this, ScResId( FT_START_VALUE ) ),
- aEdStartVal ( this, ScResId( ED_START_VALUES ) ),
+ : ModalDialog(pParent, "FillSeriesDialog", "modules/scalc/ui/filldlg.ui"),
aStartStrVal ( aStartStr),
-
- aFtEndVal ( this, ScResId( FT_END_VALUE ) ),
- aEdEndVal ( this, ScResId( ED_END_VALUES ) ),
-
- aFtIncrement ( this, ScResId( FT_INCREMENT ) ),
- aEdIncrement ( this, ScResId( ED_INCREMENT ) ),
-
- aFlDirection ( this, ScResId( FL_DIRECTION ) ),
- aBtnDown ( this, ScResId( BTN_BOTTOM ) ),
- aBtnRight ( this, ScResId( BTN_RIGHT ) ),
- aBtnUp ( this, ScResId( BTN_TOP ) ),
- aBtnLeft ( this, ScResId( BTN_LEFT ) ),
- aFlSep1 ( this, ScResId( FL_SEP1 ) ),
- aFlType ( this, ScResId( FL_TYPE ) ),
- aBtnArithmetic ( this, ScResId( BTN_ARITHMETIC ) ),
- aBtnGeometric ( this, ScResId( BTN_GEOMETRIC ) ),
- aBtnDate ( this, ScResId( BTN_DATE ) ),
- aBtnAutoFill ( this, ScResId( BTN_AUTOFILL ) ),
- aFlSep2 ( this, ScResId( FL_SEP2 ) ),
- aFlTimeUnit ( this, ScResId( FL_TIME_UNIT ) ),
- aBtnDay ( this, ScResId( BTN_DAY ) ),
- aBtnDayOfWeek ( this, ScResId( BTN_DAY_OF_WEEK ) ),
- aBtnMonth ( this, ScResId( BTN_MONTH ) ),
- aBtnYear ( this, ScResId( BTN_YEAR ) ),
-
- aBtnOk ( this, ScResId( BTN_OK ) ),
- aBtnCancel ( this, ScResId( BTN_CANCEL ) ),
- aBtnHelp ( this, ScResId( BTN_HELP ) ),
aErrMsgInvalidVal( SC_RESSTR(STR_VALERR) ),
rDoc ( rDocument ),
theFillDir ( eFillDir ),
@@ -94,8 +62,28 @@ ScFillSeriesDlg::ScFillSeriesDlg( Window* pParent,
fIncrement ( fStep ),
fEndVal ( fMax )
{
+ get(m_pFtStartVal, "startL");
+ get(m_pEdStartVal, "startValue");
+ get(m_pFtEndVal, "endL");
+ get(m_pEdEndVal, "endValue");
+ get(m_pFtIncrement, "incrementL");
+ get(m_pEdIncrement, "increment");
+ get(m_pBtnDown, "down");
+ get(m_pBtnRight, "right");
+ get(m_pBtnUp, "up");
+ get(m_pBtnLeft, "left");
+ get(m_pBtnArithmetic, "linear");
+ get(m_pBtnGeometric, "growth");
+ get(m_pBtnDate, "date");
+ get(m_pBtnAutoFill, "autofill");
+ get(m_pFtTimeUnit, "tuL");
+ get(m_pBtnDay, "day");
+ get(m_pBtnDayOfWeek, "week");
+ get(m_pBtnMonth, "month");
+ get(m_pBtnYear, "year");
+ get(m_pBtnOk, "ok");
+
Init( nPossDir );
- FreeResource();
}
@@ -112,13 +100,13 @@ void ScFillSeriesDlg::SetEdStartValEnabled(bool bFlag)
bStartValFlag=bFlag;
if(bFlag)
{
- aFtStartVal.Enable();
- aEdStartVal.Enable();
+ m_pFtStartVal->Enable();
+ m_pEdStartVal->Enable();
}
else
{
- aFtStartVal.Disable();
- aEdStartVal.Disable();
+ m_pFtStartVal->Disable();
+ m_pEdStartVal->Disable();
}
}
@@ -126,38 +114,38 @@ void ScFillSeriesDlg::SetEdStartValEnabled(bool bFlag)
void ScFillSeriesDlg::Init( sal_uInt16 nPossDir )
{
- aBtnOk.SetClickHdl ( LINK( this, ScFillSeriesDlg, OKHdl ) );
- aBtnArithmetic.SetClickHdl ( LINK( this, ScFillSeriesDlg, DisableHdl ) );
- aBtnGeometric.SetClickHdl ( LINK( this, ScFillSeriesDlg, DisableHdl ) );
- aBtnDate.SetClickHdl ( LINK( this, ScFillSeriesDlg, DisableHdl ) );
- aBtnAutoFill.SetClickHdl ( LINK( this, ScFillSeriesDlg, DisableHdl ) );
+ m_pBtnOk->SetClickHdl ( LINK( this, ScFillSeriesDlg, OKHdl ) );
+ m_pBtnArithmetic->SetClickHdl ( LINK( this, ScFillSeriesDlg, DisableHdl ) );
+ m_pBtnGeometric->SetClickHdl ( LINK( this, ScFillSeriesDlg, DisableHdl ) );
+ m_pBtnDate->SetClickHdl ( LINK( this, ScFillSeriesDlg, DisableHdl ) );
+ m_pBtnAutoFill->SetClickHdl ( LINK( this, ScFillSeriesDlg, DisableHdl ) );
if( nPossDir == FDS_OPT_NONE )
{
- aBtnLeft.Disable();
- aBtnRight.Disable();
- aBtnDown.Disable();
- aBtnUp.Disable();
+ m_pBtnLeft->Disable();
+ m_pBtnRight->Disable();
+ m_pBtnDown->Disable();
+ m_pBtnUp->Disable();
}
if( nPossDir == FDS_OPT_HORZ )
{
- aBtnDown.Disable();
- aBtnUp.Disable();
+ m_pBtnDown->Disable();
+ m_pBtnUp->Disable();
}
if( nPossDir == FDS_OPT_VERT )
{
- aBtnLeft.Disable();
- aBtnRight.Disable();
+ m_pBtnLeft->Disable();
+ m_pBtnRight->Disable();
}
switch ( theFillDir )
{
- case FILL_TO_LEFT: aBtnLeft.Check(); break;
- case FILL_TO_RIGHT: aBtnRight.Check(); break;
- case FILL_TO_BOTTOM: aBtnDown.Check(); break;
- case FILL_TO_TOP: aBtnUp.Check(); break;
+ case FILL_TO_LEFT: m_pBtnLeft->Check(); break;
+ case FILL_TO_RIGHT: m_pBtnRight->Check(); break;
+ case FILL_TO_BOTTOM: m_pBtnDown->Check(); break;
+ case FILL_TO_TOP: m_pBtnUp->Check(); break;
default:
break;
}
@@ -165,20 +153,20 @@ void ScFillSeriesDlg::Init( sal_uInt16 nPossDir )
switch ( theFillCmd )
{
case FILL_LINEAR:
- aBtnArithmetic.Check();
- DisableHdl( &aBtnArithmetic );
+ m_pBtnArithmetic->Check();
+ DisableHdl( m_pBtnArithmetic );
break;
case FILL_GROWTH:
- aBtnGeometric.Check();
- DisableHdl( &aBtnGeometric );
+ m_pBtnGeometric->Check();
+ DisableHdl( m_pBtnGeometric );
break;
case FILL_DATE:
- aBtnDate.Check();
- DisableHdl( &aBtnDate );
+ m_pBtnDate->Check();
+ DisableHdl( m_pBtnDate );
break;
case FILL_AUTO:
- aBtnAutoFill.Check();
- DisableHdl( &aBtnAutoFill );
+ m_pBtnAutoFill->Check();
+ DisableHdl( m_pBtnAutoFill );
break;
default:
break;
@@ -186,31 +174,28 @@ void ScFillSeriesDlg::Init( sal_uInt16 nPossDir )
switch ( theFillDateCmd )
{
- case FILL_DAY: aBtnDay.Check(); break;
- case FILL_WEEKDAY: aBtnDayOfWeek.Check(); break;
- case FILL_MONTH: aBtnMonth.Check(); break;
- case FILL_YEAR: aBtnYear.Check(); break;
+ case FILL_DAY: m_pBtnDay->Check(); break;
+ case FILL_WEEKDAY: m_pBtnDayOfWeek->Check(); break;
+ case FILL_MONTH: m_pBtnMonth->Check(); break;
+ case FILL_YEAR: m_pBtnYear->Check(); break;
default:
break;
}
fStartVal = MAXDOUBLE;
- aEdStartVal.SetText( aStartStrVal);
+ m_pEdStartVal->SetText( aStartStrVal);
OUString aIncrTxt;
rDoc.GetFormatTable()->GetInputLineString( fIncrement, 0, aIncrTxt );
- aEdIncrement.SetText( aIncrTxt );
+ m_pEdIncrement->SetText( aIncrTxt );
OUString aEndTxt;
if ( fEndVal != MAXDOUBLE )
rDoc.GetFormatTable()->GetInputLineString( fEndVal, 0, aEndTxt );
- aEdEndVal.SetText( aEndTxt );
+ m_pEdEndVal->SetText( aEndTxt );
bStartValFlag = false;
-
- aFlSep1.SetStyle( aFlSep1.GetStyle() | WB_VERT );
- aFlSep2.SetStyle( aFlSep2.GetStyle() | WB_VERT );
}
@@ -219,9 +204,9 @@ void ScFillSeriesDlg::Init( sal_uInt16 nPossDir )
bool ScFillSeriesDlg::CheckStartVal()
{
bool bValOk = false;
- OUString aStr = aEdStartVal.GetText();
+ OUString aStr = m_pEdStartVal->GetText();
- if ( aStr.isEmpty() || aBtnAutoFill.IsChecked())
+ if ( aStr.isEmpty() || m_pBtnAutoFill->IsChecked())
{
fStartVal = MAXDOUBLE;
bValOk = true;
@@ -240,7 +225,7 @@ bool ScFillSeriesDlg::CheckStartVal()
bool ScFillSeriesDlg::CheckIncrementVal()
{
sal_uInt32 nKey = 0;
- OUString aStr = aEdIncrement.GetText();
+ OUString aStr = m_pEdIncrement->GetText();
return rDoc.GetFormatTable()->IsNumberFormat( aStr, nKey, fIncrement );
}
@@ -251,7 +236,7 @@ bool ScFillSeriesDlg::CheckIncrementVal()
bool ScFillSeriesDlg::CheckEndVal()
{
bool bValOk = false;
- OUString aStr = aEdEndVal.GetText();
+ OUString aStr = m_pEdEndVal->GetText();
if (aStr.isEmpty())
{
@@ -273,36 +258,36 @@ bool ScFillSeriesDlg::CheckEndVal()
IMPL_LINK( ScFillSeriesDlg, DisableHdl, Button *, pBtn )
{
- if ( pBtn == &aBtnDate )
+ if ( pBtn == m_pBtnDate )
{
- aBtnDay.Enable();
- aBtnDayOfWeek.Enable();
- aBtnMonth.Enable();
- aBtnYear.Enable();
- aFlTimeUnit.Enable();
+ m_pBtnDay->Enable();
+ m_pBtnDayOfWeek->Enable();
+ m_pBtnMonth->Enable();
+ m_pBtnYear->Enable();
+ m_pFtTimeUnit->Enable();
}
else
{
- aBtnDay.Disable();
- aBtnDayOfWeek.Disable();
- aBtnMonth.Disable();
- aBtnYear.Disable();
- aFlTimeUnit.Disable();
+ m_pBtnDay->Disable();
+ m_pBtnDayOfWeek->Disable();
+ m_pBtnMonth->Disable();
+ m_pBtnYear->Disable();
+ m_pFtTimeUnit->Disable();
}
- if ( pBtn != &aBtnAutoFill )
+ if ( pBtn != m_pBtnAutoFill )
{
- aFtIncrement.Enable();
- aEdIncrement.Enable();
- aFtEndVal.Enable();
- aEdEndVal.Enable();
+ m_pFtIncrement->Enable();
+ m_pEdIncrement->Enable();
+ m_pFtEndVal->Enable();
+ m_pEdEndVal->Enable();
}
else
{
- aFtIncrement.Disable();
- aEdIncrement.Disable();
- aFtEndVal.Disable();
- aEdEndVal.Disable();
+ m_pFtIncrement->Disable();
+ m_pEdIncrement->Disable();
+ m_pFtEndVal->Disable();
+ m_pEdEndVal->Disable();
}
return 0;
}
@@ -312,37 +297,37 @@ IMPL_LINK( ScFillSeriesDlg, DisableHdl, Button *, pBtn )
IMPL_LINK_NOARG(ScFillSeriesDlg, OKHdl)
{
- if ( aBtnLeft.IsChecked() ) theFillDir = FILL_TO_LEFT;
- else if ( aBtnRight.IsChecked() ) theFillDir = FILL_TO_RIGHT;
- else if ( aBtnDown.IsChecked() ) theFillDir = FILL_TO_BOTTOM;
- else if ( aBtnUp.IsChecked() ) theFillDir = FILL_TO_TOP;
+ if ( m_pBtnLeft->IsChecked() ) theFillDir = FILL_TO_LEFT;
+ else if ( m_pBtnRight->IsChecked() ) theFillDir = FILL_TO_RIGHT;
+ else if ( m_pBtnDown->IsChecked() ) theFillDir = FILL_TO_BOTTOM;
+ else if ( m_pBtnUp->IsChecked() ) theFillDir = FILL_TO_TOP;
- if ( aBtnArithmetic.IsChecked() ) theFillCmd = FILL_LINEAR;
- else if ( aBtnGeometric.IsChecked() ) theFillCmd = FILL_GROWTH;
- else if ( aBtnDate.IsChecked() ) theFillCmd = FILL_DATE;
- else if ( aBtnAutoFill.IsChecked() ) theFillCmd = FILL_AUTO;
+ if ( m_pBtnArithmetic->IsChecked() ) theFillCmd = FILL_LINEAR;
+ else if ( m_pBtnGeometric->IsChecked() ) theFillCmd = FILL_GROWTH;
+ else if ( m_pBtnDate->IsChecked() ) theFillCmd = FILL_DATE;
+ else if ( m_pBtnAutoFill->IsChecked() ) theFillCmd = FILL_AUTO;
- if ( aBtnDay.IsChecked() ) theFillDateCmd = FILL_DAY;
- else if ( aBtnDayOfWeek.IsChecked() ) theFillDateCmd = FILL_WEEKDAY;
- else if ( aBtnMonth.IsChecked() ) theFillDateCmd = FILL_MONTH;
- else if ( aBtnYear.IsChecked() ) theFillDateCmd = FILL_YEAR;
+ if ( m_pBtnDay->IsChecked() ) theFillDateCmd = FILL_DAY;
+ else if ( m_pBtnDayOfWeek->IsChecked() ) theFillDateCmd = FILL_WEEKDAY;
+ else if ( m_pBtnMonth->IsChecked() ) theFillDateCmd = FILL_MONTH;
+ else if ( m_pBtnYear->IsChecked() ) theFillDateCmd = FILL_YEAR;
sal_Bool bAllOk = true;
Edit* pEdWrong = NULL;
if ( !CheckStartVal() )
{
bAllOk = false;
- pEdWrong = &aEdStartVal;
+ pEdWrong = m_pEdStartVal;
}
else if ( !CheckIncrementVal() )
{
bAllOk = false;
- pEdWrong = &aEdIncrement;
+ pEdWrong = m_pEdIncrement;
}
else if ( !CheckEndVal() )
{
bAllOk = false;
- pEdWrong = &aEdEndVal;
+ pEdWrong = m_pEdEndVal;
}
if ( bAllOk )
EndDialog( RET_OK );
diff --git a/sc/source/ui/src/miscdlgs.src b/sc/source/ui/src/miscdlgs.src
index 569d3a0..fc1bdc0 100644
--- a/sc/source/ui/src/miscdlgs.src
+++ b/sc/source/ui/src/miscdlgs.src
@@ -585,204 +585,9 @@ ModalDialog RID_SCDLG_SHOW_TAB
};
-ModalDialog RID_SCDLG_FILLSERIES
+String STR_VALERR
{
- OutputSize = TRUE ;
- HelpId = CMD_FID_FILL_SERIES ;
- SVLook = TRUE ;
- Size = MAP_APPFONT ( 290 , 122 ) ;
- Text [ en-US ] = "Fill Series" ;
- Moveable = TRUE ;
- Closeable = FALSE ;
- RadioButton BTN_DAY
- {
- HelpID = "sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_DAY";
- Pos = MAP_APPFONT ( 159 , 14 ) ;
- Size = MAP_APPFONT ( 66 , 10 ) ;
- Text [ en-US ] = "Da~y" ;
- TabStop = TRUE ;
- };
- RadioButton BTN_DAY_OF_WEEK
- {
- HelpID = "sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_DAY_OF_WEEK";
- Pos = MAP_APPFONT ( 159 , 28 ) ;
- Size = MAP_APPFONT ( 66 , 10 ) ;
- Text [ en-US ] = "~Weekday" ;
- TabStop = TRUE ;
- };
- RadioButton BTN_MONTH
- {
- HelpID = "sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_MONTH";
- Pos = MAP_APPFONT ( 159 , 42 ) ;
- Size = MAP_APPFONT ( 66 , 10 ) ;
- Text [ en-US ] = "~Month" ;
- TabStop = TRUE ;
- };
- RadioButton BTN_YEAR
- {
- HelpID = "sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_YEAR";
- Pos = MAP_APPFONT ( 159 , 56 ) ;
- Size = MAP_APPFONT ( 66 , 10 ) ;
- Text [ en-US ] = "Y~ear" ;
- TabStop = TRUE ;
- };
- FixedLine FL_TIME_UNIT
- {
- Pos = MAP_APPFONT ( 153 , 3 ) ;
- Size = MAP_APPFONT ( 75 , 8 ) ;
- Text [ en-US ] = "Time unit" ;
- };
- RadioButton BTN_RIGHT
- {
- HelpID = "sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_RIGHT";
- Pos = MAP_APPFONT ( 12 , 28 ) ;
- Size = MAP_APPFONT ( 51 , 10 ) ;
- Text [ en-US ] = "~Right" ;
- TabStop = TRUE ;
- };
- RadioButton BTN_LEFT
- {
- HelpID = "sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_LEFT";
- Pos = MAP_APPFONT ( 12 , 56 ) ;
- Size = MAP_APPFONT ( 51 , 10 ) ;
- Text [ en-US ] = "~Left" ;
- TabStop = TRUE ;
- };
- RadioButton BTN_TOP
- {
- HelpID = "sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_TOP";
- Pos = MAP_APPFONT ( 12 , 42 ) ;
- Size = MAP_APPFONT ( 51 , 10 ) ;
- Text [ en-US ] = "~Up" ;
- TabStop = TRUE ;
- };
- RadioButton BTN_BOTTOM
- {
- HelpID = "sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_BOTTOM";
- Pos = MAP_APPFONT ( 12 , 14 ) ;
- Size = MAP_APPFONT ( 51 , 10 ) ;
- Text [ en-US ] = "~Down" ;
- TabStop = TRUE ;
- };
- FixedLine FL_DIRECTION
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 60 , 8 ) ;
- Text [ en-US ] = "Direction" ;
- };
- RadioButton BTN_ARITHMETIC
- {
- HelpID = "sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_ARITHMETIC";
- Pos = MAP_APPFONT ( 78 , 14 ) ;
- Size = MAP_APPFONT ( 69 , 10 ) ;
- Text [ en-US ] = "Li~near" ;
- TabStop = TRUE ;
- };
- RadioButton BTN_GEOMETRIC
- {
- HelpID = "sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_GEOMETRIC";
- Pos = MAP_APPFONT ( 78 , 28 ) ;
- Size = MAP_APPFONT ( 69 , 10 ) ;
- Text [ en-US ] = "~Growth" ;
- TabStop = TRUE ;
- };
- RadioButton BTN_DATE
- {
- HelpID = "sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_DATE";
- Pos = MAP_APPFONT ( 78 , 42 ) ;
- Size = MAP_APPFONT ( 69 , 10 ) ;
- Text [ en-US ] = "Da~te" ;
- TabStop = TRUE ;
- };
- RadioButton BTN_AUTOFILL
- {
- HelpID = "sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_AUTOFILL";
- Pos = MAP_APPFONT ( 78 , 56 ) ;
- Size = MAP_APPFONT ( 69 , 10 ) ;
- Text [ en-US ] = "~AutoFill" ;
- TabStop = TRUE ;
- };
- FixedLine FL_TYPE
- {
- Pos = MAP_APPFONT ( 72 , 3 ) ;
- Size = MAP_APPFONT ( 75 , 8 ) ;
- Text [ en-US ] = "Series type" ;
- };
- FixedLine FL_SEP1
- {
- Pos = MAP_APPFONT( 69 , 14 ) ;
- Size = MAP_APPFONT ( 1 , 52 ) ;
- };
- FixedLine FL_SEP2
- {
- Pos = MAP_APPFONT( 150 , 14 ) ;
- Size = MAP_APPFONT ( 1 , 52 ) ;
- };
- FixedText FT_START_VALUE
- {
- Pos = MAP_APPFONT ( 6 , 74 ) ;
- Size = MAP_APPFONT ( 45 , 8 ) ;
- Text [ en-US ] = "~Start value" ;
- };
- Edit ED_START_VALUES
- {
- HelpID = "sc:Edit:RID_SCDLG_FILLSERIES:ED_START_VALUES";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 55 , 72 ) ;
- Size = MAP_APPFONT ( 58 , 12 ) ;
- TabStop = TRUE ;
- };
- FixedText FT_END_VALUE
- {
- Pos = MAP_APPFONT ( 6 , 90 ) ;
- Size = MAP_APPFONT ( 45 , 8 ) ;
- Text [ en-US ] = "End ~value" ;
- };
- Edit ED_END_VALUES
- {
- HelpID = "sc:Edit:RID_SCDLG_FILLSERIES:ED_END_VALUES";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 55 , 88 ) ;
- Size = MAP_APPFONT ( 58 , 12 ) ;
- TabStop = TRUE ;
- };
- FixedText FT_INCREMENT
- {
- Pos = MAP_APPFONT ( 6 , 106 ) ;
- Size = MAP_APPFONT ( 45 , 8 ) ;
- Text [ en-US ] = "In~crement" ;
- };
- Edit ED_INCREMENT
- {
- HelpID = "sc:Edit:RID_SCDLG_FILLSERIES:ED_INCREMENT";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 55 , 104 ) ;
- Size = MAP_APPFONT ( 58 , 12 ) ;
- TabStop = TRUE ;
- };
- String STR_VALERR
- {
Text [ en-US ] = "Invalid value" ;
- };
- OKButton BTN_OK
- {
- Pos = MAP_APPFONT ( 234 , 6 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- DefButton = TRUE ;
- };
- CancelButton BTN_CANCEL
- {
- Pos = MAP_APPFONT ( 234 , 23 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
- HelpButton BTN_HELP
- {
- Pos = MAP_APPFONT ( 234 , 43 ) ;
- Size = MAP_APPFONT ( 50 , 14 ) ;
- TabStop = TRUE ;
- };
};
#define TXT_COLS \
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 3e7ff8b..e80266f 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -706,8 +706,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
*pDoc,
eFillDir, eFillCmd, eFillDateCmd,
aStartStr, fIncVal, fMaxVal,
- nPossDir,
- RID_SCDLG_FILLSERIES);
+ nPossDir);
OSL_ENSURE(pDlg, "Dialog create fail!");
if ( nStartCol != nEndCol && nStartRow != nEndRow )
diff --git a/sc/uiconfig/scalc/ui/filldlg.ui b/sc/uiconfig/scalc/ui/filldlg.ui
new file mode 100644
index 0000000..d4db380
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/filldlg.ui
@@ -0,0 +1,576 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkDialog" id="FillSeriesDialog">
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="title" translatable="yes">Fill Series</property>
+ <property name="type_hint">dialog</property>
+ <child internal-child="vbox">
+ <object class="GtkBox" id="dialog-vbox1">
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area1">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="layout_style">start</property>
+ <child>
+ <object class="GtkButton" id="ok">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="help">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <property name="n_rows">2</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="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkRadioButton" id="down">
+ <property name="label" translatable="yes">_Down</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="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">right</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="right">
+ <property name="label" translatable="yes">_Right</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="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">up</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="up">
+ <property name="label" translatable="yes">_Up</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="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">left</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="left">
+ <property name="label" translatable="yes">_Left</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="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">down</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</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="hexpand">True</property>
+ <property name="label" translatable="yes">Direction</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame" id="frame2">
+ <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="alignment2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkBox" id="box2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkRadioButton" id="linear">
+ <property name="label" translatable="yes">Li_near</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="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">growth</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="growth">
+ <property name="label" translatable="yes">_Growth</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="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">date</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="date">
+ <property name="label" translatable="yes">Da_te</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="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">autofill</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="autofill">
+ <property name="label" translatable="yes">_AutoFill</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="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">linear</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</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="hexpand">True</property>
+ <property name="label" translatable="yes">Series type</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </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="GtkFrame" id="frame3">
+ <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="alignment3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</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="hexpand">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkRadioButton" id="day">
+ <property name="label" translatable="yes">Da_y</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="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">week</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="week">
+ <property name="label" translatable="yes">_Weekday</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="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">month</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="month">
+ <property name="label" translatable="yes">_Month</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="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">year</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="year">
+ <property name="label" translatable="yes">Y_ear</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="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">day</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="tuL">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label" translatable="yes">Time unit</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="startL">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="vexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Start value</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">startValue</property>
+ <attributes>
+ <attribute name="weight" value="semibold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="endL">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="vexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">End _value</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">endValue</property>
+ <attributes>
+ <attribute name="weight" value="semibold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="incrementL">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="vexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">In_crement</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">increment</property>
+ <attributes>
+ <attribute name="weight" value="semibold"/>
+ </attributes>
+ </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">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <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="GtkEntry" id="startValue">
+ <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="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="endValue">
+ <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="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="increment">
+ <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="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">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="0">ok</action-widget>
+ <action-widget response="0">cancel</action-widget>
+ <action-widget response="0">help</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup1"/>
+</interface>
More information about the Libreoffice-commits
mailing list