Changeset 209 for trunk

Timestamp:

Sep 20, 2021, 12:25:22 PM (3 years ago)

Author:

chronos

Message:

• Fixed: Correctly detect data application directories for Linux installation.
• Modified: Use registry key and root from application info component.

Location:

trunk

Files:

• Forms/UFormCheck.pas (modified) (2 diffs)
• Forms/UFormMain.pas (modified) (4 diffs)
• Languages/UJobProgressView.cs.po (deleted)
• Languages/UJobProgressView.po (deleted)
• Packages/Common/Languages/UFormAbout.cs.po (modified) (1 diff)
• Packages/Common/Languages/UFormAbout.po (modified) (1 diff)
• Packages/Common/Languages/UJobProgressView.po (modified) (1 diff)
• Packages/Common/Languages/UThreading.po (modified) (1 diff)
• UCore.lfm (modified) (1 diff)
• UCore.pas (modified) (7 diffs)

trunk/Forms/UFormCheck.pas

@@ -724 +724 @@
   with TRegistryEx.Create do
   try
-    RootKey := HKEY_CURRENT_USER;
-    OpenKey(DefaultRegKey, True);
+    RootKey := RegistryRootHKEY[Core.ApplicationInfo1.RegistryRoot];
+    OpenKey(Core.ApplicationInfo1.RegistryKey, True);
     EditSummaryStart.Text := ReadStringWithDefault('SummaryStart', 'ACRONYMS AND ABBREVIATIONS');
     EditSummaryEnd.Text := ReadStringWithDefault('SummaryEnd', 'Appendix');
@@ -739 +739 @@
   with TRegistryEx.Create do
   try
-    RootKey := HKEY_CURRENT_USER;
-    OpenKey(DefaultRegKey, True);
+    RootKey := RegistryRootHKEY[Core.ApplicationInfo1.RegistryRoot];
+    OpenKey(Core.ApplicationInfo1.RegistryKey, True);
     WriteString('SummaryStart', EditSummaryStart.Text);
     WriteString('SummaryEnd', EditSummaryEnd.Text);

trunk/Forms/UFormMain.pas

@@ -735 +735 @@
   if Title <> '' then Title := Title + ' - ';
   Title := Title + Core.ApplicationInfo1.AppName;
+  {$IFDEF WINDOWS}
+  // Under Linux title would affect reg.xml path for storing registry settings
   Application.Title := Title;
+  {$ENDIF}
   Caption := Title;
   if Assigned(Core.AcronymDb) then begin
@@ -750 +753 @@
 procedure TFormMain.LoadConfig;
 begin
-  RegistryContext := TRegistryContext.Create(HKEY_CURRENT_USER, DefaultRegKey);
-  Core.PersistentForm1.RegistryContext := RegistryContext;
-  RegistryContext := TRegistryContext.Create(HKEY_CURRENT_USER, DefaultRegKey + '\RecentFiles');
+  Core.PersistentForm1.RegistryContext := Core.ApplicationInfo1.GetRegistryContext;
+  RegistryContext := TRegistryContext.Create(Core.ApplicationInfo1.RegistryRoot,
+    Core.ApplicationInfo1.RegistryKey + '\RecentFiles');
   LastOpenedList1.LoadFromRegistry(RegistryContext);
 
@@ -763 +766 @@
   with TRegistryEx.Create do
   try
-    RootKey := HKEY_CURRENT_USER;
-    OpenKey(DefaultRegKey, True);
+    RootKey := RegistryRootHKEY[Core.ApplicationInfo1.RegistryRoot];
+    OpenKey(Core.ApplicationInfo1.RegistryKey, True);
     AFilterSameLength.Checked := ReadBoolWithDefault('SameLength', False);
     AFilterSameLetterCase.Checked := ReadBoolWithDefault('SameLetterCase', False);
@@ -789 +792 @@
 procedure TFormMain.SaveConfig;
 begin
-  RegistryContext := TRegistryContext.Create(HKEY_CURRENT_USER, DefaultRegKey + '\RecentFiles');
+  RegistryContext := TRegistryContext.Create(Core.ApplicationInfo1.RegistryRoot,
+    Core.ApplicationInfo1.RegistryKey + '\RecentFiles');
   LastOpenedList1.SaveToRegistry(RegistryContext);
 
   with TRegistryEx.Create do
   try
-    RootKey := HKEY_CURRENT_USER;
-    OpenKey(DefaultRegKey, True);
+    RootKey := RegistryRootHKEY[Core.ApplicationInfo1.RegistryRoot];
+    OpenKey(Core.ApplicationInfo1.RegistryKey, True);
     WriteBool('SameLength', AFilterSameLength.Checked);
     WriteBool('SameLetterCase', AFilterSameLetterCase.Checked);

trunk/Packages/Common/Languages/UFormAbout.cs.po

@@ -24 +24 @@
 msgstr "Verze"
 
