Changeset 69 for trunk

Timestamp:

Dec 10, 2021, 11:40:17 AM (2 years ago)

Author:

chronos

Message:

• Added: Remember last count value used in Generate contact form.

Location:

trunk

Files:

• Forms/UFormGenerate.lfm (modified) (2 diffs)
• Forms/UFormGenerate.pas (modified) (2 diffs)
• Images/Screenshots/Find duplicates.png (added)
• Packages/Common/UTheme.pas (modified) (4 diffs)
• UCore.pas (modified) (3 diffs)

trunk/Forms/UFormGenerate.lfm

@@ -14 +14 @@
   object Label1: TLabel
     Left = 19
-    Height = 25
+    Height = 24
     Top = 19
-    Width = 52
+    Width = 55
     Caption = 'Count:'
     ParentColor = False
@@ -23 +23 @@
   object SpinEditCount: TSpinEdit
     Left = 155
-    Height = 33
+    Height = 42
     Top = 18
     Width = 152

trunk/Forms/UFormGenerate.pas

@@ -59 +59 @@
   );
 begin
+  Core.GenerateCount := SpinEditCount.Value;
   Core.PersistentForm1.Save(Self);
 end;
@@ -71 +72 @@
 begin
   Core.PersistentForm1.Load(Self);
+  SpinEditCount.Value := Core.GenerateCount;
   UpdateInterface;
 end;

trunk/Packages/Common/UTheme.pas

@@ -5 +5 @@
 uses
   Classes, SysUtils, Graphics, ComCtrls, Controls, ExtCtrls, Menus, StdCtrls,
-  Spin, Forms, Contnrs, Grids;
+  Spin, Forms, fgl, Grids;
 
 type
@@ -19 +19 @@
   { TThemes }
 
-  TThemes = class(TObjectList)
+  TThemes = class(TFPGObjectList<TTheme>)
     function AddNew(Name: string): TTheme;
     function FindByName(Name: string): TTheme;
@@ -74 +74 @@
 procedure TThemes.LoadToStrings(Strings: TStrings);
 var
-  Theme: TTheme;
+  I: Integer;
 begin
-  Strings.Clear;
-  for Theme in Self do
-    Strings.AddObject(Theme.Name, Theme);
+  Strings.BeginUpdate;
+  try
+    while Strings.Count < Count do Strings.Add('');
+    while Strings.Count > Count do Strings.Delete(Strings.Count - 1);
+    for I := 0 to Count - 1 do begin
+      Strings[I] := Items[I].Name;
+      Strings.Objects[I] := Items[I];
+    end;
+  finally
+    Strings.EndUpdate;
+  end;
 end;
 
@@ -123 +131 @@
 destructor TThemeManager.Destroy;
 begin
-  Themes.Free;
-  inherited Destroy;
+  FreeAndNil(Themes);
+  inherited;
 end;
 

trunk/UCore.pas

@@ -88 +88 @@
     LastContactTabIndex: Integer;
     LastContactFileName: string;
+    GenerateCount: Integer;
     ToolbarVisible: Boolean;
     function GetProfileImage: TImage;
@@ -484 +485 @@
     LastContactFileName := ReadStringWithDefault('LastContactFileName', '');
     LastSplitDir := ReadStringWithDefault('LastSplitDir', '');
+    GenerateCount := ReadIntegerWithDefault('GenerateCount', 1);
   finally
     Free;
@@ -508 +510 @@
     WriteString('LastContactFileName', LastContactFileName);
     WriteString('LastSplitDir', LastSplitDir);
+    WriteInteger('GenerateCount', GenerateCount);
   finally
     Free;