Changeset 32

Timestamp:

Nov 25, 2021, 11:32:55 AM (3 years ago)

Author:

chronos

Message:

• Added: Bottom column filter bar in contacts list.
• Added: Allow to sort columns in contacts list.

Location:

trunk

Files:

• Forms/UFormContact.pas (modified) (1 diff)
• Forms/UFormContacts.lfm (modified) (3 diffs)
• Forms/UFormContacts.pas (modified) (7 diffs)
• UContact.pas (modified) (4 diffs)

trunk/Forms/UFormContact.pas

@@ -182 +182 @@
       Photo := PhotoProperty.GetDecodedValue;
       Stream := TMemoryStream.Create;
-      Stream.Write(Photo[1], Length(Photo));
-      Stream.Position := 0;
-      JpegImage := TJPEGImage.Create;
-      JpegImage.LoadFromStream(Stream);
-      ImagePhoto.Picture.Bitmap.SetSize(JpegImage.Width, JpegImage.Height);
-      ImagePhoto.Picture.Bitmap.Canvas.Draw(0, 0, JpegImage);
-      JpegImage.Free;
-      Stream.Free;
+      try
+        Stream.Write(Photo[1], Length(Photo));
+        Stream.Position := 0;
+        if PhotoProperty.Attributes.IndexOf('JPEG') <> -1 then begin
+          JpegImage := TJPEGImage.Create;
+          try
+            JpegImage.LoadFromStream(Stream);
+            ImagePhoto.Picture.Bitmap.SetSize(JpegImage.Width, JpegImage.Height);
+            ImagePhoto.Picture.Bitmap.Canvas.Draw(0, 0, JpegImage);
+          finally
+            JpegImage.Free;
+          end;
+        end else begin
+          ImagePhoto.Picture.Bitmap.LoadFromStream(Stream);
+        end;
+      finally
+        Stream.Free;
+      end;
     end;
   end;

trunk/Forms/UFormContacts.lfm

@@ -14 +14 @@
   object ListView1: TListView
     Left = 0
-    Height = 869
+    Height = 837
     Top = 0
     Width = 1210
@@ -80 +80 @@
     end
   end
+  object ListViewFilter1: TListViewFilter
+    Left = 0
+    Height = 32
+    Top = 837
+    Width = 1210
+    OnChange = ListViewFilter1Change
+    Align = alBottom
+  end
   object PopupMenuContact: TPopupMenu
     Images = Core.ImageList1
@@ -125 +133 @@
     end
   end
+  object ListViewSort1: TListViewSort
+    ListView = ListView1
+    OnCompareItem = ListViewSort1CompareItem
+    OnFilter = ListViewSort1Filter
+    OnColumnWidthChanged = ListViewSort1ColumnWidthChanged
+    Column = 0
+    Order = soNone
+    Left = 528
+    Top = 428
+  end
 end

trunk/Forms/UFormContacts.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ComCtrls, Menus, ActnList, UContact;
+  ComCtrls, Menus, ActnList, UContact, UListViewSort, fgl, LazUTF8;
 
 type
@@ -20 +20 @@
     ActionList1: TActionList;
     ListView1: TListView;
+    ListViewFilter1: TListViewFilter;
+    ListViewSort1: TListViewSort;
     MenuItem1: TMenuItem;
     MenuItem2: TMenuItem;
@@ -40 +42 @@
     procedure ListView1SelectItem(Sender: TObject; Item: TListItem;
       Selected: Boolean);
+    procedure ListViewFilter1Change(Sender: TObject);
+    procedure ListViewSort1ColumnWidthChanged(Sender: TObject);
+    function ListViewSort1CompareItem(Item1, Item2: TObject): Integer;
+    procedure ListViewSort1Filter(ListViewSort: TListViewSort);
   private
     FContacts: TContacts;
+    procedure FilterList(List: TFPGObjectList<TObject>);
     procedure SetContacts(AValue: TContacts);
   public
@@ -68 +75 @@
 procedure TFormContacts.ListView1Data(Sender: TObject; Item: TListItem);
 begin
-  if Assigned(Contacts) and (Item.Index < Contacts.Count) then
-  with TContact(Contacts[Item.Index]) do begin
+  if Item.Index < ListViewSort1.List.Count then
+  with TContact(ListViewSort1.List[Item.Index]) do begin
     Item.Caption := Fields[cfFullName];
     Item.SubItems.Add(Fields[cfFirstName]);
@@ -91 +98 @@
 end;
 
