Changeset 23

Timestamp:

Aug 19, 2021, 11:47:56 AM (3 years ago)

Author:

chronos

Message:

• Added: Snap package definition file.
• Fixed: Selected theme in settings also changed language.
• Modified: Load correctly language files if installed on Linux.

Location:

trunk

Files:

• Forms/UFormContact.lfm (modified) (3 diffs)
• Forms/UFormContact.pas (modified) (1 diff)
• Forms/UFormContacts.lfm (modified) (3 diffs)
• Forms/UFormContacts.pas (modified) (1 diff)
• Forms/UFormFindDuplicity.lfm (modified) (5 diffs)
• Forms/UFormFindDuplicity.pas (modified) (1 diff)
• Forms/UFormGenerate.lfm (modified) (2 diffs)
• Forms/UFormGenerate.pas (modified) (1 diff)
• Forms/UFormSettings.lfm (modified) (8 diffs)
• Forms/UFormSettings.pas (modified) (3 diffs)
• Images/Screenshots (added)
• Images/Screenshots/vCard Studio.png (added)
• Install/snap (added)
• Install/snap/local (added)
• Install/snap/local/build.sh (added)
• Install/snap/local/vCardStudio.desktop (added)
• Install/snap/snapcraft.yaml (added)
• UCore.lfm (modified) (2 diffs)
• UCore.pas (modified) (4 diffs)
• vCardStudio.lpr (modified) (1 diff)

trunk/Forms/UFormContact.lfm

@@ -11 +11 @@
   OnCreate = FormCreate
   OnShow = FormShow
-  LCLVersion = '2.0.0.4'
+  LCLVersion = '2.0.12.0'
   object PageControlContact: TPageControl
     Left = 10
@@ -483 +483 @@
   object ActionList1: TActionList
     Images = Core.ImageList1
-    left = 380
-    top = 188
+    Left = 380
+    Top = 188
     object AEditField: TAction
       Caption = 'Edit'
@@ -492 +492 @@
   object PopupMenu1: TPopupMenu
     Images = Core.ImageList1
-    left = 206
-    top = 191
+    Left = 206
+    Top = 191
     object MenuItem1: TMenuItem
       Action = AEditField

trunk/Forms/UFormContact.pas

@@ -145 +145 @@
 procedure TFormContact.FormCreate(Sender: TObject);
 begin
-  Core.CoolTranslator1.TranslateComponentRecursive(Self);
+  Core.Translator.TranslateComponentRecursive(Self);
   Core.ThemeManager1.UseTheme(Self);
   Contact := nil;

trunk/Forms/UFormContacts.lfm

@@ -11 +11 @@
   OnCreate = FormCreate
   OnShow = FormShow
-  LCLVersion = '2.0.0.4'
+  LCLVersion = '2.0.12.0'
   object ListView1: TListView
     Left = 0
@@ -82 +82 @@
   object PopupMenuContact: TPopupMenu
     Images = Core.ImageList1
-    left = 435
-    top = 263
+    Left = 435
+    Top = 263
     object MenuItem1: TMenuItem
       Action = AAdd
@@ -99 +99 @@
   object ActionList1: TActionList
     Images = Core.ImageList1
-    left = 732
-    top = 257
+    Left = 732
+    Top = 257
     object AAdd: TAction
       Caption = 'Add'

trunk/Forms/UFormContacts.pas

@@ -104 +104 @@
   Core.PersistentForm1.Load(Self);
   Core.ThemeManager1.UseTheme(Self);
-  Core.CoolTranslator1.TranslateComponentRecursive(Self);
+  Core.Translator.TranslateComponentRecursive(Self);
   ReloadList;
   UpdateInterface;

trunk/Forms/UFormFindDuplicity.lfm

@@ -12 +12 @@
   OnDestroy = FormDestroy
   OnShow = FormShow
-  LCLVersion = '2.0.0.4'
+  LCLVersion = '2.0.12.0'
   object ListView1: TListView
     Left = 5
@@ -56 +56 @@
     object ComboBoxField: TComboBox
       Left = 173
