Skip to content

Commit 9521539

Browse files
GerryFerdinandus2GerryFerdinandus2
committed
FIX: Remove the acceding/descending icon from header data/info after loading the torrent files.
1 parent fde4282 commit 9521539

File tree

3 files changed

+65
-68
lines changed

3 files changed

+65
-68
lines changed

‎controlergridtorrentdata.pas‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ TControlerGridTorrentData = class
4242
IsColumn: boolean; sIndex, tIndex: integer);
4343
procedure AddColumn(var GridColumn: TGridColumn; index: integer);
4444
procedure UpdateColumnTag;
45-
procedure ClearAllImageIndex;
4645
procedure WriteCell(GridColumn: TGridColumn; const Str: UTF8String);
4746
public
4847
//All the string that can be written to grid.
@@ -58,6 +57,7 @@ TControlerGridTorrentData = class
5857
IndexOrder //9
5958
: UTF8String;
6059

60+
procedure ClearAllImageIndex;
6161
procedure AppendRow;
6262
procedure ReorderGrid;
6363
function ReadComment(Rowindex: integer): UTF8String;
@@ -90,7 +90,7 @@ procedure TControlerGridTorrentData.UpdateColumnTag;
9090
begin
9191
//fill the 'tag' value as the position of the coulumn.
9292
//this methode must be only called when the user change the column order.
93-
for i := 0 to FStringGridTorrentData.ColCount - 1 do
93+
for i := 0 to FStringGridTorrentData.Columns.Count - 1 do
9494
begin
9595
FStringGridTorrentData.Columns[i].Tag :=
9696
FStringGridTorrentData.Columns.IndexOf(FStringGridTorrentData.Columns[i]);
@@ -105,7 +105,7 @@ procedure TControlerGridTorrentData.ClearAllImageIndex;
105105
i: integer;
106106
begin
107107
//The sort icon must be removed from the title bar
108-
for i := 0 to FStringGridTorrentData.ColCount - 1 do
108+
for i := 0 to FStringGridTorrentData.Columns.Count - 1 do
109109
begin
110110
FStringGridTorrentData.Columns[i].Title.ImageIndex := -1;
111111
end;
@@ -174,7 +174,7 @@ constructor TControlerGridTorrentData.Create(StringGridTorrentData: TStringGrid)
174174
FStringGridTorrentData.OnColRowMoved := @StringGridTorrentDataColRowMoved;
175175

176176
//The view and the controler part must have the same column count.
177-
Assert(FStringGridTorrentData.ColCount <> COLUMN_COUNT, 'Wrong column count');
177+
Assert(FStringGridTorrentData.Columns.Count <> COLUMN_COUNT, 'Wrong column count');
178178

179179
//Track the column
180180
AddColumn(FTorrentFile, 0);

‎main.pas‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1243,12 +1243,13 @@ procedure TFormTrackerModify.ViewUpdateBegin(ClearView: boolean);
12431243
TreeViewFileContents.BeginUpdate;
12441244
CheckListBoxPublicPrivateTorrent.Items.BeginUpdate;
12451245

1246-
if ClearView then //never used
1246+
if ClearView then
12471247
begin
1248-
//Clear the View
1248+
//Clear all the user data 'View' elements. This will be filled with new data.
12491249
TreeViewFileContents.Items.Clear;
12501250
CheckListBoxPublicPrivateTorrent.Clear; //Use in update torrent!
12511251
StringGridTorrentData.Clear;
1252+
FControlerGridTorrentData.ClearAllImageIndex;
12521253
//RowCount is 0 after Clear. But must be 1 to make it work.
12531254
StringGridTorrentData.RowCount := 1;
12541255
end;

‎trackereditor.lpi‎

