Changeset 164 for trunk/Forms

Timestamp:

Jun 30, 2023, 10:51:35 PM (18 months ago)

Author:

chronos

Message:

• Fixed: Build under Windows.
• Fixed: Correctly apply theme to contacts form.

Location:

trunk/Forms

Files:

• FormMain.lfm (modified) (2 diffs)
• FormMain.pas (modified) (3 diffs)
• FormSettings.lfm (modified) (20 diffs)
• FormSettings.lrj (modified) (1 diff)
• FormSettings.pas (modified) (1 diff)

trunk/Forms/FormMain.lfm

@@ -1 +1 @@
 object FormMain: TFormMain
-  Left = 534
-  Height = 993
-  Top = 223
-  Width = 1491
+  Left = 0
+  Height = 1360
+  Top = 40
+  Width = 2560
   AllowDropFiles = True
   Caption = 'vCard Studio'
-  ClientHeight = 959
-  ClientWidth = 1491
+  ClientHeight = 1330
+  ClientWidth = 2560
   DesignTimePPI = 144
   Menu = MainMenu1
@@ -18 +18 @@
   OnShow = FormShow
   LCLVersion = '2.2.6.0'
+  WindowState = wsMaximized
   object CoolBar1: TCoolBar
     Left = 0
     Height = 43
     Top = 0
-    Width = 1491
+    Width = 2560
     AutoSize = True
     Bands = <    

trunk/Forms/FormMain.pas

@@ -75 +75 @@
     FormContacts: TFormContacts;
     procedure UpdateInterface;
+    procedure SettingsChanged;
   end;
 
@@ -137 +138 @@
   try
     SetToolbarHints;
-    Core.Core.Initialize;
-    Translator.TranslateComponentRecursive(Self);
-    ThemeManager.UseTheme(Self);
-    PersistentForm.Load(Self);
     ScaleDPI.ScaleControl(CoolBar1, Core.Core.ScaleDPI1.DesignDPI);
     CoolBar1.AutosizeBands;
@@ -245 +242 @@
 end;
 
+procedure TFormMain.SettingsChanged;
+begin
+  ThemeManager.UseTheme(Self);
+  Translator.TranslateComponentRecursive(Self);
+  FormContacts.ThemeManager.UseTheme(FormContacts);
+  FormContacts.Translator.TranslateComponentRecursive(FormContacts);
+end;
+
 end.
 

trunk/Forms/FormSettings.lfm

@@ -1 +1 @@
 object FormSettings: TFormSettings
-  Left = 798
+  Left = 851
   Height = 613
-  Top = 204
+  Top = 413
   Width = 857
   Caption = 'Settings'
@@ -42 +42 @@
     Width = 845
     HorzScrollBar.Page = 520
-    VertScrollBar.Page = 491
+    VertScrollBar.Page = 481
     Anchors = [akTop, akLeft, akRight, akBottom]
-    ClientHeight = 538
-    ClientWidth = 843
+    ClientHeight = 536
+    ClientWidth = 841
     TabOrder = 2
     object Label1: TLabel
       Left = 24
-      Height = 26
+      Height = 25
       Top = 24
-      Width = 88
+      Width = 81
       Caption = 'Language:'
       ParentColor = False
@@ -58 +58 @@
     object ComboBoxLanguage: TComboBox
       Left = 240
-      Height = 42
+      Height = 33
       Top = 16
       Width = 264
-      ItemHeight = 0
+      ItemHeight = 25
       ParentFont = False
       Style = csDropDownList
@@ -68 +68 @@
     object CheckBoxAutomaticDPI: TCheckBox
       Left = 24
-      Height = 30
+      Height = 29
       Top = 416
-      Width = 148
+      Width = 145
       Caption = 'Automatic DPI'
       OnChange = CheckBoxAutomaticDPIChange
@@ -79 +79 @@
     object SpinEditDPI: TSpinEdit
       Left = 241
-      Height = 43
+      Height = 33
       Top = 448
       Width = 145
@@ -91 +91 @@
     object LabelDPI: TLabel
       Left = 56
-      Height = 26
+      Height = 25
       Top = 456
-      Width = 35
+      Width = 32
       Caption = 'DPI:'
       ParentColor = False
@@ -101 +101 @@
     object CheckBoxReopenLastFileOnStart: TCheckBox
       Left = 24
-      Height = 30
+      Height = 29
       Top = 368
-      Width = 226
+      Width = 217
       Caption = 'Reopen last file on start'
       ParentFont = False
@@ -110 +110 @@
     object Label2: TLabel
       Left = 24
-      Height = 26
+      Height = 25
       Top = 72