-      Height = 42
+      Height = 41
       Top = 14
       Width = 326
@@ -67 +67 @@
     object Label1: TLabel
       Left = 13
-      Height = 26
+      Height = 24
       Top = 19
-      Width = 113
+      Width = 111
       Caption = 'Contact field:'
       ParentColor = False
@@ -76 +76 @@
   end
   object ActionList1: TActionList
-    left = 262
-    top = 154
+    Left = 262
+    Top = 154
     object AShowContacts: TAction
       Caption = 'Show contacts'
@@ -84 +84 @@
   end
   object PopupMenu1: TPopupMenu
-    left = 90
-    top = 149
+    Left = 90
+    Top = 149
     object MenuItem1: TMenuItem
       Action = AShowContacts

trunk/Forms/UFormFindDuplicity.pas

@@ -151 +151 @@
 begin
   FoundItems := TFoundItems.Create;
-  Core.CoolTranslator1.TranslateComponentRecursive(Self);
+  Core.Translator.TranslateComponentRecursive(Self);
   Core.ThemeManager1.UseTheme(Self);
   ContactField := cfTelCell;

trunk/Forms/UFormGenerate.lfm

@@ -11 +11 @@
   OnCreate = FormCreate
   OnShow = FormShow
-  LCLVersion = '2.0.0.4'
+  LCLVersion = '2.0.12.0'
   object Label1: TLabel
     Left = 19
-    Height = 26
+    Height = 24
     Top = 19
-    Width = 56
+    Width = 55
     Caption = 'Count:'
     ParentColor = False
@@ -23 +23 @@
   object SpinEditCount: TSpinEdit
     Left = 155
-    Height = 43
+    Height = 42
     Top = 18
     Width = 152

trunk/Forms/UFormGenerate.pas

@@ -64 +64 @@
 procedure TFormGenerate.FormCreate(Sender: TObject);
 begin
-  Core.CoolTranslator1.TranslateComponentRecursive(Self);
+  Core.Translator.TranslateComponentRecursive(Self);
   Core.ThemeManager1.UseTheme(Self);
 end;

trunk/Forms/UFormSettings.lfm

@@ -14 +14 @@
   OnShow = FormShow
   Position = poScreenCenter
-  LCLVersion = '2.0.0.4'
+  LCLVersion = '2.0.12.0'
   object ComboBoxLanguage: TComboBox
     Left = 192
-    Height = 42
+    Height = 41
     Top = 36
     Width = 312
@@ -27 +27 @@
   object Label1: TLabel
     Left = 24
-    Height = 26
+    Height = 24
     Top = 36
     Width = 88
@@ -61 +61 @@
     Height = 30
     Top = 125
-    Width = 150
+    Width = 148
     Caption = 'Automatic DPI'
     OnChange = CheckBoxAutomaticDPIChange
@@ -70 +70 @@
   object SpinEditDPI: TSpinEdit
     Left = 192
-    Height = 43
+    Height = 42
     Top = 173
     Width = 145
@@ -82 +82 @@
   object LabelDPI: TLabel
     Left = 96
-    Height = 26
+    Height = 24
     Top = 182
     Width = 35
@@ -94 +94 @@
     Height = 30
     Top = 86
-    Width = 229
+    Width = 226
     Caption = 'Reopen last file on start'
     ParentFont = False
@@ -108 +108 @@
   object Label2: TLabel
     Left = 24
-    Height = 26
+    Height = 24
     Top = 221
     Width = 63
@@ -117 +117 @@
   object ComboBoxTheme: TComboBox
     Left = 192
-    Height = 42
+    Height = 41
     Top = 221
     Width = 312

trunk/Forms/UFormSettings.pas

@@ -56 +56 @@
   Core.PersistentForm1.Load(Self);
 
