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

lcl: lcltaskdialog: fix execution parameters

Browse Source 
git-svn-id: trunk@53015 -
This commit is contained in:
ondrej 2016-09-22 07:00:38 +00:00
parent 7392cc05c9
commit b934d7aa02
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lcl/dialogs.pp
View File

@ -598,13 +598,10 @@ type
FCommonButtons: TTaskDialogCommonButtons; FCommonButtons: TTaskDialogCommonButtons;
FDefaultButton: TTaskDialogCommonButton; FDefaultButton: TTaskDialogCommonButton;
FExpandButtonCaption: string; FExpandButtonCaption: string;
FExpanded: Boolean;
FExpandedText: string; FExpandedText: string;
FFlags: TTaskDialogFlags; FFlags: TTaskDialogFlags;
FFooterIcon: TTaskDialogIcon; FFooterIcon: TTaskDialogIcon;
FFooterText: string; FFooterText: string;
FHandle: HWND;
FHelpContext: Integer;
FMainIcon: TTaskDialogIcon; FMainIcon: TTaskDialogIcon;
FModalResult: TModalResult; FModalResult: TModalResult;
FRadioButton: TTaskDialogRadioButtonItem; FRadioButton: TTaskDialogRadioButtonItem;
@ -613,7 +610,6 @@ type
FTitle: string; FTitle: string;
FVerificationText: string; FVerificationText: string;
FOnButtonClicked: TTaskDlgClickEvent; FOnButtonClicked: TTaskDlgClickEvent;
FOnHyperlinkClicked: TNotifyEvent;
procedure DoOnButtonClickedHandler(Sender: PTaskDialog; AButtonID: integer; procedure DoOnButtonClickedHandler(Sender: PTaskDialog; AButtonID: integer;
var ACanClose: Boolean); var ACanClose: Boolean);
procedure SetButtons(const Value: TTaskDialogButtons); procedure SetButtons(const Value: TTaskDialogButtons);
@ -632,12 +628,11 @@ type
property Caption: string read FCaption write FCaption; property Caption: string read FCaption write FCaption;
property CommonButtons: TTaskDialogCommonButtons read FCommonButtons write FCommonButtons default [tcbOk, tcbCancel]; property CommonButtons: TTaskDialogCommonButtons read FCommonButtons write FCommonButtons default [tcbOk, tcbCancel];
property DefaultButton: TTaskDialogCommonButton read FDefaultButton write FDefaultButton default tcbOk; property DefaultButton: TTaskDialogCommonButton read FDefaultButton write FDefaultButton default tcbOk;
property Expanded: Boolean read FExpanded; property ExpandButtonCaption: string read FExpandButtonCaption write FExpandButtonCaption;
property ExpandedText: string read FExpandedText write FExpandedText; property ExpandedText: string read FExpandedText write FExpandedText;
property Flags: TTaskDialogFlags read FFlags write FFlags default [tfAllowDialogCancellation]; property Flags: TTaskDialogFlags read FFlags write FFlags default [tfAllowDialogCancellation];
property FooterIcon: TTaskDialogIcon read FFooterIcon write FFooterIcon default tdiNone; property FooterIcon: TTaskDialogIcon read FFooterIcon write FFooterIcon default tdiNone;
property FooterText: string read FFooterText write FFooterText; property FooterText: string read FFooterText write FFooterText;
property Handle: HWND read FHandle;
property MainIcon: TTaskDialogIcon read FMainIcon write FMainIcon default tdiInformation; property MainIcon: TTaskDialogIcon read FMainIcon write FMainIcon default tdiInformation;
property ModalResult: TModalResult read FModalResult write FModalResult; property ModalResult: TModalResult read FModalResult write FModalResult;
property RadioButton: TTaskDialogRadioButtonItem read FRadioButton; property RadioButton: TTaskDialogRadioButtonItem read FRadioButton;
@ -654,6 +649,7 @@ type
property Caption; property Caption;
property CommonButtons; property CommonButtons;
property DefaultButton; property DefaultButton;
property ExpandButtonCaption;
property ExpandedText; property ExpandedText;
property Flags; property Flags;
property FooterIcon; property FooterIcon;

8
lcl/include/taskdialog.inc
View File

@ -219,6 +219,14 @@ begin
for B in RadioButtons do for B in RadioButtons do
TaskDlg.Radios := TaskDlg.Radios + B.Caption + #10; 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), ButtonID := TaskDlg.Execute(TD_COMMONBUTTONS(CommonButtons), DefBtn, TD_FLAGS(Flags), TF_DIALOGICON(MainIcon), TF_FOOTERICON(FooterIcon),
DefRB, 0, ParentWnd, False, False, @DoOnButtonClickedHandler); DefRB, 0, ParentWnd, False, False, @DoOnButtonClickedHandler);
Result := ButtonID>=0; Result := ButtonID>=0;