Changeset 190

Timestamp:

Apr 22, 2018, 2:46:28 PM (6 years ago)

Author:

chronos

Message:

• Added: Sorting by table columns in players stats form.

Location:

trunk

Files:

• Forms/UFormPlayersStats.lfm (modified) (3 diffs)
• Forms/UFormPlayersStats.pas (modified) (6 diffs)
• Languages/xtactics.cs.po (modified) (3 diffs)
• xtactics.lpi (modified) (1 diff)

trunk/Forms/UFormPlayersStats.lfm

@@ -1 +1 @@
 object FormPlayersStats: TFormPlayersStats
-  Left = 411
+  Left = 709
   Height = 300
-  Top = 237
+  Top = 637
   Width = 697
   Caption = 'Players stats'
   ClientHeight = 300
   ClientWidth = 697
-  DesignTimePPI = 120
   OnClose = FormClose
   OnShow = FormShow
-  LCLVersion = '1.8.0.6'
+  LCLVersion = '1.8.0.4'
   object ListView1: TListView
     Left = 4
@@ -41 +40 @@
       item
         Caption = 'Units'
-        Width = 100
+        Width = 169
       end>
     OwnerData = True
@@ -66 +65 @@
     end
   end
+  object ListViewSort1: TListViewSort
+    ListView = ListView1
+    OnCompareItem = ListViewSort1CompareItem
+    OnFilter = ListViewSort1Filter
+    Column = 0
+    Order = soNone
+    left = 544
+    top = 110
+  end
 end

trunk/Forms/UFormPlayersStats.pas

@@ -7 +7 @@
 uses
   Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
-  Menus, ActnList, UGame;
+  Menus, ActnList, UGame, UListViewSort;
 
 type
@@ -17 +17 @@
     ActionList1: TActionList;
     ListView1: TListView;
+    ListViewSort1: TListViewSort;
     MenuItem1: TMenuItem;
     PopupMenu1: TPopupMenu;
@@ -23 +24 @@
     procedure FormShow(Sender: TObject);
     procedure ListView1Data(Sender: TObject; Item: TListItem);
+    function ListViewSort1CompareItem(Item1, Item2: TObject): Integer;
+    procedure ListViewSort1Filter(ListViewSort: TListViewSort);
   private
 
@@ -45 +48 @@
 begin
   with Core.Game do
-  if Item.Index < Players.Count then
-  with TPlayer(Players[Item.Index]) do begin
+  if Item.Index < ListViewSort1.List.Count then
+  with TPlayer(ListViewSort1.List[Item.Index]) do begin
     Item.Caption := Name;
-    Item.Data := Players[Item.Index];
+    Item.Data := ListViewSort1.List[Item.Index];
     Item.SubItems.Add(PlayerModeText[Mode]);
     Item.SubItems.Add(IntToStr(TotalCells));
@@ -54 +57 @@
     Item.SubItems.Add(IntToStr(TotalCities));
     Item.SubItems.Add(IntToStr(TotalUnits));
+  end;
+end;
+
+function TFormPlayersStats.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(TPlayer(Item1).Name, TPlayer(Item2).Name);
+      1: Result := CompareString(PlayerModeText[TPlayer(Item1).Mode], PlayerModeText[TPlayer(Item2).Mode]);
+      2: Result := CompareInteger(TPlayer(Item1).TotalCells, TPlayer(Item2).TotalCells);
+      3: Result := CompareInteger(TPlayer(Item1).TotalDiscovered, TPlayer(Item2).TotalDiscovered);
+      4: Result := CompareInteger(TPlayer(Item1).TotalCities, TPlayer(Item2).TotalCities);
+      5: Result := CompareInteger(TPlayer(Item1).TotalUnits, TPlayer(Item2).TotalUnits);
+    end;
+    if ListViewSort1.Order = soDown then Result := -Result;
+  end else Result := 0;
+end;
+
+procedure TFormPlayersStats.ListViewSort1Filter(ListViewSort: TListViewSort);
+var
+  I: Integer;
+begin
+  ListViewSort1.List.Clear;
+  for I := 0 to Core.Game.Players.Count - 1 do begin
+    ListViewSort1.List.Add(Core.Game.Players[I]);
   end;
 end;
@@ -78 +109 @@
 procedure TFormPlayersStats.ReloadList;
 begin
-  ListView1.Items.Count := Core.Game.Players.Count;
-  ListView1.Refresh;
+  ListViewSort1.Refresh;
 end;
 

trunk/Languages/xtactics.cs.po

@@ -9 +9 @@
 "MIME-Version: 1.0\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.8\n"
+"X-Generator: Poedit 2.0.4\n"
 "Language: cs\n"
 
@@ -543 +543 @@
 #: tformplayersstats.listview1.columns[2].caption
 msgid "Cells"
-msgstr "Objevených"
+msgstr "Buněk"
 
 #: tformplayersstats.listview1.columns[3].caption
 msgctxt "tformplayersstats.listview1.columns[3].caption"
 msgid "Discovered"
-msgstr "Města"
+msgstr "Objevených"
 
 #: tformplayersstats.listview1.columns[4].caption
 msgctxt "tformplayersstats.listview1.columns[4].caption"
 msgid "Cities"
-msgstr "Jednotky"
+msgstr "Města"
 
 #: tformplayersstats.listview1.columns[5].caption
@@ -883 +883 @@
 msgid "64-bit UInt read overflow."
 msgstr ""
-

trunk/xtactics.lpi

@@ -213 +213 @@
         <IsPartOfProject Value="True"/>
         <ComponentName Value="FormPlayersStats"/>
+        <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
       </Unit17>