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

IDE: Remove the "Ignore" option for uninstalling dependent packages. Fix the "Cancel" option.

Browse Source
This commit is contained in:
Juha 2023-07-26 10:23:58 +03:00
parent d0a134acdc
commit 318fa86019
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packager/installpkgsetdlg.pas
View File

@ -532,7 +532,7 @@ var
i: Integer;
begin
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);
Result:=false;
end;
@ -742,6 +742,12 @@ begin
Result:=PackageEditingInterface.CheckInstallPackageList(
FNewInstalledPackages,UninstallPkgs,[piiifRemoveConflicts]);
if not Result then begin
AssignOldInstalledPackagesToList; // Restore the old list.
UpdateNewInstalledPackages;
UpdateAvailablePackages(True);
UpdateButtonStates;
end;
finally
UninstallPkgs.Free;
end;

3
packager/pkgmanager.pas
View File

@ -5841,14 +5841,13 @@ begin
if s='' then continue;
case IDEQuestionDialog(lisUninstallFail,
Format(lisThePackageIsUsedBy, [APackage.IDAsString])+sLineBreak +s,
mtConfirmation, [mrYes, lisUninstallThemToo, mrIgnore, mrCancel]
mtConfirmation, [mrYes, lisUninstallThemToo, mrCancel]
) of
mrYes:
begin
for j:=0 to Dependencies.Count-1 do
DeleteDependency(TPkgDependency(Dependencies[j]));
end;
mrIgnore: ;
else
exit(false);
end;