Changeset 34

Timestamp:

Nov 25, 2021, 1:51:20 PM (3 years ago)

Author:

chronos

Message:

• Fixed: Memory allocation during files merge.
• Fixed: Select all context menu action was not selecting all items.
• Modified: Statusbar moved into contacts form and it is now showin total, filtered and selected number of items.

Location:

trunk

Files:

• Forms/UFormContacts.lfm (modified) (3 diffs)
• Forms/UFormContacts.pas (modified) (6 diffs)
• Forms/UFormMain.lfm (modified) (3 diffs)
• Forms/UFormMain.pas (modified) (3 diffs)
• Languages/vCardStudio.cs.po (modified) (3 diffs)
• Languages/vCardStudio.po (modified) (2 diffs)
• UContact.pas (modified) (2 diffs)
• UCore.pas (modified) (2 diffs)

trunk/Forms/UFormContacts.lfm

@@ -14 +14 @@
   object ListView1: TListView
     Left = 0
-    Height = 837
+    Height = 810
     Top = 0
     Width = 1210
@@ -58 +58 @@
     Left = 0
     Height = 39
-    Top = 869
+    Top = 842
     Width = 1210
     Align = alBottom
@@ -83 +83 @@
     Left = 0
     Height = 32
-    Top = 837
+    Top = 810
     Width = 1210
     OnChange = ListViewFilter1Change
     Align = alBottom
+  end
+  object StatusBar1: TStatusBar
+    Left = 0
+    Height = 27
+    Top = 881
+    Width = 1210
+    Panels = <    
+      item
+        Width = 50
+      end>
+    SimplePanel = False
   end
   object PopupMenuContact: TPopupMenu

trunk/Forms/UFormContacts.pas

@@ -27 +27 @@
     MenuItem4: TMenuItem;
     PopupMenuContact: TPopupMenu;
+    StatusBar1: TStatusBar;
     ToolBar1: TToolBar;
     ToolButton1: TToolButton;
@@ -70 +71 @@
   SRemoveContacts = 'Remove contacts';
   SRemoveContactsQuery = 'Do you want to remove selected contacts?';
+  STotal = 'Total';
+  SFiltered = 'Filtered';
+  SSelected = 'Selected';
 
 { TFormContacts }
@@ -83 +87 @@
     Item.SubItems.Add(Fields[cfTelCell]);
     Item.SubItems.Add(Fields[cfTelHome]);
-    Item.Data := Contacts[Item.Index];
+    Item.Data := ListViewSort1.List[Item.Index];
   end;
 end;
@@ -101 +105 @@
 begin
   ReloadList;
+  UpdateInterface;
 end;
 
@@ -244 +249 @@
 begin
   ListView1.SelectAll;
+  UpdateInterface;
 end;
 
@@ -263 +269 @@
 
 procedure TFormContacts.UpdateInterface;
+var
+  Text: string;
+  SelectedCount: Integer;
 begin
   AAdd.Enabled := Assigned(Contacts);
   AModify.Enabled := Assigned(Contacts) and Assigned(ListView1.Selected);
   ARemove.Enabled := Assigned(Contacts) and Assigned(ListView1.Selected);
+
+  Text := '';
+  if Assigned(Contacts) then begin
+    Text := STotal + ': ' + IntToStr(Contacts.Count);
+    if ListView1.Items.Count < Contacts.Count then
+      Text := Text + ', ' + SFiltered + ': ' + IntToStr(ListView1.Items.Count);
+    SelectedCount := ListView1.SelCount;
+    if SelectedCount > 0 then
+      Text := Text + ', ' + SSelected + ': ' + IntToStr(SelectedCount);
+  end;
+  StatusBar1.Panels[0].Text := Text;
 end;
 

trunk/Forms/UFormMain.lfm

@@ -14 +14 @@
   OnDestroy = FormDestroy
   OnShow = FormShow
-  LCLVersion = '2.0.0.4'
+  LCLVersion = '2.0.12.0'
   object CoolBar1: TCoolBar
     Left = 0
@@ -107 +107 @@
     end
   end
-  object StatusBar1: TStatusBar
-    Left = 0
-    Height = 28
-    Top = 734
-    Width = 1178
-    Panels = <    
-      item
-        Width = 300
-      end>
-    ParentFont = False
-    SimplePanel = False
-  end
   object MainMenu1: TMainMenu
     Images = Core.ImageList1
-    left = 192
-    top = 120
+    Left = 192
+    Top = 120
     object MenuItemFile: TMenuItem
       Caption = 'File'
@@ -187 +175 @@
   end
   object PopupMenuOpenRecent: TPopupMenu
