From ac4b85574997f72c57edc602a1716504377dcdc2 Mon Sep 17 00:00:00 2001 From: paul Date: Wed, 13 May 2009 01:23:16 +0000 Subject: [PATCH] lcl: TApplicationProperties: - set default values for most of properties (where it has sense) - add ShowButtonGlyphs property - minor formatting git-svn-id: trunk@19946 - --- lcl/forms.pp | 73 +++++++++++++---------- lcl/include/application.inc | 7 --- lcl/include/applicationproperties.inc | 83 ++++++++++++++++----------- 3 files changed, 90 insertions(+), 73 deletions(-) diff --git a/lcl/forms.pp b/lcl/forms.pp index 437795d9be..78f418872e 100644 --- a/lcl/forms.pp +++ b/lcl/forms.pp @@ -1311,10 +1311,18 @@ type property OnDestroy: TNotifyEvent read FOnDestroy write FOnDestroy; property ShowButtonGlyphs: TShowButtonGlyphs read FShowButtonGlyphs write SetShowButtonGlyphs default sbgAlways; property ShowHint: Boolean read FShowHint write SetShowHint; - property ShowMainForm: Boolean read FShowMainForm write FShowMainForm default true; + property ShowMainForm: Boolean read FShowMainForm write FShowMainForm default True; property Title: String read GetTitle write SetTitle; end; +const + DefHintColor = clInfoBk; // default hint window color + DefHintPause = 500; // default pause before hint window displays (ms) + DefHintShortPause = 0; // default reshow pause + DefHintHidePause = 5*DefHintPause; // default pause before hint is hidden (ms) + DefHintHidePausePerChar = 200; // added to DefHintHidePause (ms) + +type { TApplicationProperties } TApplicationProperties = class(TLCLComponent) @@ -1328,6 +1336,7 @@ type FHintShortCuts: Boolean; FHintShortPause: Integer; FOnDropFiles: TDropFilesEvent; + FShowButtonGlyphs: TShowButtonGlyphs; FShowHint: Boolean; FShowMainForm: Boolean; FTitle: String; @@ -1343,46 +1352,48 @@ type FOnQueryEndSession : TQueryEndSessionEvent; FOnMinimize : TNotifyEvent; FOnRestore : TNotifyEvent; - procedure SetShowMainForm(const AValue: Boolean); protected - procedure SetCaptureExceptions(Const AValue : boolean); - procedure SetHelpFile(Const AValue : string); - procedure SetHint(Const AValue : string); - procedure SetHintColor(Const AValue : TColor); - procedure SetHintHidePause(Const AValue : Integer); - procedure SetHintPause(Const AValue : Integer); - procedure SetHintShortCuts(Const AValue : Boolean); - procedure SetHintShortPause(Const AValue : Integer); - procedure SetShowHint(Const AValue : Boolean); - procedure SetTitle(Const AValue : String); + procedure SetCaptureExceptions(const AValue : boolean); + procedure SetHelpFile(const AValue : string); + procedure SetHint(const AValue : string); + procedure SetHintColor(const AValue : TColor); + procedure SetHintHidePause(const AValue : Integer); + procedure SetHintPause(const AValue : Integer); + procedure SetHintShortCuts(const AValue : Boolean); + procedure SetHintShortPause(const AValue : Integer); + procedure SetShowButtonGlyphs(const AValue: TShowButtonGlyphs); + procedure SetShowHint(const AValue : Boolean); + procedure SetShowMainForm(const AValue: Boolean); + procedure SetTitle(const AValue : String); - procedure SetOnException(Const AValue : TExceptionEvent); - procedure SetOnIdle(Const AValue : TIdleEvent); - procedure SetOnIdleEnd(Const AValue : TNotifyEvent); - procedure SetOnEndSession(Const AValue : TNotifyEvent); - procedure SetOnQueryEndSession(Const AValue : TQueryEndSessionEvent); - procedure SetOnMinimize(Const AValue : TNotifyEvent); - procedure SetOnRestore(Const AValue : TNotifyEvent); + procedure SetOnException(const AValue : TExceptionEvent); + procedure SetOnIdle(const AValue : TIdleEvent); + procedure SetOnIdleEnd(const AValue : TNotifyEvent); + procedure SetOnEndSession(const AValue : TNotifyEvent); + procedure SetOnQueryEndSession(const AValue : TQueryEndSessionEvent); + procedure SetOnMinimize(const AValue : TNotifyEvent); + procedure SetOnRestore(const AValue : TNotifyEvent); procedure SetOnDropFiles(const AValue: TDropFilesEvent); - procedure SetOnHelp(Const AValue : THelpEvent); - procedure SetOnHint(Const AValue : TNotifyEvent); - procedure SetOnShowHint(Const AValue : TShowHintEvent); - procedure SetOnUserInput(Const AValue : TOnUserInputEvent); + procedure SetOnHelp(const AValue : THelpEvent); + procedure SetOnHint(const AValue : TNotifyEvent); + procedure SetOnShowHint(const AValue : TShowHintEvent); + procedure SetOnUserInput(const AValue : TOnUserInputEvent); public constructor Create(AOwner: TComponent); Override; destructor Destroy; override; published property CaptureExceptions: boolean read FCaptureExceptions - write SetCaptureExceptions; + write SetCaptureExceptions default True; property HelpFile: string read FHelpFile write SetHelpFile; property Hint: string read FHint write SetHint; - property HintColor: TColor read FHintColor write SetHintColor; - property HintHidePause: Integer read FHintHidePause write SetHintHidePause; - property HintPause: Integer read FHintPause write SetHintPause; - property HintShortCuts: Boolean read FHintShortCuts write SetHintShortCuts; - property HintShortPause: Integer read FHintShortPause write SetHintShortPause; - property ShowHint: Boolean read FShowHint write SetShowHint; - property ShowMainForm: Boolean read FShowMainForm write SetShowMainForm default true; + property HintColor: TColor read FHintColor write SetHintColor default DefHintColor; + property HintHidePause: Integer read FHintHidePause write SetHintHidePause default DefHintHidePause; + property HintPause: Integer read FHintPause write SetHintPause default DefHintPause; + property HintShortCuts: Boolean read FHintShortCuts write SetHintShortCuts default True; + property HintShortPause: Integer read FHintShortPause write SetHintShortPause default DefHintShortPause; + property ShowButtonGlyphs: TShowButtonGlyphs read FShowButtonGlyphs write SetShowButtonGlyphs default sbgAlways; + property ShowHint: Boolean read FShowHint write SetShowHint default True; + property ShowMainForm: Boolean read FShowMainForm write SetShowMainForm default True; property Title: String read FTitle write SetTitle; property OnException: TExceptionEvent read FOnException write SetOnException; diff --git a/lcl/include/application.inc b/lcl/include/application.inc index 2ed1938d14..16d334e72e 100644 --- a/lcl/include/application.inc +++ b/lcl/include/application.inc @@ -19,13 +19,6 @@ { $define DebugHintWindow} -const - DefHintColor = clInfoBk; { default hint window color } - DefHintPause = 500; { default pause before hint window displays (ms) } - DefHintShortPause = 0; { default reshow pause } - DefHintHidePause = 5*DefHintPause; { default pause before hint is hidden (ms) } - DefHintHidePausePerChar = 200; { added to DefHintHidePause (ms) } - function FindApplicationComponent(const ComponentName: string): TComponent; begin if Application.FindGlobalComponentEnabled then diff --git a/lcl/include/applicationproperties.inc b/lcl/include/applicationproperties.inc index fdde69456e..528410386e 100644 --- a/lcl/include/applicationproperties.inc +++ b/lcl/include/applicationproperties.inc @@ -17,75 +17,75 @@ ***************************************************************************** } -procedure TApplicationProperties.SetCaptureExceptions(Const AValue : boolean); +procedure TApplicationProperties.SetCaptureExceptions(const AValue : boolean); begin FCaptureExceptions := AValue; - If not (csDesigning in ComponentState) then + if not (csDesigning in ComponentState) then Application.CaptureExceptions := AValue; end; -procedure TApplicationProperties.SetHelpFile(Const AValue : string); +procedure TApplicationProperties.SetHelpFile(const AValue : string); begin FHelpFile := AValue; - If not (csDesigning in ComponentState) then + if not (csDesigning in ComponentState) then Application.HelpFile := AValue; end; -procedure TApplicationProperties.SetHint(Const AValue : string); +procedure TApplicationProperties.SetHint(const AValue : string); begin FHint := AValue; - If not (csDesigning in ComponentState) then + if not (csDesigning in ComponentState) then Application.Hint := AValue; end; -procedure TApplicationProperties.SetHintColor(Const AValue : TColor); +procedure TApplicationProperties.SetHintColor(const AValue : TColor); begin FHintColor := AValue; - If not (csDesigning in ComponentState) then + if not (csDesigning in ComponentState) then Application.HintColor := AValue; end; -procedure TApplicationProperties.SetHintHidePause(Const AValue : Integer); +procedure TApplicationProperties.SetHintHidePause(const AValue : Integer); begin FHintHidePause := AValue; - If not (csDesigning in ComponentState) then + if not (csDesigning in ComponentState) then Application.HintHidePause := AValue; end; -procedure TApplicationProperties.SetHintPause(Const AValue : Integer); +procedure TApplicationProperties.SetHintPause(const AValue : Integer); begin FHintPause := AValue; - If not (csDesigning in ComponentState) then + if not (csDesigning in ComponentState) then Application.HintPause := AValue; end; -procedure TApplicationProperties.SetHintShortCuts(Const AValue : Boolean); +procedure TApplicationProperties.SetHintShortCuts(const AValue : Boolean); begin FHintShortCuts := AValue; - If not (csDesigning in ComponentState) then + if not (csDesigning in ComponentState) then Application.HintShortCuts := AValue; end; -procedure TApplicationProperties.SetHintShortPause(Const AValue : Integer); +procedure TApplicationProperties.SetHintShortPause(const AValue : Integer); begin FHintShortPause := AValue; - If not (csDesigning in ComponentState) then + if not (csDesigning in ComponentState) then Application.HintShortPause := AValue; end; -procedure TApplicationProperties.SetShowHint(Const AValue : Boolean); +procedure TApplicationProperties.SetShowHint(const AValue : Boolean); begin FShowHint := AValue; - If not (csDesigning in ComponentState) then + if not (csDesigning in ComponentState) then Application.ShowHint := AValue; end; @@ -97,15 +97,23 @@ begin Application.ShowMainForm := AValue; end; -procedure TApplicationProperties.SetTitle(Const AValue : String); +procedure TApplicationProperties.SetShowButtonGlyphs(const AValue: TShowButtonGlyphs); +begin + FShowButtonGlyphs := AValue; + + if not (csDesigning in ComponentState) then + Application.ShowButtonGlyphs := AValue; +end; + +procedure TApplicationProperties.SetTitle(const AValue : String); begin FTitle := AValue; - If not (csDesigning in ComponentState) then + if not (csDesigning in ComponentState) then Application.Title := AValue; end; -procedure TApplicationProperties.SetOnException(Const AValue : TExceptionEvent); +procedure TApplicationProperties.SetOnException(const AValue : TExceptionEvent); begin if (TMethod(FOnException).Data=TMethod(AValue).Data) and (TMethod(FOnException).Code=TMethod(AValue).Code) then exit; @@ -118,7 +126,7 @@ begin Application.AddOnExceptionHandler(FOnException); end; -procedure TApplicationProperties.SetOnIdle(Const AValue : TIdleEvent); +procedure TApplicationProperties.SetOnIdle(const AValue : TIdleEvent); begin if (TMethod(FOnIdle).Data=TMethod(AValue).Data) and (TMethod(FOnIdle).Code=TMethod(AValue).Code) then exit; @@ -131,7 +139,7 @@ begin Application.AddOnIdleHandler(FOnIdle); end; -procedure TApplicationProperties.SetOnIdleEnd(Const AValue : TNotifyEvent); +procedure TApplicationProperties.SetOnIdleEnd(const AValue : TNotifyEvent); begin if (TMethod(FOnIdleEnd).Data=TMethod(AValue).Data) and (TMethod(FOnIdleEnd).Code=TMethod(AValue).Code) then exit; @@ -145,7 +153,7 @@ begin end; -procedure TApplicationProperties.SetOnEndSession(Const AValue : TNotifyEvent); +procedure TApplicationProperties.SetOnEndSession(const AValue : TNotifyEvent); begin if (TMethod(FOnEndSession).Data=TMethod(AValue).Data) and (TMethod(FOnEndSession).Code=TMethod(AValue).Code) then exit; @@ -159,7 +167,7 @@ begin end; -procedure TApplicationProperties.SetOnQueryEndSession(Const AValue : TQueryEndSessionEvent); +procedure TApplicationProperties.SetOnQueryEndSession(const AValue : TQueryEndSessionEvent); begin if (TMethod(FOnQueryEndSession).Data=TMethod(AValue).Data) and (TMethod(FOnQueryEndSession).Code=TMethod(AValue).Code) then exit; @@ -211,7 +219,7 @@ begin Application.AddOnDropFilesHandler(FOnDropFiles); end; -procedure TApplicationProperties.SetOnHelp(Const AValue : THelpEvent); +procedure TApplicationProperties.SetOnHelp(const AValue : THelpEvent); begin if (TMethod(FOnHelp).Data=TMethod(AValue).Data) and (TMethod(FOnHelp).Code=TMethod(AValue).Code) then exit; @@ -224,7 +232,7 @@ begin Application.AddOnHelpHandler(FOnHelp); end; -procedure TApplicationProperties.SetOnHint(Const AValue : TNotifyEvent); +procedure TApplicationProperties.SetOnHint(const AValue : TNotifyEvent); begin if (TMethod(FOnHint).Data=TMethod(AValue).Data) and (TMethod(FOnHint).Code=TMethod(AValue).Code) then exit; @@ -237,7 +245,7 @@ begin Application.AddOnHintHandler(FOnHint); end; -procedure TApplicationProperties.SetOnShowHint(Const AValue : TShowHintEvent); +procedure TApplicationProperties.SetOnShowHint(const AValue : TShowHintEvent); begin if (TMethod(FOnShowHint).Data=TMethod(AValue).Data) and (TMethod(FOnShowHint).Code=TMethod(AValue).Code) then exit; @@ -250,7 +258,7 @@ begin Application.AddOnShowHintHandler(FOnShowHint); end; -procedure TApplicationProperties.SetOnUserInput(Const AValue : TOnUserInputEvent); +procedure TApplicationProperties.SetOnUserInput(const AValue : TOnUserInputEvent); begin if (TMethod(FOnUserInput).Data=TMethod(AValue).Data) and (TMethod(FOnUserInput).Code=TMethod(AValue).Code) then exit; @@ -267,16 +275,19 @@ constructor TApplicationProperties.Create(AOwner: TComponent); begin inherited Create(AOwner); - if (csDesigning in ComponentState) then begin - FCaptureExceptions:=true; + if (csDesigning in ComponentState) then + begin + FCaptureExceptions := True; FHintColor := DefHintColor; FHintPause := DefHintPause; FHintShortCuts := True; FHintShortPause := DefHintShortPause; FHintHidePause := DefHintHidePause; - FShowHint := true; + FShowButtonGlyphs := sbgAlways; + FShowHint := True; end - else begin + else + begin FCaptureExceptions := Application.CaptureExceptions; FHelpFile := Application.HelpFile; FHint := Application.Hint; @@ -285,10 +296,11 @@ begin FHintPause := Application.HintPause; FHintShortCuts := Application.HintShortCuts; FHintShortPause := Application.HintShortPause; + FShowButtonGlyphs := Application.ShowButtonGlyphs; FShowHint := Application.ShowHint; FTitle := Application.Title; end; - FShowMainForm := true; + FShowMainForm := True; FOnException := nil; FOnIdle := nil; @@ -303,7 +315,8 @@ end; destructor TApplicationProperties.Destroy; begin - If not (csDesigning in ComponentState) then begin + if not (csDesigning in ComponentState) then + begin Application.RemoveOnExceptionHandler(FOnException); Application.RemoveOnIdleHandler(FOnIdle); Application.RemoveOnIdleEndHandler(FOnIdleEnd);