[Libreoffice-commits] .: cui/source
Michael Meeks
mmeeks at kemper.freedesktop.org
Thu Oct 28 09:56:41 PDT 2010
cui/source/options/optgdlg.cxx | 44 +++++++++--------------
cui/source/options/optgdlg.hrc | 27 ++++++++------
cui/source/options/optgdlg.hxx | 8 ++--
cui/source/options/optgdlg.src | 76 ++++++++++++++++++++++-------------------
4 files changed, 78 insertions(+), 77 deletions(-)
New commits:
commit 929597e176808ad77520228ac8664b5c3d87b74e
Author: Michael Meeks <michael.meeks at novell.com>
Date: Thu Oct 28 16:22:18 2010 +0100
re-arrange options dialog to add experimental option
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 5ab6305..f9957cd 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -216,8 +216,8 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) :
aTwoFigureFL ( this, CUI_RES( FL_TWOFIGURE ) ),
aInterpretFT ( this, CUI_RES( FT_INTERPRET ) ),
aYearValueField ( this, CUI_RES( NF_YEARVALUE ) ),
- aToYearFT ( this, CUI_RES( FT_TOYEAR ) )
-
+ aToYearFT ( this, CUI_RES( FT_TOYEAR ) ),
+ aExperimentalCB ( this, CUI_RES( CB_EXPERIMENTAL ) )
{
FreeResource();
@@ -235,26 +235,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) :
#ifdef WNT
aFileDlgCB.SetToggleHdl( LINK( this, OfaMiscTabPage, OnFileDlgToggled ) );
#else
- {
- aODMADlgCB.Hide();
- // rearrange the following controls
- Point aNewPos = aDocStatusFL.GetPosPixel();
- long nDelta = aNewPos.Y() - aODMADlgCB.GetPosPixel().Y();
-
- Window* pWins[] =
- {
- &aDocStatusFL, &aDocStatusCB, &aSaveAlwaysCB, &aTwoFigureFL,
- &aInterpretFT, &aYearValueField, &aToYearFT
- };
- Window** pCurrent = pWins;
- const sal_Int32 nCount = SAL_N_ELEMENTS( pWins );
- for ( sal_Int32 i = 0; i < nCount; ++i, ++pCurrent )
- {
- aNewPos = (*pCurrent)->GetPosPixel();
- aNewPos.Y() -= nDelta;
- (*pCurrent)->SetPosPixel( aNewPos );
- }
- }
+ aODMADlgCB.Hide();
#endif
if ( !aFileDlgCB.IsVisible() )
@@ -266,7 +247,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) :
Window* pWins[] =
{
&aPrintDlgFL, &aPrintDlgCB, &aDocStatusFL, &aDocStatusCB, &aSaveAlwaysCB,
- &aTwoFigureFL, &aInterpretFT, &aYearValueField, &aToYearFT
+ &aTwoFigureFL, &aInterpretFT, &aYearValueField, &aToYearFT, &aExperimentalCB
};
Window** pCurrent = pWins;
const sal_Int32 nCount = SAL_N_ELEMENTS( pWins );
@@ -283,23 +264,23 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) :
aFileDlgCB.Disable();
}
- if ( aPrintDlgCB.IsVisible() )
+ if ( !aPrintDlgCB.IsVisible() )
{
// rearrange the following controls
Point aNewPos = aDocStatusFL.GetPosPixel();
- long nDelta = aNewPos.Y() - aFileDlgFL.GetPosPixel().Y();
+ long nDelta = aNewPos.Y() - aPrintDlgFL.GetPosPixel().Y();
Window* pWins[] =
{
&aDocStatusFL, &aDocStatusCB, &aSaveAlwaysCB, &aTwoFigureFL,
- &aInterpretFT, &aYearValueField, &aToYearFT
+ &aInterpretFT, &aYearValueField, &aToYearFT, &aExperimentalCB
};
Window** pCurrent = pWins;
const sal_Int32 nCount = SAL_N_ELEMENTS( pWins );
for ( sal_Int32 i = 0; i < nCount; ++i, ++pCurrent )
{
aNewPos = (*pCurrent)->GetPosPixel();
- aNewPos.Y() += nDelta;
+ aNewPos.Y() -= nDelta;
(*pCurrent)->SetPosPixel( aNewPos );
}
}
@@ -429,6 +410,13 @@ BOOL OfaMiscTabPage::FillItemSet( SfxItemSet& rSet )
bModified = TRUE;
}
+ if ( aExperimentalCB.IsChecked() != aExperimentalCB.GetSavedValue() )
+ {
+ SvtMiscOptions aMiscOpt;
+ aMiscOpt.SetExperimentalMode( aExperimentalCB.IsChecked() );
+ bModified = TRUE;
+ }
+
const SfxUInt16Item* pUInt16Item =
PTR_CAST( SfxUInt16Item, GetOldItem( rSet, SID_ATTR_YEAR2000 ) );
USHORT nNum = (USHORT)aYearValueField.GetText().ToInt32();
@@ -472,6 +460,8 @@ void OfaMiscTabPage::Reset( const SfxItemSet& rSet )
aPrintDlgCB.SaveValue();
aSaveAlwaysCB.Check( aMiscOpt.IsSaveAlwaysAllowed() );
aSaveAlwaysCB.SaveValue();
+ aExperimentalCB.Check( aMiscOpt.IsExperimentalMode() );
+ aExperimentalCB.SaveValue();
aODMADlgCB.Check( aMiscOpt.TryODMADialog() );
aODMADlgCB.SaveValue();
diff --git a/cui/source/options/optgdlg.hrc b/cui/source/options/optgdlg.hrc
index 4f57a23..425e608 100644
--- a/cui/source/options/optgdlg.hrc
+++ b/cui/source/options/optgdlg.hrc
@@ -45,19 +45,20 @@
#define ROWSPACE RSC_SP_CTRL_DESC_Y
#define ROW0 3
-#define ROW1 (ROW0+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
-#define ROW2 (ROW1+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
-#define ROW3 (ROW2+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
-#define ROW4 (ROW3+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
-#define ROW5 (ROW4+RSC_CD_PUSHBUTTON_HEIGHT+ROWSPACE)
-#define ROW6 (ROW5+RSC_CD_DROPDOWN_HEIGHT+ROWSPACE)
-#define ROW7 (ROW6+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
-#define ROW8 (ROW7+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
-#define ROW9 (ROW8+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
-#define ROW10 (ROW9+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
+#define ROW1 (ROW0 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
+#define ROW2 (ROW1 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
+#define ROW3 (ROW2 +RSC_CD_DROPDOWN_HEIGHT+ROWSPACE)
+#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 ROW11 (ROW10+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
-#define ROW12 (ROW11+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
-#define ROW13 (ROW12+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
+#define ROW12 (ROW11+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE)
+#define ROW13 (ROW12+RSC_CD_PUSHBUTTON_HEIGHT+ROWSPACE)
+#define ROW14 (ROW13+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
#define DIFF(v1,v2) (v2-v1)
#define OFFS_TEXTBOX_FIXEDTEXT(base) (base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)
@@ -103,6 +104,8 @@
#define PB_HELPAGENT_RESET 14
#define FT_HELPFORMAT 15
#define LB_HELPFORMAT 16
+#define FT_EXPERIMENTAL 17
+#define CB_EXPERIMENTAL 18
//#define FL_FILEDLG 20
//#define CB_FILEDLG 21
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 6019a78..013a454 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -67,12 +67,14 @@ private:
CheckBox aSaveAlwaysCB;
FixedLine aTwoFigureFL;
- FixedText aInterpretFT;
- NumericField aYearValueField;
- FixedText aToYearFT;
+ FixedText aInterpretFT;
+ NumericField aYearValueField;
+ FixedText aToYearFT;
String aStrDateInfo;
+ CheckBox aExperimentalCB;
+
DECL_LINK( TwoFigureHdl, NumericField* );
DECL_LINK( TwoFigureConfigHdl, NumericField* );
DECL_LINK( HelpCheckHdl_Impl, CheckBox* );
diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src
index 612e215..7cbb741 100644
--- a/cui/source/options/optgdlg.src
+++ b/cui/source/options/optgdlg.src
@@ -56,31 +56,19 @@ TabPage OFA_TP_MISC
};
CheckBox CB_EXTHELP
{
- Pos = MAP_APPFONT( COL2, ROW2 );
+ Pos = MAP_APPFONT( COL3, ROW1 );
Size = MAP_APPFONT( WHOLE_WIDTH - COL2, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "~Extended tips";
};
- CheckBox CB_HELPAGENT
- {
- Pos = MAP_APPFONT( COL1, ROW3 );
- Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
- Text [ en-US ] = "~Help Agent";
- };
- PushButton PB_HELPAGENT_RESET
- {
- Pos = MAP_APPFONT( COL2, ROW4 );
- Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
- Text [ en-US ] = "~Reset Help Agent";
- };
FixedText FT_HELPFORMAT
{
- Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW5) );
+ Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW2) );
Size = MAP_APPFONT( DIFF( COL1, COL3 ), RSC_CD_FIXEDTEXT_HEIGHT );
Text [ en-US ] = "Help ~formatting";
};
ListBox LB_HELPFORMAT
{
- Pos = MAP_APPFONT( COL4, ROW5 );
+ Pos = MAP_APPFONT( COL3, ROW2 );
Size = MAP_APPFONT( WHOLE_WIDTH - COL4, 50 );
DropDown = TRUE ;
Border = TRUE ;
@@ -94,65 +82,89 @@ TabPage OFA_TP_MISC
< "High Contrast White" ; > ;
};
};
+ CheckBox CB_HELPAGENT
+ {
+ Pos = MAP_APPFONT( COL1, ROW3 );
+ Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
+ Text [ en-US ] = "~Help Agent";
+ };
+ PushButton PB_HELPAGENT_RESET
+ {
+ Pos = MAP_APPFONT( COL3, ROW3 );
+ Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT );
+ Text [ en-US ] = "~Reset Help Agent";
+ };
FixedLine FL_FILEDLG
{
- Pos = MAP_APPFONT( COL0, ROW6 );
+ Pos = MAP_APPFONT( COL0, ROW4 );
Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
Text [ en-US ] = "Open/Save dialogs";
};
FixedImage FI_FILEDLG_RO
{
- Pos = MAP_APPFONT( COL1 - 7, ROW7 + 2 );
+ Pos = MAP_APPFONT( COL1 - 7, ROW5 + 2 );
Size = MAP_APPFONT( 6, 6 );
Hide = TRUE;
};
CheckBox CB_FILEDLG
{
- Pos = MAP_APPFONT( COL1, ROW7 );
+ Pos = MAP_APPFONT( COL1, ROW5 );
Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "~Use %PRODUCTNAME dialogs";
};
CheckBox CB_ODMADLG
{
- Pos = MAP_APPFONT( COL1, ROW8 );
+ Pos = MAP_APPFONT( COL3, ROW5 );
Size = MAP_APPFONT( WHOLE_WIDTH - COL4, 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 );
+ Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
+ Text [ en-US ] = "Print dialogs";
+ };
+ CheckBox CB_PRINTDLG
+ {
+ Pos = MAP_APPFONT( COL1, ROW7 );
+ Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
+ Text [ en-US ] = "Use %PRODUCTNAME ~dialogs";
+ };
FixedLine FL_DOCSTATUS
{
- Pos = MAP_APPFONT( COL0, ROW9 );
+ Pos = MAP_APPFONT( COL0, ROW8 );
Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
Text [ en-US ] = "Document status";
};
CheckBox CB_DOCSTATUS
{
- Pos = MAP_APPFONT( COL1, ROW10 );
+ Pos = MAP_APPFONT( COL1, ROW9 );
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, ROW11 );
+ Pos = MAP_APPFONT( COL1, ROW10 );
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, ROW12 );
+ Pos = MAP_APPFONT( COL0, ROW11 );
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(ROW13) );
+ Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW12) );
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, ROW13 );
+ Pos = MAP_APPFONT( COL4, ROW12 );
Size = MAP_APPFONT( EDIT_WIDTH, RSC_CD_TEXTBOX_HEIGHT );
Minimum = 1583 ;
Maximum = 9857 ;
@@ -161,21 +173,15 @@ TabPage OFA_TP_MISC
};
FixedText FT_TOYEAR
{
- Pos = MAP_APPFONT( COL6, OFFS_TEXTBOX_FIXEDTEXT(ROW13) );
+ Pos = MAP_APPFONT( COL6, OFFS_TEXTBOX_FIXEDTEXT(ROW12) );
Size = MAP_APPFONT( WHOLE_WIDTH - COL6, RSC_CD_FIXEDTEXT_HEIGHT );
Text [ en-US ] = "and " ;
};
- FixedLine FL_PRINTDLG
- {
- Pos = MAP_APPFONT( COL0, ROW8 );
- Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT );
- Text [ en-US ] = "Print dialogs";
- };
- CheckBox CB_PRINTDLG
+ CheckBox CB_EXPERIMENTAL
{
- Pos = MAP_APPFONT( COL1, ROW9 );
+ Pos = MAP_APPFONT( COL0, ROW13 );
Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
- Text [ en-US ] = "Use %PRODUCTNAME ~dialogs";
+ Text [ en-US ] = "Enable experimental (unstable) features";
};
};
More information about the Libreoffice-commits
mailing list