Fix wrong icons in process list, use a different "idle" icon, and indicate broken and own thread with an overlay icon.

This commit is contained in:
Ansgar Becker
2011-08-15 06:01:02 +00:00
parent 783cbdbcc0
commit 858aa92677
4 changed files with 166 additions and 19 deletions

BIN
res/icons/bullet_black.png Normal file
View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 211 B

BIN
res/icons/bullet_star.png Normal file
View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 354 B

View File

@@ -2612,9 +2612,137 @@ object MainForm: TMainForm
Left = 104
Top = 160
Bitmap = {
494C0101A7005001540110001000FFFFFFFF2110FFFFFFFFFFFFFFFF424D3600
000000000000360000002800000040000000A0020000010020000000000000A0
494C0101A90050019C0110001000FFFFFFFF2110FFFFFFFFFFFFFFFF424D3600
000000000000360000002800000040000000B0020000010020000000000000B0
0200000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000081A205D0C3745870000
0112000001120732448703171F5D000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000000051013484BCFF7FF21B1
DEF31BADDDF331C2F4FF010E1348000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000206072D4AD0F7FF82DE
F9FF78D9F9FF2AC0F4FF0005072D000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000003266577B172DAF8FF8BE0
FAFF82DDF9FF52D0F6FF0D5975B1000000030000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000224E599968D8F9FF71DAF8FF8AE0
FAFF81DDF9FF4FCEF7FF30C2F4FF094157990000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
00000000000000000000000000000000000000000009050D0F3F1538428464D7
F8FF57D2F8FF0A364587010B0E3F000000090000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000002F81
99C9267F99C90000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000050D
1042040D10420000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000FFFF
FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF0000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -2661,7 +2789,7 @@ object MainForm: TMainForm
00000000000000000000000000000000000001000021605A57CC7D8894EE778B
A2FF6A8997FF94A7A6FF83A5ABFF6293A1FF4D6669FF536D8DFF416571FF4774
7BFF29211FBC0000000B00000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000001A01010180000000D5000000D5000000800000001A0000
00000000000000000000000000000000000000000000000000001B160983B1AA
98F84F3E10EDA59F8DEDFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE9E6E0FF6657
31EC322C1AA40000000E00000000000000000000000000000000B8B8B8FFE8E8
@@ -2669,7 +2797,7 @@ object MainForm: TMainForm
2AFF000000000000000000000000000000000000000000000000000000032829
28959CB7D0FF6D93B9FF5981ACFF5A85B0FF5B86B1FF60758DFF5A7EA4FF464B
5CFF241D1CB10000000200000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
000000000000040404805F5F5FFF828282FF7D7D7DFF565656FF000000800000
00000000000000000000000000000000000000000000000000003D331CBAF9F9
F8FF7F7049F9FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF827450F60A08
044C000000000000000000000000000000000000000000000000BABABAFFEBEB
@@ -2677,7 +2805,7 @@ object MainForm: TMainForm
0000000000000000000000000000000000000000000000000002020D105061C4
DFF488AAB1FF9BB1C6FF89AED0FF729FC7FF6B9AC3FF6998C2FF6795BFFF517A
A6FF364B53F101090B4700000001000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
000000000000111111D5888888FF616161FF555555FF7D7D7DFF000000D50000
0000000000000000000000000000000000000000000000000000362F19AFFDFC
FCFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE9E7E0FF4C3E1ED40000
0000000000000000000000000000000000000000000000000000BBBBBBFFEDED
@@ -2685,7 +2813,7 @@ object MainForm: TMainForm
3CFF353535FF2E2E2EFF0707076B0000000000000002020D115339C1E2F53CD9
FEFF7CE4FFFF9AC7CEFF9FAFB2FF94A2ABFF869FB7FF719EC6FF6A99C3FF6492
BCFF485C74FF3EB0CDF2020C104F000000010000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
000000000000141414D58A8A8AFF666666FF5C5C5CFF818181FF020202D50000
00000000000000000000000000000000000000000000000000001F1B1083DAD6
CBFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF867A5AF10A08044F0000
0000000000000000000000000000000000000000000000000000BCBCBCFFEFEF
@@ -2693,7 +2821,7 @@ object MainForm: TMainForm
000000000000000000000000000000000000020E125026C3EAF82ED6FDFF20D5
FEFF59DCFEFF97EAFFFFBBF3FFFFC6F6FEFFA7DAE3FF8AA6ADFF7CA0C0FF6998
C2FF4C749DFF52AABAFF34C0E2F501090C450000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
00000000000008080880696969FF8A8A8AFF868686FF626262FF020202800000
0000000000000000000000000000000000000000000000000000261F0E98CDC8
BCF9FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE8E6DFFF493B17D7000000000000
0000000000000000000000000000000000000000000000000000BCBCBCFFF0F0
@@ -2701,7 +2829,7 @@ object MainForm: TMainForm
4EFF000000000000000000000000000000000000000400020323010D11470621
296C1B434E92478799CBA3EDFEFFC5F6FFFFBEF4FFFF7EE4FDFF64787BEB729F
C7FF5F8DB7FF1C282DA700020321000000030000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000001A08080880151515D5131313D5060606800000001A0000
000000000000000000000000000000000000000000000101002172674DDEFFFF
FFFFFFFFFFFFFFFFFFFFFFFFFFFFFCFCFBFF695A35EA03020031000000000000
0000000000000000000000000000000000000000000000000000BCBCBCFFF0F0
@@ -7991,7 +8119,7 @@ object MainForm: TMainForm
000000000000000000000000000000000000854F2FAAA46B43CEB1764ADEAE74
48DBAF7448DBAE7349DBA46A3FD054331B6E0603020800000000000000000000
000000000000000000000000000000000000424D3E000000000000003E000000
2800000040000000A00200000100010000000000001500000000000000000000
2800000040000000B00200000100010000000000801500000000000000000000
000000000000000000000000FFFFFF0000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -8161,6 +8289,10 @@ object MainForm: TMainForm
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
000000000000}
end
object PopupQueryLoad: TPopupMenu

