mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-06-13 13:08:17 +02:00
Macros: Implement $Confirm() macro. Issuse #11370
git-svn-id: trunk@40968 -
This commit is contained in:
parent
e826391389
commit
58e631025e
@ -21,7 +21,8 @@
|
|||||||
Author: Mattias Gaertner
|
Author: Mattias Gaertner
|
||||||
|
|
||||||
Abstract:
|
Abstract:
|
||||||
A simple dialog for the $PROMPT() tranfer macro function.
|
A simple dialog for the $PROMPT() tranfer macro function,
|
||||||
|
and a MessageDlg for the $CONFIRM() macro.
|
||||||
|
|
||||||
}
|
}
|
||||||
unit MacroPromptDlg;
|
unit MacroPromptDlg;
|
||||||
@ -56,12 +57,18 @@ type
|
|||||||
end;
|
end;
|
||||||
|
|
||||||
|
|
||||||
|
function ShowMacroConfirmDialog(const InitParam: string): TModalResult;
|
||||||
function ShowMacroPromptDialog(var InitParam: string): TModalResult;
|
function ShowMacroPromptDialog(var InitParam: string): TModalResult;
|
||||||
|
|
||||||
|
|
||||||
implementation
|
implementation
|
||||||
|
|
||||||
|
|
||||||
|
function ShowMacroConfirmDialog(const InitParam: string): TModalResult;
|
||||||
|
begin
|
||||||
|
Result:=MessageDlg(InitParam, mtConfirmation, mbOKCancel, 0);
|
||||||
|
end;
|
||||||
|
|
||||||
function ShowMacroPromptDialog(var InitParam: string): TModalResult;
|
function ShowMacroPromptDialog(var InitParam: string): TModalResult;
|
||||||
var MacroPrompDialog: TMacroPrompDialog;
|
var MacroPrompDialog: TMacroPrompDialog;
|
||||||
begin
|
begin
|
||||||
|
@ -1046,6 +1046,8 @@ type
|
|||||||
var Abort: boolean): string;
|
var Abort: boolean): string;
|
||||||
function MacroFuncCurToken(const s:string; const Data: PtrInt;
|
function MacroFuncCurToken(const s:string; const Data: PtrInt;
|
||||||
var Abort: boolean): string;
|
var Abort: boolean): string;
|
||||||
|
function MacroFuncConfirm(const s:string; const Data: PtrInt;
|
||||||
|
var Abort: boolean): string;
|
||||||
function MacroFuncPrompt(const s:string; const Data: PtrInt;
|
function MacroFuncPrompt(const s:string; const Data: PtrInt;
|
||||||
var Abort: boolean): string;
|
var Abort: boolean): string;
|
||||||
function MacroFuncSave(const s:string; const Data: PtrInt;
|
function MacroFuncSave(const s:string; const Data: PtrInt;
|
||||||
@ -9412,6 +9414,13 @@ begin
|
|||||||
Result := '';
|
Result := '';
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
function TSourceEditorManager.MacroFuncConfirm(const s: string; const Data: PtrInt;
|
||||||
|
var Abort: boolean): string;
|
||||||
|
begin
|
||||||
|
Result:=s;
|
||||||
|
Abort:=(ShowMacroConfirmDialog(Result)<>mrOk);
|
||||||
|
end;
|
||||||
|
|
||||||
function TSourceEditorManager.MacroFuncPrompt(const s: string;
|
function TSourceEditorManager.MacroFuncPrompt(const s: string;
|
||||||
const Data: PtrInt; var Abort: boolean): string;
|
const Data: PtrInt; var Abort: boolean): string;
|
||||||
begin
|
begin
|
||||||
@ -9444,6 +9453,8 @@ begin
|
|||||||
lisWordAtCursorInCurrentEditor,@MacroFuncCurToken,[]));
|
lisWordAtCursorInCurrentEditor,@MacroFuncCurToken,[]));
|
||||||
AMacroList.Add(TTransferMacro.Create('EdFile','',
|
AMacroList.Add(TTransferMacro.Create('EdFile','',
|
||||||
lisExpandedFilenameOfCurrentEditor,@MacroFuncEdFile,[]));
|
lisExpandedFilenameOfCurrentEditor,@MacroFuncEdFile,[]));
|
||||||
|
AMacroList.Add(TTransferMacro.Create('Confirm','',
|
||||||
|
lisConfirmation,@MacroFuncConfirm,[tmfInteractive]));
|
||||||
AMacroList.Add(TTransferMacro.Create('Prompt','',
|
AMacroList.Add(TTransferMacro.Create('Prompt','',
|
||||||
lisPromptForValue,@MacroFuncPrompt,[tmfInteractive]));
|
lisPromptForValue,@MacroFuncPrompt,[tmfInteractive]));
|
||||||
AMacroList.Add(TTransferMacro.Create('Save','',
|
AMacroList.Add(TTransferMacro.Create('Save','',
|
||||||
|
Loading…
Reference in New Issue
Block a user