-      Width = 63
+      Width = 57
       Caption = 'Theme:'
       ParentColor = False
@@ -119 +119 @@
     object ComboBoxTheme: TComboBox
       Left = 240
-      Height = 42
+      Height = 33
       Top = 64
       Width = 264
-      ItemHeight = 0
+      ItemHeight = 25
       ParentFont = False
       Style = csDropDownList
@@ -129 +129 @@
     object Label3: TLabel
       Left = 24
-      Height = 26
+      Height = 25
       Top = 120
-      Width = 186
+      Width = 174
       Caption = 'Default vCard version:'
       ParentColor = False
@@ -137 +137 @@
     object EditDefaultVcardVersion: TEdit
       Left = 240
-      Height = 43
+      Height = 33
       Top = 112
       Width = 144
@@ -144 +144 @@
     object Label4: TLabel
       Left = 24
-      Height = 26
+      Height = 25
       Top = 165
-      Width = 133
+      Width = 126
       Caption = 'Map query URL:'
       ParentColor = False
@@ -152 +152 @@
     object EditMapUrl: TEdit
       Left = 240
-      Height = 43
+      Height = 33
       Top = 160
-      Width = 588
+      Width = 586
       Anchors = [akTop, akLeft, akRight]
       TabOrder = 6
@@ -160 +160 @@
     object Label5: TLabel
       Left = 24
-      Height = 26
+      Height = 25
       Top = 212
-      Width = 120
+      Width = 114
       Caption = 'Compare tool:'
       ParentColor = False
@@ -168 +168 @@
     object EditCompareTool: TEdit
       Left = 241
-      Height = 43
+      Height = 33
       Top = 208
-      Width = 464
+      Width = 462
       Anchors = [akTop, akLeft, akRight]
       TabOrder = 7
     end
     object ButtonBrowse: TButton
-      Left = 715
+      Left = 713
       Height = 38
       Top = 210
@@ -186 +186 @@
     object Label6: TLabel
       Left = 24
-      Height = 26
+      Height = 25
       Top = 264
-      Width = 248
+      Width = 231
       Caption = 'Default phone country prefix:'
       ParentColor = False
@@ -194 +194 @@
     object EditDefaultPhoneCountryPrefix: TEdit
       Left = 376
-      Height = 43
+      Height = 33
       Top = 260
       Width = 144
@@ -201 +201 @@
     object Label7: TLabel
       Left = 24
-      Height = 26
+      Height = 25
       Top = 312
-      Width = 267
+      Width = 243
       Caption = 'Default international call prefix:'
       ParentColor = False
@@ -209 +209 @@
     object EditDefaultInternationalCallPrefix: TEdit
       Left = 376
-      Height = 43
+      Height = 33
       Top = 308
       Width = 144
@@ -216 +216 @@
   end
   object OpenDialog1: TOpenDialog
-    Title = 'Otevřít existující soubor'
     Left = 640
     Top = 72

trunk/Forms/FormSettings.lrj

@@ -13 +13 @@
 {"hash":77164181,"name":"tformsettings.buttonbrowse.caption","sourcebytes":[66,114,111,119,115,101],"value":"Browse"},
 {"hash":99356634,"name":"tformsettings.label6.caption","sourcebytes":[68,101,102,97,117,108,116,32,112,104,111,110,101,32,99,111,117,110,116,114,121,32,112,114,101,102,105,120,58],"value":"Default phone country prefix:"},
-{"hash":112394474,"name":"tformsettings.label7.caption","sourcebytes":[68,101,102,97,117,108,116,32,105,110,116,101,114,110,97,116,105,111,110,97,108,32,99,97,108,108,32,112,114,101,102,105,120,58],"value":"Default international call prefix:"},
-{"hash":45680018,"name":"tformsettings.opendialog1.title","sourcebytes":[79,116,101,118,197,153,195,173,116,32,101,120,105,115,116,117,106,195,173,99,195,173,32,115,111,117,98,111,114],"value":"Otev\u0159\u00EDt existuj\u00EDc\u00ED soubor"}
+{"hash":112394474,"name":"tformsettings.label7.caption","sourcebytes":[68,101,102,97,117,108,116,32,105,110,116,101,114,110,97,116,105,111,110,97,108,32,99,97,108,108,32,112,114,101,102,105,120,58],"value":"Default international call prefix:"}
 ]}

trunk/Forms/FormSettings.pas

@@ -40 +40 @@
     procedure CheckBoxStartOnLogonChange(Sender: TObject);
     procedure FormShow(Sender: TObject);
-  private
-    { private declarations }
   public
     procedure LoadData;