Changeset 64 for trunk/Forms/UFormMain.pas

Timestamp:

Jan 7, 2023, 12:10:51 AM (23 months ago)

Author:

chronos

Message:

• Modified: Store app settings in registry.
• Fixed: Full screen initialization.
• Fixed: Automatic language detection.

File:

• trunk/Forms/UFormMain.pas (modified) (8 diffs)

trunk/Forms/UFormMain.pas

@@ -36 +36 @@
     TimerDraw: TTimer;
     TimerEngineTick: TTimer;
-    XMLConfig1: TXMLConfig;
     procedure AAboutExecute(Sender: TObject);
     procedure AExitExecute(Sender: TObject);
@@ -83 +82 @@
 procedure TFormMain.TimerDrawTimer(Sender: TObject);
 begin
-  Application.ProcessMessages;
   if not Drawing then
   try
@@ -112 +110 @@
 
 procedure TFormMain.LoadConfig;
-begin
-  if not FileExists(XMLConfig1.Filename) then Exit;
-
-  with XMLConfig1 do begin
-    FullScreenEnabled := GetValue(DOMString('LanguageCode'), FullScreenEnabled);
-  end;
-
-  if Assigned(Engine) then Engine.LoadConfig(XMLConfig1, '');
+var
+  LangCode: string;
+begin
+  with TRegistryEx.Create do
+  try
+    CurrentContext := Core.ApplicationInfo.GetRegistryContext;
+
+    if ValueExists('LanguageCode') then begin
+      LangCode := ReadStringWithDefault('LanguageCode', '');
+      Core.Translator1.Language := Core.Translator1.Languages.SearchByCode(LangCode);
+    end else Core.Translator1.Language := Core.Translator1.Languages.SearchByCode('');
+    Engine.LoadFromRegistry(CurrentContext);
+  finally
+    Free;
+  end;
 end;
 
 procedure TFormMain.SaveConfig;
 begin
-  with XMLConfig1 do begin
-    SetValue(DOMString('LanguageCode'), FullScreenEnabled);
-  end;
-  if Assigned(Engine) then Engine.SaveConfig(XMLConfig1, '');
-  ForceDirectories(ExtractFileDir(XMLConfig1.Filename));
-  XMLConfig1.Flush;
+  with TRegistryEx.Create do
+  try
+    CurrentContext := Core.ApplicationInfo.GetRegistryContext;
+
+    if Assigned(Core.Translator1.Language) and (Core.Translator1.Language.Code <> '') then
+      WriteString('LanguageCode', Core.Translator1.Language.Code)
+      else DeleteValue('LanguageCode');
+    Engine.SaveToRegistry(CurrentContext);
+  finally
+    Free;
+  end;
 end;
 
@@ -150 +160 @@
 
 procedure TFormMain.FormCreate(Sender: TObject);
-begin
-  XMLConfig1.Filename := GetAppConfigDir(False) + 'Config.xml';
+const
+  UnixLanguagesDir = '/usr/share/Tunneler/Languages';
+begin
+  {$IFDEF UNIX}
+  // If installed in UNIX system then use installation directory for po files
+  if not DirectoryExists(Core.Translator1.POFilesFolder) and DirectoryExists(UnixLanguagesDir) then
+    Core.Translator1.POFilesFolder := UnixLanguagesDir;
+  {$ENDIF}
+
+  Image1.ControlStyle := Image1.ControlStyle + [csOpaque];
   FullScreenEnabled := True;
 
@@ -162 +180 @@
   DoubleBuffered := False;
   Engine := TEngine.Create(nil);
+  LoadConfig;
+  Engine.InitPlayerPool;
   Engine.Bitmap := Image1.Picture.Bitmap;
-  Core.Translator1.Language := Core.Translator1.Languages.SearchByCode('cs');
-  LoadConfig;
   Engine.NewGame;
+  Image1Resize(Self);
   Engine.Active := True;
-  Image1Resize(Self);
-  Image1.ControlStyle := Image1.ControlStyle + [csOpaque];
 end;
 
@@ -178 +195 @@
 procedure TFormMain.FormDestroy(Sender: TObject);
 begin
+  SaveConfig;
   TimerDraw.Enabled := False;
   FreeAndNil(PersistentForm);
@@ -218 +236 @@
 begin
   PersistentForm.Save(Self);
-  SaveConfig;
 end;
 
@@ -249 +266 @@
   PersistentForm.Load(Self, False, True);
   FullScreenEnabled := PersistentForm.FormFullScreen;
-  PersistentForm.SetFullScreen(FullScreenEnabled);
+  //PersistentForm.SetFullScreen(FullScreenEnabled);
   UpdateInterface;
 end;