Attachment #27061 for issue #12719

View | Details | Raw Unified | Return to issue 12719
Collapse All | Expand All

Lines 110-116 Link Here

(-)inc/sdattr.hrc (-1 / +2 lines)
110	#define ATTR_PRESENT_ANIMATION_ALLOWED ATTR_PRESENT_START + 12	110	#define ATTR_PRESENT_ANIMATION_ALLOWED ATTR_PRESENT_START + 12
111	#define ATTR_PRESENT_PAUSE_TIMEOUT ATTR_PRESENT_START + 13	111	#define ATTR_PRESENT_PAUSE_TIMEOUT ATTR_PRESENT_START + 13
112	#define ATTR_PRESENT_SHOW_PAUSELOGO ATTR_PRESENT_START + 14	112	#define ATTR_PRESENT_SHOW_PAUSELOGO ATTR_PRESENT_START + 14
113	#define ATTR_PRESENT_END ATTR_PRESENT_SHOW_PAUSELOGO	113	#define ATTR_PRESENT_DISPLAY ATTR_PRESENT_START + 15
		114	#define ATTR_PRESENT_END ATTR_PRESENT_DISPLAY
114		115
115	// Transformations-Attribute	116	// Transformations-Attribute
116	#define ATTR_TRANSF_START ATTR_PRESENT_END + 1	117	#define ATTR_TRANSF_START ATTR_PRESENT_END + 1

Lines 91-96 Link Here

(-)source/ui/dlg/present.cxx (-6 / +26 lines)
91	aRbtStandard ( this, SdResId( RBT_STANDARD ) ),	91	aRbtStandard ( this, SdResId( RBT_STANDARD ) ),
92	aRbtWindow ( this, SdResId( RBT_WINDOW ) ),	92	aRbtWindow ( this, SdResId( RBT_WINDOW ) ),
93	aRbtAuto ( this, SdResId( RBT_AUTO ) ),	93	aRbtAuto ( this, SdResId( RBT_AUTO ) ),
		94	aFtDisplay ( this, SdResId( FT_DISPLAY ) ),
		95	aNumFldDisplay ( this, SdResId( NUM_FLD_DISPLAY ) ),
94	// aFtPause ( this, SdResId( FT_PAUSE ) ),	96	// aFtPause ( this, SdResId( FT_PAUSE ) ),
95	aTmfPause ( this, SdResId( TMF_PAUSE ) ),	97	aTmfPause ( this, SdResId( TMF_PAUSE ) ),
96	aCbxAutoLogo ( this, SdResId( CBX_AUTOLOGO ) ),	98	aCbxAutoLogo ( this, SdResId( CBX_AUTOLOGO ) ),
Lines 120-125 Link Here
120		122
121	aLink = LINK( this, SdStartPresentationDlg, ClickWindowPresentationHdl );	123	aLink = LINK( this, SdStartPresentationDlg, ClickWindowPresentationHdl );
122	aRbtStandard.SetClickHdl( aLink );	124	aRbtStandard.SetClickHdl( aLink );
		125	aNumFldDisplay.SetModifyHdl( LINK( this, SdStartPresentationDlg, ModifyDisplayHdl ) );
123	aRbtWindow.SetClickHdl( aLink );	126	aRbtWindow.SetClickHdl( aLink );
124	aRbtAuto.SetClickHdl( aLink );	127	aRbtAuto.SetClickHdl( aLink );
125		128
Lines 172-177 Link Here
172	const BOOL bEndless = ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_ENDLESS ) ).GetValue();	175	const BOOL bEndless = ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_ENDLESS ) ).GetValue();
173	const BOOL bWindow = !( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_FULLSCREEN ) ).GetValue();	176	const BOOL bWindow = !( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_FULLSCREEN ) ).GetValue();
174	const long nPause = ( ( const SfxUInt32Item& ) rOutAttrs.Get( ATTR_PRESENT_PAUSE_TIMEOUT ) ).GetValue();	177	const long nPause = ( ( const SfxUInt32Item& ) rOutAttrs.Get( ATTR_PRESENT_PAUSE_TIMEOUT ) ).GetValue();
		178	// const long nDisplay = ( ( const SfxUInt32Item& ) rOutAttrs.Get( ATTR_PRESENT_DISPLAY ) ).GetValue();
		179	const long nDisplay = 1;