+procedure TFormContacts.ListViewFilter1Change(Sender: TObject);
+begin
+  ReloadList;
+end;
+
+procedure TFormContacts.ListViewSort1ColumnWidthChanged(Sender: TObject);
+begin
+  ListViewFilter1.UpdateFromListView(ListView1);
+end;
+
+function TFormContacts.ListViewSort1CompareItem(Item1, Item2: TObject): Integer;
+begin
+  Result := 0;
+  if Assigned(Item1) and Assigned(Item2) and (ListViewSort1.Order <> soNone) then begin
+    with ListViewSort1 do
+    case Column of
+      0: Result := CompareString(TContact(Item1).Fields[cfFullName], TContact(Item2).Fields[cfFullName]);
+      1: Result := CompareString(TContact(Item1).Fields[cfFirstName], TContact(Item2).Fields[cfFirstName]);
+      2: Result := CompareString(TContact(Item1).Fields[cfMiddleName], TContact(Item2).Fields[cfMiddleName]);
+      3: Result := CompareString(TContact(Item1).Fields[cfLastName], TContact(Item2).Fields[cfLastName]);
+      4: Result := CompareString(TContact(Item1).Fields[cfTelCell], TContact(Item2).Fields[cfTelCell]);
+      5: Result := CompareString(TContact(Item1).Fields[cfTelHome], TContact(Item2).Fields[cfTelHome]);
+    end;
+    if ListViewSort1.Order = soDown then Result := -Result;
+  end else Result := 0;
+end;
+
+procedure TFormContacts.ListViewSort1Filter(ListViewSort: TListViewSort);
+begin
+  if Assigned(Contacts) then Contacts.AssignToList(ListViewSort1.List)
+    else ListViewSort1.List.Clear;
+  FilterList(ListViewSort1.List);
+end;
+
+procedure TFormContacts.FilterList(List: TFPGObjectList<TObject>);
+var
+  I: Integer;
+  FoundCount: Integer;
+  EnteredCount: Integer;
+begin
+  EnteredCount := ListViewFilter1.TextEnteredCount;
+  for I := List.Count - 1 downto 0 do begin
+    if List.Items[I] is TContact then begin
+      with TContact(List.Items[I]) do begin
+         with ListViewFilter1 do
+         if Visible and (EnteredCount > 0) then begin
+           FoundCount := 0;
+           if Pos(UTF8LowerCase(StringGrid.Cells[0, 0]),
+             UTF8LowerCase(TContact(List.Items[I]).Fields[cfFullName])) > 0 then Inc(FoundCount);
+           if Pos(UTF8LowerCase(StringGrid.Cells[1, 0]),
+             UTF8LowerCase(TContact(List.Items[I]).Fields[cfFirstName])) > 0 then Inc(FoundCount);
+           if Pos(UTF8LowerCase(StringGrid.Cells[2, 0]),
+             UTF8LowerCase(TContact(List.Items[I]).Fields[cfMiddleName])) > 0 then Inc(FoundCount);
+           if Pos(UTF8LowerCase(StringGrid.Cells[3, 0]),
+             UTF8LowerCase(TContact(List.Items[I]).Fields[cfLastName])) > 0 then Inc(FoundCount);
+           if Pos(UTF8LowerCase(StringGrid.Cells[4, 0]),
+             UTF8LowerCase(TContact(List.Items[I]).Fields[cfTelCell])) > 0 then Inc(FoundCount);
+           if Pos(UTF8LowerCase(StringGrid.Cells[5, 0]),
+             UTF8LowerCase(TContact(List.Items[I]).Fields[cfTelHome])) > 0 then Inc(FoundCount);
+           if FoundCount <> EnteredCount then List.Delete(I);
+         end;
+      end;
+    end else
+    if TContact(List.Items[I]) is TContact then begin
+      List.Delete(I);
+    end;
+  end;
+end;
+
 procedure TFormContacts.SetContacts(AValue: TContacts);
 begin
@@ -106 +182 @@
   ReloadList;
   UpdateInterface;
+  ListViewFilter1.UpdateFromListView(ListView1);
 end;
 
@@ -182 +259 @@
 procedure TFormContacts.ReloadList;
 begin
-  if Assigned(Contacts) then
-    ListView1.Items.Count := Contacts.Count
-    else ListView1.Items.Count := 0;
-  ListView1.Refresh;
+  ListViewSort1.Refresh;
 end;
 

trunk/UContact.pas

@@ -87 +87 @@
   TContacts = class(TFPGObjectList<TContact>)
     ContactsFile: TContactsFile;
+    procedure AssignToList(List: TFPGObjectList<TObject>);
     function AddNew: TContact;
     function Search(FullName: string): TContact;
@@ -185 +186 @@
 procedure TContactProperty.EvaluateAttributes;
 begin
+  if Attributes.IndexOf('BASE64') <> -1 then
+    Encoding := 'BASE64'
+  else
   if Attributes.IndexOfName('ENCODING') <> -1 then
     Encoding := Attributes.Values['ENCODING']
     else Encoding := '';
+
   if Attributes.IndexOfName('CHARSET') <> -1 then
     Charset := Attributes.Values['CHARSET']
@@ -245 +250 @@
 
 { TContacts }
+
+procedure TContacts.AssignToList(List: TFPGObjectList<TObject>);
+var
+  I: Integer;
+begin
+  List.Clear;
+  for I := 0 to Count - 1 do
+    List.Add(Items[I]);
+end;
 
 function TContacts.AddNew: TContact;
@@ -419 +433 @@
     AddNew('TITLE', [], 'Title', cfTitle, dtString);
     AddNew('CATEGORIES', [], 'Categories', cfCategories, dtString);
-    AddNew('ORG', [], 'Organization', cfOrganization, dtString);
+    AddNew('ORG', [], 'Organization', cfOrganization, dtString, 0);
+    AddNew('ORG', [], 'Division', cfOrganization, dtString, 1);
     AddNew('ADR', ['HOME'], 'Home Address', cfAdrHome, dtString);
     AddNew('ADR', ['HOME'], 'Home Address Street', cfHomeAddressStreet, dtString, 1);