Skip to content
Browse files

Added option to only show one entry if drives have multiple partitions

Fixed popup menu not matching up with what was visible in main form
  • Loading branch information...
1 parent 8be672c commit c6095ecced6474c56607bf4d4f9ea5a5089eee4d @bgbennyboy committed Oct 27, 2011
Showing with 426 additions and 396 deletions.
  1. +1 −0 USB_Disk_Eject.cfg
  2. +328 −328 formMain.dfm
  3. +55 −65 formMain.pas
  4. +12 −2 formOptions.dfm
  5. +3 −0 formOptions.pas
  6. +1 −1 uDiskEjectConst.pas
  7. +4 −0 uDiskEjectOptions.pas
  8. +22 −0 uDriveEjector.pas
View
1 USB_Disk_Eject.cfg
@@ -21,6 +21,7 @@ SnapTo=1
HideCardReadersWithNoMedia=1
CardPollingInterval=5000
ShowCardReaders=1
+ShowPartitionsAsOne=1
[Hotkeys]
NumHotkeys=9
View
656 formMain.dfm
@@ -140,7 +140,7 @@ object Mainfrm: TMainfrm
Left = 16
Top = 112
Bitmap = {
- 494C010106000800D40030003000FFFFFFFF2110FFFFFFFFFFFFFFFF424D3600
+ 494C01010700D0012C0130003000FFFFFFFF2110FFFFFFFFFFFFFFFF424D3600
0000000000003600000028000000C00000006000000001002000000000000020
0100000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -275,11 +275,11 @@ object Mainfrm: TMainfrm
000A0000000A0000000A0000000A000000090000000900000008000000070000
0006000000050000000500000003000000020000000100000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000001010101020303030405050506070707080707
+ 0708080808090808080908080809080808090909090A080808090909090A0909
+ 090A080808090909090A0909090A0909090A0909090A0909090A0909090A0909
+ 090A0909090A0909090A0909090A080808090808080907070708060606070505
+ 0506040404050404040502020203010101020000000100000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -299,11 +299,11 @@ object Mainfrm: TMainfrm
0022000000220000002200000021000000200000001E0000001D0000001B0000
00190000001700000015000000120000000E0000000900000004000000010000
0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ 00000000000103030304080808090E0E0E0F12121214161616191818181C1A1A
+ 1A1E1B1B1B1F1B1B1B1F1C1C1C201C1C1C201C1C1C201C1C1C201C1C1C201C1C
+ 1C211C1C1C211C1C1C211C1C1C211C1C1C211C1C1C211D1D1D221D1D1D221D1D
+ 1D221D1D1D221D1D1D221C1C1C211C1C1C201A1A1A1E1919191D1818181B1616
+ 16191414141713131315101010120D0D0D0E0808080903030304000000010000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -322,13 +322,13 @@ object Mainfrm: TMainfrm
0454040404540404045404040455050505560505055605050556040404550404
0455040404550404045405030352040404510303034E0202024A030303470202
02430202023C000000350000002D000000250000001C00000012000000080000
- 0003000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ 0003000000000000000000000000000000000000000000000000000000000101
+ 0102070707080F0F0F111818181C212121272626262F2C2C2C39303030423333
+ 33483535354B3636364E3636364F373737503737375138383852383838533838
+ 3854383838543838385439393955393939563939395639393956393939553939
+ 3955393939553838385438383852373737513636364E3434344A333333473131
+ 31432D2D2D3C2A2A2A352525252D1F1F1F251818181C10101012070707080202
+ 0203000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -346,13 +346,13 @@ object Mainfrm: TMainfrm
B8FBBCB9B8FBBDBBB9FCC0BCBBFEC0BDBBFEC0BDBCFEBFBBBAFDBDBAB9FBBEBA
B9FBBEBBBAFBBDB9B8FABAB7B6F8BAB7B6F7B6B2B1F4B4B1B1F2B1ADACEFAAA8
A7EAA4A1A0E3918E8CD8696766BD302F2F8B0303034200000028000000170000
- 000A000000030000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ 000A000000030000000000000000000000000000000000000000010101020909
+ 090A14141416212121272C2C2C39444444755B5A59B1767574D38E8B8BE29896
+ 95E9A09D9CEEA6A3A2F1ABA7A6F4AFACACF6B5B2B0F8B6B3B2F9BAB7B5FBBBB7
+ B6FBBAB7B6FBBDBAB8FCBFBBBAFEBFBCBAFEBFBCBBFEBDBAB9FDBBB8B7FBBCB8
+ B7FBBCB9B8FBBAB6B5FAB7B4B3F8B6B3B2F7B1ADACF4AEACACF2AAA7A6EFA3A0
+ 9FEA9B9897E3898786D86A6968BD4D4D4D8B3030304221212128141414170909
+ 090A020202030000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -370,13 +370,13 @@ object Mainfrm: TMainfrm
BEFFC1BEBCFEC2BFBDFFC2BFBDFFC1BDBCFEC3BFBEFFC3C0BEFFC2BEBDFEC4C0
BFFFC4C1BFFFC4C0BFFEC5C2C1FFC7C3C2FFC7C4C2FFC6C3C2FEC9C6C5FFCFCB
CAFFD6CFCFFED8D3D3FFDAD6D5FFDCD8D7FFBEBBBAF12F2E2E890000002D0000
- 00190000000A0000000200000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ 00190000000A0000000200000000000000000000000000000001070707081414
+ 14172323232B3D3D3D60787573DAB8B5B4FFC1BDBCFFC5C1C0FFC6C2C1FFC4C0
+ BFFFBFBBBAFEC1BEBDFFC0BDBBFEC3BFBEFFC3BFBEFFC1BDBCFEC3BFBEFFC2BF
+ BEFFC0BDBBFEC2BFBDFFC2BFBDFFC0BCBBFEC3BFBEFFC3C0BEFFC1BDBCFEC4C0
+ BFFFC4C1BFFFC3BFBEFEC5C2C1FFC7C3C2FFC7C4C2FFC5C2C1FEC9C6C5FFCFCB
+ CAFFD5CECEFED8D3D3FFDAD6D5FFDCD8D7FFB6B3B3F14D4D4D892525252D1616
+ 16190909090A0101010200000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -394,13 +394,13 @@ object Mainfrm: TMainfrm
BCFFC0BBBBFDC2BFBCFFC1BFBCFFC0BEBAFDC1BEBEFFC3C0BDFFC0BEBBFDC4BF
BFFFC3C1BEFFC3BEBEFDC6C1C0FFC5C2C2FFC7C4C3FFC4C1C0FDCAC6C5FFC0C0
BEFF72C5A5FDA0CDB9FFD9D4D3FFD7D4D3FDD5D2D1FFD2CFCEFF4544449C0000
- 002C000000140000000500000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ 002C0000001400000005000000000000000000000000030303040E0E0E0F1F1F
+ 1F25403F40688E8B8AF0ADA9A8FFB9B5B4FFBDBAB9FDC5C1C0FFC6C2C1FFC3BF
+ BEFFBDBCB9FDC0BDBDFFBEBABAFDC1BDBCFFC1BFBEFFBEBAB9FDC1BDBCFFC2BF
+ BCFFBEBABAFDC2BFBCFFC1BFBCFFBEBCB9FDC1BEBEFFC3C0BDFFBEBCBAFDC4BF
+ BFFFC3C1BEFFC1BCBCFDC6C1C0FFC5C2C2FFC7C4C3FFC2BFBEFDCAC6C5FFC0C0
+ BEFF71C3A5FDA0CDB9FFD9D4D3FFD5D2D1FDD5D2D1FFD2CFCEFF5656569C2424
+ 242C121212140404040500000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -418,13 +418,13 @@ object Mainfrm: TMainfrm
BCFFC0BBBAFDC1BFBEFFC3BFBEFFBFBCBCFDC3C0BDFFC4BFBFFFC2BEBEFDC3BF
BEFFC5C0C0FFC2C0BFFDC5C3C2FFC7C4C1FFC6C3C3FFC7C2C1FDCBC8C7FFAEB7
B2FFAAEBD3FD6BC9A5FFD7D3D2FFD8D5D3FDD9D6D5FFD2CECDFFCDCBCAFD2A29
- 297D000000200000000B00000002000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ 297D000000200000000B00000002000000000000000004040405121212143131
+ 314383807FE9A29E9DFEB2AEADFFBDB9B8FFBFBCBBFDC5C1C0FFC6C2C1FFC6C2
+ C1FFC0BCBCFDC2BDBCFFBCBBBAFDC2BEBDFFC2BDBCFFBCBAB9FDC2BFBEFFC2BF
+ BCFFBEBAB9FDC1BFBEFFC3BFBEFFBDBBBBFDC3C0BDFFC4BFBFFFC0BCBCFDC3BF
+ BEFFC5C0C0FFC0BEBDFDC5C3C2FFC7C4C1FFC6C3C3FFC5C0BFFDCBC8C7FFAEB7
+ B2FFA9E9D1FD6AC9A5FFD7D3D2FFD6D3D1FDD9D6D5FFD2CECDFFCBC9C8FD4949
+ 497D1C1C1C200A0A0A0B01010102000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -442,13 +442,13 @@ object Mainfrm: TMainfrm
BAFDC1BEBDFEBFBEBCFDC1BCBCFDC2BFBCFEC2BEBEFDC2BFBCFDC3C0BFFEC1BE
BEFDC3C0BFFDC5C0BFFEC5C1C0FDC4C2C1FDC6C1C0FDC7C5C4FECAC7C5FDC7C3
C2FDABB7B1FEBBBEBBFDD6D2D1FDD9D7D6FEDDDAD8FDD8D5D4FDD1CECDFEB5B3
- B2EC0505053F0000001200000004000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ B2EC0505053F0000001200000004000000000000000004040405101010125D5C
+ 5BB6A6A2A1FFABA8A6FEB8B4B3FDBDBAB9FDC0BEBDFEC2BEBCFDC2BEBDFDC0BE
+ BCFDC2BDBDFEBDBCBBFDC0BCBBFEBCBBB8FDBCBBBAFDC0BCBBFEBEBAB9FDBEBA
+ B9FDC0BDBCFEBDBCBBFDBFBBBBFDC1BEBBFEC0BCBCFDC0BDBBFDC2BFBEFEBFBC
+ BCFDC1BEBDFDC4BFBEFEC3BFBEFDC2C0BFFDC4BFBEFDC6C4C3FEC8C5C3FDC5C1
+ C0FDAAB6B0FEBABCBAFDD4D0CFFDD8D6D5FEDBD8D6FDD6D3D2FDD0CDCCFEACAB
+ AAEC2F2F2F3F1010101203030304000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -466,13 +466,13 @@ object Mainfrm: TMainfrm
BDFFC0BCBBFDC3BFBEFFC3BFBEFFC1BEBEFDC4C0BFFFC4C1C0FFC2BFBEFDC5C2
C0FFC5C2C1FFC4C1BFFDC7C3C2FFC7C4C3FFC8C4C3FFC7C4C3FDCCC9C8FFD0CC
CBFFD2CDCDFDD5D2D1FFD8D4D3FFDAD7D6FDDFDBDAFFD3D0CFFFCAC7C6FDD0CE
- CDFF474747950000001500000006000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ CDFF47474795000000150000000600000000000000000303030429292934A09B
+ 9AFEA09C9BFFA8A5A3FDBCB9B7FFC4C1BFFFC1BDBCFDC6C2C1FFC6C2C1FFC5C2
+ C0FFBFBCBBFDC2BEBDFFBDBAB9FDC1BDBCFFC1BEBCFFBDBBBAFDC2BEBDFFC2BE
+ BDFFBEBBBAFDC3BFBEFFC3BFBEFFBFBCBCFDC4C0BFFFC4C1C0FFC0BDBCFDC5C2
+ C0FFC5C2C1FFC2BFBDFDC7C3C2FFC7C4C3FFC8C4C3FFC5C2C1FDCCC9C8FFD0CC
+ CBFFD0CBCBFDD5D2D1FFD8D4D3FFD8D5D4FDDFDBDAFFD3D0CFFFC8C5C4FDD0CE
+ CDFF565656951313131505050506000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -490,13 +490,13 @@ object Mainfrm: TMainfrm
B8FDBFBBBAFEBEBAB9FDBEBBBAFDC0BCBBFEBFBCBBFDBFBCBBFDC1BEBCFEC0BE
BCFDC1BEBCFDC2BFBEFEC2BFBEFDC2BFBEFDC3BFBEFDC5C1C0FEC6C3C2FDCAC5
C4FDCCC9C8FECECBC9FDCFCCCBFDD3CFCEFED7D4D3FDD6D3D2FDCBC8C7FEC7C4
- C4FEC0BFBDEE0000001C00000006000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ C4FEC0BFBDEE0000001C000000060000000000000000000000015554549B9D9A
+ 98FF9D9998FDADA9A8FEBBB7B6FDBCB8B7FDBEBBBAFEBEBBBAFDBEBBBAFDBDBA
+ B9FDBDBAB9FEBBB7B6FDBBB8B7FEBAB7B6FDBBB7B6FDBCB8B7FEBBB8B7FDBCB8
+ B7FDBEBAB9FEBCB9B8FDBCBAB9FDBFBBBAFEBDBBBAFDBDBBBAFDC0BDBBFEBEBC
+ BBFDBFBCBBFDC1BEBDFEC0BDBCFDC0BDBCFDC1BDBCFDC4C0BFFEC4C1C0FDC8C3
+ C2FDCBC8C7FECCC9C7FDCDCAC9FDD2CECDFED5D2D1FDD4D1D0FDCAC7C6FEC6C3
+ C3FEB7B6B4EE1818181C05050506000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -514,13 +514,13 @@ object Mainfrm: TMainfrm
ABFFADAAA9FDB0ADACFFB0ADACFFAEABAAFDB1ADACFFB1AEADFFAFABAAFDB1AD
ACFFB1AEADFFAFACABFDB2AEADFFB2AFADFFB1AEADFFB0ACABFDB3B0AFFFB6B3
B2FFB7B4B2FDBBB8B7FFBDBAB9FFBEB9B8FDC2BFBEFFCBC8C7FFD4D2D0FDCFCC
- CCFFCDCBCAFF2C2C2C6800000003000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ CCFFCDCBCAFF2C2C2C68000000030000000000000000141414178B8786EE9B97
+ 96FFAAA6A5FFAEAAA9FDB2AEADFFB3AFAFFFB1ADACFDB4B1B0FFB4B0AFFFB2AF
+ ADFFADAAA8FDAEABAAFFABA8A8FDAFABAAFFAFABAAFFACA8A8FDAFACAAFFAFAC
+ ABFFACA9A8FDB0ADACFFB0ADACFFADAAA9FDB1ADACFFB1AEADFFAEAAA9FDB1AD
+ ACFFB1AEADFFAEABAAFDB2AEADFFB2AFADFFB1AEADFFAFABAAFDB3B0AFFFB6B3
+ B2FFB6B3B1FDBBB8B7FFBDBAB9FFBCB8B7FDC2BFBEFFCBC8C7FFD2D0CEFDCFCC
+ CCFFCDCBCAFF4545456802020203000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -538,13 +538,13 @@ object Mainfrm: TMainfrm
D3FFD6D2D1FDD8D5D3FFD9D4D3FFD6D2D0FDD8D4D3FFD8D4D3FFD6D2D0FDD8D4
D3FFD8D4D2FFD6D2D1FDD8D4D3FFD8D5D3FFD9D6D4FFD7D4D3FDDBD7D5FFDCD8
D7FFDDD9D8FDE0DCDBFFDDDAD9FFD7D3D2FDD2CFCEFFC8C5C4FFBEBCBAFDCBC8
- C7FFD2CFCFFF8C8B8BBE00000004000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ C7FFD2CFCFFF8C8B8BBE000000040000000000000000414141629F9B9AFFA19F
+ 9EFFA5A1A0FFADA9A8FDC0BCBAFFCAC6C4FFCDC9C8FDD8D3D2FFDAD6D5FFD9D5
+ D3FFD3CFCDFDD6D1D0FFD0CBCAFDD4CFCEFFD3CECDFFD0CBCAFDD2CECDFFD3CF
+ CEFFCECAC9FDD2CFCDFFD3CECDFFCECAC8FDD2CECDFFD1CDCCFFCDC9C7FDD1CD
+ CCFFD2CECCFFCECAC9FDD3CFCEFFD5D2D0FFD6D3D2FFD2CFCEFDDAD6D4FFDCD8
+ D7FFDBD7D6FDE0DCDBFFDDDAD9FFD5D1D0FDD2CFCEFFC8C5C4FFBCBBB9FDCBC8
+ C7FFD2CFCFFF7E7D7DBE03030304000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -562,13 +562,13 @@ object Mainfrm: TMainfrm
E8FDEEE9E7FEECE7E5FDEBE6E4FDEBE6E5FEE9E5E3FDE9E4E3FDEAE5E4FEE9E5
E3FDE9E5E3FDEBE6E5FEEBE7E5FDEDE8E7FDEFEBEAFDF3EFEEFEF5F1F0FDF7F4
F2FDF9F7F6FEF8F9F7FDF8F7F8FDF8F8F6FEF6F4F4FDF0EEECFDE2DEDDFECAC7
- C6FDC5C2C1FED2D0CFF609090922000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ C6FDC5C2C1FED2D0CFF6090909220000000000000000686666BB9E9A99FFA6A2
+ A1FDBDBAB8FDD4CFCEFEE2DCDBFDECE7E5FDF4EFEEFEF6F2F1FDF3F2F1FDEDEA
+ E9FDE8E6E4FEDFDCDAFDD8D3D2FED0CCCAFDCCC6C5FDCCC8C5FEC9C4C2FDC5C1
+ C0FDC6C1C0FEC2BEBCFDC1BDBCFDC2BEBDFEBEBCBAFDBEBBBAFDC0BCBBFEBFBC
+ BBFDC0BDBCFDC5C1C0FEC8C4C2FDCDC9C8FDD3D0CFFDDEDAD9FEE4E1E0FDEBE8
+ E6FDF4F2F1FEF6F7F5FDF6F5F6FDF7F7F5FEF4F2F2FDEEECEAFDE1DDDCFEC8C5
+ C4FDC4C1C0FECBC9C8F61D1D1D22000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -586,13 +586,13 @@ object Mainfrm: TMainfrm
E7FFEBE6E5FDECE7E6FFEBE6E5FFE9E4E3FDEBE6E5FFEAE6E4FFE8E4E2FDEAE6
E5FFEBE6E5FFE9E5E4FDECE8E7FFEFEBE9FFF2EEECFFF4EFEEFDF9F5F3FFFBF8
F7FFFBF9F8FDFDFCFCFFFDFCFCFFFBFBFAFDFDFDFCFFFBF9F8FFEEEBEAFDE4E0
- DFFFD4D0CFFFCCCBCAFF46454570000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ DFFFD4D0CFFFCCCBCAFF46454570000000001A1A1A1E959291F3A7A3A1FEC5C1
+ BFFFD1CDCBFFD9D4D2FDEAE5E4FFF2EDECFFF3EFEDFDF5F2F0FFECE9E8FFCBC8
+ C7FFA8A5A5FEA7A4A3FFB1ADACFFB2AEADFFB3AFADFFB4B0AFFFB6B2B0FFB6B3
+ B1FFB6B3B2FFB5B3B2FFB6B3B1FFB6B3B1FFB6B3B2FFB6B2B1FFB6B2B1FFB7B4
+ B3FFB7B4B3FFB7B4B3FFB8B5B4FFBAB6B5FFC2B9BBFFBDB4B6FEB0ADADFFBFBC
+ BBFFE2E0DFFDF7F6F6FFFCFBFBFFF9F9F8FDFDFDFCFFFBF9F8FFECE9E8FDE4E0
+ DFFFD4D0CFFFCCCBCAFF4C4C4C70000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -610,13 +610,13 @@ object Mainfrm: TMainfrm
DFFFE2DEDCFDE4DFDEFFE4DFDEFFE2DDDCFDE4DFDEFFE4DFDEFFE2DDDCFDE4E1
DEFFE6E0E0FFE3DFDDFDE6E2E0FFE8E4E3FFEDE7E7FFECE8E8FDF1EDEBFFF5F1
EEFFF5F1EEFDF8F4F3FFF6F4F1FFF6F2F1FDF7F4F3FFF4F0EFFFEBE8E6FDE5E2
- E0FFDDDAD9FFCECBCAFF9A9897BC000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ E0FFDDDAD9FFCECBCAFF9A9897BC000000003F3F3F5DA5A2A1FFB9B5B4FDCAC5
+ C4FFD3CECDFFD5D0CFFDE4DFDEFFEAE5E2FFE5E0DFFDE3DDDBFFB5B1B1FF9D9A
+ 99FFB8B4B3FFC4C0BFFFC8C3C2FFC4C1BFFFC3C0BFFFC5C1C0FFC5C2C1FFC6C1
+ C0FFC5C2C0FFC5C2C0FFC5C2C0FFC5C2C0FFC6C2C1FFC6C3C1FFC7C3C2FFC7C4
+ C2FFC9C5C4FFCAC6C5FFCAC7C5FFCFC8C8FFBACAC2FFC5D1CAFFDDD8D7FFCCCA
+ C9FFAFACAAFEDAD6D5FFF0EEEBFFF4F0EFFDF7F4F3FFF4F0EFFFE9E6E4FDE5E2
+ E0FFDDDAD9FFCECBCAFF858483BC000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -634,13 +634,13 @@ object Mainfrm: TMainfrm
D8FDDEDAD8FEDDD9D9FDDFD9D8FDDFDAD9FEDED9D8FDDED9D8FDDFDCD9FEDEDA
DAFDE0DAD9FDE0DCDAFEE0DCDCFDE2DEDDFDE6E0DFFDE8E5E4FEE9E5E4FDEBE7
E6FDF0EAE9FEEDE9E8FDEEE9E7FDECE8E7FEEBE7E5FDE9E5E3FDE6E2E1FEE2DE
- DDFDDCD8D7FDD5D2D1FEC5C2C2EB030303100000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ DDFDDCD8D7FDD5D2D1FEC5C2C2EB030303105D5C5B9DAEAAA8FFBDB9B8FEC7C2
+ C1FDCFCAC9FDD7D1D1FEDAD5D4FDDEDAD8FDE0DCDAFEB9B5B4FD969292FFB1AD
+ ACFFBDB9B8FFC5C1C0FFC6C2C1FFC4C0BFFFC1BEBDFFC1BEBDFFC1BDBCFFC1BD
+ BDFFC2BEBCFFC2BEBCFFC2BFBDFFC2BEBDFFC3C0BEFFC4BFBEFFC3BFBEFFC4C1
+ C0FFC5C2C1FFC6C4C2FFC9C5C4FFC8C0C0FF99CDB8FF88D0B3FFDDD4D4FFDCD9
+ D8FFD2CFCEFFAEACABFEDED9D7FDEAE6E5FEE9E5E3FDE7E3E1FDE5E1E0FEE0DC
+ DBFDDAD6D5FDD4D1D0FEB9B7B7EB0F0F0F100000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -658,13 +658,13 @@ object Mainfrm: TMainfrm
D8FFDAD6D4FDDDD8D7FFDDD8D7FFDBD6D5FDDDD8D7FFDDD9D7FFDBD7D5FDDDD9
D8FFDFDBD8FFDCD8D8FDDFDBD9FFE2DEDDFFE3E0DFFFE5DFDFFDE9E5E2FFEBE7
E4FFEBE7E6FDEDE9E6FFEAE6E5FFE7E3E2FDE8E4E4FFE6E2E1FFE3DFDEFDE2DE
- DDFFDDD9D8FFD4D1D0FECAC8C7F8080808290000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ DDFFDDD9D8FFD4D1D0FECAC8C7F8080808297B7878C9B2ACACFFBDBAB8FDCBC7
+ C5FFD2CECCFFD4D0CEFDDDD8D7FFDFDCD9FFDED9D8FDA49F9FFFA6A2A0FFB6B3
+ B1FFC3C0BEFFC5C2C0FFC6C2C1FFC5C2C0FFC3BFBEFFC1BEBCFFC1BEBCFFC2BE
+ BDFFC2BEBDFFC2BFBEFFC3BFBEFFC3C0BEFFC4C0BFFFC4C1C0FFC4C1C0FFC6C2
+ C1FFC7C3C2FFC7C4C3FFC9C5C5FFCDC9C8FFC1C4C1FFC0C8C3FFDBD8D7FFDEDC
+ DAFFD8D5D4FFC9C6C5FFBAB7B6FFE3DFDEFDE8E4E4FFE6E2E1FFE1DDDCFDE2DE
+ DDFFDDD9D8FFD3D0CFFEC5C3C2F8222222290000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -682,13 +682,13 @@ object Mainfrm: TMainfrm
D5FFDCD9D8FDDFDBD9FFDFDBD9FFDDD8D7FDDFDCD9FFDFDCD9FFDDDAD9FDE1DD
DCFFDBD8D6FFDAD5D3FDDDD9D6FFDDD9D9FFE1DDDBFFE1DDDAFDE4E0E0FFE8E4
E2FFE8E4E2FDE9E5E4FFE8E4E3FFE5E1E0FDE6E2E1FFE4DFDFFFE0DDDBFDDFDC
- DAFFDBD8D6FFD3D0CFFECDCAC9FE090909360000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ DAFFDBD8D6FFD3D0CFFECDCAC9FE090909368A8787E1B2ACABFFBCB9B8FDCAC6
+ C4FFD0CCCBFFD1CDCAFDDAD6D4FFDED9D8FFC8C4C3FD999694FFA4A09FFFB8B5
+ B3FFC1BEBDFFC1BEBDFFC1BDBCFFBFBCBBFFBDB9B8FFBCB9B8FFBDB9B8FFBDB9
+ B8FFBDBAB9FFBEBAB9FFBFBBBAFFC0BCBBFFC0BDBCFFC1BEBCFFC1BFBDFFC2BE
+ BDFFC3C0BFFFC3C0BFFFC5C1C0FFC8C4C4FFD0CACAFFD3CECDFFD3D0CFFFDAD7
+ D6FFD3CFCEFFCCC9C8FFC3C1BFFFE3DFDEFDE6E2E1FFE4DFDFFFDEDBD9FDDFDC
+ DAFFDBD8D6FFD2CFCEFECCC9C8FE2B2B2B360000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -706,13 +706,13 @@ object Mainfrm: TMainfrm
C0FDFEFEFEFEFCFCFCFDFCFCFCFDFDFDFDFEFCFCFCFDFCFCFCFDFDFEFEFEF8F7
F7FDD7D3D2FDD6D2D1FED6D2D2FDD9D3D2FDDBD7D5FDDEDAD8FEDFDBDAFDE1DD
DCFDE3DFDEFEE2DEDCFDE0DCDBFDDFDBDBFEDFDBD8FDDFDBDAFDDEDAD9FEDAD7
- D6FDD6D3D2FDD0CDCCFECBC8C7FE090808330000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ D6FDD6D3D2FDD0CDCCFECBC8C7FE090808338B8887E2AFA9A9FEBDB8B7FEC3BF
+ BEFDC9C5C4FDD0CBCAFED2CDCCFDD3D0CFFDAFACAAFE9B9896FFA7A3A2FFB1AD
+ ACFFB5B1B1FFB8B5B4FFBAB6B5FFB8B4B2FFB5B2B1FFB5B2B1FFB6B2B1FFB7B2
+ B2FFB7B4B2FFB7B4B3FFB8B5B4FFB8B5B4FFB9B5B4FFB9B5B4FFB9B5B4FFB9B6
+ B5FFBAB6B5FFB9B7B5FFB9B6B5FFBBB7B6FFBFBCBAFFC2BEBDFFC3BEBDFFC3C0
+ BFFFCAC7C6FFD0CDCCFFC7C5C4FFCBC8C8FEDDD9D6FDDDD9D8FDDDD9D8FED8D5
+ D4FDD4D1D0FDCFCCCBFECAC7C6FE292929330000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -730,13 +730,13 @@ object Mainfrm: TMainfrm
C0FFDFE0E1FDE5E5E5FFE5E5E5FFE3E3E3FDE3E5E5FFE5E5E5FFE3E3E3FDE2E1
E0FFD5D1CFFFD2CECEFDD6D2CFFFD7D3D1FFD8D4D3FFD7D1D0FDD9D5D4FFDBD7
D6FFD9D5D4FDDBD7D5FFDAD6D5FFD8D4D3FDDAD6D4FFD9D6D6FFD9D5D4FDD9D6
- D4FFD5D2D1FFCCC9C8FEC4C1C0F5070707220000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ D4FFD5D2D1FFCCC9C8FEC4C1C0F507070722777675C3ADA9A7FFB9B4B3FDC5C0
+ BFFFCAC6C5FFC9C5C4FDCECAC9FFCECAC9FF9D9998FFA3A09FFFB7B3B2FFD1CB
+ CAFFE2DDDCFFEBE7E6FFEEEBEAFFEEEAE9FFEEEAE8FFEEE9E7FFECE6E5FFEBE6
+ E4FFE9E4E3FFE8E3E1FFE7E3E0FFE6E1E0FFE5E1E0FFE5E1DFFFE5E1E0FFE5E1
+ DFFFE6E2E1FFE8E4E2FFEAE6E5FFEDE9E7FFF0ECEBFFF0EFEEFFEEECEBFFE8E7
+ E6FFDAD7D5FFCBC7C6FFCDCACAFFCDCAC9FEDAD6D4FFD9D6D6FFD7D3D2FDD9D6
+ D4FFD5D2D1FFCBC8C7FEBEBBBAF51D1D1D220000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -754,13 +754,13 @@ object Mainfrm: TMainfrm
CAFFC9C5C3FDCBC7C6FFCBC7C6FFC9C5C4FDCBC7C6FFCBC7C6FFCAC6C4FDCCC8
C7FFD1CDCCFFCFCBC8FDD0CCCCFFD0CCCBFFD1CDCCFFD0CCCAFDD4D0CFFFD8D4
D3FFD7D3D0FDD7D3D3FFD6D2D1FFD4D2CFFDD7D2D2FFD5D1D0FFD4D1CEFDD6D2
- D1FFD2CECDFFC9C6C5FEB2B1B0DC010101060000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ D1FFD2CECDFFC9C6C5FEB2B1B0DC010101065554548BAAA6A4FFB5B1AFFDC1BD
+ BBFFC6C2C1FFC3BFBDFDCBC7C4FFB3AFAFFFA29E9DFFBDB9B7FFD6D2D0FFE9E4
+ E3FFF6F1F0FFFCF8F6FFFEFBFAFFFDFAF8FFFBF7F6FFF9F3F2FFF4EFECFFF1ED
+ EBFFF0ECE9FFEFEAE8FFEEE8E7FFECE7E6FFECE7E6FFECE7E6FFECE8E6FFEDE8
+ E6FFEEEAE8FFF2EDECFFF7F2F1FFFBF8F6FFFEFCFBFFFFFEFEFFFFFFFEFFFFFF
+ FFFFFBF9F7FFE5E1E0FFD3D0CFFFC4C2C1FED7D2D2FFD5D1D0FFD2CFCCFDD6D2
+ D1FFD2CECDFFC8C5C4FEA3A1A1DC050505060000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -778,13 +778,13 @@ object Mainfrm: TMainfrm
C3FDD6D3D2FED9D6D5FDD9D6D5FDDAD7D6FED9D6D6FDD9D6D6FDDAD7D6FED9D7
D5FDCAC6C5FDCBC7C7FECAC6C5FDCCC7C7FDCDC9C6FDCECAC9FED1CDCCFDD3CF
CEFDD3CFCFFED3CFCEFDD1CDCCFDD3CECEFED0CECDFDD0CDCAFDCFCCCCFECFCC
- CBFDCBC8C7FDC6C3C2FF55555487000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ CBFDCBC8C7FDC6C3C2FF55555487000000002B2B2B37A4A09FFAB1ADABFEBAB6
+ B4FDBEBAB9FDC0BCBBFEC3BFBEFD9D9B99FEB2AEADFFCBC6C5FFD6D1D0FFDFDA
+ D9FFE6E2E0FFEBE5E4FFEFEAE9FFEDE8E7FFE9E5E3FFE6E2E0FFE3E0DDFFE2DE
+ DCFFE3DDDCFFE1DDDBFFE2DDDDFFE2DDDCFFE2DDDCFFE2DDDCFFE2DEDDFFE4DE
+ DDFFE4E0DFFFE8E3E2FFECE7E7FFEFEBEAFFF4EFECFFF5F0EEFFF4F0EEFFF3EF
+ EEFFEFEBE9FFE8E4E3FFDBD7D7FFD2CFCEFFCCCAC9FDCECBC8FDCECBCBFECDCA
+ C9FDC9C6C5FDC6C3C2FF57575787000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -802,13 +802,13 @@ object Mainfrm: TMainfrm
BBFFE6E6E6FDFFFFFFFFFFFFFFFFFDFDFDFDFFFFFFFFFFFFFFFFFDFDFDFDE8E6
E5FFC9C4C3FFC7C5C2FDCBC7C6FFCAC8C5FFCBC7C7FFCCC8C7FDCFCDCAFFD2CE
CDFFD0CCCBFDD2CECDFFD1CCCCFFCFCBCAFDD0CBCAFFCDCBCAFFCBC8C5FDCDC9
- C8FFC9C6C3FFC1BFBEEF0606061C000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ C8FFC9C6C3FFC1BFBEEF0606061C0000000000000000706F6EB9ABA7A6FFB7B3
+ B2FFBCB8B7FFBCB8B5FDC3BFBEFFAAA5A4FFB7B2B1FFCAC6C4FFD4D0CEFFDCD7
+ D6FFDFDCD9FFE5E0DFFFE8E3E2FFE6E0E0FFE3DFDCFFE0DCDAFFDEDAD8FFDCD8
+ D8FFDCD9D8FFDDD9D8FFDED9D8FFDED9D8FFDED9D8FFDEDAD7FFDEDAD9FFDFDA
+ D9FFDFDBDAFFE2DFDEFFE6E2E0FFE9E5E3FFEDE9E7FFEDE9E7FFEAE6E5FFE8E4
+ E4FFE6E2E1FFE3DFDEFFDCD8D7FFD3D0CFFFBCB8B7FFCDCBCAFFC9C6C3FDCDC9
+ C8FFC9C6C3FFB8B6B6EF1818181C000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -826,13 +826,13 @@ object Mainfrm: TMainfrm
BFFFB3B1B0FDBBB9B8FFB9B7B7FFB8B6B5FDBAB8B7FFBAB7B7FFB8B6B5FDC1BF
BDFFC7C3C2FFC5C1C0FDC6C2C1FFC8C4C3FFC9C4C4FFC8C4C3FDCECAC9FFCFCB
CAFFCBC9C6FDCEC9C9FFCCCAC7FFCBC8C6FDCCC9C8FFCAC7C6FFC6C3C2FDC6C3
- C2FFC1BFBDFF5555548700000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ C2FFC1BFBDFF555554870000000000000000000000002F2F2F3DA4A09FFCAFAB
+ AAFFB5B1B0FFB7B3B0FDBFBBBAFFA7A2A2FFB7B2B1FFC8C4C3FFD1CDCBFFD8D4
+ D1FFDCD8D7FFE1DCDAFFE4DFDEFFE2DEDBFFDEDAD9FFDCD8D6FFDAD6D4FFD8D5
+ D3FFD9D5D3FFD8D5D3FFD9D5D4FFD9D4D4FFDAD6D4FFDAD6D4FFDAD5D4FFDAD6
+ D4FFDBD7D6FFDED9D8FFE1DEDBFFE4E0DFFFE8E4E2FFE8E4E2FFE6E2E1FFE4E0
+ DFFFE3DFDEFFDFDCDBFFD9D6D5FFCFCCCBFFAFADACFFCAC7C6FFC4C1C0FDC6C3
+ C2FFC1BFBDFF5757578700000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -850,13 +850,13 @@ object Mainfrm: TMainfrm
BAFDBFBAB9FECECBCAFDDDDBDBFDE6E5E4FEE7E5E5FDE1DFDEFDD4D1D0FEBFBC
BAFDC0BCBBFDC1BDBCFEC2BEBEFDC1BEBCFDC2C0BEFDC7C3C2FEC8C4C3FDC7C5
C2FDC9C4C4FEC6C4C3FDC7C4C1FDC8C5C3FEC4C1C1FDC2C0BFFDC1BDBCFEBFBB
- BBFEBDBBBBED0101010D00000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ BBFEBDBBBBED0101010D00000000000000000000000000000000686766AAA5A1
+ A0FFACA8A8FDB1ADABFEB5B1B1FDA8A4A3FFB4AFAEFFC5C0C0FFCCC8C7FFD0CB
+ CAFFD3CFCEFFD8D3D2FFDBD6D5FFD9D5D3FFD7D2D1FFD6D2D0FFD6D1CFFFD4CF
+ CEFFD3CFCEFFD5D1CEFFD4D1D0FFD5D1D0FFD5D1D0FFD4D0CFFFD5D2CFFFD5D1
+ D0FFD6D2D0FFD8D4D2FFDAD5D4FFDCD7D6FFDDD9D8FFDDD9D7FFDBD8D7FFDCD8
+ D6FFDCD8D7FFDBD8D6FFD4D1D0FFCECBCAFFB3B0B0FEC0BEBDFDC0BCBBFEBEBA
+ BAFEB4B2B2ED0C0C0C0D00000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -874,13 +874,13 @@ object Mainfrm: TMainfrm
CFFFF9F9F9FDF6F7F6FFDBDAD9FFCAC9C8FDCAC9C9FFD8D8D7FFF8F8F9FDFAFB
FBFFD2D0CFFFBEB8B7FDC0BCBBFFC2BDBDFFC2BEBDFFC2BEBEFDC7C3C2FFC7C2
C2FFC3C1BEFDC6C1C0FFC4C0BFFFC1BEBEFDC2BFBEFFC0BDBCFFBDBAB9FEBEBB
- BAFF3A3938620000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ BAFF3A39386200000000000000000000000000000000000000001818181CA09C
+ 9BF7A8A4A4FFABA8A8FDB4AFAEFF9E9B99FFAFABA9FFC0BCBAFFC5C1C0FFC8C4
+ C2FFCDC9C8FFD1CDCCFFD5D0CFFFD4D0CFFFCFCBCAFFCEC9C8FFCDCAC8FFCDC9
+ C9FFCDC9C9FFCFCBC9FFCFCBCAFFCECACAFFD0CCCAFFCFCBCAFFD0CCCAFFD0CC
+ CAFFCFCBCAFFD0CCCAFFD1CDCBFFD4D0CFFFD8D3D2FFD6D2D1FFD5D2D0FFD6D1
+ D1FFD4D1CFFFD6D2D1FFCFCBCAFFC6C3C2FFC0BDBCFFC0BDBCFFBCB9B8FEBEBB
+ BAFF444444620000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -898,13 +898,13 @@ object Mainfrm: TMainfrm
FFFFF0EFEFFDB9B6B5FFBCB7B7FFBBB7B6FDBDB9B8FFBAB6B5FFA5A3A3FDFDFE
FEFFFBFCFCFFC2BEBEFDBEBBB9FFBFBDBAFFC2BDBDFFC2BEBEFDC5C1C0FFC5C0
C0FFC1BFBCFDC4BFBEFFC2C0BFFFC1BCBBFDC0BEBDFFBEBBBAFFBBB9B8FF9997
- 97C8000000040000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ 97C8000000040000000000000000000000000000000000000000000000005555
+ 5588A4A09FFFA9A7A6FDAFADACFFACA7A7FFA9A5A3FFB8B4B2FFBFBAB9FFC3BF
+ BEFFC9C5C3FFCCC8C7FFD0CCCBFFD1CDCCFFCDC9C8FFCAC6C4FFC9C6C4FFC9C6
+ C4FFCAC6C5FFCAC5C5FFCAC6C5FFCAC7C5FFCBC7C6FFCBC7C6FFCBC7C6FFCAC7
+ C6FFCBC7C6FFCCC8C7FFCECAC8FFD1CECCFFD3CFCEFFD3CFCEFFD2CECDFFD1CE
+ CCFFCECCCAFFCECBCAFFCBC9C7FFB9B5B4FEC0BEBDFFBEBBBAFFBBB9B8FF8987
+ 87C8030303040000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -922,13 +922,13 @@ object Mainfrm: TMainfrm
FFFFEEECECFDB8B5B3FFBBB8B7FFBAB6B5FDBCB8B7FFBCB9B7FFB2ADACFDF8F8
F8FFFAF9F9FFBEB9B8FDBDB9B8FFBEBAB9FFC0BCBBFFC1BEBCFDC4C0BFFFC4C0
BFFFC0BCBBFDC3BFBEFFC3BFBEFFBEBCBBFDBFBCBAFFBFBCBBFFBEBBBAFB1514
- 153A000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ 153A000000000000000000000000000000000000000000000000000000000E0E
+ 0E0F888585E0A8A4A3FEADABA8FFB3AFACFFA4A09FFEADA8A8FFB6B2B0FFBDB9
+ B7FFC3BFBDFFC7C2C2FFCBC7C6FFCBC8C6FFC9C6C4FFC6C1C1FFC4C1C0FFC4C1
+ C0FFC5C1BFFFC5C1C0FFC5C1C0FFC5C1C0FFC5C2C0FFC5C2C0FFC6C2C1FFC6C2
+ C1FFC6C2C1FFC7C3C2FFCAC5C5FFCDCAC8FFCECAC9FFCDC9C8FFCDCAC7FFCCC8
+ C8FFC8C6C5FFC7C3C2FFC1BFBDFFB8B6B5FDBFBCBAFFBFBCBBFFBCB9B8FB2D2D
+ 2D3A000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -947,11 +947,11 @@ object Mainfrm: TMainfrm
EEFDC3C0BFFDB9B6B4FEB7B3B2FDC8C5C4FDC4C1C0FDBEBAB9FEC0BCBBFDC1BE
BCFDC0BCBBFEBFBBBAFDC0BCBBFDBEBBBAFEBEBBBAFDBDBBBAFF6A6868970000
0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ 00003C3C3C55A5A1A0FFACA8A6FEADA9A9FDB2ADACFEA4A09FFFACA8A7FFB3AF
+ AFFFBAB6B4FFBFBBB9FFC5C1C0FFC7C2C2FFC4C1BFFFC1BDBCFFC0BCBBFFC0BC
+ BBFFBFBCBBFFC0BCBBFFC0BDBBFFC0BDBBFFC1BDBCFFC1BDBCFFC0BDBBFFC1BD
+ BCFFC2BDBCFFC2BEBDFFC5C2C0FFC8C5C3FFC8C4C3FFC6C3C2FFC6C2C0FFC4C1
+ C1FFC0BEBDFFBFBCBBFFBBB8B7FEBDBAB9FEBCBAB9FDBDBBBAFF626161970000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -971,11 +971,11 @@ object Mainfrm: TMainfrm
B2FFB9B5B4FFC7C5C4FDECECECFFFEFEFEFFFCFBFBFFDCDCDAFDC3C0BFFFC1BC
BAFFBEBBBAFDC2BFBDFFC2BEBDFFBEBAB9FDC0BDBCFFB7B4B4ED030303120000
0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ 0000030303046B6A69BAAAA6A4FFB0ACABFFB1ADAAFDA9A5A4FFA7A2A1FFAEAC
+ AAFFB5B1AFFFBAB6B4FFBFBCBBFFC3BFBEFFC3BEBEFFBFBBBAFFBDB9B7FFBCB9
+ B7FFBDBAB8FFBEB9B9FFBEBAB8FFBDBAB8FFBDBBB9FFBDBBB9FFBEBBBAFFBFBB
+ BAFFBEBBB9FFC0BCBBFFC3BFBEFFC5C1C0FFC4C1BFFFC3C0BEFFC3BFBEFFC0BD
+ BCFFBDBBBAFFBBB9B8FFBEBAB9FFBCB9B8FDC0BDBCFFAEACACED101010120000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -995,11 +995,11 @@ object Mainfrm: TMainfrm
C6FFF5F4F3FFFDFDFDFDFFFFFFFFFFFFFFFFFFFFFFFFFDFDFDFDF9F9F9FFDDDB
DBFFC1BEBCFDC0BEBDFFBFBCBBFFBFBCBBFEBDBAB9FF3B393965000000000000
0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ 00000000000022222229A29E9DFCAEA9A8FFAFABA8FDB4B0AFFFA29E9EFFACAA
+ A7FFB2AFADFFB8B3B3FFBBB9B6FFC1BDBCFFC1BCBCFFBDB9B8FFBAB7B5FFBCB6
+ B6FFBAB8B6FFBAB9B6FFBCB9B8FFBDB8B8FFBDB9B7FFBDB8B7FFBCB8B8FFBCB9
+ B8FFBCB9B7FFBEBBB9FFC2BDBDFFC4C0BFFFC2BEBDFFC2BEBDFFC2BEBDFFBFBC
+ BBFFBEBCBAFFB8B4B4FFBFBCBBFFBEBBBAFEBDBAB9FF46454565000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -1019,11 +1019,11 @@ object Mainfrm: TMainfrm
A1FDB7B6B6FDE7E7E7FEFDFDFDFDFCFCFCFDFCFDFDFDFEFEFEFEECEBEBFDD1CF
CFFDC1BEBDFEBCB9B7FDBEBAB9FDBDBAB9FF898686C100000002000000000000
0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ 000000000000000000005453538BA8A4A3FFADA9A8FEAEAAA9FDA8A4A4FDA5A1
+ 9FFFB2ADACFFB6B2B0FFBAB6B5FFBEBBB9FFC0BCBAFFBDB9B8FFBBB7B6FFBAB7
+ B5FFBAB7B5FFBAB7B6FFBBB7B6FFBBB7B6FFBBB7B6FFBBB7B6FFBBB8B7FFBCB7
+ B6FFBDB8B7FFBEBBB9FFC1BDBDFFC2BEBDFFC1BEBDFFC2BEBDFFC0BDBCFFC0BD
+ BCFFBBB8B8FFBBB9B8FDBCB9B8FDBDBAB9FF7D7C7CC101010102000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -1043,11 +1043,11 @@ object Mainfrm: TMainfrm
B2FFB7B3B2FFA9A6A6FDB3B2B1FFE7E7E7FFE1E0E0FFBEBCBBFDB9B5B3FFBBB8
B7FFBAB7B7FDBDBAB7FFBCB9B8FFB3B2B1F51212123000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ 000000000000000000000F0F0F10868382DCA8A4A3FEAFABAAFFB2AFADFFA19D
+ 9CFFABA7A6FFB3B0AEFFB8B4B3FFBBB8B6FFBEBAB9FFBCB8B7FFB9B6B4FFB8B5
+ B4FFB8B5B3FFB8B5B5FFB9B5B4FFB9B5B4FFB9B5B5FFB9B6B4FFB9B7B6FFB9B6
+ B5FFBBB7B6FFBDBAB8FFC0BCBBFFC0BCBBFFC0BCBBFFC0BDBCFFBFBCBBFFBBB8
+ B7FFB4B1B0FDBDBAB7FFBCB9B8FFB0AEADF52727273000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -1067,11 +1067,11 @@ object Mainfrm: TMainfrm
AFFFB5B0AFFFB3B0AEFDB8B4B3FFAEABAAFFB7B3B2FFBAB5B4FDBAB7B6FFB8B5
B4FFB6B3B2FDBBB8B7FFB7B5B3FF535151860000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ 00000000000000000000000000003A3A3A51A39F9EFFACA8A7FFADABA8FFA8A4
+ A3FFA29F9EFFAFABAAFFB2AFADFFB7B3B2FFBBB7B7FFBBB7B6FFB8B3B3FFB6B2
+ B1FFB6B2B2FFB7B2B1FFB6B3B1FFB6B3B1FFB6B4B3FFB6B3B3FFB7B3B2FFB7B3
+ B2FFB9B5B4FFBBB8B7FFBEBAB8FFBDB9B8FFBDB9B9FFBDBAB9FFBBB9B8FFB0AD
+ ACFFB5B2B1FDBBB8B7FFB7B5B3FF565555860000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -1091,11 +1091,11 @@ object Mainfrm: TMainfrm
ACFDB0ADACFDB2AFADFEB2AFAEFDB5B2B1FDB7B3B2FDB7B3B2FEB6B1B0FDB3B0
AFFDB6B3B2FEB7B5B4FE9F9D9BDA000000040000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000005F5E5EA9A7A4A2FFA8A6A5FDA9A7
+ A6FD9C9A97FEA4A19FFFAEABA9FFB1ACACFFB7B4B2FFB8B5B3FFB4B1B0FFB1AE
+ ADFFB2AEADFFB2AEADFFB2AFADFFB2B0ADFFB2B0AFFFB2AFAFFFB3AFAEFFB3AF
+ AFFFB5B2B1FFB9B4B3FFBAB6B5FFB9B5B4FFB8B5B4FFBBB9B8FFB3B1B0FFAEAB
+ ABFDB5B2B1FEB6B4B3FE949291DA030303040000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -1115,11 +1115,11 @@ object Mainfrm: TMainfrm
B1FFB5B2B1FFB4B0AFFDB7B3B2FFB8B5B4FFB8B5B4FFB6B3B1FDB6B3B2FFB4B1
B0FFB1AEADFEAEACABF61413133E000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ 00000000000000000000000000000000000014141416908D8CECA4A19FFFA9A5
+ A4FFAAA8A7FD9E9A99FFA6A2A1FFACA9A7FFB3B0AEFFB7B4B2FFB4B3B0FFB4B0
+ AFFFB3B0AFFFB4B0AFFFB4B0AFFFB4B0AFFFB4B1AFFFB4B1B0FFB4B1B0FFB4B1
+ B0FFB6B2B1FFB8B4B3FFB9B5B4FFB7B4B3FFB4B1B0FFB1AEADFFAEABABFFB4B1
+ B0FFB0ADACFEACA9A8F6302F2F3E000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -1139,11 +1139,11 @@ object Mainfrm: TMainfrm
B0FFB4B1B0FFB2AFAEFDB6B2B1FFB7B3B2FFB6B3B2FFB2AFAEFDB2AFAEFFAEAB
AAFFAAA7A5FF3939396F00000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000035353548918D8CF7A29E
+ 9EFFA8A5A3FDA3A09FFF9C9997FFA19E9DFFABA8A7FFB4B0AFFFB5B2B0FFB5B1
+ B0FFB4B1B0FFB4B1B0FFB4B1B0FFB5B1B0FFB5B2B0FFB5B1B0FFB5B1B1FFB5B2
+ B1FFB6B3B2FFB8B4B3FFB4B2B0FFADAAA9FFACAAA8FFA5A2A1FEB2AFAEFFAEAB
+ AAFFAAA7A5FF4949496F00000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -1163,11 +1163,11 @@ object Mainfrm: TMainfrm
A9FEADAAA9FEADAAA9FEAEABAAFEAFABAAFEAEAAA9FEACA9A8FFA7A4A3FF8A88
86DE3937374B0000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ 00000000000000000000000000000000000000000000000000002A2A2A337271
+ 71C99C9998FFA5A2A1FFA9A6A5FEA4A0A0FEA29F9EFFA09C9BFFA4A1A0FFA4A1
+ A0FFA4A09FFFA3A09FFFA4A09FFFA4A09FFFA4A09FFFA4A0A0FFA4A0A0FFA4A1
+ A0FFA5A2A1FFA4A09FFFA5A3A2FFABA8A7FFABA8A7FEACA9A8FFA7A4A3FF8583
+ 82DE3939394B0000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -1187,11 +1187,11 @@ object Mainfrm: TMainfrm
99FF9E9B9AFF989695F7989594F6959291F28C8988E7706F6EB54242415D0B0B
0B0D000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000000000000000000000000000404
+ 04053B3B3B4E656463A9807F7EE2908E8DF1949392F6969493F8A3A09FFFA5A2
+ A1FFA9A6A5FFA9A5A4FFA9A5A4FFA9A5A4FFA9A5A4FFA9A5A4FFA9A6A5FFA6A3
+ A3FFA4A1A0FF999796F9959392F7928F8FF2898685E76C6C6BB54343435D0C0C
+ 0C0D000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -1212,9 +1212,9 @@ object Mainfrm: TMainfrm
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ 00000000000000000000050505061818181B1F1F1F24202020252D2D2D382D2D
+ 2D382D2D2D382D2D2D382D2D2D382D2D2D382D2D2D382D2D2D382D2D2D382D2D
+ 2D382D2D2D3721212127202020251919191D0909090A00000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -2448,43 +2448,43 @@ object Mainfrm: TMainfrm
0000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000424D3E000000000000003E000000
28000000C0000000600000000100010000000000000900000000000000000000
- 000000000000000000000000FFFFFF0000000000000000000000000000000000
- 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
+ 000000000000000000000000FFFFFF00000000000000000000000000FFFFFFFF
+ FFFF000000000000000000000000000000000000FFFFFFFFFFFF000000000000
+ 000000000000000000000000FFFFFFFFFFFF0000000000000000000000000000
+ 00000000FFFFFFFFFFFF000000000000000000000000000000000000FFFFFFFF
+ FFFF000000000000000000000000000000000000FC000000007F000000000000
+ 000000000000000000000000F0000000001F0000000000000000000000000000
+ 00000000E0000000000F000000000000000000000000000000000000C0000000
+ 0007000000000000000000000000000000000000800000000003000000000000
+ 0000000000000000000000008000000000030000000000000000000000000000
+ 0000000080000000000100000000000000000000000000000000000080000000
+ 0001000000000000000000000000000000000000800000000001000000000000
+ 0000000000000000000000008000000000010000000000000000000000000000
+ 0000000080000000000100000000000000000000000000000000000080000000
+ 0001000000000000000000000000000000000000800000000001000000000000
+ 0000000000000000000000000000000000010000000000000000000000000000
+ 0000000000000000000100000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000010000000000000000000000000000
+ 0000000080000000000100000000000000000000000000000000000080000000
+ 0003000000000000000000000000000000000000C00000000003000000000000
+ 000000000000000000000000C000000000070000000000000000000000000000
+ 00000000E00000000007000000000000000000000000000000000000E0000000
+ 000F000000000000000000000000000000000000F0000000001F000000000000
+ 000000000000000000000000F0000000001F0000000000000000000000000000
+ 00000000F8000000003F000000000000000000000000000000000000FC000000
+ 003F000000000000000000000000000000000000FC000000007F000000000000
+ 000000000000000000000000FE00000000FF0000000000000000000000000000
+ 00000000FF00000000FF000000000000000000000000000000000000FF000000
+ 01FF000000000000000000000000000000000000FF80000003FF000000000000
+ 000000000000000000000000FFC0000007FF0000000000000000000000000000
+ 00000000FFE000000FFF000000000000000000000000000000000000FFFC0000
+ 7FFF000000000000000000000000000000000000FFFFFFFFFFFF000000000000
+ 000000000000000000000000FFFFFFFFFFFF0000000000000000000000000000
+ 00000000FFFFFFFFFFFF00000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -2529,7 +2529,7 @@ object Mainfrm: TMainfrm
Left = 80
Top = 112
Bitmap = {
- 494C010108003802000210001000FFFFFFFF2110FFFFFFFFFFFFFFFF424D3600
+ 494C0101090038021C0210001000FFFFFFFF2110FFFFFFFFFFFFFFFF424D3600
0000000000003600000028000000400000003000000001002000000000000030
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -2547,105 +2547,105 @@ object Mainfrm: TMainfrm
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
+ 00000000000000000000000000000000000000000000060606072A2A2A354140
+ 406944444374454545784646467A4646467B4646467B4646467A454545774343
+ 436F3D3D3D5F1E1E1E2301010102000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
+ 000000000000000000000000000000000000010101024545457AC4C0BFFFCFCB
+ CAFFCAC6C5FFCAC7C6FFCAC7C5FFCAC7C6FFCBC8C6FFCCC9C8FFCECBCAFFCECB
+ CAFFBADECFFFD3CFCFFA3535354B000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000000F0F0F11AAA7A4FFC1BFBCFFC2C0
+ BDFFBFBBBAFFBEBBBAFFBFBCBAFFC0BDBCFFC1BEBDFFC2BFBEFFC4C1C0FFC9C6
+ C5FFCCCAC8FFDEDBD9FF9B9A99E1010101020000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
+ 00000000000000000000000000000000000045444470B3AFAEFFCFCAC9FFD8D4
+ D3FFB3B0AFFF9F9C9BFF9B9897FF9A9896FF9B9897FF9D9998FFA0A4A1FFC1BE
+ BDFFDCD9D8FFD8D5D4FFD8D5D4FF2C2C2C390000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
+ 0000000000000000000000000000000000006F6E6DC7D6D1D0FFEDE8E6FFD8D5
+ D4FFB2AFADFFCAC6C5FFC4C0BFFFC5C2C0FFC6C3C2FFC9C5C4FFCCD2CDFFCBCA
+ C8FFEFECEBFFF8F6F5FFEAE6E5FF5757578F0000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
+ 000000000000000000000000000000000000A7A3A0F3D1CCCBFFDDD8D7FFA5A1
+ A0FFD6D1D0FFE7E3E1FFDFDAD9FFDCD7D6FFDBD6D6FFDFDBD9FFEBE5E5FFE7E4
+ E3FFC3BFBFFFE5E1E0FFE3DFDEFF6C6B6BB80000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
+ 00000000000000000000000000000000000082807FD6C7C3C1FFCDCAC9FFB6B2
+ B1FFDCD7D6FFE5E1E0FFDDD8D7FFDDD7D7FFDCD8D6FFE0DCDBFFE9E5E4FFE8E4
+ E3FFB6B2B2FFD6D2D1FFD8D5D4FF5C5B5B9B0000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
+ 00000000000000000000000000000000000040404061BBB7B5FFC2BEBDFFA8A5
+ A3FFC0BCBBFFCBC7C5FFC6C2C0FFC6C2C0FFC6C3C1FFC8C4C4FFCEC9C8FFCBC8
+ C7FFB9B6B6FFCCC8C7FFD2CFCEFF202020260000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
+ 00000000000000000000000000000000000000000000858281DAB5B1B0FFBDB9
+ B8FFACA8A7FFC0BCBBFFBCB8B7FFBAB7B6FFBCB8B7FFBEBBBAFFC6C2C1FFBBB8
+ B7FFC1BEBDFFC4C1C0FF5C5C5C9B000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
+ 000000000000000000000000000000000000000000002C2C2C39B8B3B2FFBAB6
+ B5FFAEAAA9FFAEAAA9FFB6B2B1FFB4B1AFFFB4B1B0FFB8B5B4FFB4B0AFFFB8B4
+ B3FFC1BEBDFFBCB8B7F507070708000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
+ 00000000000000000000000000000000000000000000000000005D5C5CA8B6B2
+ B1FFBAB6B5FFB2AFAEFFB5B3B2FFB5B2B1FFB4B1B0FFB8B5B4FFB4B2B1FFBDB9
+ B8FFC4C1C0FF3F3F3F5E00000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
+ 00000000000000000000000000000000000000000000000000000A0A0A0B9390
+ 8FF3B2ADACFFB3B0AFFFB3AFAEFFB3AEAEFFB3B0ADFFB2AFAFFFB6B3B1FFB5B2
+ B1FF6B6A6ABE0000000000000000000000000000000000000000000000000000
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
+ 0000000000000000000000000000000000000000000000000000000000001212
+ 12145E5D5D8D757373B57D7C7CC07D7D7CC17D7D7CC17B7B7ABE727171B1504F
+ 4F71000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
@@ -2917,11 +2917,11 @@ object Mainfrm: TMainfrm
0000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000424D3E000000000000003E000000
2800000040000000300000000100010000000000800100000000000000000000
- 000000000000000000000000FFFFFF0000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
- 0000000000000000000000000000000000000000000000000000000000000000
+ 000000000000000000000000FFFFFF00FFFF000000000000FFFF000000000000
+ 8001000000000000000100000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
- 00000000000000000000000000000000FE3FFFFFFFF1FFFFF00FFFFFFF81F01F
+ 80010000000000008001000000000000C003000000000000C007000000000000
+ E00F000000000000FFFF000000000000FE3FFFFFFFF1FFFFF00FFFFFFF81F01F
8007C003C00180038001800180018001E001800180010001F801000000000000
F001000000000000F003000000000000E003000000000000E007000000000001
C007800180018001C00F80038003C003C00FC003C003C003C01FE007E007E007
View
120 formMain.pas
@@ -78,6 +78,7 @@
Option to hide card readers with no media in
Option to set card polling time - default is 5 seconds
Option to hide all card readers
+ Option to show drives with multiple partitions as one entry - with different icon to indicate this
TODO Before Release:
Update credits in readme and about form
@@ -99,7 +100,6 @@
Timer for ejection? - eg if running from pstart menu - run command to eject stick in 5 secs - gives time to close the menu
Intercept shutdown/restart message and warn that usb stick is still in the drive. Dont forget it.
REMOVEALL switch - eject every usb drive it finds?
- Hide partitions from same drive
Hide certain drives when specified by user?
Since last stable release I've disabled 'program is still running message' when app is minimized- re-enable this?
Use new Delph 2010 hints for all controls in options
@@ -118,9 +118,8 @@ interface
graphics, JwaWindows, types,
JvExControls, JvLabel, JvAppInst,
JclSysInfo, JclShell, JCLStrings,
- Menus, VirtualTrees,
+ Menus, VirtualTrees, Generics.Collections,
- {uVistaFuncs,}
uDiskEjectConst, uDiskEjectUtils, uDiskEjectOptions,
uCustomHotKeyManager, uCardReaderManager, uDriveEjector, uCommunicationManager, JvMenus;
@@ -774,75 +773,59 @@ procedure TMainfrm.FillDriveList;
procedure TMainfrm.ChangeDriveVisibility;
var
i: integer;
+ List: TList<Integer>;
TempNode, PrevNode: pVirtualNode;
begin
if Ejector.DrivesCount = 0 then //Make that first node visible again
begin
Tree.IsVisible[Tree.GetFirst] := true;
exit;
end;
-{
- //Hide/show drives - card readers with no media
+
+ //Make all drives visible again to start with
TempNode:=tree.GetFirst;
for I := 0 to Tree.RootNodeCount - 1 do
begin
- if Options.HideCardReadersWithNoMedia then
- begin
- if Ejector.RemovableDrives[i].IsCardReader then
- if Ejector.RemovableDrives[i].CardMediaPresent = false then
- Tree.IsVisible[TempNode] := false
- else
- Tree.IsVisible[TempNode] := true;
- end
- else
- Tree.IsVisible[TempNode] := true;
-
+ Tree.IsVisible[TempNode] := true;
prevNode:=TempNode;
TempNode:=Tree.GetNext(PrevNode);
end;
- //Hide/show drives - all card readers
- TempNode:=tree.GetFirst;
- for I := 0 to Tree.RootNodeCount - 1 do
- begin
- if Options.ShowCardReaders = false then
- begin
- if Ejector.RemovableDrives[i].IsCardReader then
- Tree.IsVisible[TempNode] := false
- else
- Tree.IsVisible[TempNode] := true;
- end
- else
- Tree.IsVisible[TempNode] := true;
-
- prevNode:=TempNode;
- TempNode:=Tree.GetNext(PrevNode);
- end; }
+ List := TList<Integer>.Create();
+ try
+ TempNode:=tree.GetFirst;
+ for I := 0 to Tree.RootNodeCount - 1 do
+ begin //First check if all card readers should be hidden
+ if Options.ShowCardReaders = false then
+ begin
+ if Ejector.RemovableDrives[i].IsCardReader then
+ Tree.IsVisible[TempNode] := false;
+ end
+ else //If not check if card readers with no media in should be hidden
+ if Options.HideCardReadersWithNoMedia then
+ begin
+ if Ejector.RemovableDrives[i].IsCardReader then
+ if Ejector.RemovableDrives[i].CardMediaPresent = false then
+ Tree.IsVisible[TempNode] := false;
+ end;
- TempNode:=tree.GetFirst;
- for I := 0 to Tree.RootNodeCount - 1 do
- begin //First check if all card readers should be hidden
- if Options.ShowCardReaders = false then
- begin
- if Ejector.RemovableDrives[i].IsCardReader then
- Tree.IsVisible[TempNode] := false
- else
- Tree.IsVisible[TempNode] := true;
- end
- else //If not check if card readers with no media in should be hidden
- if Options.HideCardReadersWithNoMedia then
- begin
- if Ejector.RemovableDrives[i].IsCardReader then
- if Ejector.RemovableDrives[i].CardMediaPresent = false then
- Tree.IsVisible[TempNode] := false
- else
- Tree.IsVisible[TempNode] := true;
- end
- else
- Tree.IsVisible[TempNode] := true;
+ if Options.ShowPartitionsAsOne then
+ begin
+ if Ejector.RemovableDrives[i].IsCardReader = false then //Dont group card readers
+ begin
+ if Ejector.RemovableDrives[i].HasSiblings then
+ if List.IndexOf(Ejector.RemovableDrives[i].ParentDevInst) <> -1 then //drive with same is already found and visible
+ Tree.IsVisible[TempNode] := false
+ else
+ List.Add(Ejector.RemovableDrives[i].ParentDevInst);
+ end;
+ end;
- prevNode:=TempNode;
- TempNode:=Tree.GetNext(PrevNode);
+ prevNode:=TempNode;
+ TempNode:=Tree.GetNext(PrevNode);
+ end;
+ finally
+ List.Free;
end;
end;
@@ -873,6 +856,7 @@ procedure TMainfrm.AddCustomCardReaders;
procedure TMainfrm.AddDrivePopups;
var
i: integer;
+ TempNode, PrevNode: pVirtualNode;
begin
if DrivePopups <> nil then
for i:=low(DrivePopups) to high(DrivePopups) do
@@ -886,6 +870,7 @@ procedure TMainfrm.AddDrivePopups;
exit;
end;
+ TempNode:=tree.GetFirst;
SetLength(DrivePopups, Ejector.DrivesCount);
for i:=low(DrivePopups) to high(DrivePopups) do
begin
@@ -916,22 +901,24 @@ procedure TMainfrm.AddDrivePopups;
DrivePopups[i].ImageIndex:=5
end
else
+ if Options.ShowPartitionsAsOne and Ejector.RemovableDrives[i].HasSiblings then
+ DrivePopups[i].ImageIndex:=8
+ else
DrivePopups[i].ImageIndex:=3;
end;
popupMenuTray.Items[2].add(DrivePopups[i]); //Add to the eject submenu
DrivePopups[i].OnClick:=DrivePopupMenuHandler;
- //Show/hide popups
- if Options.HideCardReadersWithNoMedia then
- begin
- if Ejector.RemovableDrives[i].IsCardReader then
- if Ejector.RemovableDrives[i].CardMediaPresent = false then
- DrivePopups[i].Visible :=false;
- end
+ //Show/hide popups - match to whether node is visible in the tree
+ if Tree.IsVisible[TempNode] then
+ DrivePopups[i].Visible := true
else
- DrivePopups[i].Visible := true;
+ DrivePopups[i].Visible := false;
+
+ prevNode:=TempNode;
+ TempNode:=Tree.GetNext(PrevNode);
end;
end;
@@ -959,10 +946,13 @@ procedure TMainfrm.TreeGetImageIndex(Sender: TBaseVirtualTree;
else
ImageIndex:=3
end
-
+ else
+ if Options.ShowPartitionsAsOne and Ejector.RemovableDrives[node.Index].HasSiblings then
+ ImageIndex:=6
else
ImageIndex:=0;
end;
+
end;
procedure TMainfrm.TreeGetNodeDataSize(Sender: TBaseVirtualTree;
View
14 formOptions.dfm
@@ -77,7 +77,7 @@ object Optionsfrm: TOptionsfrm
Top = 1
Width = 411
Height = 307
- ActivePage = TabSheet5
+ ActivePage = TabSheet1
Align = alClient
Style = tsButtons
TabOrder = 0
@@ -113,6 +113,16 @@ object Optionsfrm: TOptionsfrm
State = cbChecked
TabOrder = 0
end
+ object chkboxShowPartitionsAsOne: TCheckBox
+ Left = 13
+ Top = 45
+ Width = 332
+ Height = 17
+ Caption = 'Show drives with partitions as one entry'
+ Checked = True
+ State = cbChecked
+ TabOrder = 1
+ end
end
object GroupBox6: TGroupBox
Left = 1
@@ -591,7 +601,7 @@ object Optionsfrm: TOptionsfrm
Left = 72
Top = 288
Bitmap = {
- 494C01010700E8034C0430003000FFFFFFFF2110FFFFFFFFFFFFFFFF424D3600
+ 494C01010700E803500430003000FFFFFFFF2110FFFFFFFFFFFFFFFF424D3600
0000000000003600000028000000C00000006000000001002000000000000020
0100000000000000000000000000000000000000000000000000000000000000
0000000000000000000000000000000000000000000000000000000000000000
View
3 formOptions.pas
@@ -89,6 +89,7 @@ TOptionsfrm = class(TForm)
Label3: TLabel;
editSearchFrequency: TJvEdit;
chkBoxShowCardReaders: TCheckBox;
+ chkboxShowPartitionsAsOne: TCheckBox;
procedure FormShow(Sender: TObject);
procedure FormClose(Sender: TObject; var Action: TCloseAction);
procedure FormCreate(Sender: TObject);
@@ -194,6 +195,7 @@ procedure TOptionsfrm.FormShow(Sender: TObject);
comboboxDockTo.ItemIndex := SnapTo;
chkBoxHideCardReaders.Checked := HideCardReadersWithNoMedia;
chkBoxShowCardReaders.Checked := ShowCardReaders;
+ chkboxShowPartitionsAsOne.Checked := ShowPartitionsAsOne;
editSearchFrequency.Text := inttostr(CardPollingInterval);
editSearchFrequency.Enabled := chkboxCardPolling.Checked;
@@ -602,6 +604,7 @@ procedure TOptionsfrm.FormClose(Sender: TObject; var Action: TCloseAction);
CardPolling := chkboxCardPolling.Checked;
ShowCardReaders := chkBoxShowCardReaders.Checked;
HideCardReadersWithNoMedia := chkBoxHideCardReaders.Checked;
+ ShowPartitionsAsOne := chkboxShowPartitionsAsOne.Checked;
AfterEject := radiogroupAfterEject.ItemIndex;
SnapTo := comboboxDockTo.ItemIndex;
View
2 uDiskEjectConst.pas
@@ -26,7 +26,7 @@
interface
const
- str_App_Version: string = '1.2.0 Beta 5 CR';
+ str_App_Version: string = '1.2.0 Beta 6';
str_Ini_FileName: string = 'USB_Disk_Eject.cfg';
str_No_Drive: string = 'No disks found.';
str_Temp_Folder_Write_Error: string = 'Could not write to windows temp dir!' + #13 + 'The program will now exit';
View
4 uDiskEjectOptions.pas
@@ -64,6 +64,7 @@ TOptions = class (TComponent)
fCloseRunningApps_Ask: boolean;
fCloseRunningApps_Force: boolean;
fSnapTo: integer;
+ fShowPartitionsAsOne: boolean;
fHotKeys: TCustomHotKeyManager;
fCardReaders: TCardReaderManager;
@@ -133,6 +134,7 @@ TOptions = class (TComponent)
property WindowWidth : integer read fWindowWidth write fWindowWidth;
property WindowLeftPos : integer read fWindowLeftPos write fWindowLeftPos;
property WindowTopPos : integer read fWindowTopPos write fWindowTopPos;
+ property ShowPartitionsAsOne : boolean read fShowPartitionsAsOne write fShowPartitionsAsOne;
property ShowCardReaders : boolean read fShowCardReaders write fShowCardReaders;
property CardPolling : boolean read fCardPolling write fCardPolling;
property CardPollingInterval : integer read fCardPollingInterval write fCardPollingInterval;
@@ -186,6 +188,7 @@ procedure TOptions.ReadConfig;
fCloseRunningApps_Ask:= fIniFile.ReadBool('Preferences', 'CloseRunningApps', false);
fCloseRunningApps_Force:= fIniFile.ReadBool('Preferences', 'ForceAppsClose', false);
fAudioNotifications:= fIniFile.ReadBool('Preferences', 'AudioNotifications', false);
+ fShowPartitionsAsOne:= fIniFile.ReadBool('Preferences', 'ShowPartitionsAsOne', false);
fHideCardReadersWithNoMedia:= fIniFile.ReadBool('Preferences', 'HideCardReadersWithNoMedia', true);
fShowCardReaders:= fIniFile.ReadBool('Preferences', 'ShowCardReaders', true);
@@ -223,6 +226,7 @@ procedure TOptions.SaveConfig;
fIniFile.WriteBool('Preferences', 'CloseRunningApps', fCloseRunningApps_Ask);
fIniFile.WriteBool('Preferences', 'ForceAppsClose', fCloseRunningApps_Force);
fIniFile.WriteBool('Preferences', 'AudioNotifications', fAudioNotifications);
+ fIniFile.WriteBool('Preferences', 'ShowPartitionsAsOne', fShowPartitionsAsOne);
fIniFile.WriteBool('Preferences', 'HideCardReadersWithNoMedia', fHideCardReadersWithNoMedia);
fIniFile.WriteBool('Preferences', 'ShowCardReaders', fShowCardReaders);
View
22 uDriveEjector.pas
@@ -40,6 +40,7 @@ interface
ProductID: string;
ProductRevision: string;
IsCardReader: boolean;
+ HasSiblings: boolean;
CardMediaPresent: boolean;
BusType: integer;
ParentDevInst: integer;
@@ -71,6 +72,7 @@ TDriveEjector = class
procedure ScanDrive(GUIDVolumeName: String);
procedure CheckForCardReaders;
+ procedure CheckForSiblings;
procedure OnTimer (Sender:TObject);
procedure SetBusy(const Value: boolean);
procedure DeleteFromDrivesArray(const Index: Cardinal);
@@ -323,6 +325,8 @@ procedure TDriveEjector.FindRemovableDrives;
//Finally check if any are card readers
CheckForCardReaders;
+ //Check if it has siblings (multiple partitions but 1 drive)
+ CheckForSiblings;
{--------------------------------------------------------------------------------------}
//HACK - delete card readers
@@ -468,6 +472,9 @@ procedure TDriveEjector.ScanDrive(GUIDVolumeName: String);
//Is Card Reader //This is checked and changed later
RemovableDrives[high(RemovableDrives)].IsCardReader := false;
+ //Has siblings //This is checked and changed later
+ RemovableDrives[high(RemovableDrives)].HasSiblings := false;
+
//Does Card Reader have media in it?
if CheckIfDriveHasMedia(DriveMountPoint) then
RemovableDrives[high(RemovableDrives)].CardMediaPresent:=true
@@ -619,6 +626,21 @@ procedure TDriveEjector.CheckForCardReaders;
end;
end;
+procedure TDriveEjector.CheckForSiblings;
+var
+ i: integer;
+begin
+ for I := 0 to DrivesCount - 1 do
+ begin
+ if GetNoDevicesWithSameParentInst(RemovableDrives[i].ParentDevInst) > 0 then
+ if GetNoDevicesWithSameProductID(RemovableDrives[i].ProductId) > 0 then //Hard drive partitions
+ RemovableDrives[i].HasSiblings := true
+ else
+ RemovableDrives[i].HasSiblings := false;
+ end;
+
+end;
+
function TDriveEjector.CheckIfDriveHasMedia(MountPoint: string): boolean;
var
Returned, DriveHandle: cardinal;

0 comments on commit c6095ec

Please sign in to comment.
Something went wrong with that request. Please try again.