-    left = 420
-    top = 120
+    Left = 420
+    Top = 120
   end
 end

trunk/Forms/UFormMain.pas

@@ -37 +37 @@
     MenuItemFile: TMenuItem;
     PopupMenuOpenRecent: TPopupMenu;
-    StatusBar1: TStatusBar;
     ToolBarOther: TToolBar;
     ToolBarFile: TToolBar;
@@ -71 +70 @@
 
 resourcestring
-  SCount = 'Count:';
   SModified = 'Modified';
 
@@ -153 +151 @@
   UpdateFormTitle;
   CoolBar1.Visible := MenuItemToolbar.Checked;
-  if Assigned(Core.DataFile) then
-    StatusBar1.Panels[0].Text := SCount + ' ' + IntToStr(TcontactsFile(Core.DataFile).Contacts.Count)
-    else StatusBar1.Panels[0].Text := '';
 end;
 

trunk/Languages/vCardStudio.cs.po

@@ -185 +185 @@
 #: tformcontact.label5.caption
 msgid "Last name"
-msgstr "Příjmení:"
+msgstr "Příjmení"
 
 #: tformcontact.label6.caption
@@ -621 +621 @@
 msgstr "Upravit pole"
 
+#: uformcontacts.sfiltered
+msgid "Filtered"
+msgstr "Filtrovaných"
+
 #: uformcontacts.sremovecontacts
 msgid "Remove contacts"
@@ -629 +633 @@
 msgstr "Opravdu chcete odstranit vybrané kontakty?"
 
-#: uformmain.scount
-msgctxt "uformmain.scount"
-msgid "Count:"
-msgstr "Počet:"
+#: uformcontacts.sselected
+msgid "Selected"
+msgstr "Vybraných"
+
+#: uformcontacts.stotal
+msgid "Total"
+msgstr "Celkem"
 
 #: uformmain.smodified

trunk/Languages/vCardStudio.po

@@ -605 +605 @@
 msgstr ""
 
+#: uformcontacts.sfiltered
+msgid "Filtered"
+msgstr ""
+
 #: uformcontacts.sremovecontacts
 msgid "Remove contacts"
@@ -613 +617 @@
 msgstr ""
 
-#: uformmain.scount
-msgctxt "uformmain.scount"
-msgid "Count:"
+#: uformcontacts.sselected
+msgid "Selected"
+msgstr ""
+
+#: uformcontacts.stotal
+msgid "Total"
 msgstr ""
 

trunk/UContact.pas

@@ -302 +302 @@
   I: Integer;
 begin
-  List.Clear;
+  while List.Count > Count do List.Delete(List.Count - 1);
+  while List.Count < Count do List.Add(nil);
   for I := 0 to Count - 1 do
-    List.Add(Items[I]);
+    List[I] := Items[I];
 end;
 
@@ -425 +426 @@
 
 procedure TContact.Assign(Source: TContact);
-begin
-  Properties.Assign(Source.Properties);
+var
+  I: Integer;
+begin
+  while Properties.Count < Source.Properties.Count do
+    Properties.Add(TContactProperty.Create);
+  while Properties.Count > Source.Properties.Count do
+    Properties.Delete(Properties.Count - 1);
+  for I := 0 to Properties.Count - 1 do
+    Properties[I].Assign(Source.Properties[I]);
 end;
 

trunk/UCore.pas

@@ -364 +364 @@
       Result.Loaded := TempFile.Contacts.Count;
       for I := 0 to TempFile.Contacts.Count - 1 do begin
-        NewContact := TContactsFile(DataFile).Contacts.Search(TContact(TempFile.Contacts[I]).Fields[cfFullName]);
+        NewContact := TContactsFile(DataFile).Contacts.Search(TempFile.Contacts[I].Fields[cfFullName]);
         if not Assigned(NewContact) then begin
           NewContact := TContact.Create;
           NewContact.Parent := TContactsFile(DataFile);
-          NewContact.Assign(TContact(TempFile.Contacts[I]));
+          NewContact.Assign(TempFile.Contacts[I]);
           TContactsFile(DataFile).Contacts.Add(NewContact);
           Inc(Result.New);
         end else begin
-          if NewContact.UpdateFrom(TContact(TempFile.Contacts[I])) then
+          if NewContact.UpdateFrom(TempFile.Contacts[I]) then
             Inc(Result.Updated);
         end;
@@ -402 +402 @@
       else FormContacts.Contacts := nil;
     FormContacts.ReloadList;
+    FormContacts.UpdateInterface;
   end;
 end;