Lines changed: 58 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@
5252
<HasResources Value="True"/>
5353
<ResourceBaseClass Value="Form"/>
5454
<UnitName Value="main"/>
55+
<IsVisibleTab Value="True"/>
5556
<EditorIndex Value="0"/>
5657
<WindowIndex Value="0"/>
57-
<TopLine Value="1251"/>
58-
<CursorPos X="11" Y="1263"/>
58+
<TopLine Value="1192"/>
59+
<CursorPos X="1" Y="1252"/>
5960
<UsageCount Value="200"/>
60-
<Bookmarks Count="2">
61-
<Item0 X="1" Y="489" ID="0"/>
62-
<Item1 X="1" Y="527" ID="1"/>
61+
<Bookmarks Count="1">
62+
<Item0 X="28" Y="1246" ID="0"/>
6363
</Bookmarks>
6464
<Loaded Value="True"/>
6565
<LoadedDesigner Value="True"/>
@@ -104,9 +104,6 @@
104104
<TopLine Value="369"/>
105105
<CursorPos X="1" Y="451"/>
106106
<UsageCount Value="200"/>
107-
<Bookmarks Count="1">
108-
<Item0 X="1" Y="425" ID="2"/>
109-
</Bookmarks>
110107
<Loaded Value="True"/>
111108
</Unit6>
112109
<Unit7>
@@ -237,8 +234,8 @@
237234
<UnitName Value="Grids"/>
238235
<EditorIndex Value="5"/>
239236
<WindowIndex Value="0"/>
240-
<TopLine Value="350"/>
241-
<CursorPos X="19" Y="395"/>
237+
<TopLine Value="10798"/>
238+
<CursorPos X="1" Y="10854"/>
242239
<UsageCount Value="32"/>
243240
<Loaded Value="True"/>
244241
</Unit23>
@@ -506,11 +503,10 @@
506503
<Filename Value="controlergridtorrentdata.pas"/>
507504
<IsPartOfProject Value="True"/>
508505
<UnitName Value="controlergridtorrentdata"/>
509-
<IsVisibleTab Value="True"/>
510506
<EditorIndex Value="1"/>
511507
<WindowIndex Value="0"/>
512-
<TopLine Value="86"/>
513-
<CursorPos X="87" Y="121"/>
508+
<TopLine Value="1"/>
509+
<CursorPos X="1" Y="1"/>
514510
<UsageCount Value="29"/>
515511
<Loaded Value="True"/>
516512
</Unit58>
@@ -527,124 +523,124 @@
527523
</Units>
528524
<JumpHistory Count="30" HistoryIndex="29">
529525
<Position1>
530-
<Filename Value="C:\lazarus\lcl\grids.pas"/>
531-
<Caret Line="1" Column="1" TopLine="1"/>
526+
<Filename Value="main.pas"/>
527+
<Caret Line="116" Column="29" TopLine="32"/>
532528
</Position1>
533529
<Position2>
534-
<Filename Value="C:\lazarus\lcl\grids.pas"/>
535-
<Caret Line="1116" Column="28" TopLine="1019"/>
530+
<Filename Value="main.pas"/>
531+
<Caret Line="1248" Column="82" TopLine="1192"/>
536532
</Position2>
537533
<Position3>
538-
<Filename Value="controlergridtorrentdata.pas"/>
539-
<Caret Line="138" Column="37" TopLine="80"/>
534+
<Filename Value="main.pas"/>
535+
<Caret Line="1256" Column="43" TopLine="1192"/>
540536
</Position3>
541537
<Position4>
542-
<Filename Value="C:\lazarus\lcl\grids.pas"/>
543-
<Caret Line="1151" Column="15" TopLine="1099"/>
538+
<Filename Value="controlergridtorrentdata.pas"/>
539+
<Caret Line="108" Column="1" TopLine="55"/>
544540
</Position4>
545541
<Position5>
546-
<Filename Value="controlergridtorrentdata.pas"/>
547-
<Caret Line="138" Column="44" TopLine="80"/>
542+
<Filename Value="C:\lazarus\lcl\grids.pas"/>
543+
<Caret Line="2337" Column="1" TopLine="2284"/>
548544
</Position5>
549545
<Position6>
550-
<Filename Value="controlergridtorrentdata.pas"/>
551-
<Caret Line="137" Column="78" TopLine="80"/>
546+
<Filename Value="C:\lazarus\lcl\grids.pas"/>
547+
<Caret Line="2338" Column="1" TopLine="2284"/>
552548
</Position6>
553549
<Position7>
554-
<Filename Value="C:\lazarus\lcl\grids.pas"/>
555-
<Caret Line="1608" Column="46" TopLine="1558"/>
550+
<Filename Value="controlergridtorrentdata.pas"/>
551+
<Caret Line="112" Column="1" TopLine="55"/>
556552
</Position7>
557553
<Position8>
558-
<Filename Value="C:\lazarus\lcl\grids.pas"/>
559-
<Caret Line="1" Column="1" TopLine="1"/>
554+
<Filename Value="main.pas"/>
555+
<Caret Line="1251" Column="62" TopLine="1192"/>
560556
</Position8>
561557
<Position9>
562-
<Filename Value="C:\lazarus\lcl\grids.pas"/>
563-
<Caret Line="1068" Column="30" TopLine="971"/>
558+
<Filename Value="main.pas"/>
559+
<Caret Line="1255" Column="51" TopLine="1192"/>
564560
</Position9>
565561
<Position10>
566-
<Filename Value="C:\lazarus\lcl\grids.pas"/>
567-
<Caret Line="5020" Column="45" TopLine="5015"/>
562+
<Filename Value="controlergridtorrentdata.pas"/>
563+
<Caret Line="108" Column="1" TopLine="55"/>
568564
</Position10>
569565
<Position11>
570566
<Filename Value="C:\lazarus\lcl\grids.pas"/>
571-
<Caret Line="1" Column="1" TopLine="1"/>
567+
<Caret Line="2337" Column="1" TopLine="2284"/>
572568
</Position11>
573569
<Position12>
574570
<Filename Value="C:\lazarus\lcl\grids.pas"/>
575-
<Caret Line="733" Column="22" TopLine="634"/>
571+
<Caret Line="2338" Column="1" TopLine="2284"/>
576572
</Position12>
577573
<Position13>
578-
<Filename Value="C:\lazarus\lcl\grids.pas"/>
579-
<Caret Line="1068" Column="62" TopLine="971"/>
574+
<Filename Value="controlergridtorrentdata.pas"/>
575+
<Caret Line="108" Column="55" TopLine="55"/>
580576
</Position13>
581577
<Position14>
582-
<Filename Value="C:\lazarus\lcl\grids.pas"/>
583-
<Caret Line="3387" Column="68" TopLine="3315"/>
578+
<Filename Value="main.pas"/>
579+
<Caret Line="1256" Column="66" TopLine="1192"/>
584580
</Position14>
585581
<Position15>
586-
<Filename Value="C:\lazarus\lcl\grids.pas"/>
587-
<Caret Line="1" Column="1" TopLine="1"/>
582+
<Filename Value="controlergridtorrentdata.pas"/>
583+
<Caret Line="108" Column="1" TopLine="55"/>
588584
</Position15>
589585
<Position16>
590586
<Filename Value="C:\lazarus\lcl\grids.pas"/>
591-
<Caret Line="446" Column="24" TopLine="347"/>
587+
<Caret Line="4984" Column="1" TopLine="4931"/>
592588
</Position16>
593589
<Position17>
594590
<Filename Value="C:\lazarus\lcl\grids.pas"/>
595-
<Caret Line="3378" Column="21" TopLine="3306"/>
591+
<Caret Line="4985" Column="1" TopLine="4931"/>
596592
</Position17>
597593
<Position18>
598-
<Filename Value="C:\lazarus\lcl\grids.pas"/>
599-
<Caret Line="3386" Column="36" TopLine="3306"/>
594+
<Filename Value="controlergridtorrentdata.pas"/>
595+
<Caret Line="110" Column="1" TopLine="55"/>
600596
</Position18>
601597
<Position19>
602598
<Filename Value="C:\lazarus\lcl\grids.pas"/>
603-
<Caret Line="3388" Column="39" TopLine="3306"/>
599+
<Caret Line="4984" Column="1" TopLine="4931"/>
604600
</Position19>
605601
<Position20>
606602
<Filename Value="C:\lazarus\lcl\grids.pas"/>
607-
<Caret Line="3390" Column="35" TopLine="3306"/>
603+
<Caret Line="4985" Column="1" TopLine="4931"/>
608604
</Position20>
609605
<Position21>
610606
<Filename Value="C:\lazarus\lcl\grids.pas"/>
611-
<Caret Line="3391" Column="35" TopLine="3306"/>
607+
<Caret Line="11510" Column="1" TopLine="11457"/>
612608
</Position21>
613609
<Position22>
614610
<Filename Value="C:\lazarus\lcl\grids.pas"/>
615-
<Caret Line="3798" Column="35" TopLine="3699"/>
611+
<Caret Line="11511" Column="1" TopLine="11457"/>
616612
</Position22>
617613
<Position23>
618614
<Filename Value="C:\lazarus\lcl\grids.pas"/>
619-
<Caret Line="3840" Column="58" TopLine="3741"/>
615+
<Caret Line="10851" Column="1" TopLine="10798"/>
620616
</Position23>
621617
<Position24>
622618
<Filename Value="C:\lazarus\lcl\grids.pas"/>
623-
<Caret Line="3843" Column="66" TopLine="3744"/>
619+
<Caret Line="10854" Column="1" TopLine="10798"/>
624620
</Position24>
625621
<Position25>
626-
<Filename Value="C:\lazarus\lcl\grids.pas"/>
627-
<Caret Line="10890" Column="54" TopLine="10791"/>
622+
<Filename Value="controlergridtorrentdata.pas"/>
623+
<Caret Line="95" Column="68" TopLine="55"/>
628624
</Position25>
629625
<Position26>
630-
<Filename Value="C:\lazarus\lcl\grids.pas"/>
631-
<Caret Line="446" Column="24" TopLine="393"/>
626+
<Filename Value="controlergridtorrentdata.pas"/>
627+
<Caret Line="109" Column="73" TopLine="37"/>
632628
</Position26>
633629
<Position27>
634-
<Filename Value="C:\lazarus\lcl\grids.pas"/>
635-
<Caret Line="3378" Column="21" TopLine="3303"/>
630+
<Filename Value="controlergridtorrentdata.pas"/>
631+
<Caret Line="1" Column="1" TopLine="1"/>
636632
</Position27>
637633
<Position28>
638-
<Filename Value="C:\lazarus\lcl\grids.pas"/>
639-
<Caret Line="680" Column="5" TopLine="627"/>
634+
<Filename Value="controlergridtorrentdata.pas"/>
635+
<Caret Line="108" Column="73" TopLine="9"/>
640636
</Position28>
641637
<Position29>
642-
<Filename Value="C:\lazarus\lcl\grids.pas"/>
643-
<Caret Line="3379" Column="21" TopLine="3291"/>
638+
<Filename Value="controlergridtorrentdata.pas"/>
639+
<Caret Line="107" Column="72" TopLine="94"/>
644640
</Position29>
645641
<Position30>
646642
<Filename Value="controlergridtorrentdata.pas"/>
647-
<Caret Line="45" Column="1" TopLine="1"/>
643+
<Caret Line="1" Column="1" TopLine="1"/>
648644
</Position30>
649645
</JumpHistory>
650646
</ProjectOptions>

0 commit comments

Comments
 (0)