Changeset 123

Timestamp:

Dec 10, 2016, 7:19:34 PM (8 years ago)

Author:

chronos

Message:

Merged revision(s) 121-122 from trunk:

• Modified: Updated CoolTranslator package.
• Fixed: Set correct Windows registry path for storing form size.
• Fixed: Set correct path for Config.xml file.

Files:

• bin/win/Install-xTactics-1.0.0.exe (modified) ( previous)
• tags/1.0.0 (modified) (1 prop)
• tags/1.0.0/Packages/CoolTranslator/UCoolTranslator.pas (modified) (12 diffs)
• tags/1.0.0/UCore.pas (modified) (4 diffs)

tags/1.0.0/Packages/CoolTranslator/UCoolTranslator.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, Forms, ExtCtrls, Controls, Contnrs,
+  Classes, SysUtils, Forms, ExtCtrls, Controls, Contnrs, LazFileUtils, LazUTF8,
   Translations, TypInfo, Dialogs, FileUtil, LCLProc, ULanguages, LCLType;
 
@@ -46 +46 @@
     procedure TranslateProperty(Component: TPersistent; PropInfo: PPropInfo);
     function IsExcluded(Component: TPersistent; PropertyName: string): Boolean;
+    function GetLangFileDir: string;
   public
     ComponentExcludes: TComponentExcludesList;
@@ -150 +151 @@
   I: Integer;
   LocaleShort: string;
-  Dir: string;
+  SearchMask: string;
 begin
   FPOFiles.Clear;
@@ -158 +159 @@
     //ShowMessage(ExtractFileDir(Application.ExeName) +
     //  DirectorySeparator + 'Languages' + ' ' + '*.' + LocaleShort + '.po');
-    Dir := FPOFilesFolder;
-    if Copy(Dir, 1, 1) <> DirectorySeparator then
-      Dir := ExtractFileDir(UTF8Encode(Application.ExeName)) +
-      DirectorySeparator + Dir;
-    FileList := FindAllFiles(Dir, '*.' + LocaleShort + '.po');
+    SearchMask := '*';
+    if LocaleShort <> '' then SearchMask := SearchMask + '.' + LocaleShort;
+    SearchMask := SearchMask + '.po';
+    FileList := FindAllFiles(GetLangFileDir, SearchMask);
     for I := 0 to FileList.Count - 1 do begin
       FileName := FileList[I];
       //FileName := FindLocaleFileName('.po');
-      if FileExistsUTF8(FileName) then FPOFiles.Add(TPOFile.Create(FileName));
+      if FileExists(FileName) and (
+      ((LocaleShort = '') and (Pos('.', FileName) = Pos('.po', FileName))) or
+      (LocaleShort <> '')) then FPOFiles.Add(TPOFile.Create(FileName));
     end;
   finally
@@ -289 +291 @@
 end;
 
+function TCoolTranslator.GetLangFileDir: string;
+begin
+  Result := FPOFilesFolder;
+  if Copy(Result, 1, 1) <> DirectorySeparator then
+    Result := ExtractFileDir(UTF8Encode(Application.ExeName)) +
+      DirectorySeparator + Result;
+end;
+
 procedure TCoolTranslator.LanguageListToStrings(Strings: TStrings);
 var
@@ -321 +331 @@
   I: Integer;
 begin
+  Result := '';
   if Text <> '' then begin
     for I := 0 to FPoFiles.Count - 1 do begin
@@ -347 +358 @@
 var
   I: Integer;
-begin
+  LangDir: string;
+begin
+  LangDir := GetLangFileDir;
   TLanguage(Languages[0]).Available := True; // Automatic
 
   for I := 1 to Languages.Count - 1 do
   with TLanguage(Languages[I]) do begin
-    Available := FileExistsUTF8(POFilesFolder + DirectorySeparator + ExtractFileNameOnly(Application.ExeName) +
+    Available := FileExists(LangDir + DirectorySeparator + ExtractFileNameOnly(Application.ExeName) +
       '.' + Code + ExtensionSeparator + 'po') or (Code = 'en');
   end;
@@ -364 +377 @@
   Languages := TLanguageList.Create;
   POFilesFolder := 'Languages';
+  CheckLanguageFiles;
 
   // LCL
@@ -386 +400 @@
 begin
   // Win32 user may decide to override locale with LANG variable.
-  Lang := GetEnvironmentVariableUTF8('LANG');
+  Lang := GetEnvironmentVariable('LANG');
 
   // Use user selected language
@@ -394 +408 @@
   if Lang = '' then begin
     for i := 1 to Paramcount - 1 do
-      if (ParamStrUTF8(i) = '--LANG') or (ParamStrUTF8(i) = '-l') or
-        (ParamStrUTF8(i) = '--lang') then
-        Lang := ParamStrUTF8(i + 1);
+      if (ParamStr(i) = '--LANG') or (ParamStr(i) = '-l') or
+        (ParamStr(i) = '--lang') then
+        Lang := ParamStr(i + 1);
   end;
   if Lang = '' then
@@ -404 +418 @@
     Lang := FOnAutomaticLanguage(Lang);
   end;
-
-  if Lang = 'en' then Lang := ''; // English files are without en code
 
   Result := Lang;
@@ -427 +439 @@
     Exit;
 
-  Result := ChangeFileExt(ParamStrUTF8(0), LCExt);
+  Result := ChangeFileExt(ParamStr(0), LCExt);
   if FileExistsUTF8(Result) then
     Exit;

tags/1.0.0/UCore.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, XMLConf, FileUtil, ActnList, Controls, Dialogs, Forms,
-  UGame, UApplicationInfo, UPersistentForm, UScaleDPI, UCoolTranslator;
+  UGame, UApplicationInfo, UPersistentForm, UScaleDPI, UCoolTranslator, URegistry,
+  Registry;
 
 type
@@ -50 +51 @@
     FInitialized: Boolean;
     StoredDimension: TControlDimension;
+    RegistryContext: TRegistryContext;
     procedure DoOnMove(CellFrom, CellTo: TCell; var CountOnce,
       CountRepeat: Integer; Update: Boolean; var Confirm: Boolean);
@@ -85 +87 @@
   UFormHelp;
 
+const
+  DefaultRegKey = '\Software\Chronosoft\xTactics';
+
 resourcestring
   SPlayerWins = 'Player %s wins';
@@ -157 +162 @@
 procedure TCore.LoadConfig;
 begin
+  RegistryContext := RegContext(HKEY_CURRENT_USER, DefaultRegKey);
+  PersistentForm.RegistryContext := RegistryContext;
+  XMLConfig1.Filename := GetAppConfigDir(False) + 'Config.xml';
+
   LastMapFileName := XMLConfig1.GetValue('LastMapFileName', '');
   DevelMode := XMLConfig1.GetValue('DevelMode', false);