[ooo-build-commit] .: cui/source
Jan Holesovsky
kendy at kemper.freedesktop.org
Thu Aug 26 07:25:08 PDT 2010
cui/source/options/optgdlg.cxx | 44 +++++++++++++++++++++++++++++++++++++++++
cui/source/options/optgdlg.hrc | 8 ++++---
cui/source/options/optgdlg.hxx | 4 +++
cui/source/options/optgdlg.src | 19 ++++++++++++-----
4 files changed, 66 insertions(+), 9 deletions(-)
New commits:
commit b14bcefa52ba52b714e62dc4f9b606344ae98e26
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Wed Aug 25 22:27:15 2010 +0200
novell-win32-odma.diff: ODMA dialog implementation.
i#6885, i#32741
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 41a459e..3879199 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -204,6 +204,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) :
aFileDlgFL ( this, CUI_RES( FL_FILEDLG ) ),
aFileDlgROImage ( this, CUI_RES( FI_FILEDLG_RO ) ),
aFileDlgCB ( this, CUI_RES( CB_FILEDLG ) ),
+ aODMADlgCB ( this, CUI_RES( CB_ODMADLG ) ),
aPrintDlgFL ( this, CUI_RES( FL_PRINTDLG ) ),
aPrintDlgCB ( this, CUI_RES( CB_PRINTDLG ) ),
aDocStatusFL ( this, CUI_RES( FL_DOCSTATUS ) ),
@@ -227,6 +228,31 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) :
aPrintDlgCB.Hide();
#endif
+#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, &aTwoFigureFL,
+ &aInterpretFT, &aYearValueField, &aToYearFT
+ };
+ Window** pCurrent = pWins;
+ const sal_Int32 nCount = sizeof( pWins ) / sizeof( pWins[ 0 ] );
+ for ( sal_Int32 i = 0; i < nCount; ++i, ++pCurrent )
+ {
+ aNewPos = (*pCurrent)->GetPosPixel();
+ aNewPos.Y() -= nDelta;
+ (*pCurrent)->SetPosPixel( aNewPos );
+ }
+ }
+#endif
+
if ( !aFileDlgCB.IsVisible() )
{
// rearrange the following controls
@@ -316,6 +342,14 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) :
}
}
+#ifdef WNT
+IMPL_LINK( OfaMiscTabPage, OnFileDlgToggled, CheckBox*, EMPTYARG )
+{
+ aODMADlgCB.Enable( !aFileDlgCB.IsChecked() );
+ return 0;
+}
+#endif
+
// -----------------------------------------------------------------------
OfaMiscTabPage::~OfaMiscTabPage()
@@ -370,6 +404,13 @@ BOOL OfaMiscTabPage::FillItemSet( SfxItemSet& rSet )
bModified = TRUE;
}
+ if ( aODMADlgCB.IsChecked() != aODMADlgCB.GetSavedValue() )
+ {
+ SvtMiscOptions aMiscOpt;
+ aMiscOpt.SetTryODMADialog( aODMADlgCB.IsChecked() );
+ bModified = TRUE;
+ }
+
if ( aDocStatusCB.IsChecked() != aDocStatusCB.GetSavedValue() )
{
SvtPrintWarningOptions aPrintOptions;
@@ -419,6 +460,9 @@ void OfaMiscTabPage::Reset( const SfxItemSet& rSet )
aPrintDlgCB.Check( !aMiscOpt.UseSystemPrintDialog() );
aPrintDlgCB.SaveValue();
+ aODMADlgCB.Check( aMiscOpt.TryODMADialog() );
+ aODMADlgCB.SaveValue();
+
SvtPrintWarningOptions aPrintOptions;
aDocStatusCB.Check(aPrintOptions.IsModifyDocumentOnPrintingAllowed());
aDocStatusCB.SaveValue();
diff --git a/cui/source/options/optgdlg.hrc b/cui/source/options/optgdlg.hrc
index 7df69da..db1ded0 100644
--- a/cui/source/options/optgdlg.hrc
+++ b/cui/source/options/optgdlg.hrc
@@ -53,9 +53,10 @@
#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_FIXEDLINE_HEIGHT+ROWSPACE)
-#define ROW10 (ROW9+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE)
-#define ROW11 (ROW10+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 DIFF(v1,v2) (v2-v1)
#define OFFS_TEXTBOX_FIXEDTEXT(base) (base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2)
@@ -199,6 +200,7 @@
#define FT_HELPAGENT_TIME_UNIT 59
#define FL_DOCSTATUS 60
#define CB_DOCSTATUS 61
+#define CB_ODMADLG 62
#endif // #ifndef _SVX_OPTGDLG_HRC
// ******************************************************************* EOF
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 6263bc4..5b51490 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -56,6 +56,7 @@ private:
FixedLine aFileDlgFL;
ReadOnlyImage aFileDlgROImage;
CheckBox aFileDlgCB;
+ CheckBox aODMADlgCB;
FixedLine aPrintDlgFL;
CheckBox aPrintDlgCB;
@@ -74,6 +75,9 @@ private:
DECL_LINK( TwoFigureConfigHdl, NumericField* );
DECL_LINK( HelpCheckHdl_Impl, CheckBox* );
DECL_LINK( HelpAgentResetHdl_Impl, PushButton* );
+#ifdef WNT
+ DECL_LINK( OnFileDlgToggled, CheckBox* );
+#endif
protected:
virtual int DeactivatePage( SfxItemSet* pSet = NULL );
diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src
index 5be48d1..a0db825 100644
--- a/cui/source/options/optgdlg.src
+++ b/cui/source/options/optgdlg.src
@@ -112,34 +112,41 @@ TabPage OFA_TP_MISC
Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT );
Text [ en-US ] = "~Use %PRODUCTNAME dialogs";
};
+ CheckBox CB_ODMADLG
+ {
+ Pos = MAP_APPFONT( COL1, ROW8 );
+ 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_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";
};
FixedLine FL_TWOFIGURE
{
- Pos = MAP_APPFONT( COL0, ROW10 );
+ 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(ROW11) );
+ 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, ROW11 );
+ Pos = MAP_APPFONT( COL4, ROW12 );
Size = MAP_APPFONT( EDIT_WIDTH, RSC_CD_TEXTBOX_HEIGHT );
Minimum = 1583 ;
Maximum = 9857 ;
@@ -148,7 +155,7 @@ TabPage OFA_TP_MISC
};
FixedText FT_TOYEAR
{
- Pos = MAP_APPFONT( COL6, OFFS_TEXTBOX_FIXEDTEXT(ROW11) );
+ Pos = MAP_APPFONT( COL6, OFFS_TEXTBOX_FIXEDTEXT(ROW12) );
Size = MAP_APPFONT( WHOLE_WIDTH - COL6, RSC_CD_FIXEDTEXT_HEIGHT );
Text [ en-US ] = "and " ;
};
More information about the ooo-build-commit
mailing list