175		180
176	aTmfPause.SetTime( Time( 0, 0, nPause ) );	181	aTmfPause.SetTime( Time( 0, 0, nPause ) );
177	// set cursor in timefield	182	// set cursor in timefield
Lines 181-186 Link Here
181		186
182	aCbxAutoLogo.Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_SHOW_PAUSELOGO ) ).GetValue() );	187	aCbxAutoLogo.Check( ( ( const SfxBoolItem& ) rOutAttrs.Get( ATTR_PRESENT_SHOW_PAUSELOGO ) ).GetValue() );
183		188
		189	aNumFldDisplay.SetValue( nDisplay );
184	if( bWindow )	190	if( bWindow )
185	aRbtWindow.Check( TRUE );	191	aRbtWindow.Check( TRUE );
186	else if( bEndless )	192	else if( bEndless )
Lines 224-229 Link Here
224	rOutAttrs.Put( SfxBoolItem ( ATTR_PRESENT_ANIMATION_ALLOWED, aCbxAnimationAllowed.IsChecked() ) );	230	rOutAttrs.Put( SfxBoolItem ( ATTR_PRESENT_ANIMATION_ALLOWED, aCbxAnimationAllowed.IsChecked() ) );
225	rOutAttrs.Put( SfxBoolItem ( ATTR_PRESENT_CHANGE_PAGE, aCbxChangePage.IsChecked() ) );	231	rOutAttrs.Put( SfxBoolItem ( ATTR_PRESENT_CHANGE_PAGE, aCbxChangePage.IsChecked() ) );
226	rOutAttrs.Put( SfxBoolItem ( ATTR_PRESENT_ALWAYS_ON_TOP, aCbxAlwaysOnTop.IsChecked() ) );	232	rOutAttrs.Put( SfxBoolItem ( ATTR_PRESENT_ALWAYS_ON_TOP, aCbxAlwaysOnTop.IsChecked() ) );
		233	rOutAttrs.Put( SfxBoolItem ( ATTR_PRESENT_DISPLAY, aNumFldDisplay.GetValue() ) );
