From f372eb44cc2e03a2da0d4bfa07094173a7d56180 Mon Sep 17 00:00:00 2001 From: mattias Date: Sat, 5 Dec 2015 12:33:40 +0000 Subject: [PATCH] IDE: load lfm: hide abort button when opening a single form git-svn-id: trunk@50642 - --- ide/sourcefilemanager.pas | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ide/sourcefilemanager.pas b/ide/sourcefilemanager.pas index 47b7d6ac22..c89dc317f6 100644 --- a/ide/sourcefilemanager.pas +++ b/ide/sourcefilemanager.pas @@ -6884,12 +6884,13 @@ function TLazSourceFileManager.LoadComponentDependencyHidden( end; var - Quiet: Boolean; + Quiet, HideAbort: Boolean; LFMFilename: string; begin Result:=mrCancel; AComponentClass:=nil; Quiet:=([ofProjectLoading,ofQuiet]*Flags<>[]); + HideAbort:=not (ofProjectLoading in Flags); if (AComponentClassName='') or (not IsValidIdent(AComponentClassName)) then begin @@ -6899,10 +6900,9 @@ begin // check for cycles if AnUnitInfo.LoadingComponent then begin - Result:=IDEQuestionDialog(lisCodeTemplError, + Result:=IDEQuestionDialogAb(lisCodeTemplError, Format(lisUnableToLoadTheComponentClassBecauseItDependsOnIts, [AComponentClassName]), - mtError, [mrCancel, lisCancelLoadingThisComponent, - mrAbort, lisAbortWholeLoading]); + mtError, [mrCancel, lisCancelLoadingThisComponent],HideAbort); exit; end; @@ -6936,12 +6936,12 @@ begin Result:=mrCancel; if Result=mrAbort then exit; if Result<>mrOk then begin - Result:=IDEQuestionDialog(lisCodeTemplError, + Result:=IDEQuestionDialogAb(lisCodeTemplError, Format(lisUnableToFindTheComponentClassItIsNotRegisteredViaR, [ AComponentClassName, LineEnding, LineEnding, LineEnding, AnUnitInfo.Filename]), mtError, [mrCancel, lisCancelLoadingThisComponent, - mrAbort, lisAbortWholeLoading, - mrIgnore, lisIgnoreUseTFormAsAncestor]); + mrIgnore, lisIgnoreUseTFormAsAncestor], + HideAbort); end; finally AnUnitInfo.LoadingComponent:=false;