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

IDE: load lfm: hide abort button when opening a single form

Browse Source 
git-svn-id: branches/fixes_1_6@50643 -
This commit is contained in:
mattias 2015-12-05 12:34:02 +00:00
parent a4146e7b95
commit a119508665
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ide/sourcefilemanager.pas
View File

@ -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;