|
|
@@ -78,7 +78,7 @@ var |
|
|
|
implementation |
|
|
|
|
|
|
|
uses |
|
|
|
uutlExceptions, Forms, uvfsManager, uutlMessages, syncobjs; |
|
|
|
uutlExceptions, Forms{$IFDEF USE_VFS}, uvfsManager{$ENDIF}, uutlMessages, syncobjs; |
|
|
|
|
|
|
|
const |
|
|
|
SETTINGS_MSG_WAIT_TIME = 1000; //ms |
|
|
@@ -317,6 +317,7 @@ begin |
|
|
|
fBlocks.ValueAt[i].Instance.SaveToConfig(aMcf.Section(fBlocks.Keys[i])); |
|
|
|
end; |
|
|
|
|
|
|
|
{$IFDEF USE_VFS} |
|
|
|
procedure TutlSettings.LoadFromFile(const aFile: string); |
|
|
|
var |
|
|
|
sh: IStreamHandle; |
|
|
@@ -331,7 +332,24 @@ begin |
|
|
|
end; |
|
|
|
end; |
|
|
|
end; |
|
|
|
{$ELSE} |
|
|
|
procedure TutlSettings.LoadFromFile(const aFile: string); |
|
|
|
var |
|
|
|
fs: TFileStream; |
|
|
|
mcf: TutlMCFFile; |
|
|
|
begin |
|
|
|
fs := TFileStream.Create(aFile, fmOpenRead); |
|
|
|
mcf := TutlMCFFile.Create(nil); |
|
|
|
try |
|
|
|
mcf.LoadFromStream(fs); |
|
|
|
LoadFromConfig(mcf); |
|
|
|
finally |
|
|
|
FreeAndNil(fs); |
|
|
|
end; |
|
|
|
end; |
|
|
|
{$ENDIF} |
|
|
|
|
|
|
|
{$IFDEF USE_VFS} |
|
|
|
procedure TutlSettings.SaveToFile(const aFile: string); |
|
|
|
var |
|
|
|
sh: IStreamHandle; |
|
|
@@ -347,6 +365,23 @@ begin |
|
|
|
end; |
|
|
|
end; |
|
|
|
end; |
|
|
|
{$ELSE} |
|
|
|
procedure TutlSettings.SaveToFile(const aFile: string); |
|
|
|
var |
|
|
|
fs: TFileStream; |
|
|
|
mcf: TutlMCFFile; |
|
|
|
begin |
|
|
|
fs := TFileStream.Create(aFile, fmCreate); |
|
|
|
mcf := TutlMCFFile.Create(nil); |
|
|
|
try |
|
|
|
SaveToConfig(mcf); |
|
|
|
mcf.SaveToStream(fs); |
|
|
|
finally |
|
|
|
FreeAndNil(mcf); |
|
|
|
FreeAndNil(fs); |
|
|
|
end; |
|
|
|
end; |
|
|
|
{$ENDIF} |
|
|
|
|
|
|
|
constructor TutlSettings.Create; |
|
|
|
begin |
|
|
|