From e584e0ad2bbaf55a5739091b41ed1d494362e19e Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Mon, 6 Dec 2010 23:15:19 -0500 Subject: [PATCH] Put the ODMA dialog check box on its own row. * Put the ODMA dialog check box on its own row, and push everything downward to make some room. * Instead of hiding the ODMA check box, disable it on non-Windodws platform. Hiding it would make the page look odd with the whole empty row where the hidden check box is. This fixes fdo#32133. --- cui/source/options/optgdlg.cxx | 2 +- cui/source/options/optgdlg.hrc | 13 +++++++------ cui/source/options/optgdlg.src | 26 +++++++++++++------------- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 293cfc3..9341e23 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -235,7 +235,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) : #ifdef WNT aFileDlgCB.SetToggleHdl( LINK( this, OfaMiscTabPage, OnFileDlgToggled ) ); #else - aODMADlgCB.Hide(); + aODMADlgCB.Disable(); #endif if ( !aFileDlgCB.IsVisible() ) diff --git a/cui/source/options/optgdlg.hrc b/cui/source/options/optgdlg.hrc index 425e608..e6f9288 100644 --- a/cui/source/options/optgdlg.hrc +++ b/cui/source/options/optgdlg.hrc @@ -51,14 +51,15 @@ #define ROW4 (ROW3 +RSC_CD_PUSHBUTTON_HEIGHT+ROWSPACE) #define ROW5 (ROW4 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) #define ROW6 (ROW5 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) -#define ROW7 (ROW6 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) -#define ROW8 (ROW7 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) -#define ROW9 (ROW8 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) -#define ROW10 (ROW9 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) +#define ROW7 (ROW6 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) +#define ROW8 (ROW7 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) +#define ROW9 (ROW8 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) +#define ROW10 (ROW9 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) #define ROW11 (ROW10+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) -#define ROW12 (ROW11+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) -#define ROW13 (ROW12+RSC_CD_PUSHBUTTON_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) +#define ROW15 (ROW14+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) #define DIFF(v1,v2) (v2-v1) #define OFFS_TEXTBOX_FIXEDTEXT(base) (base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2) diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src index 5b14e93..fe9e28c 100644 --- a/cui/source/options/optgdlg.src +++ b/cui/source/options/optgdlg.src @@ -109,62 +109,62 @@ TabPage OFA_TP_MISC CheckBox CB_FILEDLG { Pos = MAP_APPFONT( COL1, ROW5 ); - Size = MAP_APPFONT( COL3 - COL1, RSC_CD_CHECKBOX_HEIGHT ); + Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "~Use %PRODUCTNAME dialogs"; }; CheckBox CB_ODMADLG { - Pos = MAP_APPFONT( COL3, ROW5 ); - Size = MAP_APPFONT( WHOLE_WIDTH - COL4, RSC_CD_CHECKBOX_HEIGHT ); + Pos = MAP_APPFONT( COL1, ROW6 ); + Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "Show ODMA DMS dialogs first"; Text [ en-GB ] = "Show ODMA DMS dialogues first"; }; FixedLine FL_PRINTDLG { - Pos = MAP_APPFONT( COL0, ROW6 ); + Pos = MAP_APPFONT( COL0, ROW7 ); Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ); Text [ en-US ] = "Print dialogs"; }; CheckBox CB_PRINTDLG { - Pos = MAP_APPFONT( COL1, ROW7 ); + Pos = MAP_APPFONT( COL1, ROW8 ); Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "Use %PRODUCTNAME ~dialogs"; }; FixedLine FL_DOCSTATUS { - Pos = MAP_APPFONT( COL0, ROW8 ); + Pos = MAP_APPFONT( COL0, ROW9 ); Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ); Text [ en-US ] = "Document status"; }; CheckBox CB_DOCSTATUS { - Pos = MAP_APPFONT( COL1, ROW9 ); + Pos = MAP_APPFONT( COL1, ROW10 ); Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "~Printing sets \"document modified\" status"; }; CheckBox CB_SAVE_ALWAYS { - Pos = MAP_APPFONT( COL1, ROW10 ); + Pos = MAP_APPFONT( COL1, ROW11 ); Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "Allow to save document even when the document is not modified"; }; FixedLine FL_TWOFIGURE { - Pos = MAP_APPFONT( COL0, ROW11 ); + Pos = MAP_APPFONT( COL0, ROW12 ); Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ); Text [ en-US ] = "Year (two digits)" ; }; FixedText FT_INTERPRET { - Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW12) ); + Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW13) ); Size = MAP_APPFONT( DIFF( COL1, COL3), RSC_CD_FIXEDTEXT_HEIGHT ); Text [ en-US ] = "Interpret as years between"; }; NumericField NF_YEARVALUE { Border = TRUE ; - Pos = MAP_APPFONT( COL4, ROW12 ); + Pos = MAP_APPFONT( COL4, ROW13 ); Size = MAP_APPFONT( EDIT_WIDTH, RSC_CD_TEXTBOX_HEIGHT ); Minimum = 1583 ; Maximum = 9857 ; @@ -173,13 +173,13 @@ TabPage OFA_TP_MISC }; FixedText FT_TOYEAR { - Pos = MAP_APPFONT( COL6, OFFS_TEXTBOX_FIXEDTEXT(ROW12) ); + Pos = MAP_APPFONT( COL6, OFFS_TEXTBOX_FIXEDTEXT(ROW13) ); Size = MAP_APPFONT( WHOLE_WIDTH - COL6, RSC_CD_FIXEDTEXT_HEIGHT ); Text [ en-US ] = "and " ; }; CheckBox CB_EXPERIMENTAL { - Pos = MAP_APPFONT( COL0, ROW13 ); + Pos = MAP_APPFONT( COL1, ROW15 ); Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); Text [ en-US ] = "Enable experimental (unstable) features"; }; -- 1.7.3.1