paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-10-27 08:21:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Packager: In order to preserve consistency with other opkman related dialogs(install/download/extract), confirmation dlg. from packager was moved to opkman. Extended InstallPackages function.

Browse Source 
git-svn-id: trunk@56635 -
This commit is contained in:
balazs 2017-12-05 13:41:26 +00:00
parent 2b465125f8
commit 40b29b08ce
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/ideintf/packagelinkintf.pas
View File

@ -107,7 +107,9 @@ type
TOPMInterface = class TOPMInterface = class
public public
function InstallPackages(APkgLinks: TList): TModalResult; virtual; abstract; {confirmation/install/extract/download dialogs will be displayed in the center of ParentForm}
function InstallPackages(APkgLinks: TList; AParentForm: TForm;
const AResolveDependencies: Boolean = True): TModalResult; virtual; abstract;
end; end;
var var

18
packager/addpkgdependencydlg.pas
View File

@ -226,32 +226,21 @@ var
I: Integer; I: Integer;
PackageLink: TPackageLink; PackageLink: TPackageLink;
PkgList: TList; PkgList: TList;
PkgListStr: String;
begin begin
Result := mrOk; Result := mrOk;
PkgList := TList.Create; PkgList := TList.Create;
try try
PkgListStr := '';
for I := 0 to DependPkgNameListBox.Count - 1 do for I := 0 to DependPkgNameListBox.Count - 1 do
begin begin
if DependPkgNameListBox.Selected[I] then if DependPkgNameListBox.Selected[I] then
begin begin
PackageLink := FindPackageLink(TLazPackageID(DependPkgNameListBox.Items.Objects[I])); PackageLink := FindPackageLink(TLazPackageID(DependPkgNameListBox.Items.Objects[I]));
if (PackageLink <> nil) and (PackageLink.Origin = ploOnline) then if (PackageLink <> nil) and (PackageLink.Origin = ploOnline) then
begin
PkgList.Add(PackageLink); PkgList.Add(PackageLink);
if PkgListStr = '' then
PkgListStr := '"' + PackageLink.Name + '"'
else
PkgListStr := PkgListStr + ', "' + PackageLink.Name + '"';
end;
end; end;
end; end;
if PkgList.Count > 0 then if PkgList.Count > 0 then
begin Result := OPMInterface.InstallPackages(PkgList, Self);
if IDEMessageDialog(lisProjAddInstConfCaption, lisProjAddInstConf + ' ' + PkgListStr + ' ?', mtInformation, [mbYes, mbNo]) = mrYes then
Result := OPMInterface.InstallPackages(PkgList);
end;
finally finally
PkgList.Free; PkgList.Free;
PkgList := nil; PkgList := nil;
@ -259,9 +248,12 @@ begin
end; end;
procedure TAddPkgDependencyDialog.CloseButtonClick(Sender: TObject); procedure TAddPkgDependencyDialog.CloseButtonClick(Sender: TObject);
var
InstallRes: TModalResult;
begin begin
ModalResult := mrNone; ModalResult := mrNone;
if InstallOnlinePackages <> mrOk then InstallRes := InstallOnlinePackages;
if (InstallRes <> mrCancel) and (InstallRes <> mrOk) then
IDEMessageDialog(lisProjAddInstErrCaption, lisProjAddInstErr, mtError, [mbOk]); IDEMessageDialog(lisProjAddInstErrCaption, lisProjAddInstErr, mtError, [mbOk]);
end; end;