diff --git a/icons/arrow/arrow_divide24.png b/icons/arrow/arrow_divide24.png index e12b80c7..0f55c0b7 100644 Binary files a/icons/arrow/arrow_divide24.png and b/icons/arrow/arrow_divide24.png differ diff --git a/icons/arrow/arrow_join24.png b/icons/arrow/arrow_join24.png index 976797af..f719d786 100644 Binary files a/icons/arrow/arrow_join24.png and b/icons/arrow/arrow_join24.png differ diff --git a/icons/arrow/arrow_pen.png b/icons/arrow/arrow_pen.png deleted file mode 100644 index 2105335c..00000000 Binary files a/icons/arrow/arrow_pen.png and /dev/null differ diff --git a/icons/arrow/arrow_redo24.png b/icons/arrow/arrow_redo24.png index 0d02d2ab..ef1b640c 100644 Binary files a/icons/arrow/arrow_redo24.png and b/icons/arrow/arrow_redo24.png differ diff --git a/icons/arrow/arrow_undo24.png b/icons/arrow/arrow_undo24.png index 2a6c9bc5..5e11c1a9 100644 Binary files a/icons/arrow/arrow_undo24.png and b/icons/arrow/arrow_undo24.png differ diff --git a/icons/arrow/arrow_update24.png b/icons/arrow/arrow_update24.png index 92528386..c45aefd9 100644 Binary files a/icons/arrow/arrow_update24.png and b/icons/arrow/arrow_update24.png differ diff --git a/icons/arrow/go_down24.png b/icons/arrow/go_down24.png index 3b733e92..31ba62d8 100644 Binary files a/icons/arrow/go_down24.png and b/icons/arrow/go_down24.png differ diff --git a/icons/arrow/go_jump24.png b/icons/arrow/go_jump24.png index b978b800..c24aad18 100644 Binary files a/icons/arrow/go_jump24.png and b/icons/arrow/go_jump24.png differ diff --git a/icons/arrow/go_next24.png b/icons/arrow/go_next24.png index d9ce6b09..a50f8c17 100644 Binary files a/icons/arrow/go_next24.png and b/icons/arrow/go_next24.png differ diff --git a/icons/arrow/go_previous24.png b/icons/arrow/go_previous24.png index 3b9bde3c..d54f9a3b 100644 Binary files a/icons/arrow/go_previous24.png and b/icons/arrow/go_previous24.png differ diff --git a/icons/arrow/go_up24.png b/icons/arrow/go_up24.png index 6c830698..ad981fb5 100644 Binary files a/icons/arrow/go_up24.png and b/icons/arrow/go_up24.png differ diff --git a/icons/book/book24.png b/icons/book/book24.png index 7d2f9b73..4da91e8b 100644 Binary files a/icons/book/book24.png and b/icons/book/book24.png differ diff --git a/icons/book/book_add24.png b/icons/book/book_add24.png index fbbc884a..96795c62 100644 Binary files a/icons/book/book_add24.png and b/icons/book/book_add24.png differ diff --git a/icons/book/book_delete24.png b/icons/book/book_delete24.png index e529fa25..affe91cd 100644 Binary files a/icons/book/book_delete24.png and b/icons/book/book_delete24.png differ diff --git a/icons/book/book_edit24.png b/icons/book/book_edit24.png index 712aad23..f2acf218 100644 Binary files a/icons/book/book_edit24.png and b/icons/book/book_edit24.png differ diff --git a/icons/book/book_gey24.png b/icons/book/book_gey24.png index c888abac..8cfdebeb 100644 Binary files a/icons/book/book_gey24.png and b/icons/book/book_gey24.png differ diff --git a/icons/book/book_link24.png b/icons/book/book_link24.png index 99590def..02471c60 100644 Binary files a/icons/book/book_link24.png and b/icons/book/book_link24.png differ diff --git a/icons/book/book_open24.png b/icons/book/book_open24.png index 1b85cf5a..ed1bec7a 100644 Binary files a/icons/book/book_open24.png and b/icons/book/book_open24.png differ diff --git a/icons/bullet/bullet_black24.png b/icons/bullet/bullet_black24.png index dd106ee6..a8511bb1 100644 Binary files a/icons/bullet/bullet_black24.png and b/icons/bullet/bullet_black24.png differ diff --git a/icons/bullet/bullet_blue24.png b/icons/bullet/bullet_blue24.png index eeac61d7..245c5a9c 100644 Binary files a/icons/bullet/bullet_blue24.png and b/icons/bullet/bullet_blue24.png differ diff --git a/icons/bullet/bullet_green24.png b/icons/bullet/bullet_green24.png index 1f2da078..665237d6 100644 Binary files a/icons/bullet/bullet_green24.png and b/icons/bullet/bullet_green24.png differ diff --git a/icons/bullet/bullet_orange24.png b/icons/bullet/bullet_orange24.png index c7b858b7..4e8f11c5 100644 Binary files a/icons/bullet/bullet_orange24.png and b/icons/bullet/bullet_orange24.png differ diff --git a/icons/bullet/bullet_pink24.png b/icons/bullet/bullet_pink24.png index 88136425..daba3d3e 100644 Binary files a/icons/bullet/bullet_pink24.png and b/icons/bullet/bullet_pink24.png differ diff --git a/icons/bullet/bullet_purple24.png b/icons/bullet/bullet_purple24.png index 62d2490a..c5054334 100644 Binary files a/icons/bullet/bullet_purple24.png and b/icons/bullet/bullet_purple24.png differ diff --git a/icons/bullet/bullet_red24.png b/icons/bullet/bullet_red24.png index 03a5615f..094fccad 100644 Binary files a/icons/bullet/bullet_red24.png and b/icons/bullet/bullet_red24.png differ diff --git a/icons/bullet/bullet_star24.png b/icons/bullet/bullet_star24.png index 3d87b7f9..d828e763 100644 Binary files a/icons/bullet/bullet_star24.png and b/icons/bullet/bullet_star24.png differ diff --git a/icons/bullet/bullet_yellow24.png b/icons/bullet/bullet_yellow24.png index b4adf581..bac26449 100644 Binary files a/icons/bullet/bullet_yellow24.png and b/icons/bullet/bullet_yellow24.png differ diff --git a/icons/cog/cog24.png b/icons/cog/cog24.png index 4a5513ea..89860a94 100644 Binary files a/icons/cog/cog24.png and b/icons/cog/cog24.png differ diff --git a/icons/cog/cog_add24.png b/icons/cog/cog_add24.png index b045cc4f..8fa4ac0a 100644 Binary files a/icons/cog/cog_add24.png and b/icons/cog/cog_add24.png differ diff --git a/icons/cog/cog_delete24.png b/icons/cog/cog_delete24.png index f7524094..cf8d3e47 100644 Binary files a/icons/cog/cog_delete24.png and b/icons/cog/cog_delete24.png differ diff --git a/icons/cog/cog_edit24.png b/icons/cog/cog_edit24.png index 50d559ab..9a87b9cf 100644 Binary files a/icons/cog/cog_edit24.png and b/icons/cog/cog_edit24.png differ diff --git a/icons/cog/cog_go24.png b/icons/cog/cog_go24.png index 25b0a17a..98983e04 100644 Binary files a/icons/cog/cog_go24.png and b/icons/cog/cog_go24.png differ diff --git a/icons/cog/wrench24.png b/icons/cog/wrench24.png index 9f0c2fd0..1eab9b9a 100644 Binary files a/icons/cog/wrench24.png and b/icons/cog/wrench24.png differ diff --git a/icons/cog/wrench_orange24.png b/icons/cog/wrench_orange24.png index 07315c55..12e95d82 100644 Binary files a/icons/cog/wrench_orange24.png and b/icons/cog/wrench_orange24.png differ diff --git a/icons/disk/disk24.png b/icons/disk/disk24.png index c203e2c5..7dea5637 100644 Binary files a/icons/disk/disk24.png and b/icons/disk/disk24.png differ diff --git a/icons/disk/disk_multiple24.png b/icons/disk/disk_multiple24.png index 82d17283..651cae74 100644 Binary files a/icons/disk/disk_multiple24.png and b/icons/disk/disk_multiple24.png differ diff --git a/icons/disk/disk_pen24.png b/icons/disk/disk_pen24.png index e8ded0ee..58d05776 100644 Binary files a/icons/disk/disk_pen24.png and b/icons/disk/disk_pen24.png differ diff --git a/icons/file/document24.png b/icons/file/document24.png index 1b3f1ce1..d6b297aa 100644 Binary files a/icons/file/document24.png and b/icons/file/document24.png differ diff --git a/icons/file/document_add24.png b/icons/file/document_add24.png index c86e019f..928f5496 100644 Binary files a/icons/file/document_add24.png and b/icons/file/document_add24.png differ diff --git a/icons/file/document_all24.png b/icons/file/document_all24.png index 99a4f1c4..58420d85 100644 Binary files a/icons/file/document_all24.png and b/icons/file/document_all24.png differ diff --git a/icons/file/document_back24.png b/icons/file/document_back24.png index 9eed9b48..37cdc478 100644 Binary files a/icons/file/document_back24.png and b/icons/file/document_back24.png differ diff --git a/icons/file/document_delete24.png b/icons/file/document_delete24.png index e909091e..dd9befec 100644 Binary files a/icons/file/document_delete24.png and b/icons/file/document_delete24.png differ diff --git a/icons/file/document_next24.png b/icons/file/document_next24.png index 0cf70d58..f4a08528 100644 Binary files a/icons/file/document_next24.png and b/icons/file/document_next24.png differ diff --git a/icons/file/document_plus24.png b/icons/file/document_plus24.png index 41ed4e29..4f14ba86 100644 Binary files a/icons/file/document_plus24.png and b/icons/file/document_plus24.png differ diff --git a/icons/file/page_text.png b/icons/file/page_text.png new file mode 100644 index 00000000..eb9bf1ac Binary files /dev/null and b/icons/file/page_text.png differ diff --git a/icons/file/page_text24.png b/icons/file/page_text24.png new file mode 100644 index 00000000..6239c95c Binary files /dev/null and b/icons/file/page_text24.png differ diff --git a/icons/file/page_text32.png b/icons/file/page_text32.png new file mode 100644 index 00000000..d0ba55a8 Binary files /dev/null and b/icons/file/page_text32.png differ diff --git a/icons/file/script_gear24.png b/icons/file/script_gear24.png index 2fd15dff..16ea787c 100644 Binary files a/icons/file/script_gear24.png and b/icons/file/script_gear24.png differ diff --git a/icons/folder/folder24.png b/icons/folder/folder24.png index 8d372aaa..96a26588 100644 Binary files a/icons/folder/folder24.png and b/icons/folder/folder24.png differ diff --git a/icons/folder/folder_add24.png b/icons/folder/folder_add24.png index 796cfd15..cdc2a867 100644 Binary files a/icons/folder/folder_add24.png and b/icons/folder/folder_add24.png differ diff --git a/icons/folder/folder_brick24.png b/icons/folder/folder_brick24.png index 75372c77..82206a65 100644 Binary files a/icons/folder/folder_brick24.png and b/icons/folder/folder_brick24.png differ diff --git a/icons/folder/folder_delete24.png b/icons/folder/folder_delete24.png index 3512b4f0..cbdbdb15 100644 Binary files a/icons/folder/folder_delete24.png and b/icons/folder/folder_delete24.png differ diff --git a/icons/folder/folder_go24.png b/icons/folder/folder_go24.png index fb3f5e9d..da4d1407 100644 Binary files a/icons/folder/folder_go24.png and b/icons/folder/folder_go24.png differ diff --git a/icons/folder/folder_star24.png b/icons/folder/folder_star24.png index abb270c9..fe4300ff 100644 Binary files a/icons/folder/folder_star24.png and b/icons/folder/folder_star24.png differ diff --git a/icons/link/link24.png b/icons/link/link24.png index 6fe41b33..a3064a2a 100644 Binary files a/icons/link/link24.png and b/icons/link/link24.png differ diff --git a/icons/link/link_break24.png b/icons/link/link_break24.png index ab6867f7..490d28ce 100644 Binary files a/icons/link/link_break24.png and b/icons/link/link_break24.png differ diff --git a/icons/link/link_edit24.png b/icons/link/link_edit24.png index 427e4f22..beb3983f 100644 Binary files a/icons/link/link_edit24.png and b/icons/link/link_edit24.png differ diff --git a/icons/other/accept24.png b/icons/other/accept24.png index 5b8cf804..88a3b034 100644 Binary files a/icons/other/accept24.png and b/icons/other/accept24.png differ diff --git a/icons/other/bricks24.png b/icons/other/bricks24.png index 273cd99e..d7c2f020 100644 Binary files a/icons/other/bricks24.png and b/icons/other/bricks24.png differ diff --git a/icons/other/camera_add24.png b/icons/other/camera_add24.png index 1867f8db..3995840e 100644 Binary files a/icons/other/camera_add24.png and b/icons/other/camera_add24.png differ diff --git a/icons/other/camera_go24.png b/icons/other/camera_go24.png index 488e6478..5fd228a2 100644 Binary files a/icons/other/camera_go24.png and b/icons/other/camera_go24.png differ diff --git a/icons/other/cancel24.png b/icons/other/cancel24.png index e964fc64..fe26585e 100644 Binary files a/icons/other/cancel24.png and b/icons/other/cancel24.png differ diff --git a/icons/other/case24.png b/icons/other/case24.png index d9598c1d..bb9fd671 100644 Binary files a/icons/other/case24.png and b/icons/other/case24.png differ diff --git a/icons/other/clean24.png b/icons/other/clean24.png index 68da2ed2..f81beaca 100644 Binary files a/icons/other/clean24.png and b/icons/other/clean24.png differ diff --git a/icons/other/copy24.png b/icons/other/copy24.png index 30dc556d..df8e93b8 100644 Binary files a/icons/other/copy24.png and b/icons/other/copy24.png differ diff --git a/icons/other/cut24.png b/icons/other/cut24.png index 8b0e8052..d6544c9c 100644 Binary files a/icons/other/cut24.png and b/icons/other/cut24.png differ diff --git a/icons/other/dub24.png b/icons/other/dub24.png index 4f48a72d..b8f42040 100644 Binary files a/icons/other/dub24.png and b/icons/other/dub24.png differ diff --git a/icons/other/filter_clear.png b/icons/other/filter_clear.png new file mode 100644 index 00000000..8ace7d77 Binary files /dev/null and b/icons/other/filter_clear.png differ diff --git a/icons/other/filter_clear24.png b/icons/other/filter_clear24.png new file mode 100644 index 00000000..51690184 Binary files /dev/null and b/icons/other/filter_clear24.png differ diff --git a/icons/other/filter_clear32.png b/icons/other/filter_clear32.png new file mode 100644 index 00000000..a29aea63 Binary files /dev/null and b/icons/other/filter_clear32.png differ diff --git a/icons/other/find.png b/icons/other/find.png new file mode 100644 index 00000000..1d6f4f13 Binary files /dev/null and b/icons/other/find.png differ diff --git a/icons/other/find24.png b/icons/other/find24.png new file mode 100644 index 00000000..6927f674 Binary files /dev/null and b/icons/other/find24.png differ diff --git a/icons/other/find32.png b/icons/other/find32.png new file mode 100644 index 00000000..790c54a2 Binary files /dev/null and b/icons/other/find32.png differ diff --git a/icons/other/flash24.png b/icons/other/flash24.png index 6c84de8d..ad094fc6 100644 Binary files a/icons/other/flash24.png and b/icons/other/flash24.png differ diff --git a/icons/other/information24.png b/icons/other/information24.png index d7735377..bffae1d1 100644 Binary files a/icons/other/information24.png and b/icons/other/information24.png differ diff --git a/icons/other/list.png b/icons/other/list.png index 663cbadd..cd091db3 100644 Binary files a/icons/other/list.png and b/icons/other/list.png differ diff --git a/icons/other/list24.png b/icons/other/list24.png new file mode 100644 index 00000000..5a9b70d0 Binary files /dev/null and b/icons/other/list24.png differ diff --git a/icons/other/list32.png b/icons/other/list32.png new file mode 100644 index 00000000..7db7b98c Binary files /dev/null and b/icons/other/list32.png differ diff --git a/icons/other/package_add24.png b/icons/other/package_add24.png index f4e58cd0..f74ea86a 100644 Binary files a/icons/other/package_add24.png and b/icons/other/package_add24.png differ diff --git a/icons/other/package_delete24.png b/icons/other/package_delete24.png index 1d7ab255..680e0736 100644 Binary files a/icons/other/package_delete24.png and b/icons/other/package_delete24.png differ diff --git a/icons/other/paste24.png b/icons/other/paste24.png index 59cb2357..e191ed1a 100644 Binary files a/icons/other/paste24.png and b/icons/other/paste24.png differ diff --git a/icons/other/pause24.png b/icons/other/pause24.png index f39aefec..72a34928 100644 Binary files a/icons/other/pause24.png and b/icons/other/pause24.png differ diff --git a/icons/other/pencil24.png b/icons/other/pencil24.png index 188d1bee..bdec8cb6 100644 Binary files a/icons/other/pencil24.png and b/icons/other/pencil24.png differ diff --git a/icons/other/pencil_delete24.png b/icons/other/pencil_delete24.png index a81f5a03..ad4c620d 100644 Binary files a/icons/other/pencil_delete24.png and b/icons/other/pencil_delete24.png differ diff --git a/icons/other/pencil_go24.png b/icons/other/pencil_go24.png index efc1e1fa..c1e31453 100644 Binary files a/icons/other/pencil_go24.png and b/icons/other/pencil_go24.png differ diff --git a/icons/other/play24.png b/icons/other/play24.png index ab46e0da..b3e8c535 100644 Binary files a/icons/other/play24.png and b/icons/other/play24.png differ diff --git a/icons/other/power24.png b/icons/other/power24.png index 2b5d83ec..c375b21c 100644 Binary files a/icons/other/power24.png and b/icons/other/power24.png differ diff --git a/icons/other/processor24.png b/icons/other/processor24.png index c7244e11..f9f26caf 100644 Binary files a/icons/other/processor24.png and b/icons/other/processor24.png differ diff --git a/icons/other/script_bricks24.png b/icons/other/script_bricks24.png index 52dca7fc..6960c4ca 100644 Binary files a/icons/other/script_bricks24.png and b/icons/other/script_bricks24.png differ diff --git a/icons/other/sort_az24.png b/icons/other/sort_az24.png index e88a2dc4..91f2f700 100644 Binary files a/icons/other/sort_az24.png and b/icons/other/sort_az24.png differ diff --git a/icons/other/splitter24.png b/icons/other/splitter24.png index 4a2d1f1c..fa8a4a48 100644 Binary files a/icons/other/splitter24.png and b/icons/other/splitter24.png differ diff --git a/icons/other/step24.png b/icons/other/step24.png index 30293b4d..be65ab1e 100644 Binary files a/icons/other/step24.png and b/icons/other/step24.png differ diff --git a/icons/other/stop24.png b/icons/other/stop24.png index 1e34f7c3..621042a0 100644 Binary files a/icons/other/stop24.png and b/icons/other/stop24.png differ diff --git a/icons/other/tag_purple24.png b/icons/other/tag_purple24.png new file mode 100644 index 00000000..777889ce Binary files /dev/null and b/icons/other/tag_purple24.png differ diff --git a/icons/other/tag_purple32.png b/icons/other/tag_purple32.png new file mode 100644 index 00000000..d0797201 Binary files /dev/null and b/icons/other/tag_purple32.png differ diff --git a/icons/other/text_replace.png b/icons/other/text_replace.png new file mode 100644 index 00000000..877f82fe Binary files /dev/null and b/icons/other/text_replace.png differ diff --git a/icons/other/text_replace24.png b/icons/other/text_replace24.png new file mode 100644 index 00000000..db27f6c5 Binary files /dev/null and b/icons/other/text_replace24.png differ diff --git a/icons/other/text_replace32.png b/icons/other/text_replace32.png new file mode 100644 index 00000000..5bdfcb1a Binary files /dev/null and b/icons/other/text_replace32.png differ diff --git a/icons/other/textfield_add24.png b/icons/other/textfield_add24.png index fc5af384..6fb7f736 100644 Binary files a/icons/other/textfield_add24.png and b/icons/other/textfield_add24.png differ diff --git a/icons/other/textfield_delete24.png b/icons/other/textfield_delete24.png index cfd8e5d8..23e3b81d 100644 Binary files a/icons/other/textfield_delete24.png and b/icons/other/textfield_delete24.png differ diff --git a/icons/other/tree_list24.png b/icons/other/tree_list24.png index 14003237..6e5236a4 100644 Binary files a/icons/other/tree_list24.png and b/icons/other/tree_list24.png differ diff --git a/icons/other/warn_red24.png b/icons/other/warn_red24.png index 47512a0d..20f6e1e0 100644 Binary files a/icons/other/warn_red24.png and b/icons/other/warn_red24.png differ diff --git a/icons/other/warning24.png b/icons/other/warning24.png index 7711f6f7..d3586a24 100644 Binary files a/icons/other/warning24.png and b/icons/other/warning24.png differ diff --git a/icons/window/application24.png b/icons/window/application24.png index 254269e0..d10ee8d0 100644 Binary files a/icons/window/application24.png and b/icons/window/application24.png differ diff --git a/icons/window/application_add24.png b/icons/window/application_add24.png index 9001f988..627bebde 100644 Binary files a/icons/window/application_add24.png and b/icons/window/application_add24.png differ diff --git a/icons/window/application_delete24.png b/icons/window/application_delete24.png index e2cdd84c..ca9a66c5 100644 Binary files a/icons/window/application_delete24.png and b/icons/window/application_delete24.png differ diff --git a/icons/window/application_double24.png b/icons/window/application_double24.png index 3d49cef0..3e55494b 100644 Binary files a/icons/window/application_double24.png and b/icons/window/application_double24.png differ diff --git a/icons/window/application_edit24.png b/icons/window/application_edit24.png index afc0ed0e..889ca704 100644 Binary files a/icons/window/application_edit24.png and b/icons/window/application_edit24.png differ diff --git a/icons/window/application_flash24.png b/icons/window/application_flash24.png index c4cd04b9..d98b8fa7 100644 Binary files a/icons/window/application_flash24.png and b/icons/window/application_flash24.png differ diff --git a/icons/window/application_go24.png b/icons/window/application_go24.png index eab87fc6..9140fc36 100644 Binary files a/icons/window/application_go24.png and b/icons/window/application_go24.png differ diff --git a/icons/window/layout24.png b/icons/window/layout24.png index 70e5c1eb..8d5eb434 100644 Binary files a/icons/window/layout24.png and b/icons/window/layout24.png differ diff --git a/icons/window/layout_add24.png b/icons/window/layout_add24.png index 45fa3097..d6e5c8c9 100644 Binary files a/icons/window/layout_add24.png and b/icons/window/layout_add24.png differ diff --git a/icons/window/watch_window24.png b/icons/window/watch_window24.png index 0d3803b4..ba935f20 100644 Binary files a/icons/window/watch_window24.png and b/icons/window/watch_window24.png differ diff --git a/lazproj/coedit.lpi b/lazproj/coedit.lpi index fd33b01f..dd800954 100644 --- a/lazproj/coedit.lpi +++ b/lazproj/coedit.lpi @@ -13,301 +13,316 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ce_ceprojeditor.pas b/src/ce_ceprojeditor.pas index 9b524c32..d83bd413 100644 --- a/src/ce_ceprojeditor.pas +++ b/src/ce_ceprojeditor.pas @@ -65,7 +65,7 @@ implementation constructor TCEProjectConfigurationWidget.create(aOwner: TComponent); begin inherited; - // + fSynchroItem := TStringList.Create; fSynchroValue := TStringList.Create; Tree.Selected := Tree.Items.GetLastNode; @@ -73,7 +73,8 @@ begin inspector.CheckboxForBoolean := true; inspector.PropertyEditorHook.AddHandlerModified(@inspectorModified); inspector.DefaultItemHeight:= scaleY(22, 96); - // + selConf.BorderSpacing.Left:= scaleX(114, 96); + EntitiesConnector.addObserver(self); end; diff --git a/src/ce_dfmt.pas b/src/ce_dfmt.pas index b003d497..c72faad1 100644 --- a/src/ce_dfmt.pas +++ b/src/ce_dfmt.pas @@ -102,16 +102,31 @@ begin toolbarVisible:=false; fDmtWrapper := TCEDmtWrapper.Create(self); fBackup := TStringList.Create; - // + fname := getCoeditDocPath + optFname; if fname.fileExists then fDmtWrapper.loadFromFile(fname); - // + btnCancel.OnClick := @doCancel; btnApply.OnClick := @doApply; - AssignPng(btnCancel, 'CANCEL'); - AssignPng(btnApply, 'ACCEPT'); - // + case GetIconScaledSize of + iss16: + begin + AssignPng(btnCancel, 'CANCEL'); + AssignPng(btnApply, 'ACCEPT'); + end; + iss24: + begin + AssignPng(btnCancel, 'CANCEL24'); + AssignPng(btnApply, 'ACCEPT24'); + end; + iss32: + begin + AssignPng(btnCancel, 'CANCEL32'); + AssignPng(btnApply, 'ACCEPT32'); + end; + end; + dfmtOptionEditor.TIObject := fDmtWrapper; end; diff --git a/src/ce_gdb.lfm b/src/ce_gdb.lfm index 7b12a5e4..60943215 100644 --- a/src/ce_gdb.lfm +++ b/src/ce_gdb.lfm @@ -21,28 +21,28 @@ inherited CEGdbWidget: TCEGdbWidget ClientWidth = 517 object Panel1: TPanel[0] Left = 0 - Height = 388 + Height = 386 Top = 205 Width = 517 Align = alClient AutoSize = True BevelOuter = bvNone - ClientHeight = 388 + ClientHeight = 386 ClientWidth = 517 TabOrder = 0 object GroupBox3: TGroupBox Left = 0 - Height = 182 + Height = 180 Top = 206 Width = 517 Align = alClient Caption = 'CPU' - ClientHeight = 163 + ClientHeight = 161 ClientWidth = 513 TabOrder = 0 object cpuViewer: TTIPropertyGrid Left = 0 - Height = 163 + Height = 161 Hint = 'cpu registers' Top = 0 Width = 513 @@ -78,13 +78,13 @@ inherited CEGdbWidget: TCEGdbWidget OnChange = PageControl2Change object TabSheet3: TTabSheet Caption = 'Variables' - ClientHeight = 169 - ClientWidth = 513 + ClientHeight = 165 + ClientWidth = 511 object lstVariables: TListView Left = 2 - Height = 138 - Top = 29 - Width = 509 + Height = 132 + Top = 31 + Width = 507 Align = alClient AutoWidthLastColumn = True BorderSpacing.Around = 2 @@ -96,7 +96,7 @@ inherited CEGdbWidget: TCEGdbWidget end item Caption = 'value' - Width = 460 + Width = 458 end> GridLines = True HideSelection = False @@ -109,10 +109,10 @@ inherited CEGdbWidget: TCEGdbWidget end object varListFlt: TListViewFilterEdit Left = 2 - Height = 25 + Height = 27 Hint = 'locate variables' Top = 2 - Width = 509 + Width = 507 ButtonWidth = 24 NumGlyphs = 1 Align = alTop @@ -124,13 +124,13 @@ inherited CEGdbWidget: TCEGdbWidget end object TabSheet4: TTabSheet Caption = 'Assembler' - ClientHeight = 169 - ClientWidth = 513 + ClientHeight = 165 + ClientWidth = 511 object lstAsm: TListView Left = 2 - Height = 160 + Height = 161 Top = 2 - Width = 505 + Width = 507 Align = alClient AutoSort = False AutoWidthLastColumn = True @@ -143,7 +143,7 @@ inherited CEGdbWidget: TCEGdbWidget end item Caption = 'instruction' - Width = 442 + Width = 444 end> GridLines = True HideSelection = False @@ -158,19 +158,19 @@ inherited CEGdbWidget: TCEGdbWidget end object Panel3: TPanel[1] Left = 4 - Height = 27 - Top = 597 + Height = 29 + Top = 595 Width = 509 Align = alBottom AutoSize = True BorderSpacing.Around = 4 BevelOuter = bvNone - ClientHeight = 27 + ClientHeight = 29 ClientWidth = 509 TabOrder = 1 object btnSendCom: TSpeedButton Left = 504 - Height = 25 + Height = 27 Top = 1 Width = 4 Align = alRight @@ -180,7 +180,7 @@ inherited CEGdbWidget: TCEGdbWidget end object Edit1: TComboBox Left = 0 - Height = 27 + Height = 29 Hint = 'enter a custom GDB command or the program input with ">"' Top = 0 Width = 503 @@ -214,14 +214,14 @@ inherited CEGdbWidget: TCEGdbWidget TabOrder = 3 object TabSheet1: TTabSheet Caption = 'Call stack' - ClientHeight = 169 - ClientWidth = 513 + ClientHeight = 165 + ClientWidth = 511 object lstCallStack: TListView Left = 0 - Height = 169 + Height = 165 Hint = 'call stack' Top = 0 - Width = 513 + Width = 511 Align = alClient AutoSort = False Columns = < @@ -251,8 +251,8 @@ inherited CEGdbWidget: TCEGdbWidget end object TabSheet2: TTabSheet Caption = 'Thread list' - ClientHeight = 169 - ClientWidth = 513 + ClientHeight = 165 + ClientWidth = 511 object lstThreads: TListView Left = 0 Height = 169 @@ -307,8 +307,8 @@ inherited CEGdbWidget: TCEGdbWidget end object TabSheet5: TTabSheet Caption = 'Debugee options' - ClientHeight = 169 - ClientWidth = 513 + ClientHeight = 165 + ClientWidth = 511 object dbgeeOptsEd: TTIPropertyGrid Left = 2 Height = 165 diff --git a/src/ce_gdb.pas b/src/ce_gdb.pas index 0207e894..ca7a56f3 100644 --- a/src/ce_gdb.pas +++ b/src/ce_gdb.pas @@ -1196,8 +1196,25 @@ begin cpuViewer.DefaultItemHeight := scaleY(22, 96); + Case GetIconScaledSize of + iss16: + begin + AssignPng(btnSendCom, 'ACCEPT'); + AssignPng(varListFlt.Glyph, 'FILTER_CLEAR'); + end; + iss24: + begin + AssignPng(btnSendCom, 'ACCEPT24'); + AssignPng(varListFlt.Glyph, 'FILTER_CLEAR24'); + end; + iss32: + begin + AssignPng(btnSendCom, 'ACCEPT32'); + AssignPng(varListFlt.Glyph, 'FILTER_CLEAR32'); + end; + end; + updateMenu; - AssignPng(btnSendCom, 'ACCEPT'); updateButtonsState; end; diff --git a/src/ce_libmaneditor.pas b/src/ce_libmaneditor.pas index fad1b47d..5241c9d4 100644 --- a/src/ce_libmaneditor.pas +++ b/src/ce_libmaneditor.pas @@ -203,11 +203,14 @@ var bno: TBitBtn; bww: TBitBtn; bsv: TSpeedButton; + ics: TIconScaledSize; begin inherited; - width := 400; - height := 34; + ics := GetIconScaledSize; + + width := ScaleX(400,96); + height := ScaleY(34,96); BorderStyle:= bsToolWindow; caption := 'Select or type the DUB package name'; Position:= poMainFormCenter; @@ -221,11 +224,12 @@ begin cbb.ShowHint:=true; cbb.OnSelect:= @updateHint; cbb.OnCloseUp:=@updateHint; + cbb.AutoSize:=true; bsv := TSpeedButton.Create(self); bsv.Parent := self; bsv.Align := alRight; - bsv.Width:= 28; + bsv.AutoSize:= true; bsv.BorderSpacing.Around := 4; bsv.ShowHint := true; bsv.Hint := 'get latest tag, by default get master'; @@ -235,43 +239,61 @@ begin bsv.Layout:= blGlyphTop; bsv.Spacing:= 2; bsv.Down:=fGetLatestTag; - AssignPng(bsv, 'TAG_PURPLE'); + case ics of + iss16: AssignPng(bsv, 'TAG_PURPLE'); + iss24: AssignPng(bsv, 'TAG_PURPLE24'); + iss32: AssignPng(bsv, 'TAG_PURPLE32'); + end; + bww := TBitBtn.Create(self); bww.Parent := self; bww.Align := alRight; - bww.Width:= 28; + bww.AutoSize:=true; bww.BorderSpacing.Around := 4; bww.ShowHint := true; bww.Hint := 'get the package list'; bww.OnClick:= @getList; bww.Layout:= blGlyphTop; bww.Spacing:= 2; - AssignPng(bww, 'ARROW_UPDATE'); + case ics of + iss16: AssignPng(bww, 'ARROW_UPDATE'); + iss24: AssignPng(bww, 'ARROW_UPDATE24'); + iss32: AssignPng(bww, 'ARROW_UPDATE32'); + end; bok := TBitBtn.Create(self); bok.Parent := self; bok.ModalResult:= mrOk; bok.Align := alRight; - bok.Width := 28; + bok.AutoSize:=true; bok.BorderSpacing.Around := 4; bok.Hint := 'try to fetch, compile and auto-register'; bok.ShowHint := true; bok.Layout:= blGlyphTop; bok.Spacing:= 2; - AssignPng(bok, 'ACCEPT'); + case ics of + iss16: AssignPng(bok, 'ACCEPT'); + iss24: AssignPng(bok, 'ACCEPT24'); + iss32: AssignPng(bok, 'ACCEPT32'); + end; bno := TBitBtn.Create(self); bno.Parent := self; bno.ModalResult:= mrCancel; bno.Align := alRight; - bno.Width:= 28; + bno.AutoSize:=true; bno.BorderSpacing.Around := 4; bno.Hint := 'cancel and do nothing'; bno.ShowHint := true; bno.Layout:= blGlyphTop; bno.Spacing:= 2; - AssignPng(bno, 'CANCEL'); + case ics of + iss16: AssignPng(bno, 'CANCEL'); + iss24: AssignPng(bno, 'CANCEL24'); + iss32: AssignPng(bno, 'CANCEL32'); + end; + fillList; end; diff --git a/src/ce_messages.pas b/src/ce_messages.pas index 968f039d..03a5657d 100644 --- a/src/ce_messages.pas +++ b/src/ce_messages.pas @@ -345,7 +345,7 @@ begin fMaxMessCnt := 500; fAutoSelect := true; fCtxt := amcAll; - // + fActAutoSel := TAction.Create(self); fActAutoSel.Caption := 'Auto select message category'; fActAutoSel.AutoCheck := true; @@ -368,25 +368,31 @@ begin fActDemangle := TAction.Create(self); fActDemangle.OnExecute := @actDemangleExecute; fActDemangle.caption := 'Demangle selection'; - // + inherited; - // + + Case GetIconScaledSize of + iss16: AssignPng(TreeFilterEdit1.Glyph, 'FILTER_CLEAR'); + iss24: AssignPng(TreeFilterEdit1.Glyph, 'FILTER_CLEAR24'); + iss32: AssignPng(TreeFilterEdit1.Glyph, 'FILTER_CLEAR32'); + end; + fMsgColors[amkBub] := $FCE7D2; fMsgColors[amkWarn] := $B3FFFF; fMsgColors[amkErr] := $BDBDFF; fMsgColors[amkInf] := $FFD0A8; fMsgColors[amkHint] := $C2FFC2; - // + updaterByLoopInterval := 12; fOptions := TCEMessagesOptions.Create(Self); fOptions.assign(self); fOptions.Name:= 'messageOptions'; fOptionsBackup := TCEMessagesOptions.Create(Self); - // + List.PopupMenu := contextMenu; List.OnDeletion := @ListDeletion; List.OnDblClick := @handleMessageClick; - // + btnSelProj.OnClick := @selCtxtClick; btnSelMisc.OnClick := @selCtxtClick; btnSelEdit.OnClick := @selCtxtClick; @@ -397,18 +403,18 @@ begin fBtns[amcEdit]:= btnSelEdit; fBtns[amcMisc]:= btnSelMisc; fBtns[amcProj]:= btnSelProj; - // + btnClearCat.OnClick := @actClearCurCatExecute; - // + fEditorMessagePos := TCEEditorMessagePos.Create; - // + fname := getCoeditDocPath + optname; if fname.fileExists then begin fOptions.loadFromFile(fname); fOptions.AssignTo(self); end; - // + EntitiesConnector.addObserver(self); EntitiesConnector.addSingleService(self); end; diff --git a/src/ce_miniexplorer.lfm b/src/ce_miniexplorer.lfm index 56e00e20..3ae014a8 100644 --- a/src/ce_miniexplorer.lfm +++ b/src/ce_miniexplorer.lfm @@ -34,7 +34,6 @@ inherited CEMiniExplorerWidget: TCEMiniExplorerWidget ReadOnly = True ScrollBars = ssAutoBoth ShowColumnHeaders = False - SmallImages = imgList TabOrder = 0 ViewStyle = vsReport OnEnter = lstFavEnter @@ -65,7 +64,6 @@ inherited CEMiniExplorerWidget: TCEMiniExplorerWidget Top = 0 Width = 335 Align = alTop - Images = imgList ReadOnly = True ScrollBars = ssAutoBoth TabOrder = 0 @@ -97,7 +95,6 @@ inherited CEMiniExplorerWidget: TCEMiniExplorerWidget ReadOnly = True ScrollBars = ssAutoBoth ShowColumnHeaders = False - SmallImages = imgList TabOrder = 2 ViewStyle = vsReport OnDblClick = lstFilesDblClick @@ -167,174 +164,7 @@ inherited CEMiniExplorerWidget: TCEMiniExplorerWidget end end inherited contextMenu: TPopupMenu - left = 8 - top = 24 - end - object imgList: TImageList[2] - left = 40 - top = 8 - Bitmap = { - 4C69050000001000000010000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00B2B2B2B0AFAFAFFFADADADFFADADADFFADADADFFAEAE - AEFFAEAEAEFFB0B0B0AC00000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00AEAEAEFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE0E0 - E0FFFFFFFFFFEBEBEBFFB0B0B0ACFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00ADADADFFFFFFFFFFE0E0E0FFE0E0E0FFFFFFFFFFA5A5 - A5FFF3F3F3FFFFFFFFFFAEAEAEFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00ADADADFFFFFFFFFFE5E5E5FFE5E5E5FFFFFFFFFFBCBC - BCFFA5A5A5FFE0E0E0FFAEAEAEFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00ACACACFFFFFFFFFFEBEBEBFFEAEAEAFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFADADADFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00ACACACFFFFFFFFFFEFEFEFFFEFEFEFFFEEEEEEFFEEEE - EEFFEFEFEFFFFFFFFFFFACACACFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00ACACACFFFFFFFFFFF5F5F5FFF5F5F5FFF5F5F5FFF5F5 - F5FFF5F5F5FFFFFFFFFFACACACFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00ADADADFFFFFFFFFFFBFBFBFFFAFAFAFFFAFAFAFFFAFA - FAFFFBFBFBFFFFFFFFFFADADADFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00AFAFAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFAFAFAFFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00B0B0B0F2AEAEAEFFADADADFFACACACFFACACACFFACAC - ACFFADADADFFAEAEAEFFA3A3A3C0FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF0000000030000000330000003300000033000000330000 - 0033000000330000003300000023FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF004398D2B03D94D0FF3A92CFFF3A92CFFF3D94 - D0FF4197D1D24398D2004498D2004498D2004498D2004498D2004499D2004499 - D300459AD300469AD300469AD3003D94D0FFDCFCFFFFD8F7FFFFD8F7FFFFDBFA - FFFF358ECDFF3991CEFF3A92CFFF3A92CFFF3A92CFFF3A92CFFF3B92CFFF3D94 - D0FF4398D2D7469AD300469AD3003B92CFFFD5F7FFFF60D1F9FF61D0F8FFB4EB - FDFFD9F6FFFFDAF8FFFFDAF8FFFFDBF9FFFFDCFAFFFFDCFAFFFFDCFBFFFFE0FF - FFFF3E95D0FF4599D333469AD3003B92CFFFCAF6FFFF69D5F9FF6CD5F9FF6BD5 - F9FF69D5F9FF69D5FAFF6AD7FBFF68D4FAFF5EC7F1FF5EC7F2FF5DC8F2FFB4E3 - F8FF3D94D0FF3F8FC669469AD3003C92CFFFC0F3FFFF71DAFBFF74DBFBFF75DB - FCFF75DBFCFF76DCFCFF73DAFAFF449CD4FF378CCBFF368CCBFF358CCCFF348D - CCFF3890CEFF3D94D0FF4398D2EB3D92CFFFB9F4FFFF73DBFBFF6BCCF2FF6CCD - F3FF6CCEF3FF6DCEF3FF479CD4FF56BAE9FFDAF8FFFFD7F6FFFFD6F6FFFFD5F6 - FFFFD5F7FFFFDBFCFFFF3E94D0FF3E94D0FFABF0FFFF449DD6FF368CCBFF368C - CBFF368CCBFF378BCBFF5CBEEAFF6FD9FBFF6AD6FAFF68D5F9FF67D4F9FF66D4 - F9FF82DEFCFFAAE0F6FF3885BCB94095D0FF8AD7F5FF44A1D8FFDDFDFFFFDAFA - FFFFDBFAFFFFDEFAFFFF74DCFCFF76DBFAFF75DAFAFF74DAFAFF74DAFAFF72D9 - FAFFA1E8FFFF7CBFE6FF306F9C5E4296D1FF6BBEE8FF6DBDE6FFBBF2FFFF75DE - FDFF77DEFCFF78DEFCFF7BDFFCFF7DDFFCFF7DDFFCFF7DDFFCFF7CDFFCFF80E0 - FDFFADF0FFFF4D9DD3FF0000000E4398D2FF4FA6D9FF8EDAF5FFA2EEFFFF82E5 - FEFF84E5FEFF84E5FEFF85E6FEFF85E6FEFF85E6FEFF85E6FEFF84E6FEFF96EB - FFFF8CD8F5FF3985BCB84499D2004499D2FF3F94D0FFABFBFFFF9BF3FFFF92F1 - FFFF93F1FFFF93F1FFFF93F1FFFF93F1FFFF93F1FFFF93F1FFFF93F1FFFFA6F8 - FFFF65B8E3FF31709D5F469AD3004598D1F24398D2FF4094D0FF3E92CFFF3E92 - CEFF3F92CEFF3F92CEFF3F92CEFF3F92CEFF3F92CEFF3F92CEFF3F92CEFF3F93 - CFFF4194CEF00000000E469AD300000000300000003300000033000000330000 - 0033000000330000003300000033000000330000003300000033000000330000 - 00330000002F0000000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000FB4DA2126B9DEFF0B97CC1CFFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000EB0D9EB7CD0EAFF0A94CAF0FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF000EB8DC110EB5DC7267C8E6FFBBECFAFF50B7DFFF0A98 - CE740BA9D711FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF000FB3DAFB0EB5DBFE1EB8DCFF6FCCE8FFACE4F5FF9BE3F8FF9DDDF3FF5ABE - E2FF17A9D7FF0AA0D4FD0889C9FCFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF000B96C87548B0D5FF93D6ECFFBDEDFBFF9CE4F8FF5FD1F3FF8ADCF6FFA4E4 - F8FF75C6E5FF369AC9FF0679B67934B4D9D05EC2E1FA60C3E2FA60C3E2FA60C3 - E2FA5FC3E2FA29A8D4E846AFD8FFB7EBF9FF6FD6F4FF55CDF2FF50CCF2FF9DDF - F4FF369BCBFF0679B659FFFFFF0036B3DAF8FDFEFEFFFEFFFFFFFEFEFFFFFDFE - FFFFFEFFFFFFEAF7FBFF28A4D4FD7ECDEBFF8DDEF6FF99E1F7FF75D6F4FF70C5 - E6FF0C82BED1FFFFFF00FFFFFF0035AFDAF0F7FCFEFF8EE4F8FF91DEF5FF9FE0 - F5FFACE1F6FFEFFBFEFF48B7DEFF8BD2EDFFA3E1F2FF5FBBE1FF98DDF4FF77CB - ECFF0F83C2F6FFFFFF00FFFFFF0036AADAF2F1FAFDFF94DEF5FF93DCF4FF81D5 - F2FF60C0E9FF4FAEE1FF3594DAFF3594DAFF3594DAFF3594DAFF3594DAFF3594 - DAFF3594DAFFFFFFFF00FFFFFF0035ABDAFAE8F6FBFF7EC5EAFF5BAEE3FF51A8 - E1FF60AFE4FFE8F9FDFF92CCE7FFB5DBEDFFE5F6FCFFE4F5FCFFE4F5FCFFCFE4 - F1FF3594DAFFFFFFFF00FFFFFF0037A6DAFAFEFFFFFFF8FDFFFFF6FDFFFFF5FC - FFFFE8FAFEFFACEBF9FF84DCF4FF87E3F8FF7DE0F7FF72DDF6FF68DBF5FFE9F9 - FDFF3594DAFF0166B705FFFFFF0036A1DAF9F6FCFEFFC8F2FCFFB9EFFBFFACEC - FAFF8CE4F8FF8AE3F8FF82E1F7FF79DFF7FF6DDDF6FF61DAF5FF57D7F4FFE7F8 - FDFF3594DAFFFFFFFF00FFFFFF00369ADAF8F2FAFDFFB3EDFAFFA4E9F9FF95E6 - F8FF85E2F7FF81E1F7FF7AE0F7FF6FDDF6FF62DAF5FF54D6F3FF47D3F2FFE8F9 - FDFF3594DAFFFFFFFF00FFFFFF003594DAF7EFFAFEFFA1E9F9FF91E5F8FF81E1 - F7FF72DEF6FF63DAF5FF54D7F4FF47D3F3FF39D0F2FF2ECDF1FF26CBF0FFCAF2 - FBFF3594DAF7FFFFFF00FFFFFF00338ED9E6DCF0FAF0A7DDF4FD9EDBF4FF96DA - F3FF8ED8F3FF86D7F3FF7FD4F2FF79D3F2FF72D2F1FF6CD0F1FF69CFF1FFC2EA - F8FE338ED9F0FFFFFF00FFFFFF002C86D8002D88D8A62D87D8EA2D88D8F72D88 - D8F72D88D8F72D88D8F72D88D8F72D88D8F72D88D8F72D88D8F72D87D8F72D88 - D8F12C86D893FFFFFF00FFFFFF004398D2EF3D94D0FF3A92CFFF3A92CFFF3D94 - D0FF4197D1E44398D22B4498D2324498D2334498D2334498D2334499D2334499 - D337459AD300469AD300469AD3003D94D0FFDCFCFFFFD8F7FFFFD8F7FFFFDBFA - FFFF358ECDFF3991CEFF3A92CFFF3A92CFFF3A92CFFF3A92CFFF3A92CFFF3D94 - D0FF4298D2EA469AD300469AD3003B92CFFFD5F7FFFF60D1F9FF61D0F8FFB4EB - FDFFD9F6FFFFDAF8FFFFDAF8FFFFDAF9FFFFDBF9FFFFDAF9FFFFDAFAFFFFDFFE - FFFF3D94D0FF4599D335469AD3003B92CFFFCAF6FFFF69D5F9FF6CD5F9FF6AD4 - F9FF69D4F9FF69D5F9FF6AD6FAFF6BD8FBFF6BD9FCFF6BDAFDFF69DAFDFFDAFD - FFFF3C93D0FF367BAA2F469AD3003C92CFFFC0F3FFFF70D9FBFF73DAFBFF74DA - FBFF74DAFBFF74DBFBFF76DEFDFF4FA9DCFF368BCAFF358BCBFF338BCBFF338C - CCFF3790CEFF3D94D0FF4398D2AE3D92CFFFB8F3FFFF77DFFEFF7BE0FEFF7CE1 - FEFF7CE1FFFF7DE2FFFF52ABDDFF56B9E8FFDAF8FFFFD6F6FFFFD6F6FFFFD5F6 - FFFFD5F7FFFFDBFCFFFF3E94D0FF3E93CFFFB2F6FFFF51ACDEFF358ACAFF358A - CAFF358ACAFF368ACAFF5BBDE9FF6ED9FBFF6AD6FAFF69D6FAFF68D6FAFF67D6 - FAFF83DFFCFFAAE1F6FF3A8AC1C84095D0FF90DDF8FF44A0D8FFDDFCFFFFDAFA - FFFFDBF9FFFFDEFAFFFF74DCFCFF76DCFBFF77DDFBFF79E2FCFF7AE6FDFF79E7 - FEFFA7F4FFFF7FC6E7FF3377A4704296D1FF71C4EAFF6CBCE6FFBBF2FFFF75DE - FDFF77DEFCFF78DEFCFF7BDFFCFF7FE3FDFF83ECFFFF5186DEFF2B38C6FF2B3A - C6FF2B3AC7FF3E6FCFFF000000124397D1FF56ACDDFF8EDAF5FFA2EDFFFF82E5 - FEFF84E5FEFF84E5FEFF86E7FEFF89EEFFFF5589E0FF4052D9FF6E85FFFF7289 - FFFF6E86FFFF4559DCFF3446CC924499D2FF3F94D0FFABFBFFFF9BF3FFFF92F1 - FFFF93F1FFFF93F1FFFF94F3FFFF98FCFFFF2A38C6FF5B75FDFF5775FEFF5473 - FDFF5775FEFF5D79FFFF3349CBFF4598D0F14398D2FF4094D0FF3E92CFFF3E92 - CEFF3F92CEFF3F92CEFF4094CFFF419BCFFF2E3EC9FFA9B8FFFFFFFFFFFFFFFF - FFFFFFFFFFFFA9BAFFFF3148CAFF0000002F29597A5F2655755C2655745C2655 - 745C2655745C2655745C2654725A214B63513342CBFF4164FBFF3C60FAFF3A5D - F8FF3C60FAFF4165FBFF344BCCFF469AD3000000000B0000000A0000000A0000 - 000A0000000A0000000A0000000A000000082F3DB4AA3851D7FF385DF9FF375D - FAFF385DF9FF3852D7FF3044B4AC469AD300469AD300469AD300469AD300469A - D300469AD300469AD300469BD30048A2D3000000001E3044B4AC384DCCFF384D - CBFF384DCCFF3145B4AC0000001E000000000000000000000000000000000000 - 000000000000000000000000000000000000000000000000001E000000330000 - 0033000000330000001E000000004398D2EF3D94D0FF3A92CFFF3A92CFFF3D94 - D0FF4197D1E44398D22B4498D2324498D2334498D2334498D2334499D2334499 - D337459AD300469AD300469AD3003D94D0FFDCFCFFFFD8F7FFFFD8F7FFFFDBFA - FFFF358ECDFF3991CEFF3A92CFFF3A92CFFF3A92CFFF3A92CFFF3A92CFFF3D94 - D0FF4298D2EA469AD300469AD3003B92CFFFD5F7FFFF60D1F9FF61D0F8FFB4EB - FDFFD9F6FFFFDAF8FFFFDAF8FFFFDAF9FFFFDBF9FFFFDAF9FFFFDAFAFFFFDFFE - FFFF3D94D0FF4599D335469AD3003B92CFFFCAF6FFFF69D5F9FF6CD5F9FF6AD4 - F9FF69D4F9FF69D5F9FF6AD6FAFF6BD8FBFF6BD9FCFF6BDAFDFF69DAFDFFDAFD - FFFF3C93D0FF367BAA2F469AD3003C92CFFFC0F3FFFF70D9FBFF73DAFBFF74DA - FBFF74DAFBFF74DBFBFF76DEFDFF4FA9DCFF368BCAFF358BCBFF338BCBFF338C - CCFF3790CEFF3D94D0FF4398D2AE3D92CFFFB8F3FFFF77DFFEFF7BE0FEFF7CE1 - FEFF7CE1FFFF7DE2FFFF52ABDDFF56B9E8FFDAF8FFFFD6F6FFFFD6F6FFFFD5F6 - FFFFD5F7FFFFDBFCFFFF3E94D0FF3E93CFFFB2F6FFFF51ACDEFF358ACAFF358A - CAFF358ACAFF368ACAFF5BBDE9FF6ED9FBFF6AD6FAFF69D5FBFF69D5FBFF68D5 - FCFF84DEFEFFABE1F8FF3A8AC1C84095D0FF90DDF8FF44A0D8FFDDFCFFFFDAFA - FFFFDBF9FFFFDEFAFFFF74DCFCFF76DBFBFF78DBFEFF7CDDFFFF7FDFFFFF7FDF - FFFFADECFFFF82C1EEFF3575A7704296D1FF71C4EAFF6CBCE6FFBBF2FFFF75DE - FDFF77DEFCFF78DEFCFF7CDFFDFF80E1FFFF89E4FFFF32B89EFF009549FF0095 - 4AFF00974BFF1F9E91FF000000124397D1FF56ACDDFF8EDAF5FFA2EDFFFF82E5 - FEFF84E5FEFF84E5FEFF86E6FFFF8DE9FFFF35BA9EFF00A965FF00D299FF74EC - D1FF00D29AFF00AE6CFF009F56924499D2FF3F94D0FFABFBFFFF9BF3FFFF92F1 - FFFF93F1FFFF93F1FFFF95F1FFFF9EF4FFFF00964AFF00CA93FF00C78EFFFFFF - FFFF00C88FFF00CC97FF009D5CFF4598D0F14398D2FF4094D0FF3E92CFFF3E92 - CEFF3F92CEFF3F92CEFF4092D1FF4792DAFF009B4EFF75E5CAFFFFFFFFFFFFFF - FFFFFFFFFFFF77E5CCFF009C5CFF0000002F29597A5F2655755C2655745C2655 - 745C2655745C2655745C2653745A24486851009E52FF00C08AFF00BB82FFFFFF - FFFF00BB82FF00C08CFF009E5EFF469AD3000000000B0000000A0000000A0000 - 000A0000000A0000000A0000000A00000008008D4BAA00A668FF00BA86FF77DF - C4FF00BA86FF00A66AFF008C55AC469AD300469AD300469AD300469AD300469A - D300469AD300469AD300479AD5004D99DF000000001E008C53AC009E5EFF009D - 5DFF009E5EFF008C55AC0000001E000000000000000000000000000000000000 - 000000000000000000000000000000000000000000000000001E000000330000 - 0033000000330000001E00000000 - } + left = 72 + top = 56 end end diff --git a/src/ce_miniexplorer.pas b/src/ce_miniexplorer.pas index 9f149d0d..9d43c189 100644 --- a/src/ce_miniexplorer.pas +++ b/src/ce_miniexplorer.pas @@ -65,7 +65,6 @@ type btnEdit: TCEToolButton; btnRemFav: TCEToolButton; btnShellOpen: TCEToolButton; - imgList: TImageList; lstFilter: TListFilterEdit; lstFiles: TListView; lstFav: TListView; @@ -91,6 +90,7 @@ type fDblClick: TExplorerDoubleClick; fContextExpand: boolean; fEditableOptions: TCEMiniExplorerEditableOptions; + fImages: TImageList; procedure lstFavDblClick(Sender: TObject); procedure updateFavorites; procedure treeSetRoots; @@ -248,37 +248,81 @@ var fname: string; begin inherited; - // + + fImages := TImageList.Create(self); + case GetIconScaledSize of + iss16: + begin + fImages.Width := 16; + fImages.Height := 16; + Tree.Indent := 16; + fImages.AddResourceName(HINSTANCE, 'DOCUMENT'); + fImages.AddResourceName(HINSTANCE, 'FOLDER'); + fImages.AddResourceName(HINSTANCE, 'FOLDER_STAR'); + fImages.AddResourceName(HINSTANCE, 'FOLDER_ADD'); + fImages.AddResourceName(HINSTANCE, 'FOLDER_DELETE'); + AssignPng(lstFilter.Glyph, 'FILTER_CLEAR'); + end; + iss24: + begin + fImages.Width := 24; + fImages.Height := 24; + Tree.Indent := 24; + fImages.AddResourceName(HINSTANCE, 'DOCUMENT24'); + fImages.AddResourceName(HINSTANCE, 'FOLDER24'); + fImages.AddResourceName(HINSTANCE, 'FOLDER_STAR24'); + fImages.AddResourceName(HINSTANCE, 'FOLDER_ADD24'); + fImages.AddResourceName(HINSTANCE, 'FOLDER_DELETE24'); + AssignPng(lstFilter.Glyph, 'FILTER_CLEAR24'); + end; + iss32: + begin + fImages.Width := 24; + fImages.Height := 24; + Tree.Indent := 24; + fImages.AddResourceName(HINSTANCE, 'DOCUMENT32'); + fImages.AddResourceName(HINSTANCE, 'FOLDER32'); + fImages.AddResourceName(HINSTANCE, 'FOLDER_STAR32'); + fImages.AddResourceName(HINSTANCE, 'FOLDER_ADD32'); + fImages.AddResourceName(HINSTANCE, 'FOLDER_DELETE32'); + AssignPng(lstFilter.Glyph, 'FILTER_CLEAR32'); + end; + end; + lstFav.SmallImages := fImages; + tree.Images := fImages; + lstFiles.SmallImages := fImages; + fEditableOptions:= TCEMiniExplorerEditableOptions.create(self); - // + fFavorites := TStringList.Create; fFavorites.onChange := @favStringsChange; lstFiles.OnDeletion := @lstDeletion; lstFav.OnDeletion := @lstDeletion; lstFav.OnSelectItem := @lstFavSelect; lstFav.OnDblClick := @lstFavDblClick; - // + Tree.OnClick := @treeClick; Tree.OnChange := @treeChanged; Tree.OnDeletion := @treeDeletion; Tree.OnSelectionChanged := @treeSelectionChanged; Tree.OnExpanding := @treeExpanding; - // + lstFilter.FilteredListbox := nil; lstFilter.onChange := @lstFilterChange; lstFilter.BorderSpacing.Left := ScaleX(116, 96); - // + treeSetRoots; - // + fname := getCoeditDocPath + OptsFname; - if fname.fileExists then with TCEMiniExplorerOptions.create(nil) do + if fname.fileExists then + with TCEMiniExplorerOptions.create(nil) do try loadFromFile(fname); assignTo(self); finally free; end; - // + EntitiesConnector.addObserver(self); EntitiesConnector.addSingleService(self); end; diff --git a/src/ce_optionseditor.pas b/src/ce_optionseditor.pas index ce4897a0..da9bd5c0 100644 --- a/src/ce_optionseditor.pas +++ b/src/ce_optionseditor.pas @@ -73,13 +73,29 @@ begin fEdOptsSubj := TCEEditableOptionsSubject.create; inspector.CheckboxForBoolean := true; inspector.PropertyEditorHook.AddHandlerModified(@inspectorModified); - inspector.DefaultItemHeight:= scaleY(22, 96); + inspector.DefaultItemHeight := scaleY(22, 96); selCat.Width := ScaleX(180, 96); width := ScaleX(600, 96); inspector.SplitterX := inspector.width div 2 + ScaleX(20, 96); inspector.PreferredSplitterX := inspector.SplitterX; - AssignPng(btnCancel, 'CANCEL'); - AssignPng(btnAccept, 'ACCEPT'); + + case GetIconScaledSize of + iss16: + begin + AssignPng(btnCancel, 'CANCEL'); + AssignPng(btnAccept, 'ACCEPT'); + end; + iss24: + begin + AssignPng(btnCancel, 'CANCEL24'); + AssignPng(btnAccept, 'ACCEPT24'); + end; + iss32: + begin + AssignPng(btnCancel, 'CANCEL32'); + AssignPng(btnAccept, 'ACCEPT32'); + end; + end; EntitiesConnector.addSingleService(self); end; diff --git a/src/ce_profileviewer.lfm b/src/ce_profileviewer.lfm index daa406fc..12dca5c7 100644 --- a/src/ce_profileviewer.lfm +++ b/src/ce_profileviewer.lfm @@ -162,10 +162,10 @@ inherited CEProfileViewerWidget: TCEProfileViewerWidget end object selPieSource: TComboBox[3] Left = 118 - Height = 31 + Height = 33 Hint = 'select the pie representation' Top = 0 - Width = 154 + Width = 282 BorderSpacing.InnerBorder = 3 ItemHeight = 0 ItemIndex = 0 diff --git a/src/ce_projgroup.pas b/src/ce_projgroup.pas index 15aba3a5..4797ef82 100644 --- a/src/ce_projgroup.pas +++ b/src/ce_projgroup.pas @@ -513,8 +513,24 @@ end; constructor TCEProjectGroupWidget.create(aOwner: TCOmponent); begin inherited; - AssignPng(btnFreeFocus, 'PENCIL'); - AssignPng(btnAddUnfocused, 'DOCUMENT_ADD'); + case GetIconScaledSize of + iss16: + begin + AssignPng(btnFreeFocus, 'PENCIL'); + AssignPng(btnAddUnfocused, 'DOCUMENT_ADD'); + end; + iss24: + begin + AssignPng(btnFreeFocus, 'PENCIL24'); + AssignPng(btnAddUnfocused, 'DOCUMENT_ADD24'); + end; + iss32: + begin + AssignPng(btnFreeFocus, 'PENCIL32'); + AssignPng(btnAddUnfocused, 'DOCUMENT_ADD32'); + end; + end; + projectGroup.onChanged:= @handleChanged; fProjSubj:= TCEProjectSubject.Create; end; diff --git a/src/ce_projinspect.lfm b/src/ce_projinspect.lfm index 5a18c4bb..a2561ec4 100644 --- a/src/ce_projinspect.lfm +++ b/src/ce_projinspect.lfm @@ -32,7 +32,6 @@ inherited CEProjectInspectWidget: TCEProjectInspectWidget BorderSpacing.Around = 2 DragMode = dmAutomatic HideSelection = False - Images = imgList ReadOnly = True RightClickSelect = True ScrollBars = ssAutoBoth @@ -117,267 +116,4 @@ inherited CEProjectInspectWidget: TCEProjectInspectWidget left = 128 top = 48 end - object imgList: TImageList[2] - left = 160 - top = 48 - Bitmap = { - 4C69080000001000000010000000B3B3B1EFB0B0ADFFAEAEACFFAEAEACFFAEAE - ACFFAFAFACFFAFAFADFFB1B1AFD5B4B4B100B5B5B300B5B5B300B5B5B300B5B5 - B300B5B5B300B5B5B300B5B5B300AFAFADFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFEDEDEEFFB3B3B0A4B5B5B300B5B5B300B5B5B300B5B5 - B300B5B5B300B5B5B300B5B5B300AEAEACFFFFFFFFFFE3E3E2FFBEBEBCFFA8A8 - A6FFA8A8A6FFACACAAFFB0B0ADFFB2B2B0FFB3B3B1FFB4B4B2A8B4B4B200B4B4 - B200B4B4B200B5B5B300B5B5B300AEAEABFFFFFFFFFFE9E8E7FFA8A8A6FFFFFF - FFFFFFFFFFFFD1D1D0FFADADABFFADADABFFAEAEABFFADADABFFAEAEABFFAFAF - ADFFB0B0AEACB3B3B100B5B5B300ADADABFFFFFFFFFFEDECECFFA8A8A5FFFFFF - FFFFE4E4E3FFA9A9A6FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFE9E9E9FFAFAFADA7B3B3B100ADADABFFFFFFFFFFF1F1F0FFA7A7A5FFFFFF - FFFFEAE8E7FFA8A8A6FFFFFFFFFFE0E0DFFFE0E0DFFFE0E0DFFFFFFFFFFFA4A4 - A2FFFFFFFFFFE9E9E9FFB0B0AEACADADABFFFFFFFFFFF5F5F4FFA7A7A5FFFFFF - FFFFEDECECFFA8A8A5FFFFFFFFFFE5E4E3FFE6E5E4FFE5E4E3FFFFFFFFFFCACA - C9FFA4A4A2FFFFFFFFFFAFAFADFFADADABFFFFFFFFFFF9F8F8FFA7A7A5FFFFFF - FFFFF1F1F0FFA7A7A5FFFFFFFFFFE9E8E8FFEAE8E9FFE9E8E8FFF3F2F2FFFFFF - FFFFFFFFFFFFFFFFFFFFAEAEABFFADADABFFFFFFFFFFFDFCFCFFA6A7A4FFFFFF - FFFFF5F5F4FFA7A7A5FFFFFFFFFFECECEBFFEDEDECFFEDEDECFFECECEBFFEBEB - EAFFEBEBEAFFFFFFFFFFADADABFFAEAEABFFFFFFFFFFFFFFFFFFA7A7A4FFFFFF - FFFFF9F8F8FFA7A7A4FFFFFFFFFFF0F0EFFFF0F0EFFFF0F0EFFFF0F0EFFFEFEF - EEFFEFEFEEFFFFFFFFFFADADABFFB0B0ADFFFFFFFFFFFFFFFFFFA8A8A6FFFFFF - FFFFFDFCFCFFA6A7A4FFFFFFFFFFF4F3F3FFF4F3F3FFF4F3F3FFF4F3F3FFF4F3 - F3FFF4F3F3FFFFFFFFFFADADABFFB0B0AEF1B0B0AEFFAFAFADFFACACA9FFFFFF - FFFFFFFFFFFFA6A7A4FFFFFFFFFFF7F6F6FFF7F6F6FFF7F6F6FFF7F6F6FFF7F6 - F6FFF7F6F6FFFFFFFFFFADADABFF0000002F6666655D54545351AFAFADFFFFFF - FFFFFFFFFFFFA8A8A6FFFFFFFFFFFCFCFCFFFBFBFCFFFBFBFCFFFBFBFCFFFBFB - FCFFFCFCFCFFFFFFFFFFAEAEABFFB5B5B3000000000B00000008A4A4A2BDB0B0 - AEFFAFAFADFFADADABFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF - FFFFFFFFFFFFFFFFFFFFB0B0ADFFB5B5B300B5B5B300B5B5B300000000230000 - 003300000033AFAFADECAFAFADFFAEAEABFFADADABFFADADABFFADADABFFADAD - ABFFAEAEABFFAFAFADFFB1B1AFF2000000000000000000000000000000000000 - 0000000000000000002E00000033000000330000003300000033000000330000 - 0033000000330000003300000030FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF009E9E9E709C9C9CD69B9B9BFB9999 - 99FBFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF009D9D9D709B9B9BF5E4E4E4FFEEEEEEFF9696 - 96FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF009B9B9BD6E2E2E2FFE7E7E7FFB9B9B9FF9393 - 93FFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00989898FBE4E4E4FFCFCFCFFF929292C2FFFF - FF008E8E8EFF8C8C8CFF8A8A8AFBFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00969696FCDDDDDDFFC5C5C5FF8F8F8FC18D8D - 8DC3ACACACFFD7D7D7FF878787FBFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF0095959548939393FED4D4D4FFC8C8C8FFBCBCBCFFBABA - BAFFC2C2C2FFC4C4C4FF858585D6FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00E3AD8B92DAA788CF929292FBC7C7C7FFCCCCCCFFC7C7C7FFC6C6C6FFC3C3 - C3FFC0C0C0FF848484F582828270FFFFFF00FFFFFF00FFFFFF00FFFFFF00E1A9 - 8992E7B99CFFE6B698FFD8A98CFFD2D2D2FFB5B5B5FF898989FE878787FB8585 - 85FB838383D681818170FFFFFF00FFFFFF00FFFFFF00FFFFFF00E1A98792E6B7 - 9CFFEFCFBCFFEECEBAFFE2AE8CFFD29B7BFF888888F786868623FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00E1A78592E6B799FFEECE - BBFFE9C0A7FFE8BDA3FFECC8B3FFDFA481FFD2895DC9FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00DFA58392E6B498FFEECDBAFFE9BF - A5FFE5B496FFE7B99DFFEBC6AEFFDE9F79FFD58351AAFFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00DFA57F92E6B394FFEECCB8FFE9BEA5FFE5B3 - 94FFE6B79BFFEAC4ADFFDE9E78FFD3814FACFFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00DD9F79FFEDCCB7FFE8BDA3FFE4B192FFE6B6 - 9AFFEAC3ACFFDE9C74FFD37F4DACFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00DB976FFFEDC8B3FFE7B89BFFE6B498FFEAC3 - ABFFDE9C73FFD17D49AFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00D99165CCDFA481FFEAC2ABFFEAC0A8FFDC99 - 71FFD17B47AFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00D58757D5D58351FFD17D4BFFD179 - 45AFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000001C00000033000000360000 - 0036000000360000003600000036000000360000003600000036000000200000 - 0002FFFFFF00FFFFFF00FFFFFF00FFFFFF0000000033F8F8F8F0FBFBFBFDFCFC - FCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFCFCFFF8F8F8FF949494910000 - 002000000002FFFFFF00FFFFFF00FFFFFF0000000036FBFBFBFDF4F4F4FFF5F5 - F5FFF5F5F5FFF5F5F5FFF1F1F1FFEFEFEFFFE9E9E9FFFCFCFCFFE7E7E7FF9595 - 95910000002000000002FFFFFF000000000100000036FCFCFCFFF7F7F7FFF9F9 - F9FFF7F7F7FFF7F7F7FFF3F3F3FFF0F0F0FFEAEAEAFFFCFCFCFFF6F6F6FFF4F4 - F4FF9999999100000020FFFFFF000000000100000036FCFCFCFFF9F9F9FFC0C0 - C0FFBABABAFFB4B4B4FFAFAFAFFFAAAAAAFFA5A5A5FFFCFCFCFFFCFCFCFFFCFC - FCFFFCFCFCFF00000036000000010000000100000036FCFCFCFFFBFBFBFFFCFC - FCFFFCFCFCFFFBFBFBFFF8F8F8FFF5F5F5FFF1F1F1FFECECECFFEAEAEAFFE6E6 - E6FFFCFCFCFF00000036000000010000000100000036FCFCFCFFFCFCFCFFC7C7 - C7FFC2C2C2FFBEBEBEFFB8B8B8FFB4B4B4FFB1B1B1FFAEAEAEFFACACACFFEDED - EDFFFCFCFCFF00000036000000010000000100000036FCFCFCFFFCFCFCFFFCFC - FCFFFCFCFCFFFCFCFCFFFCFCFCFFFBFBFBFFF8F8F8FFF6F6F6FFF3F3F3FFF2F2 - F2FFFCFCFCFF00000036000000010000000100000036FCFCFCFFFCFCFCFFCECE - CEFFCACACAFFC6C6C6FFC3C3C3FFC0C0C0FFBDBDBDFFBCBCBCFFBABABAFFF6F6 - F6FFFCFCFCFF00000036000000010000000100000036FCFCFCFFFCFCFCFFFCFC - FCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFCFCFFFBFBFBFFF9F9F9FFF9F9F9FFF8F8 - F8FFFCFCFCFF00000036000000010000000100000036FCFCFCFFFCFCFCFFD6D6 - D6FFD3D3D3FFCFCFCFFFCDCDCDFFCBCBCBFFC8C8C8FFC8C8C8FFC6C6C6FFF8F8 - F8FFFCFCFCFF00000036000000010000000100000036FCFCFCFFFCFCFCFFFCFC - FCFFFCFCFCFFFBFBFBFFFBFBFBFFFAFAFAFFFAFAFAFFFAFAFAFFFAFAFAFFFAFA - FAFFFCFCFCFF00000036000000010000000100000036FCFCFCFFFCFCFCFFDDDD - DDFFDBDBDBFFD9D9D9FFD7D7D7FFD5D5D5FFD4D4D4FFD4D4D4FFD4D4D4FFFBFB - FBFFFCFCFCFF00000036000000010000000100000036FCFCFCFEFCFCFCFFFCFC - FCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFC - FCFFFCFCFCFD00000036FFFFFF00FFFFFF0000000034F9F9F9F5FCFCFCFDFCFC - FCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFCFCFFFCFC - FCFDF9F9F9F300000033FFFFFF00FFFFFF000000001D00000034000000360000 - 0036000000360000003600000036000000360000003600000036000000360000 - 0036000000330000001DFFFFFF00000000000000000000000000000000000000 - 000000000000908E8CFF8F8D8BFF908E8CFF0000000000000000000000000000 - 00000000000000000000FFFFFF0000000000000000008D8B89B28D8B89AF0000 - 0000000000008B8987FFE9E7E7FF8B8987FF00000000000000008C8A88ED8D8B - 89B00000000000000000FFFFFF00000000008B8987B2B2B1AFFFAFAEACFF8583 - 81EB868482FF9A9897FFBCBAB7FF9A9897FF868482FF858381FEAFAEACFFB2B1 - AFFF8B8987B200000000FFFFFF000000000082807EBAA4A2A0FFDAD8D7FFC6C4 - C2FFE4E3E1FFDBD9D7FFC2BFBEFFD7D5D4FFE4E3E1FFC5C4C2FFDAD8D7FFA4A2 - A0FF82807EBA00000000FFFFFF000000000000000023827F7DEFACAAA8FFC7C5 - C3FFBBB8B7FFBAB7B6FFBBB8B7FFBBB8B7FFBBB8B7FFC7C5C3FFACAAA8FF817F - 7DEF0000002300000000FFFFFF000000000000000000807E7CFFDAD9D8FFBEBB - B9FFBCB9B7FF94918EFF928F8DFF94918FFFB3B2B0FFBEBBB9FFDBD9D8FF807E - 7CFF0000000000000000FFFFFF00848280FF807E7CFF949492FFD0CECCFFC3C0 - BFFF93918FFF72716FAD3A39384E72716FAD939290FFC3C0BFFFD0CECCFF9494 - 92FF807E7CFF848280FFFFFFFF00817F7DFFE3E1DFFFDCDAD8FFC6C5C2FFC8C6 - C4FF8F8D8BFF4847463D000000074847463D8F8D8BFFC8C6C4FFC6C5C2FFDCDA - D8FFE3E1DFFF817F7DFFFFFFFF00817F7DFF7C7A78FF9D9B99FFCCC9C8FFCCC9 - C8FF93918FFF7A78769C7E7C7A227A78769C93918FFFCCC9C8FFCCC9C8FF9D9B - 99FF7C7A78FF817F7DFFFFFFFF000000003300000033787674FFD2D0CEFFCECC - CAFFBEBCBAFF92908EFF8D8B89FF92908EFFBEBCBAFFCECCCAFFD2D0CEFF7876 - 74FF0000003300000033FFFFFF000000000000000000767572FEB7B3B3FFD2D0 - CFFFD1CFCFFFD3D1D0FFD3D1D0FFD3D1D0FFD1CFCFFFD2D0CFFFB7B3B3FF7573 - 71EF0000000000000000FFFFFF00000000007A7876ED9F9D9BFFDFDDDBFFB8B6 - B4FFDBD9D7FFD8D6D4FFD6D4D2FFD8D6D4FFDBD9D7FFB8B6B4FFDFDDDBFF9F9D - 9BFF7A7876AF00000000FFFFFF00000000006F6D6BBFA19F9DFF9E9C9AFF706E - 6CEF716F6DFF898785FFE1DFDEFF898785FF716F6DFF72706EFE9F9D9BFFA19F - 9DFF716F6DBD00000000FFFFFF0000000000000000236D6B69C16C6A69BF0000 - 002F00000033716F6DFFEEECEBFF716F6DFF0000003300000033747270F16C6A - 69C00000002400000000FFFFFF00000000000000000000000024000000230000 - 000000000000757371FF73716FFF757371FF00000000000000000000002F0000 - 00230000000000000000FFFFFF00000000000000000000000000000000000000 - 0000000000000000003300000033000000330000000000000000000000000000 - 00000000000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00EAC39DFFE6BF96FFE4BB92FFE4BB92FFD1A06CF5D09E6DF6CC96 - 5FDAC479427EB2673C09FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00E5BE96FFFFFFFEFFFDF3E9FFFDF3EAFFFCF2E8FFFAEFE3FFFAF2 - E7FFEABB88FFCF8555B3B4693D0CFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00E4BB93FFFEF5EDFFFCDEC5FFFBE0C7FFF9DCC2FFF5D3B4FFFEF9 - F3FFFAE2C4FFECC193FFC37D4893FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00E4BB92FFFEF6F0FFFCE2CDFFFCE3CDFFFADFC8FFF7D9BCFFF5E9 - DDFFFAF3EBFFFBF8F3FFCA8353FEFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00E4BB92FFFEF7F1FFFCE5D2FFFCE4D1FFFBE2CCFFF9DDC4FFF6D7 - BBFFF3D1AFFFFAEFE4FFCC8758FE34B4D9D05EC2E1FA60C3E2FA60C3E2FA60C3 - E2FA5FC3E2FAE4BB91FFFFF7F2FFFEE7D5FFFEE7D5FFFDE5D1FFFAE0CAFFF9DE - C4FFF7D9BCFFFDF2E7FFCC8757FE36B3DAF8FDFEFEFFFEFFFFFFFEFEFFFFFDFE - FFFFFEFFFFFFE4BA91FFFFF7F0FFFFE7D5FFFDE7D6FFFDE6D4FFFCE4D0FFFBE3 - CBFFFADCC2FFFEF3E8FFCC8656FE35AFDAF0F7FCFEFF8EE4F8FF91DEF5FF9FE0 - F5FFACE1F6FFCA8452FFFFF7F1FFFFE9D9FFFFEADBFFFFE9D9FFFFE7D7FFFFE5 - D2FFFFE2CBFFFFF7F1FFCB8555FE36AADAF2F1FAFDFF94DEF5FF93DCF4FF64BC - E9FF3594DAFF3594DAFF3594DAFF3594DAFF3594DAFF3594DAFF3594DAFF3594 - DAFF3594DAFFFBF6EFFFCC8355FE35ABDAFAE8F6FBFF70BCE7FF55AAE2FF4DA5 - E0FF91C9EBFFFAF3EFFFFDFEFDFFFFFDFCFFFFFDFCFFFEFDFCFFFEFCFBFFFEFE - FDFF3594DAFFEFF2E8FFCE8156FF37A6DAFAFEFFFFFFF8FDFFFFF6FDFFFFF5FC - FFFFF3FCFEFF9AE4F4FF9AE6F7FF9BE6F6FF9DE5F5FF9EE5F5FF9FE5F4FFDAF3 - F8FF3594DAFFFDF4EEFFCA8054F936A1DAF9F6FCFEFF94E5F8FF93E5F8FF93E5 - F8FF91E5F8FF93DBE9FF93D7E3FF93D2DCFF90CED7FF8CC8CFFF86C1C6FFC9D8 - D6FF3594DAFFC57444E8CA7F53F1369ADAF8F2FAFDFF94E6F8FF92E5F8FF90E5 - F8FF8BE3F8FF86E2F7FF7FE1F7FF77DEF6FF6CDCF6FF5ED9F4FF4FD5F3FFCCF2 - FBFF3594DAFFFFFFFF00FFFFFF003594DAF7EFFAFEFF93E5F8FF8FE4F8FF89E3 - F8FF82E1F7FF7ADFF7FF71DEF6FF67DBF5FF5BD8F4FF4DD4F3FF40D1F2FFCAF2 - FBFF3594DAFFFFFFFF00FFFFFF00338ED9FBDCF0FAFF98E1F6FF95E0F6FF92DF - F6FF8EDEF5FF89DCF5FF85DAF4FF80D9F4FF7AD7F3FF74D5F3FF70D3F2FFC2EA - F8FF3594DAFFFFFFFF00FFFFFF002C86D8002D88D8F72D87D8F72D88D8F72D88 - D8F72D88D8F72D88D8F72D88D8F72D88D8F72D88D8F72D88D8F72D87D8F72D88 - D8F72C86D800FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF004398D2B03D94D0FF3A92CFFF3A92CFFF3D94 - D0FF4197D1D24398D2004498D2004498D2004498D2004498D2004499D2004499 - D300459AD300469AD300469AD3003D94D0FFDCFCFFFFD8F7FFFFD8F7FFFFDBFA - FFFF358ECDFF3991CEFF3A92CFFF3A92CFFF3A92CFFF3A92CFFF3B92CFFF3D94 - D0FF4398D2D7469AD300469AD3003B92CFFFD5F7FFFF60D1F9FF61D0F8FFB4EB - FDFFD9F6FFFFDAF8FFFFDAF8FFFFDBF9FFFFDCFAFFFFDCFAFFFFDCFBFFFFE0FF - FFFF3E95D0FF4599D333469AD3003B92CFFFCAF6FFFF69D5F9FF6CD5F9FF6BD5 - F9FF69D5F9FF69D5FAFF6AD7FBFF68D4FAFF5EC7F1FF5EC7F2FF5DC8F2FFB4E3 - F8FF3D94D0FF3F8FC669469AD3003C92CFFFC0F3FFFF71DAFBFF74DBFBFF75DB - FCFF75DBFCFF76DCFCFF73DAFAFF449CD4FF378CCBFF368CCBFF358CCCFF348D - CCFF3890CEFF3D94D0FF4398D2EB3D92CFFFB9F4FFFF73DBFBFF6BCCF2FF6CCD - F3FF6CCEF3FF6DCEF3FF479CD4FF56BAE9FFDAF8FFFFD7F6FFFFD6F6FFFFD5F6 - FFFFD5F7FFFFDBFCFFFF3E94D0FF3E94D0FFABF0FFFF449DD6FF368CCBFF368C - CBFF368CCBFF378BCBFF5CBEEAFF6FD9FBFF6AD6FAFF68D5F9FF67D4F9FF66D4 - F9FF82DEFCFFAAE0F6FF3885BCB94095D0FF8AD7F5FF44A1D8FFDDFDFFFFDAFA - FFFFDBFAFFFFDEFAFFFF74DCFCFF76DBFAFF75DAFAFF74DAFAFF74DAFAFF72D9 - FAFFA1E8FFFF7CBFE6FF306F9C5E4296D1FF6BBEE8FF6DBDE6FFBBF2FFFF75DE - FDFF77DEFCFF78DEFCFF7BDFFCFF7DDFFCFF7DDFFCFF7DDFFCFF7CDFFCFF80E0 - FDFFADF0FFFF4D9DD3FF0000000E4398D2FF4FA6D9FF8EDAF5FFA2EEFFFF82E5 - FEFF84E5FEFF84E5FEFF85E6FEFF85E6FEFF85E6FEFF85E6FEFF84E6FEFF96EB - FFFF8CD8F5FF3985BCB84499D2004499D2FF3F94D0FFABFBFFFF9BF3FFFF92F1 - FFFF93F1FFFF93F1FFFF93F1FFFF93F1FFFF93F1FFFF93F1FFFF93F1FFFFA6F8 - FFFF65B8E3FF31709D5F469AD3004598D1F24398D2FF4094D0FF3E92CFFF3E92 - CEFF3F92CEFF3F92CEFF3F92CEFF3F92CEFF3F92CEFF3F92CEFF3F92CEFF3F93 - CFFF4194CEF00000000E469AD300000000300000003300000033000000330000 - 0033000000330000003300000033000000330000003300000033000000330000 - 00330000002F0000000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00C5C5C504A9A9A9199E9E9E29BFBFBFF1B1B1B1FFB1B1B1FFBEBE - BEF19999992AAAAAAA19C5C5C504FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00B7B7B776D5D5D5FFCDCDCDFFC3C3C3FFE0E0E0FFDEDEDEFFC3C3 - C3FFCECECEFFD6D6D6FFB4B4B476FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00ACACACE4E5E5E5FFFFFFFFFFC8C8C8FFB3B3B3FFB3B3B3FFC8C8 - C8FFFFFFFFFFE5E5E5FFA0A0A0EDFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00A8A8A8FFDBDBDBFFD0D0D0FFC6C6C6FFFFFFFFFFFFFFFFFFC8C8 - C8FFCACACAFFBFBFBFFFACACACFFFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00AAAAAAFFF6F6F6FFE6E6E6FFCCCCCCFFD6D6D6FFD4D4D4FFBCBC - BCFFBFBFBFFFC3C3C3FFAFAFAFFF34B4D9D05EC2E1FA60C3E2FA60C3E2FA60C3 - E2FA5FC3E2FAABABABFFF6F6F6FFE8E8E8FFE1E1E1FFD7D7D7FFC0C0C0FFBFBF - BFFFC2C2C2FFC3C3C3FFACACACFF36B3DAF8FDFEFEFFFEFFFFFFFEFEFFFFFDFE - FFFFFEFFFFFFB1B2B2FFCCCCCCFFE9E9E9FFE0E0E0FFD5D5D5FFBDBDBDFFC3C3 - C3FFC2C2C2FFB2B2B2FF9D9D9DED35AFDAF0F7FCFEFF8EE4F8FF91DEF5FF9FE0 - F5FFACE1F6FFE7F2F4FFBEC2C2FFAEAFAFFFCDCDCDFFE1E1E1FFC6C6C6FFB9B9 - B9FF9FA2A3FE959595A59393931E36AADAF2F1FAFDFF94DEF5FF93DCF4FF81D5 - F2FF60C0E9FF4FAEE1FF3594DAFF3594DAFF3594DAFF3594DAFF3594DAFF3594 - DAFF3594DAFFFFFFFF00FFFFFF0035ABDAFAE8F6FBFF7EC5EAFF5BAEE3FF51A8 - E1FF60AFE4FFEBFAFDFFECFAFEFFE5F5FCFFE5F6FCFFE3F4FBFFE4F5FCFFFEFF - FFFF3594DAFFFFFFFF00FFFFFF0037A6DAFAFEFFFFFFF8FDFFFFF6FDFFFFF5FC - FFFFE8FAFEFFAFECFAFF8EE4F8FF87E3F8FF7DE0F7FF72DDF6FF68DBF5FFE9F9 - FDFF3594DAFFFFFFFF00FFFFFF0036A1DAF9F6FCFEFFC8F2FCFFB9EFFBFFACEC - FAFF8CE4F8FF8AE3F8FF82E1F7FF79DFF7FF6DDDF6FF61DAF5FF57D7F4FFE7F8 - FDFF3594DAFFFFFFFF00FFFFFF00369ADAF8F2FAFDFFB3EDFAFFA4E9F9FF95E6 - F8FF85E2F7FF81E1F7FF7AE0F7FF6FDDF6FF62DAF5FF54D6F3FF47D3F2FFE8F9 - FDFF3594DAFFFFFFFF00FFFFFF003594DAF7EFFAFEFFA1E9F9FF91E5F8FF81E1 - F7FF72DEF6FF63DAF5FF54D7F4FF47D3F3FF39D0F2FF2ECDF1FF26CBF0FFCAF2 - FBFF3594DAF7FFFFFF00FFFFFF00338ED9E6DCF0FAF0A7DDF4FD9EDBF4FF96DA - F3FF8ED8F3FF86D7F3FF7FD4F2FF79D3F2FF72D2F1FF6CD0F1FF69CFF1FFC2EA - F8FE338ED9F0FFFFFF00FFFFFF002C86D8002D88D8A62D87D8EA2D88D8F72D88 - D8F72D88D8F72D88D8F72D88D8F72D88D8F72D88D8F72D88D8F72D87D8F72D88 - D8F12C86D893FFFFFF00FFFFFF008D8B89008D8B89008F8D8B008F8D8B008C8A - 880092908E00908E8CFF8F8D8BFF908E8CFF92908E008F8D8B008F8D8B008F8D - 8B008D8B89008D8B89008D8B89008D8B89008C8A88008D8B89B28D8B89AF8B89 - 87008B8987008B8987FFE9E7E7FF8B8987FF8B8987008D8B89008C8A88ED8D8B - 89B08C8A88008D8B89008D8B89008D8B89008B8987B2B2B1AFFFAFAEACFF8583 - 81EB868482FF9A9897FFBCBAB7FF9A9897FF868482FF858381FEAFAEACFFB2B1 - AFFF8B8987B28D8B89008D8B89008C8A880082807EBAA4A2A0FFDAD8D7FFC6C4 - C2FFE4E3E1FFDBD9D7FFC2BFBEFFD7D5D4FFE4E3E1FFC5C4C2FFDAD8D7FFA4A2 - A0FF82807EBA8C8A88008C8A88008583810000000023827F7DEFACAAA8FFC7C5 - C3FFBBB8B7FFBAB7B6FFBBB8B7FFBBB8B7FFBCB8B8FFC9C5C4FFAFABAAFF8380 - 7EEF0000002385838100858381008684820085838100807E7CFFDAD9D8FFBEBB - B9FFBCB9B7FF94908FFF938F8DFF959190FFB9B3B3FFCCBEC0FFEBDBDFFF8B80 - 81FF888281008684820086848200848280FF807E7CFF949492FFD0CECCFFC3C0 - BFFF949190FF757070AD3A36364D777070ADA49598FF00873AFF00A87AFF2584 - 55FF918083FF8A8383FF88848300817F7DFFE3E1DFFFDCDAD8FFC6C5C2FFC8C6 - C4FF948D8DFF483F4236000000064A3E4135AD9199FF00873EFF73E3D5FF00A9 - 79FF52AD7FFF947E83FF92818500817F7DFF7C7A78FF9D9B99FFCCC9C8FFCDC9 - C9FF9C9092FF148552E5008A41FF00883FFF00863EFF008239FF81E4D5FF56D9 - C3FF00AD7AFF318359FF008F47000000003300000033787674FFD2D0CEFFD0CD - CBFFCDBDC1FF00853AFF94EFE2FF4DE9D4FF4FE8D3FF4DE6D1FF93E8D8FF00C3 - 97FF5EE0C6FF00B37FFF008B48A97E7C7A007C7A7800767572FEB7B3B3FFD5D1 - D1FFE3D3D8FF008239FF6CE8CEFF00C899FF00C899FF00C899FF00C797FF00C8 - 98FF00CA9AFF63E6CDFF008A47FF7D7B79007A7876ED9F9D9BFFDFDDDBFFBBB7 - B5FFEDDDE0FF00863CFF3DE8BFFF00D79FFF00D7A0FF00D59FFF00D09CFF00D0 - 9CFF00D39FFF00B981FF007E43BD7B7977006F6D6BBFA19F9DFF9E9C9AFF716E - 6DEF7C7172FF208254FF00893FFF008842FF008845FF008341FF00D9A1FF00D8 - A0FF00BC80FF007C41B9000000227B797700000000236D6B69C16C6A69BF0000 - 002F000000337C7173FFFFEEF4FF8B6E77FF00000033008847FF00E4A6FF00BE - 80FF007C41B900000021008F4F007B7977007B79770000000024000000237B79 - 770078757300777472FF787171FF847176FF00904A00008A4AFF00C684FF007C - 41BD00000021008F4F00008F4F00000000000000000000000000000000000000 - 0000000000000000003300000033000000330000000000000033000000330000 - 0022000000000000000000000000 - } - end end diff --git a/src/ce_projinspect.pas b/src/ce_projinspect.pas index 07d9d2a1..e53e3983 100644 --- a/src/ce_projinspect.pas +++ b/src/ce_projinspect.pas @@ -19,7 +19,6 @@ type btnAddFold: TCEToolButton; btnRemFile: TCEToolButton; btnRemFold: TCEToolButton; - imgList: TImageList; Tree: TTreeView; TreeFilterEdit1: TTreeFilterEdit; procedure btnAddFileClick(Sender: TObject); @@ -44,6 +43,7 @@ type fFileNode, fConfNode: TTreeNode; fLastFileOrFolder: string; fSymStringExpander: ICESymStringExpander; + fImages: TImageList; procedure actUpdate(sender: TObject); procedure DetectNewDubSources(const document: TCESynMemo); procedure TreeDblClick(sender: TObject); @@ -93,10 +93,51 @@ begin inherited; + fImages := TImageList.Create(self); + case GetIconScaledSize of + iss16: + begin + fImages.Width := 16; + fImages.Height := 16; + Tree.Indent := 16; + fImages.AddResourceName(HINSTANCE, 'DOCUMENT_ALL'); + fImages.AddResourceName(HINSTANCE, 'WRENCH'); + fImages.AddResourceName(HINSTANCE, 'PAGE_TEXT'); + fImages.AddResourceName(HINSTANCE, 'COG'); + fImages.AddResourceName(HINSTANCE, 'COG_GO'); + AssignPng(TreeFilterEdit1.Glyph, 'FILTER_CLEAR'); + end; + iss24: + begin + fImages.Width := 24; + fImages.Height := 24; + Tree.Indent := 24; + fImages.AddResourceName(HINSTANCE, 'DOCUMENT_ALL24'); + fImages.AddResourceName(HINSTANCE, 'WRENCH24'); + fImages.AddResourceName(HINSTANCE, 'PAGE_TEXT24'); + fImages.AddResourceName(HINSTANCE, 'COG24'); + fImages.AddResourceName(HINSTANCE, 'COG_GO24'); + AssignPng(TreeFilterEdit1.Glyph, 'FILTER_CLEAR24'); + end; + iss32: + begin + fImages.Width := 24; + fImages.Height := 24; + Tree.Indent := 24; + fImages.AddResourceName(HINSTANCE, 'DOCUMENT_ALL32'); + fImages.AddResourceName(HINSTANCE, 'WRENCH32'); + fImages.AddResourceName(HINSTANCE, 'PAGE_TEXT32'); + fImages.AddResourceName(HINSTANCE, 'COG32'); + fImages.AddResourceName(HINSTANCE, 'COG_GO32'); + AssignPng(TreeFilterEdit1.Glyph, 'FILTER_CLEAR32'); + end; + end; + Tree.OnDblClick := @TreeDblClick; fFileNode := Tree.Items[0]; fConfNode := Tree.Items[1]; + Tree.Images := fImages; Tree.PopupMenu := contextMenu; TreeFilterEdit1.BorderSpacing.Left := ScaleX(114, 96); @@ -542,8 +583,8 @@ begin itm := Tree.Items.AddChild(fConfNode, conf); if i = j then begin - itm.ImageIndex := 7; - itm.SelectedIndex:= 7; + itm.ImageIndex := 4; + itm.SelectedIndex:= 4; end else begin diff --git a/src/ce_search.lfm b/src/ce_search.lfm index ef3812b0..df54d3ec 100644 --- a/src/ce_search.lfm +++ b/src/ce_search.lfm @@ -13,12 +13,13 @@ inherited CESearchWidget: TCESearchWidget ClientWidth = 422 inherited Content: TPanel Height = 293 + Top = 36 Width = 422 ClientHeight = 293 ClientWidth = 422 object cbToFind: TComboBox[0] Left = 4 - Height = 27 + Height = 29 Top = 4 Width = 414 Align = alTop @@ -33,113 +34,41 @@ inherited CESearchWidget: TCESearchWidget end object btnFind: TBitBtn[1] Left = 4 - Height = 27 - Top = 169 + Height = 29 + Top = 161 Width = 414 Align = alBottom AutoSize = True BorderSpacing.Around = 4 Caption = 'btnFind' - Glyph.Data = { - 36040000424D3604000000000000360000002800000010000000100000000100 - 2000000000000004000064000000640000000000000000000000FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF003E39 - 34FF393430FF332F2BFF2C2925FF272421FF201D1BFF1716141A110F0EDB0B0A - 09FF070706FF040403FF000000FF000000FFFFFFFF00FFFFFF00FFFFFF004641 - 3BFF857A70FFC3B8AEFF7C7268FF7F756BFF36322DFF1E1C190F282522D49589 - 7DFFBAAEA2FF7C7268FF7F756BFF010101FFFFFFFF00FFFFFF00FFFFFF004D47 - 41FF83786FFFCCC3BAFF786F65FF7B7167FF2F2B28F9272421011D1B18EE9589 - 7DFFC2B8ADFF786F65FF7C7268FF060505FFFFFFFF00FFFFFF00FFFFFF00534C - 46FC83786FFFCCC3BAFF797066FF71685FFF37332ED5FFFFFF00252220D5857A - 70FFC2B8ADFF786F65FF7B7167FF0A0908FCFFFFFF00FFFFFF00FFFFFF005A52 - 4CC39F9286FFCCC3BAFFC0B4AAFFA6988BFF3E3934A8FFFFFF002C2925A89084 - 79FFC2B8ADFFC0B4AAFFA89B8EFF110F0EC3FFFFFF00FFFFFF00797066055C55 - 4EF9423D38FF58514AFF3D3833FF332F2BFF23201DE5171614301E1C19B51A18 - 16FF252220FF191715FF0F0E0DFF010101EE00000002FFFFFF009F9286059D91 - 85FFB1A396FF7F756BFF7C7268FF776D64FF6C635BFF2E2A26FF564F48FF8076 - 6CFF7C7268FF776D64FF70675EFF000000FE00000005FFFFFF00AB9D9004AFA1 - 94E1BAAEA2FF82776DFF82776DFFAA917BFFBAA794FFB7A48EFAB09781FF9F8D - 7DFF836D5BFF716357FF95897DFF040403E000000003FFFFFF00B9ACA008877D - 72489B8E82FF9D9185FF867B71FF564F48FF504A44FF80766CFF6E665DFF826C - 58FFA6917DFF948474FF564F48FF0C0B0B7A07070601FFFFFF00FFFFFF00FFFF - FF00746B62FFA4978AFF95897DFF9F9286FF3E3934FFFFFFFF004C4640FF7E74 - 6AFF857A70FF3E3934FF453F3AA72522200C15131102FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF008E8378E2C3B8AEFF655D55FFFFFFFF007C7268FFA89B - 8EFF9C8F83E4FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF009C8F83E2BCB0A4FF9D9185FFFFFFFF00AEA093FF9D91 - 85FF655D55DAFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00 - } TabOrder = 1 end object btnReplace: TBitBtn[2] Left = 4 - Height = 27 - Top = 231 + Height = 29 + Top = 227 Width = 414 Align = alBottom AutoSize = True BorderSpacing.Around = 4 Caption = 'btnReplace' - Glyph.Data = { - 36040000424D3604000000000000360000002800000010000000100000000100 - 2000000000000004000064000000640000000000000000000000FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00DB772511DB742199D9701FFFD96E1CFFD86C - 1BCCD8691A77D8671A77D6651AEED6621AEED4621999D4601911FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00DD7B2A66E18F4CFFEBB183FFE3914EFFDA73 - 23FFDA7428FFE08848FFE7A270FFE3935CFFDB7533FFD6621A44FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00DF823044E28D44FFECB588FFDC7A2CFFDB74 - 2311DB721F22D9701EDDE6A471FFDC7A34FFD8671A44FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00DF8231CCE69959FFE49755FFDB7B - 2877FFFFFF00DB742177E18C4CFFE18B49FFD86C1B77FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00E1873711DF8435BBE59856FFE595 - 53FFDD7B2ACCDB7727AAE69D63FFE8A46DFFD9701ECCFFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00419149E539853FFF317A37FF7F7A32FF9579 - 2EFCDF8230BBDF7E2CFFE39250FFEBB386FFDC7728FFDB721F11FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00419149F9BCB272FFE8A05EFFBD82 - 37FEDF853511FFFFFF00DF7E2E99E69E61FFE1924EFFDB772566FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF0051A75A8A71B67AFFB6C590FFE69B55FFE8A4 - 65FFE2893988FFFFFF00DF843588E69F61FFE59858FFDD7B2A77DB721F99D96E - 1CDDD86C1BDDD8691AFF919749F080C588FFB0DCB6FF75B87CFF8E9146FAE496 - 4AFFE8A361FFE28B3CFFE69E5CFFE9A96FFFE49956FFDF823066DB772755E087 - 42FFDB721F88FFFFFF0083AA59D988CB90FF83C68BFF51A75AA8499C52035991 - 48E5E2924377E29040BBE28D3CBBE28B3AAAE1873966FFFFFF00DF7E2E11DE7E - 2FFFDB7727AAFFFFFF00DB721F1190A352FF85A251F958B16203FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00DF82 - 31BBDF7E2EFFFFFFFF00FFFFFF00DB7423CCDE833AFFD96E1C44FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00E189 - 3977E59B59FFDF8231BBDF7E2E88E39250FFDD7F32FFDB742322FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00E28E - 4033E5944CFFE18939BBDF8535AADF8231BBDF7E2E55FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00E29041FFE28E40DDFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00E697 - 4766E69547FFE69A4EFFE2904122FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00 - } TabOrder = 2 end object grpOpts: TGroupBox[3] Left = 4 - Height = 99 - Top = 66 + Height = 87 + Top = 70 Width = 414 Align = alClient AutoSize = True BorderSpacing.Around = 4 Caption = 'Options' - ClientHeight = 80 + ClientHeight = 68 ClientWidth = 410 TabOrder = 4 object FlowPanel1: TFlowPanel Left = 0 - Height = 80 + Height = 68 Top = 0 Width = 410 Align = alClient @@ -181,9 +110,9 @@ inherited CESearchWidget: TCESearchWidget TabOrder = 0 object chkRegex: TCheckBox Left = 0 - Height = 21 + Height = 22 Top = 0 - Width = 99 + Width = 100 Anchors = [] Caption = 'allow regex' Checked = True @@ -192,27 +121,27 @@ inherited CESearchWidget: TCESearchWidget end object chkPrompt: TCheckBox Left = 0 - Height = 21 - Top = 22 - Width = 70 + Height = 22 + Top = 23 + Width = 71 Anchors = [] Caption = 'prompt' TabOrder = 1 end object chkCaseSens: TCheckBox - Left = 0 - Height = 21 - Top = 44 - Width = 116 + Left = 100 + Height = 22 + Top = 0 + Width = 117 Anchors = [] Caption = 'case sensitive' TabOrder = 2 end object chkFromCur: TCheckBox - Left = 116 - Height = 21 - Top = 0 - Width = 98 + Left = 100 + Height = 22 + Top = 23 + Width = 99 Anchors = [] Caption = 'from cursor' Checked = True @@ -221,20 +150,20 @@ inherited CESearchWidget: TCESearchWidget TabOrder = 3 end object chkBack: TCheckBox - Left = 116 - Height = 21 - Top = 22 - Width = 86 + Left = 217 + Height = 22 + Top = 0 + Width = 87 Anchors = [] Caption = 'backward' OnChange = chkBackChange TabOrder = 4 end object chkWWord: TCheckBox - Left = 116 - Height = 21 - Top = 44 - Width = 98 + Left = 217 + Height = 22 + Top = 23 + Width = 99 Anchors = [] Caption = 'whole word' Checked = True @@ -245,68 +174,32 @@ inherited CESearchWidget: TCESearchWidget end object btnReplaceAll: TBitBtn[4] Left = 4 - Height = 27 - Top = 262 + Height = 29 + Top = 260 Width = 414 Align = alBottom AutoSize = True BorderSpacing.Around = 4 Caption = 'btnReplaceAll' - Glyph.Data = { - 36040000424D3604000000000000360000002800000010000000100000000100 - 2000000000000004000064000000640000000000000000000000FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00DB772511DB742199D9701FFFD96E1CFFD86C - 1BCCD8691A77D8671A77D6651AEED6621AEED4621999D4601911FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00DD7B2A66E18F4CFFEBB183FFE3914EFFDA73 - 23FFDA7428FFE08848FFE7A270FFE3935CFFDB7533FFD6621A44FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00DF823044E28D44FFECB588FFDC7A2CFFDB74 - 2311DB721F22D9701EDDE6A471FFDC7A34FFD8671A44FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00DF8231CCE69959FFE49755FFDB7B - 2877FFFFFF00DB742177E18C4CFFE18B49FFD86C1B77FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00E1873711DF8435BBE59856FFE595 - 53FFDD7B2ACCDB7727AAE69D63FFE8A46DFFD9701ECCFFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00419149E539853FFF317A37FF7F7A32FF9579 - 2EFCDF8230BBDF7E2CFFE39250FFEBB386FFDC7728FFDB721F11FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00419149F9BCB272FFE8A05EFFBD82 - 37FEDF853511FFFFFF00DF7E2E99E69E61FFE1924EFFDB772566FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF0051A75A8A71B67AFFB6C590FFE69B55FFE8A4 - 65FFE2893988FFFFFF00DF843588E69F61FFE59858FFDD7B2A77DB721F99D96E - 1CDDD86C1BDDD8691AFF919749F080C588FFB0DCB6FF75B87CFF8E9146FAE496 - 4AFFE8A361FFE28B3CFFE69E5CFFE9A96FFFE49956FFDF823066DB772755E087 - 42FFDB721F88FFFFFF0083AA59D988CB90FF83C68BFF51A75AA8499C52035991 - 48E5E2924377E29040BBE28D3CBBE28B3AAAE1873966FFFFFF00DF7E2E11DE7E - 2FFFDB7727AAFFFFFF00DB721F1190A352FF85A251F958B16203FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00DF82 - 31BBDF7E2EFFFFFFFF00FFFFFF00DB7423CCDE833AFFD96E1C44FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00E189 - 3977E59B59FFDF8231BBDF7E2E88E39250FFDD7F32FFDB742322FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00E28E - 4033E5944CFFE18939BBDF8535AADF8231BBDF7E2E55FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00E29041FFE28E40DDFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00E697 - 4766E69547FFE69A4EFFE2904122FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00 - } TabOrder = 3 end object Panel1: TPanel[5] Left = 4 - Height = 27 - Top = 35 + Height = 29 + Top = 37 Width = 414 Align = alTop AutoSize = True BorderSpacing.Around = 4 BevelOuter = bvNone - ClientHeight = 27 + ClientHeight = 29 ClientWidth = 414 TabOrder = 5 object cbReplaceWth: TComboBox - Left = 110 - Height = 27 + Left = 111 + Height = 29 Top = 0 - Width = 304 + Width = 303 Align = alClient AutoComplete = True AutoCompleteText = [cbactEnabled, cbactEndOfLineComplete, cbactSearchCaseSensitive, cbactSearchAscending] @@ -318,9 +211,9 @@ inherited CESearchWidget: TCESearchWidget end object chkEnableRep: TCheckBox Left = 0 - Height = 27 + Height = 29 Top = 0 - Width = 110 + Width = 111 Align = alLeft Caption = 'Replace with ' OnChange = chkEnableRepChange @@ -329,67 +222,31 @@ inherited CESearchWidget: TCESearchWidget end object Panel2: TPanel[6] Left = 4 - Height = 27 - Top = 200 + Height = 29 + Top = 194 Width = 414 Align = alBottom AutoSize = True BorderSpacing.Around = 4 BevelOuter = bvNone - ClientHeight = 27 + ClientHeight = 29 ClientWidth = 414 TabOrder = 6 object btnFindAll: TBitBtn Left = 0 - Height = 27 + Height = 29 Top = 0 - Width = 402 + Width = 400 Align = alClient AutoSize = True Caption = 'btnFindAll' - Glyph.Data = { - 36040000424D3604000000000000360000002800000010000000100000000100 - 2000000000000004000064000000640000000000000000000000FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF003E39 - 34FF393430FF332F2BFF2C2925FF272421FF201D1BFF1716141A110F0EDB0B0A - 09FF070706FF040403FF000000FF000000FFFFFFFF00FFFFFF00FFFFFF004641 - 3BFF857A70FFC3B8AEFF7C7268FF7F756BFF36322DFF1E1C190F282522D49589 - 7DFFBAAEA2FF7C7268FF7F756BFF010101FFFFFFFF00FFFFFF00FFFFFF004D47 - 41FF83786FFFCCC3BAFF786F65FF7B7167FF2F2B28F9272421011D1B18EE9589 - 7DFFC2B8ADFF786F65FF7C7268FF060505FFFFFFFF00FFFFFF00FFFFFF00534C - 46FC83786FFFCCC3BAFF797066FF71685FFF37332ED5FFFFFF00252220D5857A - 70FFC2B8ADFF786F65FF7B7167FF0A0908FCFFFFFF00FFFFFF00FFFFFF005A52 - 4CC39F9286FFCCC3BAFFC0B4AAFFA6988BFF3E3934A8FFFFFF002C2925A89084 - 79FFC2B8ADFFC0B4AAFFA89B8EFF110F0EC3FFFFFF00FFFFFF00797066055C55 - 4EF9423D38FF58514AFF3D3833FF332F2BFF23201DE5171614301E1C19B51A18 - 16FF252220FF191715FF0F0E0DFF010101EE00000002FFFFFF009F9286059D91 - 85FFB1A396FF7F756BFF7C7268FF776D64FF6C635BFF2E2A26FF564F48FF8076 - 6CFF7C7268FF776D64FF70675EFF000000FE00000005FFFFFF00AB9D9004AFA1 - 94E1BAAEA2FF82776DFF82776DFFAA917BFFBAA794FFB7A48EFAB09781FF9F8D - 7DFF836D5BFF716357FF95897DFF040403E000000003FFFFFF00B9ACA008877D - 72489B8E82FF9D9185FF867B71FF564F48FF504A44FF80766CFF6E665DFF826C - 58FFA6917DFF948474FF564F48FF0C0B0B7A07070601FFFFFF00FFFFFF00FFFF - FF00746B62FFA4978AFF95897DFF9F9286FF3E3934FFFFFFFF004C4640FF7E74 - 6AFF857A70FF3E3934FF453F3AA72522200C15131102FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF008E8378E2C3B8AEFF655D55FFFFFFFF007C7268FFA89B - 8EFF9C8F83E4FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF009C8F83E2BCB0A4FF9D9185FFFFFFFF00AEA093FF9D91 - 85FF655D55DAFFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00 - } TabOrder = 0 end object btnAllScope: TBitBtn - Left = 404 - Height = 27 + Left = 402 + Height = 29 Top = 0 - Width = 10 + Width = 12 Align = alRight AutoSize = True BorderSpacing.Left = 2 diff --git a/src/ce_search.pas b/src/ce_search.pas index f1ced5de..eac4f9e6 100644 --- a/src/ce_search.pas +++ b/src/ce_search.pas @@ -229,10 +229,10 @@ begin fActReplaceAll := TAction.Create(self); fActReplaceAll.Caption := 'Replace all'; fActReplaceAll.OnExecute := @actReplaceAllExecute; - // + fSearchMru := TCEMruList.Create; fReplaceMru:= TCEMruList.Create; - // + fname := getCoeditDocPath + OptsFname; if fname.fileExists then with TCESearchOptions.create(nil) do try @@ -241,14 +241,39 @@ begin finally free; end; - // + btnFind.Action := fActFindNext; btnReplace.Action := fActReplaceNext; btnReplaceAll.Action := fActReplaceAll; btnFindAll.Action := fActFindAll; - AssignPng(btnAllScope, 'DOCUMENT'); + case GetIconScaledSize of + iss16: + begin + AssignPng(btnAllScope, 'DOCUMENT'); + AssignPng(btnFind, 'FIND'); + AssignPng(btnFindAll, 'FIND'); + AssignPng(btnReplace, 'TEXT_REPLACE'); + AssignPng(btnReplaceAll, 'TEXT_REPLACE'); + end; + iss24: + begin + AssignPng(btnAllScope, 'DOCUMENT24'); + AssignPng(btnFind, 'FIND24'); + AssignPng(btnFindAll, 'FIND24'); + AssignPng(btnReplace, 'TEXT_REPLACE24'); + AssignPng(btnReplaceAll, 'TEXT_REPLACE24'); + end; + iss32: + begin + AssignPng(btnAllScope, 'DOCUMENT32'); + AssignPng(btnFind, 'FIND32'); + AssignPng(btnFindAll, 'FIND32'); + AssignPng(btnReplace, 'TEXT_REPLACE32'); + AssignPng(btnReplaceAll, 'TEXT_REPLACE32'); + end; + end; updateImperative; - // + EntitiesConnector.addObserver(self); end; @@ -261,7 +286,7 @@ begin finally free; end; - // + EntitiesConnector.removeObserver(self); fSearchMru.Free; fReplaceMru.Free; @@ -567,12 +592,20 @@ begin fAllInProj := not fAllInProj; if fAllInProj then begin - AssignPng(btnAllScope, 'DOCUMENT_ALL'); + case GetIconScaledSize of + iss16: AssignPng(btnAllScope, 'DOCUMENT_ALL'); + iss24: AssignPng(btnAllScope, 'DOCUMENT_ALL24'); + iss32: AssignPng(btnAllScope, 'DOCUMENT_ALL32'); + end; btnAllScope.Hint := 'all project sources'; end else begin - AssignPng(btnAllScope, 'DOCUMENT'); + case GetIconScaledSize of + iss16: AssignPng(btnAllScope, 'DOCUMENT'); + iss24: AssignPng(btnAllScope, 'DOCUMENT24'); + iss32: AssignPng(btnAllScope, 'DOCUMENT32'); + end; btnAllScope.Hint := 'selected source'; end; updateImperative; diff --git a/src/ce_symlist.pas b/src/ce_symlist.pas index d0bcdede..9ab67326 100644 --- a/src/ce_symlist.pas +++ b/src/ce_symlist.pas @@ -377,6 +377,7 @@ begin fImages.AddResourceName(HINSTANCE, 'BULLET_YELLOW'); fImages.AddResourceName(HINSTANCE, 'WARNING'); fImages.AddResourceName(HINSTANCE, 'WARN_RED'); + AssignPng(TreeFilterEdit1.Glyph, 'FILTER_CLEAR'); end; iss24: begin @@ -393,6 +394,7 @@ begin fImages.AddResourceName(HINSTANCE, 'BULLET_YELLOW24'); fImages.AddResourceName(HINSTANCE, 'WARNING24'); fImages.AddResourceName(HINSTANCE, 'WARN_RED24'); + AssignPng(TreeFilterEdit1.Glyph, 'FILTER_CLEAR24'); end; iss32: begin @@ -409,6 +411,7 @@ begin fImages.AddResourceName(HINSTANCE, 'BULLET_YELLOW32'); fImages.AddResourceName(HINSTANCE, 'WARNING32'); fImages.AddResourceName(HINSTANCE, 'WARN_RED32'); + AssignPng(TreeFilterEdit1.Glyph, 'FILTER_CLEAR32'); end; end; Tree.Images := fImages; diff --git a/src/ce_todolist.lfm b/src/ce_todolist.lfm index 42048c97..ee90033b 100644 --- a/src/ce_todolist.lfm +++ b/src/ce_todolist.lfm @@ -70,7 +70,7 @@ inherited CETodoListWidget: TCETodoListWidget Top = 0 AutoSize = True Caption = 'btnGo' - resourceName = 'ARROW_PEN' + resourceName = 'PENCIL_GO' scaledSeparator = False end object btnRefresh: TCEToolButton[1] diff --git a/src/ce_todolist.pas b/src/ce_todolist.pas index d7737c0b..b7fa097d 100644 --- a/src/ce_todolist.pas +++ b/src/ce_todolist.pas @@ -205,12 +205,19 @@ var fname: string; begin inherited; - // + + Case GetIconScaledSize of + iss16: AssignPng(lstfilter.Glyph, 'FILTER_CLEAR'); + iss24: AssignPng(lstfilter.Glyph, 'FILTER_CLEAR24'); + iss32: AssignPng(lstfilter.Glyph, 'FILTER_CLEAR32'); + end; + lstfilter.BorderSpacing.Left := scaleX(58, 96); + columns:= [TTodoColumn.filename .. TTodoColumn.line]; fOptions := TCETodoOptions.Create(self); fOptions.autoRefresh := True; fOptions.Name := 'todolistOptions'; - // + fTodos := TTodoItems.Create(self); lstItems.OnDblClick := @handleListClick; btnRefresh.OnClick := @btnRefreshClick; @@ -221,14 +228,14 @@ begin mnuAutoRefresh.Checked := True; lstfilter.OnChange := @filterItems; btnGo.OnClick := @handleListClick; - // + fname := getCoeditDocPath + OptFname; if fname.fileExists then begin fOptions.loadFromFile(fname); fOptions.AssignTo(self); end; - // + EntitiesConnector.addObserver(self); end;