From: Jens F. <jfu...@us...> - 2005-01-30 14:38:28
|
Update of /cvsroot/jvcl/dev/JVCL3/run In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30496/JVCL3/run Modified Files: JvProgramVersionCheck.pas Log Message: Small Fixes, Resource-Strings and other Changes Index: JvProgramVersionCheck.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvProgramVersionCheck.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JvProgramVersionCheck.pas 30 Jan 2005 11:53:56 -0000 1.3 --- JvProgramVersionCheck.pas 30 Jan 2005 14:38:18 -0000 1.4 *************** *** 135,139 **** A Location is the class which defines where the remote files could be found and manages all communications to these files. } ! TJvProgramVersionCustomLocation = class(TJvCustomPropertyStore) private FDownloadError: string; --- 135,139 ---- A Location is the class which defines where the remote files could be found and manages all communications to these files. } ! TJvCustomProgramVersionLocation = class(TJvCustomPropertyStore) private FDownloadError: string; *************** *** 144,147 **** --- 144,150 ---- function LoadFileFromRemoteInt(const iRemotePath, iRemoteFileName, iLocalPath, iLocalFileName: string; iBaseThread: TJvBaseThread): string; virtual; + property DownloadStatus: string read FDownloadStatus write FDownloadStatus; + property DownloadError: string read FDownloadError write FDownloadError; + property DownloadThreaded: Boolean read FDownloadThreaded write FDownloadThreaded default False; public constructor Create(AOwner: TComponent); override; *************** *** 152,163 **** function LoadVersionInfoFromRemote(const iLocalDirectory, iLocalVersionInfoFileName: string; iBaseThread: TJvBaseThread): string; virtual; - property DownloadStatus: string read FDownloadStatus write FDownloadStatus; - property DownloadError: string read FDownloadError write FDownloadError; - published - property DownloadThreaded: Boolean read FDownloadThreaded write FDownloadThreaded default False; end; { Base class for all file based Locations like Network, FTP and HTTP } ! TJvProgramVersionCustomFileBasedLocation = class(TJvProgramVersionCustomLocation) private FVersionInfoLocationPathList: TStringList; --- 155,163 ---- function LoadVersionInfoFromRemote(const iLocalDirectory, iLocalVersionInfoFileName: string; iBaseThread: TJvBaseThread): string; virtual; end; { Base class for all file based Locations like Network, FTP and HTTP } ! TJvCustomProgramVersionFileBasedLocation = class( ! TJvCustomProgramVersionLocation) private FVersionInfoLocationPathList: TStringList; *************** *** 166,178 **** function GetVersionInfoLocationPathList: TStrings; procedure SetVersionInfoLocationPathList(Value: TStrings); ! public ! constructor Create(AOwner: TComponent); override; ! destructor Destroy; override; ! function LoadVersionInfoFromRemote(const iLocalDirectory, ! iLocalVersionInfoFileName: string; iBaseThread: TJvBaseThread): string; override; ! function LoadInstallerFileFromRemote(const iRemotePath, iRemoteFileName, ! iLocalPath, iLocalFileName: string; iBaseThread: TJvBaseThread): string; override; property ValidLocationPath: string read FValidLocationPath; - published { List of locations-path where the remote files could be found The application loops throuh all path from the top } --- 166,172 ---- function GetVersionInfoLocationPathList: TStrings; procedure SetVersionInfoLocationPathList(Value: TStrings); ! { If the location has a list of possible pathes, this property contains ! the path where the last valid download has happend} property ValidLocationPath: string read FValidLocationPath; { List of locations-path where the remote files could be found The application loops throuh all path from the top } *************** *** 181,191 **** { Name of the VersionInfofile at the remote location } property VersionInfoFileName: string read FVersionInfoFileName write FVersionInfoFileName; end; { Location Class for Local Network Location } ! TJvProgramVersionNetworkLocation = class(TJvProgramVersionCustomFileBasedLocation) protected function LoadFileFromRemoteInt(const iRemotePath, iRemoteFileName, iLocalPath, iLocalFileName: string; iBaseThread: TJvBaseThread): string; override; end; --- 175,195 ---- { Name of the VersionInfofile at the remote location } property VersionInfoFileName: string read FVersionInfoFileName write FVersionInfoFileName; + public + constructor Create(AOwner: TComponent); override; + destructor Destroy; override; + function LoadVersionInfoFromRemote(const iLocalDirectory, + iLocalVersionInfoFileName: string; iBaseThread: TJvBaseThread): string; override; + function LoadInstallerFileFromRemote(const iRemotePath, iRemoteFileName, + iLocalPath, iLocalFileName: string; iBaseThread: TJvBaseThread): string; override; end; { Location Class for Local Network Location } ! TJvProgramVersionNetworkLocation = class(TJvCustomProgramVersionFileBasedLocation) protected function LoadFileFromRemoteInt(const iRemotePath, iRemoteFileName, iLocalPath, iLocalFileName: string; iBaseThread: TJvBaseThread): string; override; + published + property VersionInfoLocationPathList; + property VersionInfoFileName; end; *************** *** 207,211 **** { Base class for all Internet locations } ! TJvProgramVersionInternetLocation = class(TJvProgramVersionCustomFileBasedLocation) private FProxySettings: TJvProgramVersionProxySettings; --- 211,216 ---- { Base class for all Internet locations } ! TJvCustomProgramVersionInternetLocation = class( ! TJvCustomProgramVersionFileBasedLocation) private FProxySettings: TJvProgramVersionProxySettings; *************** *** 216,227 **** protected property ProxySettings: TJvProgramVersionProxySettings read FProxySettings; - public - constructor Create(AOwner: TComponent); override; - destructor Destroy; override; - published property UserName: string read FUserName write FUserName; property Password: string read FPassword write FPassword; property PasswordRequired: Boolean read FPasswordRequired write FPasswordRequired default False; property Port: Integer read FPort write FPort default 80; end; --- 221,232 ---- protected property ProxySettings: TJvProgramVersionProxySettings read FProxySettings; property UserName: string read FUserName write FUserName; property Password: string read FPassword write FPassword; property PasswordRequired: Boolean read FPasswordRequired write FPasswordRequired default False; property Port: Integer read FPort write FPort default 80; + public + constructor Create(AOwner: TComponent); override; + destructor Destroy; override; + published end; *************** *** 232,236 **** { Simple HTTP location class with no http logic. The logic must be implemented manually in the OnLoadFileFromRemote event } ! TJvProgramVersionHTTPLocation = class(TJvProgramVersionInternetLocation) private FOnLoadFileFromRemote: TJvLoadFileFromRemoteHTTPEvent; --- 237,241 ---- { Simple HTTP location class with no http logic. The logic must be implemented manually in the OnLoadFileFromRemote event } ! TJvProgramVersionHTTPLocation = class(TJvCustomProgramVersionInternetLocation) private FOnLoadFileFromRemote: TJvLoadFileFromRemoteHTTPEvent; *************** *** 242,245 **** --- 247,256 ---- read FOnLoadFileFromRemote write FOnLoadFileFromRemote; property ProxySettings; + property UserName; + property Password; + property PasswordRequired; + property Port; + property VersionInfoLocationPathList; + property VersionInfoFileName; end; *************** *** 258,261 **** --- 269,278 ---- published property ProxySettings; + property UserName; + property Password; + property PasswordRequired; + property Port; + property VersionInfoLocationPathList; + property VersionInfoFileName; end; {$ENDIF USE_3RDPARTY_INDY} *************** *** 275,278 **** --- 292,301 ---- published property ProxySettings; + property UserName; + property Password; + property PasswordRequired; + property Port; + property VersionInfoLocationPathList; + property VersionInfoFileName; end; {$ENDIF USE_3RDPARTY_ICS} *************** *** 284,288 **** { Simple FTP location class with no http logic. The logic must be implemented manually in the OnLoadFileFromRemote event } ! TJvProgramVersionFTPLocation = class(TJvProgramVersionInternetLocation) private FOnLoadFileFromRemote: TJvLoadFileFromRemoteFTPEvent; --- 307,311 ---- { Simple FTP location class with no http logic. The logic must be implemented manually in the OnLoadFileFromRemote event } ! TJvProgramVersionFTPLocation = class(TJvCustomProgramVersionInternetLocation) private FOnLoadFileFromRemote: TJvLoadFileFromRemoteFTPEvent; *************** *** 310,313 **** --- 333,342 ---- published property ProxySettings; + property UserName; + property Password; + property PasswordRequired; + property Port; + property VersionInfoLocationPathList; + property VersionInfoFileName; end; {$ENDIF USE_3RDPARTY_INDY} *************** *** 327,330 **** --- 356,365 ---- published property ProxySettings; + property UserName; + property Password; + property PasswordRequired; + property Port; + property VersionInfoLocationPathList; + property VersionInfoFileName; end; {$ENDIF USE_3RDPARTY_ICS} *************** *** 337,341 **** The logic must be implemented manually in the OnLoadFileFromRemote event } ! TJvProgramVersionDatabaseLocation = class(TJvProgramVersionCustomLocation) private FServerName: string; --- 372,376 ---- The logic must be implemented manually in the OnLoadFileFromRemote event } ! TJvProgramVersionDatabaseLocation = class(TJvCustomProgramVersionLocation) private FServerName: string; *************** *** 426,430 **** procedure Execute; function GetRemoteVersionOperation(var ReleaseType: TJvProgramReleaseType): TJvRemoteVersionOperation; ! function SelectedLocation: TJvProgramVersionCustomLocation; procedure ShowProgramVersionsDescription(const iFromVersion, iToVersion: string); property LastCheck: TDateTime read FLastCheck write FLastCheck; --- 461,465 ---- procedure Execute; function GetRemoteVersionOperation(var ReleaseType: TJvProgramReleaseType): TJvRemoteVersionOperation; ! function SelectedLocation: TJvCustomProgramVersionLocation; procedure ShowProgramVersionsDescription(const iFromVersion, iToVersion: string); property LastCheck: TDateTime read FLastCheck write FLastCheck; *************** *** 483,493 **** {$ENDIF UNIX} JclFileUtils, JclShell, ! JvDSADialogs, JvParameterListParameter; const ! cProgramVersion = 'Program Version '; ! cLastCheck = 'LastCheck'; resourcestring RsPVCReleaseTypeAlpha = 'Alpha'; RsPVCReleaseTypeBeta = 'Beta'; --- 518,544 ---- {$ENDIF UNIX} JclFileUtils, JclShell, ! JvDSADialogs, JvParameterListParameter, JclBase; const ! SParamNameVersionButtonInfo = 'VersionButtonInfo'; ! SParamNameMemo = 'Memo'; ! STempFileNameExtention = '.temp'; ! SAppStorageDefaultSection = 'Version'; ! SParamNameNewVersionLabel = 'New Version Label'; ! SParamNameGroupBox = 'GroupBox'; ! SParamNameOperation = 'Operation'; ! SParamNameRadioButton = 'RadioButton'; ! SProgramVersion = 'Program Version '; ! SLastCheck = 'LastCheck'; resourcestring + RsPVFailedUnableToConnectTo = 'Failed: Unable to connect to %s'; + RsPVFailedUnableToGet = 'Failed: Unable to get %s'; + RsPVDownloadFailed = 'Failed: %s'; + RsPVDefaultVersioninfoFileName = 'versioninfo.ini'; + RsPVSiceB = '%6f B'; + RsPVSiceKB = '%6.2f KB'; + RsPVSiceMB = '%6.2f MB'; + RsPVSiceGB = '%6.2f GB'; RsPVCReleaseTypeAlpha = 'Alpha'; RsPVCReleaseTypeBeta = 'Beta'; *************** *** 513,516 **** --- 564,568 ---- 'The file download was successful.' + #13#10 + 'Do you want to close and install?'; + RsPVInfoButtonCaption = 'Info'; //=== Common Functions ======================================================= *************** *** 610,614 **** procedure TJvProgramVersionInfo.Clear; begin ! FVersionDescription.Clear; FProgramVersion := ''; FProgramReleaseType := prtProduction; --- 662,667 ---- procedure TJvProgramVersionInfo.Clear; begin ! if Assigned(FVersionDescription) then ! FVersionDescription.Clear; FProgramVersion := ''; FProgramReleaseType := prtProduction; *************** *** 633,645 **** else if ProgramSize >= 1024 * 1024 * 1024 then ! Result := Format('%6.2f GB', [ProgramSize / 1024 / 1024 / 1024]) else if ProgramSize >= 1024 * 1024 then ! Result := Format('%6.2f MB', [ProgramSize / 1024 / 1024]) else if ProgramSize >= 1024 then ! Result := Format('%6.2f KB', [ProgramSize / 1024]) else ! Result := IntToStr(ProgramSize) + 'B'; end; --- 686,698 ---- else if ProgramSize >= 1024 * 1024 * 1024 then ! Result := Format(RsPVSiceGB, [ProgramSize / 1024 / 1024 / 1024]) else if ProgramSize >= 1024 * 1024 then ! Result := Format(RsPVSiceMB, [ProgramSize / 1024 / 1024]) else if ProgramSize >= 1024 then ! Result := Format(RsPVSiceKB, [ProgramSize / 1024]) else ! Result := Format(RsPVSiceB, [ProgramSize]) end; *************** *** 657,661 **** inherited Create(AOwner); DeleteBeforeStore := True; ! ItemName := cProgramVersion; IgnoreLastLoadTime := True; IgnoreProperties.Add('Duplicates'); --- 710,714 ---- inherited Create(AOwner); DeleteBeforeStore := True; ! ItemName := SProgramVersion; IgnoreLastLoadTime := True; IgnoreProperties.Add('Duplicates'); *************** *** 773,778 **** Result := Result + ' - ' + DateTimeToStr(ProgramVersion[I].ProgramReleaseDate); if ProgramVersion[I].VersionDescription.Count > 0 then ! Result := Result + #13#10 + ProgramVersion[I].VersionDescription.Text; ! Result := Result + #13#10#13#10; end; end; --- 826,831 ---- Result := Result + ' - ' + DateTimeToStr(ProgramVersion[I].ProgramReleaseDate); if ProgramVersion[I].VersionDescription.Count > 0 then ! Result := Result + AnsiLineBreak + ProgramVersion[I].VersionDescription.Text; ! Result := Result + AnsiLineBreak+AnsiLineBreak; end; end; *************** *** 780,784 **** //=== { TJvProgramVersionCustomLocation } ==================================== ! constructor TJvProgramVersionCustomLocation.Create(AOwner: TComponent); begin inherited Create(AOwner); --- 833,837 ---- //=== { TJvProgramVersionCustomLocation } ==================================== ! constructor TJvCustomProgramVersionLocation.Create(AOwner: TComponent); begin inherited Create(AOwner); *************** *** 789,793 **** end; ! function TJvProgramVersionCustomLocation.LoadFileFromRemoteInt( const iRemotePath, iRemoteFileName, iLocalPath, iLocalFileName: string; iBaseThread: TJvBaseThread): string; --- 842,846 ---- end; ! function TJvCustomProgramVersionLocation.LoadFileFromRemoteInt( const iRemotePath, iRemoteFileName, iLocalPath, iLocalFileName: string; iBaseThread: TJvBaseThread): string; *************** *** 795,799 **** end; ! function TJvProgramVersionCustomLocation.LoadFileFromRemote( const iRemotePath, iRemoteFileName, iLocalPath, iLocalFileName: string; iBaseThread: TJvBaseThread): string; --- 848,852 ---- end; ! function TJvCustomProgramVersionLocation.LoadFileFromRemote( const iRemotePath, iRemoteFileName, iLocalPath, iLocalFileName: string; iBaseThread: TJvBaseThread): string; *************** *** 808,812 **** else LocalFileName := iLocalFileName; ! TemporaryLocalFileName := LocalFileName + '.temp'; if FileExists(PathAppend(iLocalPath, TemporaryLocalFileName)) then DeleteFile(PathAppend(iLocalPath, TemporaryLocalFileName)); --- 861,865 ---- else LocalFileName := iLocalFileName; ! TemporaryLocalFileName := LocalFileName + STempFileNameExtention; if FileExists(PathAppend(iLocalPath, TemporaryLocalFileName)) then DeleteFile(PathAppend(iLocalPath, TemporaryLocalFileName)); *************** *** 824,828 **** end; ! function TJvProgramVersionCustomLocation.LoadInstallerFileFromRemote( const iRemotePath, iRemoteFileName, iLocalPath, iLocalFileName: string; iBaseThread: TJvBaseThread): string; --- 877,881 ---- end; ! function TJvCustomProgramVersionLocation.LoadInstallerFileFromRemote( const iRemotePath, iRemoteFileName, iLocalPath, iLocalFileName: string; iBaseThread: TJvBaseThread): string; *************** *** 832,836 **** end; ! function TJvProgramVersionCustomLocation.LoadVersionInfoFromRemote( const iLocalDirectory, iLocalVersionInfoFileName: string; iBaseThread: TJvBaseThread): string; --- 885,889 ---- end; ! function TJvCustomProgramVersionLocation.LoadVersionInfoFromRemote( const iLocalDirectory, iLocalVersionInfoFileName: string; iBaseThread: TJvBaseThread): string; *************** *** 838,842 **** end; ! procedure TJvProgramVersionCustomLocation.SetDownloadStatus(Value: string); begin FDownloadStatus := Value; --- 891,895 ---- end; ! procedure TJvCustomProgramVersionLocation.SetDownloadStatus(Value: string); begin FDownloadStatus := Value; *************** *** 848,852 **** //=== { TJvProgramVersionCustomFileBasedLocation } =========================== ! constructor TJvProgramVersionCustomFileBasedLocation.Create(AOwner: TComponent); begin inherited Create(AOwner); --- 901,905 ---- //=== { TJvProgramVersionCustomFileBasedLocation } =========================== ! constructor TJvCustomProgramVersionFileBasedLocation.Create(AOwner: TComponent); begin inherited Create(AOwner); *************** *** 854,858 **** end; ! destructor TJvProgramVersionCustomFileBasedLocation.Destroy; begin FreeAndNil(FVersionInfoLocationPathList); --- 907,911 ---- end; ! destructor TJvCustomProgramVersionFileBasedLocation.Destroy; begin FreeAndNil(FVersionInfoLocationPathList); *************** *** 860,874 **** end; ! function TJvProgramVersionCustomFileBasedLocation.GetVersionInfoLocationPathList: TStrings; begin Result := FVersionInfoLocationPathList; end; ! procedure TJvProgramVersionCustomFileBasedLocation.SetVersionInfoLocationPathList(Value: TStrings); begin FVersionInfoLocationPathList.Assign(Value); end; ! function TJvProgramVersionCustomFileBasedLocation.LoadVersionInfoFromRemote( const iLocalDirectory, iLocalVersionInfoFileName: string; iBaseThread: TJvBaseThread): string; --- 913,927 ---- end; ! function TJvCustomProgramVersionFileBasedLocation.GetVersionInfoLocationPathList: TStrings; begin Result := FVersionInfoLocationPathList; end; ! procedure TJvCustomProgramVersionFileBasedLocation.SetVersionInfoLocationPathList(Value: TStrings); begin FVersionInfoLocationPathList.Assign(Value); end; ! function TJvCustomProgramVersionFileBasedLocation.LoadVersionInfoFromRemote( const iLocalDirectory, iLocalVersionInfoFileName: string; iBaseThread: TJvBaseThread): string; *************** *** 895,899 **** end; ! function TJvProgramVersionCustomFileBasedLocation.LoadInstallerFileFromRemote( const iRemotePath, iRemoteFileName, iLocalPath, iLocalFileName: string; iBaseThread: TJvBaseThread): string; --- 948,952 ---- end; ! function TJvCustomProgramVersionFileBasedLocation.LoadInstallerFileFromRemote( const iRemotePath, iRemoteFileName, iLocalPath, iLocalFileName: string; iBaseThread: TJvBaseThread): string; *************** *** 938,942 **** //=== { TJvProgramVersionInternetLocation } ================================== ! constructor TJvProgramVersionInternetLocation.Create(AOwner: TComponent); begin inherited Create(AOwner); --- 991,995 ---- //=== { TJvProgramVersionInternetLocation } ================================== ! constructor TJvCustomProgramVersionInternetLocation.Create(AOwner: TComponent); begin inherited Create(AOwner); *************** *** 946,950 **** end; ! destructor TJvProgramVersionInternetLocation.Destroy; begin FreeAndNil(FProxySettings); --- 999,1003 ---- end; ! destructor TJvCustomProgramVersionInternetLocation.Destroy; begin FreeAndNil(FProxySettings); *************** *** 1007,1011 **** FRemoteAppStorage.ReadOnly := True; FRemoteAppStorage.AutoReload := True; ! FRemoteAppStorage.DefaultSection := 'Version'; with FRemoteAppStorage.StorageOptions do begin --- 1060,1064 ---- FRemoteAppStorage.ReadOnly := True; FRemoteAppStorage.AutoReload := True; ! FRemoteAppStorage.DefaultSection := SAppStorageDefaultSection; with FRemoteAppStorage.StorageOptions do begin *************** *** 1041,1045 **** FAllowedReleaseType := prtProduction; FLocalInstallerFileName := ''; ! FLocalVersionInfoFileName := 'versioninfo.ini'; FLocationType := pvltNetWork; end; --- 1094,1098 ---- FAllowedReleaseType := prtProduction; FLocalInstallerFileName := ''; ! FLocalVersionInfoFileName := RsPVDefaultVersioninfoFileName; FLocationType := pvltNetWork; end; *************** *** 1047,1050 **** --- 1100,1104 ---- destructor TJvProgramVersionCheck.Destroy; begin + FreeAndNil(FRemoteProgramVersionHistory); FreeAndNil(FThreadDialog); FreeAndNil(FThread); *************** *** 1217,1224 **** with Parameter do begin ! SearchName := 'New Version Label'; Caption := Format(RsPVCNewVersionAvailable, [GetAllowedRemoteProgramVersionReleaseType, CurrentApplicationName]); Width := 350; end; ParameterList.AddParameter(Parameter); --- 1271,1279 ---- with Parameter do begin ! SearchName := SParamNameNewVersionLabel; Caption := Format(RsPVCNewVersionAvailable, [GetAllowedRemoteProgramVersionReleaseType, CurrentApplicationName]); Width := 350; + Height := 45; end; ParameterList.AddParameter(Parameter); *************** *** 1226,1230 **** with GroupParameter do begin ! SearchName := 'GroupBox'; Caption := RsPVCChooseWhichVersion; Width := 350; --- 1281,1285 ---- with GroupParameter do begin ! SearchName := SParamNameGroupBox; Caption := RsPVCChooseWhichVersion; Width := 350; *************** *** 1241,1246 **** with Parameter do begin ! ParentParameterName := 'GroupBox'; ! SearchName := 'RadioButton' + IntToStr(Ord(I)); Caption := RemoteProgramVersionHistory.CurrentProgramVersion[I].ProgramVersionInfo; Width := 250; --- 1296,1301 ---- with Parameter do begin ! ParentParameterName := SParamNameGroupBox; ! SearchName := SParamNameRadioButton + IntToStr(Ord(I)); Caption := RemoteProgramVersionHistory.CurrentProgramVersion[I].ProgramVersionInfo; Width := 250; *************** *** 1251,1257 **** with TJvButtonParameter(Parameter) do begin ! ParentParameterName := 'GroupBox'; ! SearchName := 'VersionButtonInfo' + IntToStr(Ord(I)); ! Caption := 'Info'; Width := 80; Tag := Ord(I); --- 1306,1312 ---- with TJvButtonParameter(Parameter) do begin ! ParentParameterName := SParamNameGroupBox; ! SearchName := SParamNameVersionButtonInfo + IntToStr(Ord(I)); ! Caption := RsPVInfoButtonCaption; Width := 80; Tag := Ord(I); *************** *** 1264,1268 **** with TJvRadioGroupParameter(Parameter) do begin ! SearchName := 'Operation'; Caption := RsPVCChooseOperation; ItemList.Add(RsPVCOperationIgnore); --- 1319,1323 ---- with TJvRadioGroupParameter(Parameter) do begin ! SearchName := SParamNameOperation; Caption := RsPVCChooseOperation; ItemList.Add(RsPVCOperationIgnore); *************** *** 1276,1280 **** if ParameterList.ShowParameterDialog then begin ! case TJvRadioGroupParameter(ParameterList.ParameterByName('Operation')).ItemIndex of 0: Result := rvoIgnore; --- 1331,1335 ---- if ParameterList.ShowParameterDialog then begin ! case TJvRadioGroupParameter(ParameterList.ParameterByName(SParamNameOperation)).ItemIndex of 0: Result := rvoIgnore; *************** *** 1288,1292 **** if IsRemoteProgramVersionReleaseTypeNewer(I) then begin ! Parameter := ParameterList.ParameterByName('RadioButton' + IntToStr(Ord(I))); if Assigned(Parameter) then if Parameter.AsBoolean then --- 1343,1347 ---- if IsRemoteProgramVersionReleaseTypeNewer(I) then begin ! Parameter := ParameterList.ParameterByName(SParamNameRadioButton + IntToStr(Ord(I))); if Assigned(Parameter) then if Parameter.AsBoolean then *************** *** 1319,1323 **** begin inherited LoadData; ! LastCheck := AppStorage.ReadDateTime(AppStorage.ConcatPaths([AppStoragePath, cLastCheck]), LastCheck); end; --- 1374,1378 ---- begin inherited LoadData; ! LastCheck := AppStorage.ReadDateTime(AppStorage.ConcatPaths([AppStoragePath, SLastCheck]), LastCheck); end; *************** *** 1363,1367 **** end; ! function TJvProgramVersionCheck.SelectedLocation: TJvProgramVersionCustomLocation; begin case LocationType of --- 1418,1422 ---- end; ! function TJvProgramVersionCheck.SelectedLocation: TJvCustomProgramVersionLocation; begin case LocationType of *************** *** 1410,1414 **** with Parameter do begin ! SearchName := 'Memo'; Caption := Format(RsPVCChangesBetween, [iFromVersion, iToVersion]); Width := 340; --- 1465,1469 ---- with Parameter do begin ! SearchName := SParamNameMemo; Caption := Format(RsPVCChangesBetween, [iFromVersion, iToVersion]); Width := 340; *************** *** 1426,1430 **** begin inherited StoreData; ! AppStorage.WriteDateTime(AppStorage.ConcatPaths([AppStoragePath, cLastCheck]), LastCheck); end; --- 1481,1485 ---- begin inherited StoreData; ! AppStorage.WriteDateTime(AppStorage.ConcatPaths([AppStoragePath, SLastCheck]), LastCheck); end; *************** *** 1659,1663 **** except on E: EHttpException do ! DownloadError := 'Failed: ' + IntToStr(StatusCode) + ' ' + ReasonPhrase; else raise; --- 1714,1718 ---- except on E: EHttpException do ! DownloadError := Format(RsPVDownloadFailed, [IntToStr(StatusCode) + ' ' + ReasonPhrase]); else raise; *************** *** 1770,1784 **** if not Open then begin ! DownloadError := 'Failed: Unable to connect to ' + HostName; Exit; end; if not Get then begin ! DownloadError := 'Failed: Unable to get ' + HostDirName + '/' + HostFileName; Exit; end; except on E: Exception do ! DownloadError := 'Failed: ' + E.Message; else raise; --- 1825,1839 ---- if not Open then begin ! DownloadError := Format(RsPVFailedUnableToConnectTo, [HostName]); Exit; end; if not Get then begin ! DownloadError := Format(RsPVFailedUnableToGet, [HostDirName + '/' + HostFileName]); Exit; end; except on E: Exception do ! DownloadError := Format(RsPVDownloadFailed, [E.Message]); else raise; |