Index: inc/sdattr.hrc =================================================================== RCS file: /cvs/graphics/sd/inc/sdattr.hrc,v --- inc/sdattr.hrc 6 Jul 2004 12:22:47 -0000 1.2 +++ inc/sdattr.hrc 10 Jun 2005 07:29:31 -0000 @@ -110,7 +110,8 @@ #define ATTR_PRESENT_ANIMATION_ALLOWED ATTR_PRESENT_START + 12 #define ATTR_PRESENT_PAUSE_TIMEOUT ATTR_PRESENT_START + 13 #define ATTR_PRESENT_SHOW_PAUSELOGO ATTR_PRESENT_START + 14 -#define ATTR_PRESENT_END ATTR_PRESENT_SHOW_PAUSELOGO +#define ATTR_PRESENT_DISPLAY ATTR_PRESENT_START + 15 +#define ATTR_PRESENT_END ATTR_PRESENT_DISPLAY // Transformations-Attribute #define ATTR_TRANSF_START ATTR_PRESENT_END + 1 Index: source/ui/dlg/present.cxx =================================================================== RCS file: /cvs/graphics/sd/source/ui/dlg/present.cxx,v --- source/ui/dlg/present.cxx 23 Aug 2004 08:17:55 -0000 1.5 +++ source/ui/dlg/present.cxx 10 Jun 2005 07:29:32 -0000 @@ -91,6 +91,8 @@ aRbtStandard ( this, SdResId( RBT_STANDARD ) ), aRbtWindow ( this, SdResId( RBT_WINDOW ) ), aRbtAuto ( this, SdResId( RBT_AUTO ) ), + aFtDisplay ( this, SdResId( FT_DISPLAY ) ), + aNumFldDisplay ( this, SdResId( NUM_FLD_DISPLAY ) ), // aFtPause ( this, SdResId( FT_PAUSE ) ), aTmfPause ( this, SdResId( TMF_PAUSE ) ), aCbxAutoLogo ( this, SdResId( CBX_AUTOLOGO ) ), @@ -120,6 +122,7 @@ aLink = LINK( this, SdStartPresentationDlg, ClickWindowPresentationHdl ); aRbtStandard.SetClickHdl( aLink ); + aNumFldDisplay.SetModifyHdl( LINK( this, SdStartPresentationDlg, ModifyDisplayHdl ) ); aRbtWindow.SetClickHdl( aLink ); aRbtAuto.SetClickHdl( aLink ); @@ -172,6 +175,8 @@ const BOOL bEndless = ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_ENDLESS ) ).GetValue(); const BOOL bWindow = !( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_FULLSCREEN ) ).GetValue(); const long nPause = ( ( const SfxUInt32Item& ) rOutAttrs.Get( ATTR_PRESENT_PAUSE_TIMEOUT ) ).GetValue(); + // const long nDisplay = ( ( const SfxUInt32Item& ) rOutAttrs.Get( ATTR_PRESENT_DISPLAY ) ).GetValue(); + const long nDisplay = 1; aTmfPause.SetTime( Time( 0, 0, nPause ) ); // set cursor in timefield @@ -181,6 +186,7 @@ aCbxAutoLogo.Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_SHOW_PAUSELOGO ) ).GetValue() ); + aNumFldDisplay.SetValue( nDisplay ); if( bWindow ) aRbtWindow.Check( TRUE ); else if( bEndless ) @@ -224,6 +230,7 @@ rOutAttrs.Put( SfxBoolItem ( ATTR_PRESENT_ANIMATION_ALLOWED, aCbxAnimationAllowed.IsChecked() ) ); rOutAttrs.Put( SfxBoolItem ( ATTR_PRESENT_CHANGE_PAGE, aCbxChangePage.IsChecked() ) ); rOutAttrs.Put( SfxBoolItem ( ATTR_PRESENT_ALWAYS_ON_TOP, aCbxAlwaysOnTop.IsChecked() ) ); + rOutAttrs.Put( SfxBoolItem ( ATTR_PRESENT_DISPLAY, aNumFldDisplay.GetValue() ) ); rOutAttrs.Put( SfxBoolItem ( ATTR_PRESENT_FULLSCREEN, !aRbtWindow.IsChecked() ) ); rOutAttrs.Put( SfxBoolItem ( ATTR_PRESENT_ENDLESS, aRbtAuto.IsChecked() ) ); rOutAttrs.Put( SfxUInt32Item ( ATTR_PRESENT_PAUSE_TIMEOUT, aTmfPause.GetTime().GetMSFromTime() / 1000 ) ); @@ -267,18 +274,31 @@ IMPL_LINK( SdStartPresentationDlg, ClickWindowPresentationHdl, void *, EMPTYARG ) { const BOOL bAuto = aRbtAuto.IsChecked(); + const BOOL bWindow = aRbtWindow.IsChecked(); // aFtPause.Enable( bAuto ); aTmfPause.Enable( bAuto ); aCbxAutoLogo.Enable( bAuto && ( aTmfPause.GetTime().GetMSFromTime() > 0UL ) ); + aNumFldDisplay.Enable( ! bWindow ); + aCbxAlwaysOnTop.Enable( ! bWindow ); - if( aRbtWindow.IsChecked() ) - { - aCbxAlwaysOnTop.Enable( FALSE ); + if( bWindow ) aCbxAlwaysOnTop.Check( FALSE ); - } - else - aCbxAlwaysOnTop.Enable(); + + return( 0L ); +} + +/************************************************************************* +|* Handler: Numeric Field "Display" +\************************************************************************/ +IMPL_LINK( SdStartPresentationDlg, ModifyDisplayHdl, void *, EMPTYARG ) +{ + ULONG nDisplay = aNumFldDisplay.GetValue(); + + if ( nDisplay > 2 ) + nDisplay = 2; + if ( nDisplay < 1 ) + nDisplay = 1; return( 0L ); } Index: source/ui/dlg/present.src =================================================================== RCS file: /cvs/graphics/sd/source/ui/dlg/present.src,v --- source/ui/dlg/present.src 31 Jan 2005 14:52:06 -0000 1.43 +++ source/ui/dlg/present.src 10 Jun 2005 07:29:32 -0000 @@ -228,6 +228,31 @@ Text [ en-US ] = "Show ~logo" ; Text [ x-comment ] = " "; }; + FixedText FT_DISPLAY + { + Pos = MAP_APPFONT ( 12, 152 ) ; + Size = MAP_APPFONT ( 50, 12 ) ; + Text [ de ] = "Anzeigenzahl:" ; + Text [ en-US ] = "Display Number:" ; + }; + NumericField NUM_FLD_DISPLAY + { + Border = TRUE ; + Pos = MAP_APPFONT ( 65, 150 ) ; + Size = MAP_APPFONT ( 20, 12 ) ; + TabStop = TRUE ; + Repeat = TRUE ; + Spin = TRUE ; + Minimum = 1 ; + Maximum = 2 ; + StrictFormat = TRUE ; + First = 1 ; + Last = 2 ; + SpinSize = 1 ; + QuickHelpText [ de ] = "Anzeigenzahl (Mehrfache Monitoren)" ; + QuickHelpText [ en-US ] = "Display Number (Multiple Monitors)" ; + QuickHelpText [ x-comment ] = " "; + }; FixedLine GRP_OPTIONS { Index: source/ui/inc/present.hrc =================================================================== RCS file: /cvs/graphics/sd/source/ui/inc/present.hrc,v --- source/ui/inc/present.hrc 18 Sep 2000 16:48:40 -0000 1.1.1.1 +++ source/ui/inc/present.hrc 10 Jun 2005 07:29:33 -0000 @@ -73,10 +73,12 @@ #define LB_CUSTOMSHOW 2 #define GRP_KIND 2 +#define NUM_FLD_DISPLAY 1 #define RBT_STANDARD 4 #define RBT_WINDOW 5 #define RBT_AUTO 6 #define FT_PAUSE 1 +#define FT_DISPLAY 2 #define TMF_PAUSE 1 #define CBX_AUTOLOGO 1 Index: source/ui/inc/present.hxx =================================================================== RCS file: /cvs/graphics/sd/source/ui/inc/present.hxx,v --- source/ui/inc/present.hxx 15 Jun 2001 18:16:52 -0000 1.2 +++ source/ui/inc/present.hxx 10 Jun 2005 07:29:33 -0000 @@ -103,6 +103,8 @@ RadioButton aRbtStandard; RadioButton aRbtWindow; RadioButton aRbtAuto; + FixedText aFtDisplay; + NumericField aNumFldDisplay; // FixedText aFtPause; TimeField aTmfPause; CheckBox aCbxAutoLogo; @@ -126,6 +128,7 @@ DECL_LINK( ChangeRangeHdl, void * ); DECL_LINK( ChangeMousepointerHdl, void * ); DECL_LINK( ClickWindowPresentationHdl, void * ); + DECL_LINK( ModifyDisplayHdl, void * ); DECL_LINK( ChangePauseHdl, void * ); public: