Changeset 74 for trunk

Timestamp:

Aug 2, 2016, 12:27:13 PM (8 years ago)

Author:

chronos

Message:

• Fixed: Wrong column indexes in list of import sources.
• Fixed: Do not sort items in TListSort component if soNone order is set.

Location:

trunk

Files:

• Forms/UFormImportSources.pas (modified) (1 diff)
• Forms/UFormMain.lfm (modified) (1 diff)
• Forms/UFormMain.pas (modified) (1 diff)
• Packages/Common/UListViewSort.pas (modified) (1 diff)

trunk/Forms/UFormImportSources.pas

@@ -274 +274 @@
            if Pos(UTF8LowerCase(StringGrid.Cells[2, 0]),
              UTF8LowerCase(TImportSource(List.Items[I]).Categories.GetString)) > 0 then Inc(FoundCount);
-           if Pos(UTF8LowerCase(StringGrid.Cells[2, 0]),
+           if Pos(UTF8LowerCase(StringGrid.Cells[3, 0]),
              UTF8LowerCase(IntToStr(TImportSource(List.Items[I]).ItemCount))) > 0 then Inc(FoundCount);
-           if Pos(UTF8LowerCase(StringGrid.Cells[2, 0]),
+           if Pos(UTF8LowerCase(StringGrid.Cells[4, 0]),
              UTF8LowerCase(DateTimeToStr(TImportSource(List.Items[I]).LastImportTime))) > 0 then Inc(FoundCount);
            if FoundCount <> EnteredCount then List.Delete(I);

trunk/Forms/UFormMain.lfm

@@ -1430 +1430 @@
     OnCompareItem = ListViewSort1CompareItem
     OnFilter = ListViewSort1Filter
-    Column = 2
+    Column = 0
     Order = soUp
     left = 472

trunk/Forms/UFormMain.pas

@@ -426 +426 @@
 procedure TFormMain.ListViewSort1Filter(ListViewSort: TListViewSort);
 begin
-  AcronymDb.Acronyms.Sort(AcronymComparer);
   AcronymDb.AssignToList(ListViewSort1.List);
   FilterList(ListViewSort1.List);

trunk/Packages/Common/UListViewSort.pas

@@ -209 +209 @@
   if ListView.Items.Count <> List.Count then
     ListView.Items.Count := List.Count;
-  if Assigned(FOnCompareItem) then Sort(FOnCompareItem);
+  if Assigned(FOnCompareItem) and (Order <> soNone) then Sort(FOnCompareItem);
   //ListView.Items[-1]; // Workaround for not show first row if selected
   ListView.Refresh;