227	rOutAttrs.Put( SfxBoolItem ( ATTR_PRESENT_FULLSCREEN, !aRbtWindow.IsChecked() ) );	234	rOutAttrs.Put( SfxBoolItem ( ATTR_PRESENT_FULLSCREEN, !aRbtWindow.IsChecked() ) );
228	rOutAttrs.Put( SfxBoolItem ( ATTR_PRESENT_ENDLESS, aRbtAuto.IsChecked() ) );	235	rOutAttrs.Put( SfxBoolItem ( ATTR_PRESENT_ENDLESS, aRbtAuto.IsChecked() ) );
229	rOutAttrs.Put( SfxUInt32Item ( ATTR_PRESENT_PAUSE_TIMEOUT, aTmfPause.GetTime().GetMSFromTime() / 1000 ) );	236	rOutAttrs.Put( SfxUInt32Item ( ATTR_PRESENT_PAUSE_TIMEOUT, aTmfPause.GetTime().GetMSFromTime() / 1000 ) );
Lines 267-284 Link Here
267	IMPL_LINK( SdStartPresentationDlg, ClickWindowPresentationHdl, void *, EMPTYARG )	274	IMPL_LINK( SdStartPresentationDlg, ClickWindowPresentationHdl, void *, EMPTYARG )
268	{	275	{
269	const BOOL bAuto = aRbtAuto.IsChecked();	276	const BOOL bAuto = aRbtAuto.IsChecked();
		277	const BOOL bWindow = aRbtWindow.IsChecked();
270		278
271	// aFtPause.Enable( bAuto );	279	// aFtPause.Enable( bAuto );
272	aTmfPause.Enable( bAuto );	280	aTmfPause.Enable( bAuto );
273	aCbxAutoLogo.Enable( bAuto && ( aTmfPause.GetTime().GetMSFromTime() > 0UL ) );	281	aCbxAutoLogo.Enable( bAuto && ( aTmfPause.GetTime().GetMSFromTime() > 0UL ) );
		282	aNumFldDisplay.Enable( ! bWindow );
		283	aCbxAlwaysOnTop.Enable( ! bWindow );
274		284
275	if( aRbtWindow.IsChecked() )	285	if( bWindow )
276	{
277	aCbxAlwaysOnTop.Enable( FALSE );
278	aCbxAlwaysOnTop.Check( FALSE );	286	aCbxAlwaysOnTop.Check( FALSE );
279	}	287
280	else	288	return( 0L );
281	aCbxAlwaysOnTop.Enable();	289	}
		290
		291	/*************************************************************************
		292	\|* Handler: Numeric Field "Display"
		293	\************************************************************************/
		294	IMPL_LINK( SdStartPresentationDlg, ModifyDisplayHdl, void *, EMPTYARG )
		295	{
		296	ULONG nDisplay = aNumFldDisplay.GetValue();
		297
		298	if ( nDisplay > 2 )
		299	nDisplay = 2;
		300	if ( nDisplay < 1 )
		301	nDisplay = 1;
282		302
283	return( 0L );	303	return( 0L );
284	}	304	}




		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
	{




#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


Lines 103-108 Link Here

(-)source/ui/inc/present.hxx (+3 lines)
103	RadioButton aRbtStandard;	103	RadioButton aRbtStandard;
104	RadioButton aRbtWindow;	104	RadioButton aRbtWindow;
105	RadioButton aRbtAuto;	105	RadioButton aRbtAuto;
		106	FixedText aFtDisplay;
		107	NumericField aNumFldDisplay;
106	// FixedText aFtPause;	108	// FixedText aFtPause;
107	TimeField aTmfPause;	109	TimeField aTmfPause;
108	CheckBox aCbxAutoLogo;	110	CheckBox aCbxAutoLogo;
Lines 126-131 Link Here
126	DECL_LINK( ChangeRangeHdl, void * );	128	DECL_LINK( ChangeRangeHdl, void * );
127	DECL_LINK( ChangeMousepointerHdl, void * );	129	DECL_LINK( ChangeMousepointerHdl, void * );
128	DECL_LINK( ClickWindowPresentationHdl, void * );	130	DECL_LINK( ClickWindowPresentationHdl, void * );
		131	DECL_LINK( ModifyDisplayHdl, void * );
129	DECL_LINK( ChangePauseHdl, void * );	132	DECL_LINK( ChangePauseHdl, void * );
130		133
131	public:	134	public:

Return to issue 12719

Lines 228-233 Link Here

(-)source/ui/dlg/present.src (+25 lines)
228	Text [ en-US ] = "Show ~logo" ;	228	Text [ en-US ] = "Show ~logo" ;
229	Text [ x-comment ] = " ";	229	Text [ x-comment ] = " ";
230	};	230	};
		231	FixedText FT_DISPLAY
		232	{
		233	Pos = MAP_APPFONT ( 12, 152 ) ;
		234	Size = MAP_APPFONT ( 50, 12 ) ;
		235	Text [ de ] = "Anzeigenzahl:" ;
		236	Text [ en-US ] = "Display Number:" ;
		237	};
		238	NumericField NUM_FLD_DISPLAY
		239	{
		240	Border = TRUE ;
		241	Pos = MAP_APPFONT ( 65, 150 ) ;
		242	Size = MAP_APPFONT ( 20, 12 ) ;
		243	TabStop = TRUE ;
		244	Repeat = TRUE ;
		245	Spin = TRUE ;
		246	Minimum = 1 ;
		247	Maximum = 2 ;
		248	StrictFormat = TRUE ;
		249	First = 1 ;
		250	Last = 2 ;
		251	SpinSize = 1 ;
		252	QuickHelpText [ de ] = "Anzeigenzahl (Mehrfache Monitoren)" ;
		253	QuickHelpText [ en-US ] = "Display Number (Multiple Monitors)" ;
		254	QuickHelpText [ x-comment ] = " ";
		255	};
231		256
232	FixedLine GRP_OPTIONS	257	FixedLine GRP_OPTIONS
233	{	258	{

Lines 73-82 Link Here

(-)source/ui/inc/present.hrc (+2 lines)
73	#define LB_CUSTOMSHOW 2	73	#define LB_CUSTOMSHOW 2
74		74
75	#define GRP_KIND 2	75	#define GRP_KIND 2
		76	#define NUM_FLD_DISPLAY 1
76	#define RBT_STANDARD 4	77	#define RBT_STANDARD 4
77	#define RBT_WINDOW 5	78	#define RBT_WINDOW 5
78	#define RBT_AUTO 6	79	#define RBT_AUTO 6
79	#define FT_PAUSE 1	80	#define FT_PAUSE 1
		81	#define FT_DISPLAY 2
80	#define TMF_PAUSE 1	82	#define TMF_PAUSE 1
81	#define CBX_AUTOLOGO 1	83	#define CBX_AUTOLOGO 1
82		84