mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-06-17 01:08:11 +02:00
IDE: Remove the "Ignore" option for uninstalling dependent packages. Fix the "Cancel" option.
This commit is contained in:
parent
d0a134acdc
commit
318fa86019
@ -532,7 +532,7 @@ var
|
|||||||
i: Integer;
|
i: Integer;
|
||||||
begin
|
begin
|
||||||
for i:=0 to NewInstalledPackages.Count-1 do
|
for i:=0 to NewInstalledPackages.Count-1 do
|
||||||
if SysUtils.CompareText(TLazPackageID(NewInstalledPackages[i]).Name,PkgName)=0 then
|
if CompareText(TLazPackageID(NewInstalledPackages[i]).Name,PkgName)=0 then
|
||||||
exit(true);
|
exit(true);
|
||||||
Result:=false;
|
Result:=false;
|
||||||
end;
|
end;
|
||||||
@ -742,6 +742,12 @@ begin
|
|||||||
|
|
||||||
Result:=PackageEditingInterface.CheckInstallPackageList(
|
Result:=PackageEditingInterface.CheckInstallPackageList(
|
||||||
FNewInstalledPackages,UninstallPkgs,[piiifRemoveConflicts]);
|
FNewInstalledPackages,UninstallPkgs,[piiifRemoveConflicts]);
|
||||||
|
if not Result then begin
|
||||||
|
AssignOldInstalledPackagesToList; // Restore the old list.
|
||||||
|
UpdateNewInstalledPackages;
|
||||||
|
UpdateAvailablePackages(True);
|
||||||
|
UpdateButtonStates;
|
||||||
|
end;
|
||||||
finally
|
finally
|
||||||
UninstallPkgs.Free;
|
UninstallPkgs.Free;
|
||||||
end;
|
end;
|
||||||
|
@ -5841,14 +5841,13 @@ begin
|
|||||||
if s='' then continue;
|
if s='' then continue;
|
||||||
case IDEQuestionDialog(lisUninstallFail,
|
case IDEQuestionDialog(lisUninstallFail,
|
||||||
Format(lisThePackageIsUsedBy, [APackage.IDAsString])+sLineBreak +s,
|
Format(lisThePackageIsUsedBy, [APackage.IDAsString])+sLineBreak +s,
|
||||||
mtConfirmation, [mrYes, lisUninstallThemToo, mrIgnore, mrCancel]
|
mtConfirmation, [mrYes, lisUninstallThemToo, mrCancel]
|
||||||
) of
|
) of
|
||||||
mrYes:
|
mrYes:
|
||||||
begin
|
begin
|
||||||
for j:=0 to Dependencies.Count-1 do
|
for j:=0 to Dependencies.Count-1 do
|
||||||
DeleteDependency(TPkgDependency(Dependencies[j]));
|
DeleteDependency(TPkgDependency(Dependencies[j]));
|
||||||
end;
|
end;
|
||||||
mrIgnore: ;
|
|
||||||
else
|
else
|
||||||
exit(false);
|
exit(false);
|
||||||
end;
|
end;
|
||||||
|
Loading…
Reference in New Issue
Block a user