paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-19 01:49:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

TaskDialog: TLCLTaskDialog and Win32 WS: remove type definitions (and conversion routines) that were copied from the old LCLTaskDialog unit.

Browse Source
This commit is contained in:
Bart 2023-08-18 17:55:15 +02:00
parent bdd7515d79
commit 17bf02baad
2 changed files with 44 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/interfaces/win32/win32wsdialogs.pp
View File

@ -1856,7 +1856,7 @@ var
end;
MainInstruction := Utf8ToUtf16(ADlg.Title);
if (MainInstruction = '') then
MainInstruction := Utf8ToUtf16(IconMessage(TF_DIALOGICON(ADlg.MainIcon)));
MainInstruction := Utf8ToUtf16(IconMessage(ADlg.MainIcon));
Content := Utf8ToUtf16(ADlg.Text);
VerificationText := Utf8ToUtf16(ADlg.VerificationText);
if (AParentWnd = 0) then

87
lcl/taskdlgemulation.pp
View File

@ -167,11 +167,7 @@ type
TLCLTaskDialogFooterIcon = (
tfiBlank, tfiWarning, tfiQuestion, tfiError, tfiInformation, tfiShield);
function IconMessage(Icon: TLCLTaskDialogIcon): string;
function TF_DIALOGICON(const aIcon: TTaskDialogIcon): TLCLTaskDialogIcon;
function TF_FOOTERICON(const aIcon: TTaskDialogIcon): TLCLTaskDialogFooterIcon;
function IconMessage(Icon: TTaskDialogIcon): string;
implementation
@ -207,10 +203,10 @@ end;
const
LCL_IMAGES: array[TLCLTaskDialogIcon] of Integer = (
0, idDialogWarning, idDialogConfirm, idDialogError, idDialogInfo, 0, idDialogShield);
LCL_FOOTERIMAGES: array[TLCLTaskDialogFooterIcon] of Integer = (
0, idDialogWarning, idDialogConfirm, idDialogError, idDialogInfo, idDialogShield);
LCL_IMAGES: array[TTaskDialogIcon] of Integer = (
0 {tdiNone}, idDialogWarning {tdiWarning}, idDialogError {tdiError}, idDialogInfo {tdiInformation}, idDialogShield {tdiShield}, idDialogConfirm {tdiQuestion});
//LCL_FOOTERIMAGES: array[TTaskDialogIcon] of Integer = (
//0 {tdiNone}, idDialogWarning {tdiWarning}, idDialogError {tdiError}, idDialogInfo {tdiInformation}, idDialogShield {tdiShield}, idDialogConfirm {tdiQuestion});
const
TD_BTNMOD: array[TTaskDialogCommonButton] of Integer = (
@ -231,40 +227,40 @@ end;
function TF_DIALOGICON(const aIcon: TTaskDialogIcon): TLCLTaskDialogIcon;
begin
case aIcon of
tdiWarning: Result := tiWarning;
tdiError: Result := tiError;
tdiInformation: Result := tiInformation;
tdiShield: Result := tiShield;
tdiQuestion: Result := tiQuestion;
else
Result := tiBlank;
end;
end;
//function TF_DIALOGICON(const aIcon: TTaskDialogIcon): TLCLTaskDialogIcon;
//begin
// case aIcon of
// tdiWarning: Result := tiWarning;
// tdiError: Result := tiError;
// tdiInformation: Result := tiInformation;
// tdiShield: Result := tiShield;
// tdiQuestion: Result := tiQuestion;
// else
// Result := tiBlank;
// end;
//end;
function TF_FOOTERICON(const aIcon: TTaskDialogIcon): TLCLTaskDialogFooterIcon;
begin
case aIcon of
tdiWarning: Result := tfiWarning;
tdiError: Result := tfiError;
tdiInformation: Result := tfiInformation;
tdiShield: Result := tfiShield;
tdiQuestion: Result := tfiQuestion;
else
Result := tfiBlank;
end;
end;
//function TF_FOOTERICON(const aIcon: TTaskDialogIcon): TLCLTaskDialogFooterIcon;
//begin
// case aIcon of
// tdiWarning: Result := tfiWarning;
// tdiError: Result := tfiError;
// tdiInformation: Result := tfiInformation;
// tdiShield: Result := tfiShield;
// tdiQuestion: Result := tfiQuestion;
// else
// Result := tfiBlank;
// end;
//end;
function IconMessage(Icon: TLCLTaskDialogIcon): string;
function IconMessage(Icon: TTaskDialogIcon): string;
begin
case Icon of
tiWarning: Result := rsMtWarning;
tiQuestion: Result := rsMtConfirmation;
tiError: Result := rsMtError;
tiInformation, tiShield: Result := rsMtInformation;
tdiWarning: Result := rsMtWarning;
tdiQuestion: Result := rsMtConfirmation;
tdiError: Result := rsMtError;
tdiInformation, tdiShield: Result := rsMtInformation;
else Result := '';
end;
end;
@ -392,7 +388,7 @@ begin
else
DialogCaption := Application.MainForm.Caption;
if (DlgTitle = '') then
DlgTitle := IconMessage(TF_DIALOGICON(FDlg.MainIcon));
DlgTitle := IconMessage(FDlg.MainIcon);
end;
procedure TLCLTaskDialog.InitGlobalDimensionsAndStyle(ACustomButtonsTextLength: Integer; out aWidth, aFontHeight: Integer);
@ -455,10 +451,10 @@ end;
procedure TLCLTaskDialog.AddIcon(out ALeft,ATop: Integer; AGlobalLeftMargin: Integer; AParent: TWinControl);
var
aDialogIcon: TLCLTaskDialogIcon;
aDialogIcon: TTaskDialogIcon;
begin
aDialogIcon := TF_DIALOGICON(FDlg.MainIcon);
if (LCL_IMAGES[aDialogIcon]<>0) then
aDialogIcon := FDlg.MainIcon;
if (LCL_IMAGES[FDlg.MainIcon]<>0) then
begin
MainImage := TImage.Create(Self);
MainImage.Parent := AParent;
@ -741,17 +737,20 @@ end;
procedure TLCLTaskDialog.AddFooter(var ALeft: Integer; var ATop: Integer; AFontHeight, AWidth: Integer; APArent: TWinControl);
//ALeft must be adjusted by AddFooter if FooterIcon exists, so that we can left-align
//ExpandedText in the Footer area with the FooterText (in case of tfExpandFooterArea)
var
aFooterIcon: TTaskDialogIcon;
begin
//debugln(['AddFooterText: XB=',XB]);
AddBevel(ATop, aWidth, AParent);
inc(ATop,LabelVSPacing div 2);
if (LCL_FOOTERIMAGES[TF_FOOTERICON(FDlg.FooterIcon)]<>0) then
aFooterIcon := FDlg.FooterIcon;
if (LCL_IMAGES[aFooterIcon]<>0) then
begin
FooterImage := TImage.Create(Self);
FooterImage.Parent := AParent;
FooterImage.Images := DialogGlyphs;
FooterImage.ImageWidth := 16;
FooterImage.ImageIndex := DialogGlyphs.DialogIcon[LCL_FOOTERIMAGES[TF_FOOTERICON(FDlg.FooterIcon)]];
FooterImage.ImageIndex := DialogGlyphs.DialogIcon[LCL_IMAGES[aFooterIcon]];
FooterImage.Stretch := True;
FooterImage.StretchOutEnabled := False;
FooterImage.Proportional := True;