Changeset 178 for branches/highdpi/Packages/CevoComponents/Directories.pas

Timestamp:

Jun 23, 2019, 3:15:29 PM (5 years ago)

Author:

chronos

Message:

• Modified: Use DpiControls package for High DPI support.

File:

• branches/highdpi/Packages/CevoComponents/Directories.pas (modified) (5 diffs)

branches/highdpi/Packages/CevoComponents/Directories.pas

@@ -4 +4 @@
 
 var
-  HomeDir: string;
-  DataDir: string;
+  HomeDir, DataDir: string;
   LocaleCode: string = '';
   LocaleCodeAuto: string = '';
@@ -11 +10 @@
 function LocalizedFilePath(const Path: string): string;
 procedure InitUnit;
-function GetSavedDir(Home: Boolean = False): string;
-function GetMapsDir(Home: Boolean = False): string;
 
 
@@ -72 +69 @@
   else
   begin
-    if not DirectoryExists(AppDataDir) then CreateDir(AppDataDir);
+    if not DirectoryExists(AppDataDir) then
+      CreateDir(AppDataDir);
     DataDir := AppDataDir;
   end;
-  if not DirectoryExists(GetSavedDir) then CreateDir(GetSavedDir);
-  if not DirectoryExists(GetMapsDir) then CreateDir(GetMapsDir);
+  if not DirectoryExists(DataDir + 'Saved') then
+    CreateDir(DataDir + 'Saved');
+  if not DirectoryExists(DataDir + 'Maps') then
+    CreateDir(DataDir + 'Maps');
 
   // Copy appdata if not done yet
-  if FindFirst(GetSavedDir(True) + DirectorySeparator + '*.cevo', $21, src) = 0 then
+  if FindFirst(HomeDir + 'Saved' + DirectorySeparator + '*.cevo', $21, src) = 0 then
     repeat
-      if (FindFirst(GetSavedDir(True) + DirectorySeparator + src.Name, $21, dst) <> 0) or
+      if (FindFirst(DataDir + 'Saved' + DirectorySeparator + src.Name, $21, dst) <> 0) or
         (dst.Time < src.Time) then
-        CopyFile(PChar(GetSavedDir(True) + DirectorySeparator + src.Name),
-          PChar(GetSavedDir(True) + DirectorySeparator + src.Name), false);
+        CopyFile(PChar(HomeDir + 'Saved' + DirectorySeparator + src.Name),
+          PChar(DataDir + 'Saved' + DirectorySeparator + src.Name), false);
       FindClose(dst);
     until FindNext(src) <> 0;
@@ -90 +90 @@
 
   // Copy appdata if not done yet
-  if FindFirst(GetMapsDir(True) + DirectorySeparator + '*.*', $21, src) = 0 then
+  if FindFirst(HomeDir + 'Maps' + DirectorySeparator + '*.*', $21, src) = 0 then
     repeat
-      if (FindFirst(GetMapsDir(True) + DirectorySeparator + src.Name, $21, dst) <> 0) or
+      if (FindFirst(DataDir + 'Maps' + DirectorySeparator + src.Name, $21, dst) <> 0) or
         (dst.Time < src.Time) then
-        CopyFile(PChar(GetMapsDir(True) + DirectorySeparator + src.Name),
-          PChar(GetMapsDir(True) + DirectorySeparator + src.Name), false);
+        CopyFile(PChar(HomeDir + 'Maps' + DirectorySeparator + src.Name),
+          PChar(DataDir + 'Maps' + DirectorySeparator + src.Name), false);
       FindClose(dst);
     until FindNext(src) <> 0;
@@ -101 +101 @@
 end;
 
-function GetSavedDir(Home: Boolean = False): string;
-begin
-  if Home then Result := HomeDir + 'Saved'
-    else Result := DataDir + 'Saved';
-end;
-
-function GetMapsDir(Home: Boolean = False): string;
-begin
-  if Home then Result := HomeDir + 'Maps'
-    else Result := DataDir + 'Maps';
-end;
-
 end.