-  Core.CoolTranslator1.LanguageListToStrings(ComboBoxLanguage.Items);
-  ComboBoxLanguage.ItemIndex := ComboBoxLanguage.Items.IndexOfObject(Core.CoolTranslator1.Language);
+  Core.Translator.LanguageListToStrings(ComboBoxLanguage.Items);
+  ComboBoxLanguage.ItemIndex := ComboBoxLanguage.Items.IndexOfObject(Core.Translator.Language);
   if ComboBoxLanguage.ItemIndex = -1 then ComboBoxLanguage.ItemIndex := 0;
 
@@ -68 +68 @@
 begin
   if ComboBoxLanguage.ItemIndex <> -1 then
-    Core.CoolTranslator1.Language := TLanguage(ComboBoxLanguage.Items.Objects[ComboBoxTheme.ItemIndex]);
+    Core.Translator.Language := TLanguage(ComboBoxLanguage.Items.Objects[ComboBoxLanguage.ItemIndex]);
   if ComboBoxTheme.ItemIndex <> -1 then
     Core.ThemeManager1.Theme := TTheme(ComboBoxTheme.Items.Objects[ComboBoxTheme.ItemIndex]);
@@ -91 +91 @@
 procedure TFormSettings.FormCreate(Sender: TObject);
 begin
-  Core.CoolTranslator1.TranslateComponentRecursive(Self);
+  Core.Translator.TranslateComponentRecursive(Self);
   Core.ThemeManager1.UseTheme(Self);
 end;

trunk/UCore.lfm

@@ -8710 +8710 @@
     Top = 125
   end
-  object CoolTranslator1: TTranslator
+  object Translator: TTranslator
     POFilesFolder = 'Languages'
     Left = 115
@@ -8725 +8725 @@
   end
   object AboutDialog1: TAboutDialog
-    CoolTranslator = CoolTranslator1
+    CoolTranslator = Translator
     ThemeManager = ThemeManager1
     ApplicationInfo = ApplicationInfo1

trunk/UCore.pas

@@ -41 +41 @@
     ActionList1: TActionList;
     ApplicationInfo1: TApplicationInfo;
-    CoolTranslator1: TTranslator;
+    Translator: TTranslator;
     ImageList1: TImageList;
     LastOpenedList1: TLastOpenedList;
@@ -273 +273 @@
 
 procedure TCore.DataModuleCreate(Sender: TObject);
-begin
+const
+  LinuxLanguagesDir = '/usr/share/vCardStudio/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}
+
   DataFile := nil;
   DefaultDataFileClass := TContactsFile;
@@ -396 +404 @@
     CurrentContext := ApplicationInfo1.GetRegistryContext;
     if ValueExists('LanguageCode') then
-      CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode(ReadStringWithDefault('LanguageCode', ''))
-      else CoolTranslator1.Language := CoolTranslator1.Languages.SearchByCode('');
+      Translator.Language := Translator.Languages.SearchByCode(ReadStringWithDefault('LanguageCode', ''))
+      else Translator.Language := Translator.Languages.SearchByCode('');
     if ValueExists('Theme') then
       ThemeManager1.Theme := ThemeManager1.Themes.FindByName(ReadStringWithDefault('Theme', 'System'))
@@ -416 +424 @@
   try
     CurrentContext := ApplicationInfo1.GetRegistryContext;
-    if Assigned(CoolTranslator1.Language) and (CoolTranslator1.Language.Code <> '') then
-      WriteString('LanguageCode', CoolTranslator1.Language.Code)
+    if Assigned(Translator.Language) and (Translator.Language.Code <> '') then
+      WriteString('LanguageCode', Translator.Language.Code)
       else DeleteValue('LanguageCode');
     if Assigned(ThemeManager1.Theme) and (ThemeManager1.Theme.Name <> '') then

trunk/vCardStudio.lpr

@@ -4 +4 @@
 
 uses
-  {$IFDEF UNIX}{$IFDEF UseCThreads}
-  cthreads,
-  {$ENDIF}{$ENDIF}
+  {$IFDEF UNIX}
+  cthreads, clocale,
+  {$ENDIF}
   Interfaces, // this includes the LCL widgetset
   Forms, UFormMain, UCore, Common, UDataFile,