Opkman: Fixed a small bug + a refresh problem.

git-svn-id: trunk@53796 -
This commit is contained in:
balazs 2016-12-29 10:10:21 +00:00
parent 625d8bbd2e
commit ccc4cf64a7
2 changed files with 9 additions and 4 deletions

View File

@ -361,6 +361,7 @@ object CreateRepositoryPackagefr: TCreateRepositoryPackagefr
Width = 75 Width = 75
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
Caption = 'Cancel' Caption = 'Cancel'
Enabled = False
ModalResult = 2 ModalResult = 2
OnClick = bCancelClick OnClick = bCancelClick
TabOrder = 4 TabOrder = 4
@ -380,6 +381,7 @@ object CreateRepositoryPackagefr: TCreateRepositoryPackagefr
Width = 75 Width = 75
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
Caption = 'Options' Caption = 'Options'
Enabled = False
OnClick = bOptionsClick OnClick = bOptionsClick
TabOrder = 2 TabOrder = 2
end end
@ -390,6 +392,7 @@ object CreateRepositoryPackagefr: TCreateRepositoryPackagefr
Width = 75 Width = 75
Anchors = [akTop, akRight] Anchors = [akTop, akRight]
Caption = 'Help' Caption = 'Help'
Enabled = False
OnClick = bHelpClick OnClick = bHelpClick
TabOrder = 5 TabOrder = 5
end end

View File

@ -528,8 +528,10 @@ begin
SDD.Title := rsCreateRepositoryPackageFrm_SDDTitleDst; SDD.Title := rsCreateRepositoryPackageFrm_SDDTitleDst;
SDD.InitialDir := Options.LastPackagedirDst; SDD.InitialDir := Options.LastPackagedirDst;
EnableDisableControls(False);
if SDD.Execute then if SDD.Execute then
begin begin
ShowHideControls(1);
fPackageZipper := TPackageZipper.Create; fPackageZipper := TPackageZipper.Create;
fPackageZipper.OnZipError := @DoOnZippError; fPackageZipper.OnZipError := @DoOnZippError;
fPackageZipper.OnZipCompleted := @DoOnZipCompleted; fPackageZipper.OnZipCompleted := @DoOnZipCompleted;
@ -539,10 +541,10 @@ begin
FPackageName := StringReplace(FPackageName, ' ', '', [rfReplaceAll]); FPackageName := StringReplace(FPackageName, ' ', '', [rfReplaceAll]);
FPackageFile := FDestDir + FPackageName + '.zip'; FPackageFile := FDestDir + FPackageName + '.zip';
pnMessage.Caption := rsCreateRepositoryPackageFrm_Message4; pnMessage.Caption := rsCreateRepositoryPackageFrm_Message4;
ShowHideControls(1);
EnableDisableControls(False);
fPackageZipper.StartZip(FPackageDir, FPackageFile); fPackageZipper.StartZip(FPackageDir, FPackageFile);
end; end
else
EnableDisableControls(True);
end; end;
procedure TCreateRepositoryPackagefr.bHelpClick(Sender: TObject); procedure TCreateRepositoryPackagefr.bHelpClick(Sender: TObject);
@ -817,7 +819,7 @@ begin
begin begin
RootData := FVSTPackages.GetNodeData(RootNode); RootData := FVSTPackages.GetNodeData(RootNode);
UpdatePackage.UpdatePackageData.Name := RootData^.FName; UpdatePackage.UpdatePackageData.Name := RootData^.FName;
UpdatePackage.UpdatePackageData.DownloadZipURL := ''; UpdatePackage.UpdatePackageData.DownloadZipURL := RootData^.FDownloadURL;
if RootData^.FDisplayName <> '' then if RootData^.FDisplayName <> '' then
FileName := FDestDir + 'update_' + RootData^.FDisplayName + '.json' FileName := FDestDir + 'update_' + RootData^.FDisplayName + '.json'
else else