View File

@@ -6357,21 +6357,36 @@ procedure TMainForm.HostListGetImageIndex(Sender: TBaseVirtualTree; Node: PVirtu
Kind: TVTImageKind; Column: TColumnIndex; var Ghosted: Boolean; var ImageIndex: Integer);
var
Results: TDBQuery;
Idx: PCardinal;
begin
if not (Kind in [ikNormal, ikSelected]) then
exit;
if (Column <> (Sender as TVirtualStringTree).Header.MainColumn) then
exit;
ImageIndex := 25;
if Sender = ListProcesses then begin
Idx := Sender.GetNodeData(Node);
Results := GridResult(Sender);
if AnsiCompareText(Results.Col(4), 'Killed') = 0 then
ImageIndex := 26 // killed
else begin
if Results.Col('Info') = '' then
ImageIndex := 55 // idle
else
ImageIndex := 57 // running query
Results.RecNo := Idx^;
case Kind of
ikNormal, ikSelected: begin
if Results.Col('Info') = '' then begin
if MakeInt(Results.Col(5)) < 60 then
ImageIndex := 151 // Idle, same icon as in lower right status panel
else
ImageIndex := 167 // Long idle thread
end else
ImageIndex := actExecuteQuery.ImageIndex; // Running query
end;
ikOverlay: begin
if IntToStr(Results.Connection.ThreadId) = Results.Col(0) then
ImageIndex := 168; // Indicate users own thread id
if CompareText(Results.Col(4), 'Killed') = 0 then
ImageIndex := 158; // Broken
end;
else;
end;
end else begin
case Kind of
ikNormal, ikSelected: ImageIndex := 25;
else;
end;
end;
end;