diff --git a/res/icons/gridcheckbox_disabled_checked.png b/res/icons/gridcheckbox_disabled_checked.png new file mode 100644 index 00000000..691c2d02 Binary files /dev/null and b/res/icons/gridcheckbox_disabled_checked.png differ diff --git a/res/icons/gridcheckbox_disabled_unchecked.png b/res/icons/gridcheckbox_disabled_unchecked.png new file mode 100644 index 00000000..72873a6f Binary files /dev/null and b/res/icons/gridcheckbox_disabled_unchecked.png differ diff --git a/source/main.dfm b/source/main.dfm index 6ad31c2f..918122b7 100644 --- a/source/main.dfm +++ b/source/main.dfm @@ -2610,9 +2610,137 @@ object MainForm: TMainForm Left = 104 Top = 160 Bitmap = { - 494C0101AF005001600210001000FFFFFFFF2110FFFFFFFFFFFFFFFF424D3600 - 000000000000360000002800000040000000C0020000010020000000000000C0 - 0200000000000000000000000000000000000069D0000069D0000069D000026B + 494C0101B1005001880210001000FFFFFFFF2110FFFFFFFFFFFFFFFF424D3600 + 000000000000360000002800000040000000D0020000010020000000000000D0 + 0200000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000000000000000000000000000000000000000808080FF808080FF8080 + 80FF808080FF808080FF808080FF808080FF808080FF808080FF808080FF8080 + 80FF808080FF808080FF00000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000000000000000000000000000000000000000808080FFC0C0C0FFFFFF + FFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFF + FFFFC0C0C0FF808080FF00000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000000000000000000000000000000000000000808080FFFFFFFFFFC0C0 + C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0 + C0FFFFFFFFFF808080FF00000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000000000000000000000000000000000000000808080FFC0C0C0FFFFFF + FFFFC0C0C0FFFFFFFFFF808080FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFF + FFFFC0C0C0FF808080FF00000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000000000000000000000000000000000000000808080FFFFFFFFFFC0C0 + C0FFFFFFFFFF808080FF808080FF808080FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0 + C0FFFFFFFFFF808080FF00000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000000000000000000000000000000000000000808080FFC0C0C0FFFFFF + FFFF808080FF808080FF808080FF808080FF808080FFFFFFFFFFC0C0C0FFFFFF + FFFFC0C0C0FF808080FF00000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000000000000000000000000000000000000000808080FFFFFFFFFF8080 + 80FF808080FF808080FFFFFFFFFF808080FF808080FF808080FFFFFFFFFFC0C0 + C0FFFFFFFFFF808080FF00000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000000000000000000000000000000000000000808080FFC0C0C0FFFFFF + FFFF808080FFFFFFFFFFC0C0C0FFFFFFFFFF808080FF808080FF808080FFFFFF + FFFFC0C0C0FF808080FF00000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000000000000000000000000000000000000000808080FFFFFFFFFFC0C0 + C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFFFFFF808080FF808080FF8080 + 80FFFFFFFFFF808080FF00000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000000000000000000000000000000000000000808080FFC0C0C0FFFFFF + FFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFFFFFF808080FFFFFF + FFFFC0C0C0FF808080FF00000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000000000000000000000000000000000000000808080FFFFFFFFFFC0C0 + C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0 + C0FFFFFFFFFF808080FF00000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000000000000000000000000000000000000000808080FFC0C0C0FFFFFF + FFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFF + FFFFC0C0C0FF808080FF00000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000000000000000000000000000000000000000808080FF808080FF8080 + 80FF808080FF808080FF808080FF808080FF808080FF808080FF808080FF8080 + 80FF808080FF808080FF00000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000069D0000069D0000069D000026B D400026BD400026BD400026BD400026BD400026BD400026BD400026BD400026B D400026BD400026BD400026BD400026BD4000000000000000000000000000000 0000000000000000000000000000336B96C62C9FF8FF04090C39000000000000 @@ -2634,105 +2762,105 @@ object MainForm: TMainForm 000000000000336B96C61C98F8FF1C98F8FF1C98F8FF1C98F8FF2C9FF8FF0202 031C00000000000000000000000000000000000000000819297012395CA62470 B5EA297FCAF7297FCAF7297FCAF7297FCAF7297FCAF7297FCAF7297FCAF7297F - CAF7297ECAF72779C0F10E2C4793000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000026BD400FFFFFF00FFFFFF00FFFF + CAF7297ECAF72779C0F10E2C47930000000000000000808080FF808080FF8080 + 80FF808080FF808080FF808080FF808080FF808080FF808080FF808080FF8080 + 80FF808080FF808080FF0000000000000000026BD400FFFFFF00FFFFFF00FFFF FF00FFFFFF00FFFFFF00F6FDFA00F6FDFA00F6FDFA00F9FFFE00F9FFFE00F9FF FE00F9FFFE00F9FFFE00F9FFFE00026BD4000000000000000000000000000000 0000263C4E8E1C98F8FF1C98F8FF1C98F8FF1C98F8FF1C98F8FF1C98F8FF3687 C5E300000000000000000000000000000000000000002872B0E6C3D4DDF0A4D9 F0FD9DDBF4FF95DAF3FF8DD8F3FF85D7F3FF7DD4F2FF77D3F2FF70D2F1FF6AD0 - F1FF67CFF1FFBFE8F6FE2C7DC0F0000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000069D000FFFFFF00FFFFFF00FFFF + F1FF67CFF1FFBFE8F6FE2C7DC0F00000000000000000808080FFC0C0C0FFFFFF + FFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFF + FFFFC0C0C0FF808080FF00000000000000000069D000FFFFFF00FFFFFF00FFFF FF00EEF0F000F6F6F600F6F6F600EEF3F100F9FFFE00F9FFFE00F1F6F500EEF3 F100F6FDFA00FFFFFF00FFFFFF00026BD4000000000000000000000000000000 0000000000001A364D8E1C98F8FF1C98F8FF1C98F8FF1C98F8FF2F84C5E30000 000000000000000000000000000000000000000000003089CCF7EFFAFEFFA0E9 F9FF90E5F8FF80E1F7FF70DEF6FF61DAF5FF52D7F4FF45D3F3FF37D0F2FF2CCD - F1FF24CBF0FFCAF2FBFF3089CCF7000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000026BD400FFFFFF00FFFFFF00CED2 + F1FF24CBF0FFCAF2FBFF3089CCF70000000000000000808080FFFFFFFFFFC0C0 + C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0 + C0FFFFFFFFFF808080FF0000000000000000026BD400FFFFFF00FFFFFF00CED2 D3006C7271007C818000DCDCDC00FFFFFF00F6FDFA00AAAFAD00636664007B80 7E00C8CFCC00FFFFFF00FFFFFF000069D0000000000000000000000000000000 000000000000000000001A364D8E1C98F8FF1C98F8FF3285C5E3000000000000 000000000000000000000000000000000000000000003291CEF8F2FAFDFFB2ED FAFFA3E9F9FF94E6F8FF84E2F7FF74DEF6FF63DBF5FF55D7F4FF47D4F3FF39D1 - F2FF2ECEF1FFCCF2FBFF308DCCF7000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000026BD400FFFFFF00C4C6C6006366 + F2FF2ECEF1FFCCF2FBFF308DCCF70000000000000000808080FFC0C0C0FFFFFF + FFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFF + FFFFC0C0C0FF808080FF0000000000000000026BD400FFFFFF00C4C6C6006366 6400787D7C008A8C8C00E9EEEC00DCDCDC00555757000D1210004E514F008A8C 8C0099999900D1D2D000F6FDFA00026BD4000202021CA8A6A5E3181817550000 00000202021C575655C6121212550C203071296696C60A0B0C39A5A4A3E30A0A 0A39000000000202021C777776E308080839000000003298D0F9F6FCFEFFC8F2 FCFFB8EFFBFFABECFAFF9BE8F9FF8AE3F7FF7AE0F6FF6ADCF6FF5BD9F5FF4DD6 - F4FF42D3F3FFD0F3FCFF3094CCF7000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000026BD400F6FDFA00999999004A4F + F4FF42D3F3FFD0F3FCFF3094CCF70000000000000000808080FFFFFFFFFFC0C0 + C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0 + C0FFFFFFFFFF808080FF0000000000000000026BD400F6FDFA00999999004A4F 4E00FFFFFF00FFFFFF00B2B4B4001E1E1E000000000073767400E4E5E300FFFF FF007C81800084848400E9EEEC00026BD400A3A2A1E3C0BDBCFFC4C2C1FF1818 1855737270E3656362FF706E6DFF07070739000000007A7978C6C0BDBCFFC7C4 C3FF181818556B6968E3656362FF757372FF00000000339FD1FAFEFFFFFFF8FD FFFFF6FDFFFFF5FCFFFFF3FCFEFFD8F6FCFF93E6F8FF84E3F7FF74DFF6FF66DB - F5FF5AD8F4FFD7F4FCFF3099CCF7000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000026BD400FFFFFF00E4E5E3009999 + F5FF5AD8F4FFD7F4FCFF3099CCF70000000000000000808080FFC0C0C0FFFFFF + FFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFF + FFFFC0C0C0FF808080FF0000000000000000026BD400FFFFFF00E4E5E3009999 9900848484006A6C6C001B1D1D0033333300BFC1C100E9EEEC0090979400666B 6A004A4F4E00A3A8A600F6F6F600026BD400403F3F8EC0BDBCFFC0BDBCFFA4A1 A1FF656362FF656362FF454444C60202021C0000000027262671C0BDBCFFC0BD BCFF9D9A99FF656362FF656362FF4D4C4CC60000000031A4D1FAE8F6FBFF93D4 EFFF87CEEEFF71C0E9FFC9E9F6FFF2FCFEFFF3FCFEFFF2FCFEFFF0FCFEFFEFFB - FEFFEEFBFEFFFEFFFFFF31A0CCF7000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000026BD400FFFFFF00FFFFFF00EEF0 + FEFFEEFBFEFFFEFFFFFF31A0CCF70000000000000000808080FFFFFFFFFFC0C0 + C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0 + C0FFFFFFFFFF808080FF0000000000000000026BD400FFFFFF00FFFFFF00EEF0 F0008A8C8C00575D5C008A8C8C00E9EEEC00FFFFFF00F1F6F500A3AAA7006C72 7100A3AAA700F1F6F500FFFFFF00026BD40000000000403F3F8EC4C2C1FFA29F 9EFF656362FF454444C60202021C000000000000000000000000403F3F8EC0BD BCFF9B9897FF656362FF4D4C4CC600000000000000002F98C4F2F1FAFDFF93DE F5FF92DCF4FF80D5F2FF68CAEDFF6ACBEAFF84D3EFFF7ED2EFFF78D0EFFF74CF - EEFF70CFEEFFE9F7FBFF2E9DC6F3000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000026BD400FFFFFF00FFFFFF00FFFF + EEFF70CFEEFFE9F7FBFF2E9DC6F30000000000000000808080FFC0C0C0FFFFFF + FFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFF + FFFFC0C0C0FF808080FF0000000000000000026BD400FFFFFF00FFFFFF00FFFF FF00F6F6F600E9EEEC00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00F6F6 F600FFFFFF00FFFFFF00FFFFFF00026BD400000000000000000027262671A29F 9EFF4D4C4CC60A0A0A390A0A0A3900000000000000000202021C07070739403F 3F8E9B9897FF4D4C4CC60000000000000000000000002D9AC1F0F7FCFEFF8DE4 F8FF90DEF5FF9EE0F5FFABE1F6FFEFFBFEFFF4FDFEFFF3FCFEFFF1FCFEFFEFFB - FEFFEEFBFEFFEEF1F3F9247896D4000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000026BD400FFFFFF00FFFFFF00FFFF + FEFFEEFBFEFFEEF1F3F9247896D40000000000000000808080FFFFFFFFFFC0C0 + C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0 + C0FFFFFFFFFF808080FF0000000000000000026BD400FFFFFF00FFFFFF00FFFF FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF FF00FFFFFF00FFFFFF00FFFFFF00026BD4000000000000000000000000003A3A 3A8E000000007A7978C6C4C2C1FF0A0A0A3900000000545352C6706E6DFF0202 021C3838388E0000000000000000000000000000000032A8CEF8FDFEFEFFFEFF FFFFFEFEFFFFFDFEFFFFFEFFFFFFEAF7FBFF65BDD9F963BCD7F863BCD7F863BC - D7F86FC0D8F7589DB2E105131856000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000026BD400FFFFFF00FFFFFF00F6FD + D7F86FC0D8F7589DB2E1051318560000000000000000808080FFC0C0C0FFFFFF + FFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFF + FFFFC0C0C0FF808080FF0000000000000000026BD400FFFFFF00FFFFFF00F6FD FA00F6FDFA00F6FDFA00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF FF00FFFFFF00FFFFFF00FFFFFF00026BD4000000000000000000000000000000 00004242428EC0BDBCFFC0BDBCFFC4C2C1FF757473E3656362FF656362FF6D6B 6AE30000000000000000000000000000000000000000227790D058B9D8FA5ABA D9FA5ABAD9FA5ABAD9FA59BAD9FA2C88A4DD000101160000000F0000000F0000 - 000F0000000F0000000F00000004000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000026BD400FFFFFF00FFFFFF00FFFF + 000F0000000F0000000F000000040000000000000000808080FFFFFFFFFFC0C0 + C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0 + C0FFFFFFFFFF808080FF0000000000000000026BD400FFFFFF00FFFFFF00FFFF FF00FFFFFF00FFFFFF00FFFFFF00F6FDFA00F6FDFA00F6FDFA00F6FDFA00F6FD FA00F6FDFA00F9FFFE00F9FFFE00026BD4000000000000000000000000000000 00000000000027262671C4C2C1FFC0BDBCFF827E7DFF656362FF4D4C4CC60000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000026BD400FFFFFF00FFFFFF00FFFF + 00000000000000000000000000000000000000000000808080FFC0C0C0FFFFFF + FFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFFFFFFC0C0C0FFFFFF + FFFFC0C0C0FF808080FF0000000000000000026BD400FFFFFF00FFFFFF00FFFF FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF FF00FFFFFF00FFFFFF00FFFFFF00026BD4000000000000000000000000000000 00000000000000000000403F3F8EC0BDBCFF7C7978FF636160E3000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000069D000026BD400026BD400026B + 00000000000000000000000000000000000000000000808080FF808080FF8080 + 80FF808080FF808080FF808080FF808080FF808080FF808080FF808080FF8080 + 80FF808080FF808080FF00000000000000000069D000026BD400026BD400026B D400026BD400026BD400026BD400026BD400026BD400026BD400026BD400026B D400026BD400026BD400026BD400026BD4000000000000000000000000000000 0000000000000000000000000000403F3F8E777675E30202021C000000000000 @@ -8245,7 +8373,7 @@ object MainForm: TMainForm 000000000000000000000000000000000000854F2FAAA46B43CEB1764ADEAE74 48DBAF7448DBAE7349DBA46A3FD054331B6E0603020800000000000000000000 000000000000000000000000000000000000424D3E000000000000003E000000 - 2800000040000000C00200000100010000000000001600000000000000000000 + 2800000040000000D00200000100010000000000801600000000000000000000 000000000000000000000000FFFFFF0000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 @@ -8423,6 +8551,10 @@ object MainForm: TMainForm 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 000000000000} end object PopupQueryLoad: TPopupMenu diff --git a/source/table_editor.pas b/source/table_editor.pas index 1f09db2a..5d2eaf55 100644 --- a/source/table_editor.pas +++ b/source/table_editor.pas @@ -893,6 +893,7 @@ var Col: PTableColumn; ImageIndex, X, Y, i: Integer; VT: TVirtualStringTree; + Checked: Boolean; begin VT := TVirtualStringTree(Sender); Col := Sender.GetNodeData(Node); @@ -919,10 +920,15 @@ begin // Paint checkbox image in certain columns // while restricting "Allow NULL" checkbox to numeric datatypes - if (Column in [4, 5, 6]) and CellEditingAllowed(Node, Column) then begin - if (Col.Unsigned and (Column=4)) or (Col.AllowNull and (Column=5)) or (Col.ZeroFill and (Column = 6)) then - ImageIndex := 128 - else ImageIndex := 127; + if (Column in [4, 5, 6]) then begin + Checked := (Col.Unsigned and (Column=4)) or (Col.AllowNull and (Column=5)) or (Col.ZeroFill and (Column = 6)); + if CellEditingAllowed(Node, Column) then begin + if Checked then ImageIndex := 128 + else ImageIndex := 127; + end else begin + if Checked then ImageIndex := 176 + else ImageIndex := 175; + end; X := CellRect.Left + (VT.Header.Columns[Column].Width div 2) - (VT.Images.Width div 2); VT.Images.Draw(TargetCanvas, X, Y, ImageIndex); end; @@ -969,7 +975,13 @@ begin // No editor for very first column and checkbox columns 0: Result := False; 3: Result := Col.DataType.HasLength; - 4,6: Result := (Col.DataType.Category in [dtcInteger, dtcReal]) and (DBObject.Connection.Parameters.NetTypeGroup = ngMySQL); + 4: begin + Result := (Col.DataType.Category in [dtcInteger, dtcReal]) and (DBObject.Connection.Parameters.NetTypeGroup = ngMySQL); + if (not Result) and Col.Unsigned then begin + Col.Unsigned := False; + Col.Status := esModified; + end; + end; 5: begin // Do not allow NULL, and force NOT NULL, on primary key columns Result := True; @@ -984,6 +996,13 @@ begin end; end; end; + 6: begin + Result := (Col.DataType.Category in [dtcInteger, dtcReal]) and (DBObject.Connection.Parameters.NetTypeGroup = ngMySQL); + if (not Result) and Col.ZeroFill then begin + Col.ZeroFill := False; + Col.Status := esModified; + end; + end; // No editing of collation allowed if "Convert data" was checked 9: Result := not chkCharsetConvert.Checked; else Result := True;