Changeset 552 for Common

Timestamp:

Dec 20, 2021, 11:03:48 AM (3 years ago)

Author:

chronos

Message:

• Modified: Update Common package.

Location:

Common

Files:

• Languages/ULanguages.cs.po (added)
• Languages/ULanguages.po (added)
• UCommon.pas (modified) (2 diffs)
• UListViewSort.pas (modified) (4 diffs)
• UTheme.pas (modified) (4 diffs)

Common/UCommon.pas

@@ -85 +85 @@
 function TryHexToInt(Data: string; var Value: Integer): Boolean;
 function TryBinToInt(Data: string; var Value: Integer): Boolean;
+procedure SortStrings(Strings: TStrings);
 
 
@@ -677 +678 @@
 end;
 
+procedure SortStrings(Strings: TStrings);
+var
+  Tmp: TStringList;
+begin
+  Strings.BeginUpdate;
+  try
+    if Strings is TStringList then begin
+      TStringList(Strings).Sort;
+    end else begin
+      Tmp := TStringList.Create;
+      try
+        Tmp.Assign(Strings);
+        Tmp.Sort;
+        Strings.Assign(Tmp);
+      finally
+        Tmp.Free;
+      end;
+    end;
+  finally
+    Strings.EndUpdate;
+  end;
+end;
+
 
 initialization

Common/UListViewSort.pas

@@ -81 +81 @@
     FOnChange: TNotifyEvent;
     FStringGrid1: TStringGrid;
+    procedure DoOnChange;
     procedure GridDoOnKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState);
     procedure GridDoOnResize(Sender: TObject);
@@ -90 +91 @@
     function TextEnteredColumn(Index: Integer): Boolean;
     function GetColValue(Index: Integer): string;
+    procedure Reset;
     property StringGrid: TStringGrid read FStringGrid1 write FStringGrid1;
   published
@@ -152 +154 @@
 { TListViewFilter }
 
+procedure TListViewFilter.DoOnChange;
+begin
+  if Assigned(FOnChange) then FOnChange(Self);
+end;
+
 procedure TListViewFilter.GridDoOnKeyUp(Sender: TObject; var Key: Word;
   Shift: TShiftState);
 begin
-  if Assigned(FOnChange) then
-    FOnChange(Self);
+  DoOnChange;
 end;
 
@@ -227 +233 @@
     Result := StringGrid.Cells[Index, 0]
     else Result := '';
+end;
+
+procedure TListViewFilter.Reset;
+var
+  I: Integer;
+begin
+  with StringGrid do
+  for I := 0 to ColCount - 1 do
+    Cells[I, 0] := '';
+  DoOnChange;
 end;
 

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;