paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-11 17:16:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

merged r50789 #2df8c60e2b,r50790: QuestionDlg fixes

Browse Source 
git-svn-id: branches/fixes_1_6@50791 -
This commit is contained in:
ondrej 2015-12-14 11:04:38 +00:00
parent 033d704341
commit 3d19486b3e
2 changed files with 49 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
docs/xml/lcl/dialogs.xml
View File

@ -2774,29 +2774,14 @@ or you can make your own set.</descr>
<!-- function Visibility: default --> <!-- function Visibility: default -->
<element name="QuestionDlg"> <element name="QuestionDlg">
<short>Show a question to the user and get a response</short> <short>Show a question to the user and get a response</short>
<descr>QuestionDlg has the same functionality as MessageDlg <br/> <descr><p>QuestionDlg has the same functionality as MessageDlg except for the parameter Buttons which is of a different type. <br/>
You can define your own captions and return values of this function.
except for the parameter Buttons which is of a different type. <br/> </p><p>Buttons is a list of TModalResult (defined as constants [mrNone..MrYesToAll] in <link id="Controls"/>) and strings. <br/>
For each TModalResult a button is created. <br/>
You can define your own captions and return values of this function.<br/> To set a custom caption, add a string after a button. You can use the special string parameters 'isdefault' and 'iscancel' to setup the default and cancel buttons.
<br/> </p><p>The default TModalResults defined in controls.pp (mrNone..mrLast) don't need a caption. The default captions will be used.
</p>
</descr>
Buttons is a list of TModalResult (defined as constants [mrNone..MrYesToAll] in <link id="Controls"/>
) and strings. <br/>
For each TModalResult a button is
created. <br/>
To set a custom caption, add a string after a button.<br/>
<br/>
The default TModalResults defined in controls.pp (mrNone..mrLast) <br/>
doesn't need a caption. The default captions will be used.</descr>
<errors/> <errors/>
<seealso> <seealso>
<link id="MessageDlg"/> <link id="MessageDlg"/>

19
lcl/include/promptdialog.inc
View File

@ -924,9 +924,16 @@ begin
end; end;
// get options // get options
if (SysUtils.CompareText(CurBtnCaption,'isdefault')=0)
or (SysUtils.CompareText(CurBtnCaption,'iscancel')=0) then
begin
HasOptions := True;
CurOptions := CurBtnCaption;
CurBtnCaption := '';
end else
begin
CurOptions := ''; CurOptions := '';
IsDefault := False; HasOptions := False;
IsCancel := False;
if (i <= High(Buttons)) then if (i <= High(Buttons)) then
begin begin
HasOptions := True; HasOptions := True;
@ -940,7 +947,13 @@ begin
vtWidestring: CurOptions := AnsiString(WideString(Buttons[i].VWideString)); vtWidestring: CurOptions := AnsiString(WideString(Buttons[i].VWideString));
else else
HasOptions := False; HasOptions := False;
dec(i); // prevent the following inc(i)
end; end;
inc(i);
end;
end;
IsDefault := False;
IsCancel := False;
if HasOptions then if HasOptions then
begin begin
if SysUtils.CompareText(CurOptions,'isdefault')=0 then if SysUtils.CompareText(CurOptions,'isdefault')=0 then
@ -957,8 +970,6 @@ begin
end else end else
raise Exception.Create('TQuestionDlg.CreateQuestionDlg option expected at ' raise Exception.Create('TQuestionDlg.CreateQuestionDlg option expected at '
+IntToStr(i)+' but "'+CurOptions+'" found.'); +IntToStr(i)+' but "'+CurOptions+'" found.');
inc(i);
end;
end; end;
if CurBtnCaption = '' then if CurBtnCaption = '' then