+#: tformabout.buttonhomepage.caption
+msgid "Home page"
+msgstr "Domovská stránka"
+
+#: tformabout.buttonclose.caption
+msgid "Close"
+msgstr "Zavřít"

trunk/Packages/Common/Languages/UFormAbout.po

@@ -14 +14 @@
 msgstr ""
 
+#: tformabout.buttonhomepage.caption
+msgid "Home page"
+msgstr ""
+
+#: tformabout.buttonclose.caption
+msgid "Close"
+msgstr ""
+

trunk/Packages/Common/Languages/UJobProgressView.po

@@ -14 +14 @@
 msgstr ""
 
+#: ujobprogressview.soperations
+msgid "Operations:"
+msgstr ""
+
 #: ujobprogressview.spleasewait
 msgid "Please wait..."

trunk/Packages/Common/Languages/UThreading.po

@@ -3 +3 @@
 
 #: uthreading.scurrentthreadnotfound
-#, fuzzy,badformat
 msgid "Current thread ID %d not found in virtual thread list."
 msgstr "Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8Content-Type: text/plain; charset=UTF-8"

trunk/UCore.lfm

@@ -3477 +3477 @@
     Description = 'A simple tool for quick searching of meaning for various acronyms and abbreviations.'
     ReleaseDate = 44322
-    RegistryKey = '\Software\Chronosoft\AcronymDecoder'
+    RegistryKey = '\Software\Chronosoft\Acronym Decoder'
     RegistryRoot = rrKeyCurrentUser
     License = 'CC0'

trunk/UCore.pas

@@ -49 +49 @@
     InitializeStarted: Boolean;
     InitializeFinished: Boolean;
+    function GetAppShareDir(Dir: string): string;
     procedure Initialize;
     procedure LoadConfig;
@@ -59 +60 @@
   Core: TCore;
 
-const
-  DefaultRegKey = '\Software\Chronosoft\Acronym Decoder';
-
 
 implementation
@@ -82 +80 @@
 
 procedure TCore.DataModuleCreate(Sender: TObject);
-const
-  LinuxLanguagesDir = '/usr/share/AcronymDecoder/Languages';
-begin
-  {$IFDEF Linux}
-  // If installed in Linux system then use installation directory for po files
-  if not DirectoryExists(Translator.POFilesFolder) and DirectoryExists(LinuxLanguagesDir) then
-    Translator.POFilesFolder := LinuxLanguagesDir;
-  {$ENDIF}
+begin
+  Translator.POFilesFolder := GetAppShareDir('Languages');
 
   AcronymDb := nil;
@@ -131 +123 @@
   {$ENDIF}
   WriteLn(Text);
+end;
+
+function TCore.GetAppShareDir(Dir: string): string;
+var
+  NewDir: string;
+begin
+  Result := ExtractFileDir(Application.ExeName) + DirectorySeparator + Dir;
+  {$IFDEF Linux}
+  // If installed in Linux system then try to use different installation directory
+  if not DirectoryExists(Result) then begin
+    NewDir := '/usr/share/' + ExtractFileNameOnly(Application.ExeName) + DirectorySeparator + Dir;
+    if DirectoryExists(NewDir) then Result := NewDir;
+  end;
+  {$ENDIF}
 end;
 
@@ -159 +165 @@
     end;
 
-    ExamplesDir := ExtractFileDir(Application.ExeName) + DirectorySeparator +
-      'Examples';
-    {$IFDEF Linux}
-    // If installed in Linux system then use installation directory for po files
-    if Application.ExeName = '/usr/bin/' + ExtractFileNameOnly(Application.ExeName) then
-      ExamplesDir := '/usr/share/' + ExtractFileNameOnly(Application.ExeName) +
-        DirectorySeparator + 'Examples';
-    {$ENDIF}
+    ExamplesDir := GetAppShareDir('Examples');
     ExampleFileName := ExamplesDir + DirectorySeparator + ExampleFile;
 
@@ -212 +211 @@
   with TRegistryEx.Create do
   try
-    RootKey := HKEY_CURRENT_USER;
-    OpenKey(DefaultRegKey, True);
+    RootKey := RegistryRootHKEY[ApplicationInfo1.RegistryRoot];
+    OpenKey(ApplicationInfo1.RegistryKey, True);
     ScaleDPI1.DPI := Point(ReadIntegerWithDefault('DPIX', 96), ReadIntegerWithDefault('DPIY', 96));
     ScaleDPI1.AutoDetect := ReadBoolWithDefault('DPIAuto', True);
@@ -234 +233 @@
   with TRegistryEx.Create do
   try
-    RootKey := HKEY_CURRENT_USER;
-    OpenKey(DefaultRegKey, True);
+    RootKey := RegistryRootHKEY[ApplicationInfo1.RegistryRoot];
+    OpenKey(ApplicationInfo1.RegistryKey, True);
     WriteInteger('DPIX', ScaleDPI1.DPI.X);
     WriteInteger('DPIY', ScaleDPI1.DPI.Y);