cui/source/options/optgdlg.cxx | 7 ++++--- cui/source/options/optgdlg.hrc | 10 ++++++---- cui/source/options/optgdlg.hxx | 1 + cui/source/options/optgdlg.src | 14 ++++++++++---- 4 files changed, 21 insertions(+), 11 deletions(-)
New commits: commit 06645f0885ef3fd37ce7120487b35633949cbe33 Author: Ivan Timofeev <[email protected]> Date: Thu Aug 9 09:12:02 2012 +0400 correct row heights Change-Id: I567520f8c68f7f8f84dbd7d6e9b76705b7cb311d diff --git a/cui/source/options/optgdlg.hrc b/cui/source/options/optgdlg.hrc index 2bf4343..aaa9666 100644 --- a/cui/source/options/optgdlg.hrc +++ b/cui/source/options/optgdlg.hrc @@ -49,8 +49,8 @@ #define ROW11 (ROW10+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) #define ROW12 (ROW11+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) #define ROW13 (ROW12+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) -#define ROW14 (ROW13+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE+6) -#define ROW15 (ROW14+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) +#define ROW14 (ROW13+RSC_CD_TEXTBOX_HEIGHT+ROWSPACE) +#define ROW15 (ROW14+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) #define ROW16 (ROW15+RSC_CD_CHECKBOX_HEIGHT) #define DIFF(v1,v2) (v2-v1) commit 65476708533f6a2f423ede9135114bbb7aff82be Author: Joel Madero <[email protected]> Date: Wed Aug 8 17:04:09 2012 -0700 Addition of linear divider and header "Optional (unstable) Features" Put two experimental options (Experimental & Macro Recording) below a linear divider with the header of "Optional (Unstable) Features" Had to adjust distance between two options in order for them to fit properly in the dialog. Change-Id: I784f99c282d5b70e7e025b1ca05a7c8d73869cef diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 8800e11..4f83368 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -213,6 +213,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) : aInterpretFT ( this, CUI_RES( FT_INTERPRET ) ), aYearValueField ( this, CUI_RES( NF_YEARVALUE ) ), aToYearFT ( this, CUI_RES( FT_TOYEAR ) ), + aExperimentalFL ( this, CUI_RES( FL_EXPERIMENTAL ) ), aExperimentalCB ( this, CUI_RES( CB_EXPERIMENTAL ) ), aMacroRecorderCB ( this, CUI_RES( CB_MACRORECORDER ) ) { @@ -244,7 +245,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) : Window* pWins[] = { &aPrintDlgFL, &aPrintDlgCB, &aDocStatusFL, &aDocStatusCB, &aSaveAlwaysCB, - &aTwoFigureFL, &aInterpretFT, &aYearValueField, &aToYearFT, &aExperimentalCB, &aMacroRecorderCB + &aTwoFigureFL, &aInterpretFT, &aYearValueField, &aToYearFT, &aExperimentalFL, &aExperimentalCB, &aMacroRecorderCB }; Window** pCurrent = pWins; const sal_Int32 nCount = SAL_N_ELEMENTS( pWins ); @@ -265,7 +266,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) : Window* pWins[] = { &aPrintDlgFL, &aPrintDlgCB, &aDocStatusFL, &aDocStatusCB, &aSaveAlwaysCB, - &aTwoFigureFL, &aInterpretFT, &aYearValueField, &aToYearFT, &aExperimentalCB, &aMacroRecorderCB + &aTwoFigureFL, &aInterpretFT, &aYearValueField, &aToYearFT, &aExperimentalFL, &aExperimentalCB, &aMacroRecorderCB }; Window** pCurrent = pWins; const sal_Int32 nCount = SAL_N_ELEMENTS( pWins ); @@ -291,7 +292,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) : Window* pWins[] = { &aDocStatusFL, &aDocStatusCB, &aSaveAlwaysCB, &aTwoFigureFL, - &aInterpretFT, &aYearValueField, &aToYearFT, &aExperimentalCB, &aMacroRecorderCB + &aInterpretFT, &aYearValueField, &aToYearFT, &aExperimentalFL, &aExperimentalCB, &aMacroRecorderCB }; Window** pCurrent = pWins; const sal_Int32 nCount = SAL_N_ELEMENTS( pWins ); diff --git a/cui/source/options/optgdlg.hrc b/cui/source/options/optgdlg.hrc index 9be9051..2bf4343 100644 --- a/cui/source/options/optgdlg.hrc +++ b/cui/source/options/optgdlg.hrc @@ -51,6 +51,7 @@ #define ROW13 (ROW12+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) #define ROW14 (ROW13+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE+6) #define ROW15 (ROW14+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) +#define ROW16 (ROW15+RSC_CD_CHECKBOX_HEIGHT) #define DIFF(v1,v2) (v2-v1) #define OFFS_TEXTBOX_FIXEDTEXT(base) (base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2) @@ -93,8 +94,9 @@ #define CB_EXTHELP 12 #define CB_HELPAGENT 13 #define PB_HELPAGENT_RESET 14 -#define CB_EXPERIMENTAL 15 -#define CB_MACRORECORDER 16 +#define FL_EXPERIMENTAL 15 +#define CB_EXPERIMENTAL 16 +#define CB_MACRORECORDER 17 #define FL_TWOFIGURE 40 #define FT_INTERPRET 41 diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 3ae53fd..e38c48c 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -70,6 +70,7 @@ private: String aStrDateInfo; + FixedLine aExperimentalFL; CheckBox aExperimentalCB; CheckBox aMacroRecorderCB; diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src index 5f2edda..2728744 100644 --- a/cui/source/options/optgdlg.src +++ b/cui/source/options/optgdlg.src @@ -160,17 +160,23 @@ TabPage OFA_TP_MISC Size = MAP_APPFONT( WHOLE_WIDTH - COL6, RSC_CD_FIXEDTEXT_HEIGHT ); Text [ en-US ] = "and " ; }; + FixedLine FL_EXPERIMENTAL + { + Pos = MAP_APPFONT( COL0, ROW14 ); + Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ); + Text [ en-US ] = "Optional (unstable) features" ; + }; CheckBox CB_EXPERIMENTAL { - Pos = MAP_APPFONT( COL1, ROW14 ); + Pos = MAP_APPFONT( COL1, ROW15 ); Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); - Text [ en-US ] = "Enable experimental (unstable) features"; + Text [ en-US ] = "Enable experimental features"; }; CheckBox CB_MACRORECORDER { - Pos = MAP_APPFONT( COL1, ROW15 ); + Pos = MAP_APPFONT( COL1, ROW16 ); Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); - Text [ en-US ] = "Enable macro recording (limited)"; + Text [ en-US ] = "Enable macro recording"; }; }; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
