paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-03 14:00:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL: Dialogs unit: cleanup.

Browse Source
This commit is contained in:
Bart 2023-07-24 22:27:09 +02:00
parent 71f8725fb8
commit 158f10e193
2 changed files with 6 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/dialogs.pp
View File

@ -636,8 +636,6 @@ type
FVerificationText: TTranslateString; FVerificationText: TTranslateString;
FWidth: Integer; FWidth: Integer;
FOnButtonClicked: TTaskDlgClickEvent; FOnButtonClicked: TTaskDlgClickEvent;
//procedure DoOnButtonClickedHandler(Sender: PTaskDialog; AButtonID: Integer;
// var ACanClose: Boolean);
procedure SetButtons(const Value: TTaskDialogButtons); procedure SetButtons(const Value: TTaskDialogButtons);
procedure SetRadioButtons(const Value: TTaskDialogButtons); procedure SetRadioButtons(const Value: TTaskDialogButtons);
protected protected

155
lcl/include/taskdialog.inc
View File

@ -134,91 +134,7 @@ begin
end; end;
function TCustomTaskDialog.DoExecute(ParentWnd: HWND): Boolean; function TCustomTaskDialog.DoExecute(ParentWnd: HWND): Boolean;
//function TD_COMMONBUTTONS(const aButtons: TTaskDialogCommonButtons): LCLTaskDialog.TCommonButtons;
//begin
// Result := [];
// if tcbOk in aButtons then
// Result := Result + [cbOK];
// if tcbYes in aButtons then
// Result := Result + [cbYes];
// if tcbNo in aButtons then
// Result := Result + [cbNo];
// if tcbCancel in aButtons then
// Result := Result + [cbCancel];
// if tcbRetry in aButtons then
// Result := Result + [cbRetry];
// if tcbClose in aButtons then
// Result := Result + [cbClose];
//end;
//function TD_FLAGS(const aTaskFlags: TTaskDialogFlags): LCLTaskDialog.TTaskDialogFlags;
//begin
// Result := [];
// if tfEnableHyperlinks in aTaskFlags then
// Result := Result + [tdfEnableHyperlinks];
// if tfUseHiconMain in aTaskFlags then
// Result := Result + [tdfUseHIconMain];
// if tfUseHiconFooter in aTaskFlags then
// Result := Result + [tdfUseHIconFooter];
// if tfAllowDialogCancellation in aTaskFlags then
// Result := Result + [tdfAllowDialogCancellation];
// if tfUseCommandLinks in aTaskFlags then
// Result := Result + [tdfUseCommandLinks];
// if tfUseCommandLinksNoIcon in aTaskFlags then
// Result := Result + [tdfUseCommandLinksNoIcon];
// if tfExpandFooterArea in aTaskFlags then
// Result := Result + [tdfExpandFooterArea];
// if tfExpandedByDefault in aTaskFlags then
// Result := Result + [tdfExpandByDefault];
// if tfVerificationFlagChecked in aTaskFlags then
// Result := Result + [tdfVerificationFlagChecked];
// if tfShowProgressBar in aTaskFlags then
// Result := Result + [tdfShowProgressBar];
// if tfShowMarqueeProgressBar in aTaskFlags then
// Result := Result + [tdfShowMarqueeProgressBar];
// if tfCallbackTimer in aTaskFlags then
// Result := Result + [tdfCallbackTimer];
// if tfPositionRelativeToWindow in aTaskFlags then
// Result := Result + [tdfPositionRelativeToWindow];
// if tfRtlLayout in aTaskFlags then
// Result := Result + [tdfRtlLayout];
// if tfNoDefaultRadioButton in aTaskFlags then
// Result := Result + [tdfNoDefaultRadioButton];
// if tfCanBeMinimized in aTaskFlags then
// Result := Result + [tdfCanBeMinimized];
// if tfNoSetForeGround in aTaskFlags then
// Result := Result + [tdfNoSetForeGround];
// if tfSizeToContent in aTaskFlags then
// Result := Result + [tdfSizeToContent];
//end;
//function TF_DIALOGICON(const aIcon: TTaskDialogIcon): LCLTaskDialog.TTaskDialogIcon;
//begin
// case aIcon of
// tdiWarning: Result := LCLTaskDialog.TTaskDialogIcon.tiWarning;
// tdiError: Result := LCLTaskDialog.TTaskDialogIcon.tiError;
// tdiInformation: Result := LCLTaskDialog.TTaskDialogIcon.tiInformation;
// tdiShield: Result := LCLTaskDialog.TTaskDialogIcon.tiShield;
// tdiQuestion: Result := LCLTaskDialog.TTaskDialogIcon.tiQuestion;
// else
// Result := LCLTaskDialog.TTaskDialogIcon.tiBlank;
// end;
//end;
//
//function TF_FOOTERICON(const aIcon: TTaskDialogIcon): LCLTaskDialog.TTaskDialogFooterIcon;
//begin
// case aIcon of
// tdiWarning: Result := LCLTaskDialog.TTaskDialogFooterIcon.tfiWarning;
// tdiError: Result := LCLTaskDialog.TTaskDialogFooterIcon.tfiError;
// tdiInformation: Result := LCLTaskDialog.TTaskDialogFooterIcon.tfiInformation;
// tdiShield: Result := LCLTaskDialog.TTaskDialogFooterIcon.tfiShield;
// tdiQuestion: Result := LCLTaskDialog.TTaskDialogFooterIcon.tfiQuestion;
// else
// Result := LCLTaskDialog.TTaskDialogFooterIcon.tfiBlank;
// end;
//end;
var var
//TaskDlg: LCLTaskDialog.TTaskDialog;
DefRB, DefBtn: TModalResult; DefRB, DefBtn: TModalResult;
B: TTaskDialogBaseButtonItem; B: TTaskDialogBaseButtonItem;
ButtonID, ARadioRes: Integer; ButtonID, ARadioRes: Integer;
@ -226,10 +142,6 @@ const
TD_BTNMOD: array[TTaskDialogCommonButton] of Integer = ( TD_BTNMOD: array[TTaskDialogCommonButton] of Integer = (
mrOk, mrYes, mrNo, mrCancel, mrRetry, mrAbort); mrOk, mrYes, mrNo, mrCancel, mrRetry, mrAbort);
begin begin
//Current goal of refactoring: replace all this with:
//Result := TWSTaskDialogClass(WidgetSetClass).Execute(Self);
ButtonID := TWSTaskDialogClass(WidgetSetClass).Execute(Self, ParentWnd, ARadioRes); ButtonID := TWSTaskDialogClass(WidgetSetClass).Execute(Self, ParentWnd, ARadioRes);
FModalResult := ButtonIDToModalResult(ButtonID); FModalResult := ButtonIDToModalResult(ButtonID);
Result := (ButtonID >= 0); Result := (ButtonID >= 0);
@ -237,62 +149,12 @@ begin
FRadioButton := RadioButtons[ARadioRes-TaskDialogFirstRadioButtonIndex] as TTaskDialogRadioButtonItem FRadioButton := RadioButtons[ARadioRes-TaskDialogFirstRadioButtonIndex] as TTaskDialogRadioButtonItem
else else
FRadioButton := nil; FRadioButton := nil;
debugln(['TWSTaskDialogClass(WidgetSetClass).Execute(Self)=',ButtonID,', Result=',Result]); //debugln(['TWSTaskDialogClass(WidgetSetClass).Execute(Self)=',ButtonID,', Result=',Result]);
debugln([' ButtonID=',ButtonID]); //debugln([' ButtonID=',ButtonID]);
debugln([' FModalResult=',FModalResult]); //debugln([' FModalResult=',FModalResult]);
debugln([' VerifyChecked=',tfVerificationFlagChecked in FFlags]); //debugln([' VerifyChecked=',tfVerificationFlagChecked in FFlags]);
debugln([' ARadioRes=',ARadioRes]); //debugln([' ARadioRes=',ARadioRes]);
debugln([' Assigned(FRadioButton)=',Assigned(FRadioButton)]); //debugln([' Assigned(FRadioButton)=',Assigned(FRadioButton)]);
(*
FillChar(TaskDlg, SizeOf(LCLTaskDialog.TTaskDialog), 0);
if RadioButtons.DefaultButton<> nil then
DefRB := RadioButtons.DefaultButton.Index
else
DefRB := 0;
if Buttons.DefaultButton<>nil then
DefBtn := Buttons.DefaultButton.ModalResult
else
DefBtn := TD_BTNMOD[DefaultButton];
for B in Buttons do
TaskDlg.Buttons := TaskDlg.Buttons + B.Caption + #10;
for B in RadioButtons do
TaskDlg.Radios := TaskDlg.Radios + B.Caption + #10;
TaskDlg.Title := Caption;
TaskDlg.Inst := Title;
TaskDlg.Content := Text;
TaskDlg.InfoCollapse := ExpandButtonCaption;
TaskDlg.Info := ExpandedText;
TaskDlg.Footer := FooterText;
TaskDlg.Verify := VerificationText;
ButtonID := TaskDlg.Execute(TD_COMMONBUTTONS(CommonButtons), DefBtn, TD_FLAGS(Flags), TF_DIALOGICON(MainIcon), TF_FOOTERICON(FooterIcon),
DefRB, FWidth, ParentWnd, tfForceNonNative in Flags, tfEmulateClassicStyle in Flags, @DoOnButtonClickedHandler);
debugln(['TaskDlg.Execute()=',ButtonID,', Result=',Result]);
debugln(['Old: ButtonID=',ButtonID]);
Result := ButtonID>=0;
FModalResult := ButtonIDToModalResult(ButtonID);
debugln(['Old: FModalResult=',FModalResult]);
//ToDo move TaskDialogFirstButtonIndex and TaskDialogFirstRadioButtonIndex to interface section Dialogs unit.
debugln(['Old: TaskDlg.RadioRes=',TaskDlg.RadioRes]);
if (TaskDlg.RadioRes>=TaskDialogFirstRadioButtonIndex) and (TaskDlg.RadioRes-TaskDialogFirstRadioButtonIndex<RadioButtons.Count) then
FRadioButton := RadioButtons[TaskDlg.RadioRes-TaskDialogFirstRadioButtonIndex] as TTaskDialogRadioButtonItem
else
FRadioButton := nil;
if TaskDlg.VerifyChecked then
Include(FFlags, tfVerificationFlagChecked)
else
Exclude(FFlags, tfVerificationFlagChecked)
*)
end; end;
procedure TCustomTaskDialog.DoOnButtonClicked(AModalResult: Integer; procedure TCustomTaskDialog.DoOnButtonClicked(AModalResult: Integer;
@ -302,11 +164,6 @@ begin
FOnButtonClicked(Self, AModalResult, ACanClose); FOnButtonClicked(Self, AModalResult, ACanClose);
end; end;
//procedure TCustomTaskDialog.DoOnButtonClickedHandler(Sender: PTaskDialog;
// AButtonID: integer; var ACanClose: Boolean);
//begin
// DoOnButtonClicked(ButtonIDToModalResult(AButtonID), ACanClose)
//end;
function TCustomTaskDialog.Execute(ParentWnd: HWND): Boolean; function TCustomTaskDialog.Execute(ParentWnd: HWND): Boolean;
begin begin