LCL: Replace some lcl images by more well-known ones (in several Hi-DPI resolutions, by Roland Hahn). Fix grids.pas not compiling with png instead of xpm images.

git-svn-id: trunk@57744 -
2025-04-10 08:08:00 +02:00 · 2018-04-30 08:42:11 +00:00 · 2018-04-30 08:42:11 +00:00 · c21a4162b9
commit c21a4162b9
parent 61d41ced28
49 changed files with 20 additions and 83 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -8356,9 +8356,15 @@ lcl/images/cursors/cur_18.cur -text svneol=unset#image/x-cursor
 lcl/images/cursors/cur_20.cur -text svneol=unset#image/x-cursor
 lcl/images/cursors/cur_21.cur -text svneol=unset#image/x-cursor
 lcl/images/cursors/cur_22.cur -text svneol=unset#image/x-cursor
-lcl/images/dbgridcheckedcb.xpm -text svneol=native#image/x-xpixmap
-lcl/images/dbgridgrayedcb.xpm -text svneol=native#image/x-xpixmap
-lcl/images/dbgriduncheckedcb.xpm -text svneol=native#image/x-xpixmap
+lcl/images/dbgridcheckedcb.png -text svneol=unset#image/png
+lcl/images/dbgridcheckedcb_150.png -text svneol=unset#image/png
+lcl/images/dbgridcheckedcb_200.png -text svneol=unset#image/png
+lcl/images/dbgridgrayedcb.png -text svneol=unset#image/png
+lcl/images/dbgridgrayedcb_150.png -text svneol=unset#image/png
+lcl/images/dbgridgrayedcb_200.png -text svneol=unset#image/png
+lcl/images/dbgriduncheckedcb.png -text svneol=unset#image/png
+lcl/images/dbgriduncheckedcb_150.png -text svneol=unset#image/png
+lcl/images/dbgriduncheckedcb_200.png -text svneol=unset#image/png
 lcl/images/dbnavigator/dbnavcancel.png -text svneol=unset#image/png
 lcl/images/dbnavigator/dbnavcancel_150.png -text svneol=unset#image/png
 lcl/images/dbnavigator/dbnavcancel_200.png -text svneol=unset#image/png
--- a/lcl/btn_icons.res
+++ b/lcl/btn_icons.res
--- a/lcl/grids.pas
+++ b/lcl/grids.pas
@ -2475,9 +2475,9 @@ end;

 function TCustomGrid.LoadResBitmapImage(const ResName: string): TBitmap;
 var
-  C: TPixmap;
+  C: TPortableNetworkGraphic;
 begin
-  C := TPixmap.Create;
+  C := TPortableNetworkGraphic.Create;
  try
    C.LoadFromResourceName(hInstance, ResName);
    Result := TBitmap.Create;
--- a/lcl/images/buttons/btn_abort.png
+++ b/lcl/images/buttons/btn_abort.png
--- a/lcl/images/buttons/btn_abort_150.png
+++ b/lcl/images/buttons/btn_abort_150.png
--- a/lcl/images/buttons/btn_abort_200.png
+++ b/lcl/images/buttons/btn_abort_200.png
--- a/lcl/images/buttons/btn_ignore.png
+++ b/lcl/images/buttons/btn_ignore.png
--- a/lcl/images/buttons/btn_ignore_150.png
+++ b/lcl/images/buttons/btn_ignore_150.png
--- a/lcl/images/buttons/btn_ignore_200.png
+++ b/lcl/images/buttons/btn_ignore_200.png
--- a/lcl/images/dbgridcheckedcb.png
+++ b/lcl/images/dbgridcheckedcb.png
--- a/lcl/images/dbgridcheckedcb.xpm
+++ b/lcl/images/dbgridcheckedcb.xpm
@ -1,25 +0,0 @@
-/* XPM */
-static char * dbgridcheckedcb[] = {
-/* columns rows colors chars-per-pixel */
-"13 13 6 1",
-" 	c None",
-".	c #808080",
-"+	c #FFFFFF",
-"@	c #404040",
-"#	c #D4D0C8",
-"$	c #000000",
-/* pixels */
-"............+",
-".@@@@@@@@@@#+",
-".@+++++++++#+",
-".@+++++++$+#+",
-".@++++++$$+#+",
-".@+$+++$$$+#+",
-".@+$$+$$$++#+",
-".@+$$$$$+++#+",
-".@++$$$++++#+",
-".@+++$+++++#+",
-".@+++++++++#+",
-".###########+",
-"+++++++++++++"
-);
--- a/lcl/images/dbgridcheckedcb_150.png
+++ b/lcl/images/dbgridcheckedcb_150.png
--- a/lcl/images/dbgridcheckedcb_200.png
+++ b/lcl/images/dbgridcheckedcb_200.png
--- a/lcl/images/dbgridgrayedcb.png
+++ b/lcl/images/dbgridgrayedcb.png
--- a/lcl/images/dbgridgrayedcb.xpm
+++ b/lcl/images/dbgridgrayedcb.xpm
@ -1,25 +0,0 @@
-/* XPM */
-static char * dbgridgrayedcb[] = {
-/* columns rows colors chars-per-pixel */
-"13 13 6 1",
-" 	c None",
-".	c #808080",
-"+	c #FFFFFF",
-"@	c #404040",
-"#	c #D4D0C8",
-"$	c #000000",
-/* pixels */
-"############+",
-"#..........#+",
-"#.##########+",
-"#.#######.##+",
-"#.######..##+",
-"#.#.###...##+",
-"#.#..#...###+",
-"#.#.....####+",
-"#.##...#####+",
-"#.###.######+",
-"#.##########+",
-"############+",
-"+++++++++++++"
-};
--- a/lcl/images/dbgridgrayedcb_150.png
+++ b/lcl/images/dbgridgrayedcb_150.png
--- a/lcl/images/dbgridgrayedcb_200.png
+++ b/lcl/images/dbgridgrayedcb_200.png
--- a/lcl/images/dbgriduncheckedcb.png
+++ b/lcl/images/dbgriduncheckedcb.png
--- a/lcl/images/dbgriduncheckedcb.xpm
+++ b/lcl/images/dbgriduncheckedcb.xpm
@ -1,25 +0,0 @@
-/* XPM */
-static char * dbgriduncheckedcb[] = {
-/* columns rows colors chars-per-pixel */
-"13 13 6 1",
-" 	c none",
-".	c #808080",
-"+	c #ffffff",
-"@	c #404040",
-"#	c #d4d0c8",
-"$	c #000000",
-/* pixels */
-"............+",
-".@@@@@@@@@@#+",
-".@+++++++++#+",
-".@+++++++++#+",
-".@+++++++++#+",
-".@+++++++++#+",
-".@+++++++++#+",
-".@+++++++++#+",
-".@+++++++++#+",
-".@+++++++++#+",
-".@+++++++++#+",
-".###########+",
-"+++++++++++++"
-);
--- a/lcl/images/dbgriduncheckedcb_150.png
+++ b/lcl/images/dbgriduncheckedcb_150.png
--- a/lcl/images/dbgriduncheckedcb_200.png
+++ b/lcl/images/dbgriduncheckedcb_200.png
--- a/lcl/images/dbnavigator/dbnavcancel.png
+++ b/lcl/images/dbnavigator/dbnavcancel.png
--- a/lcl/images/dbnavigator/dbnavcancel_150.png
+++ b/lcl/images/dbnavigator/dbnavcancel_150.png
--- a/lcl/images/dbnavigator/dbnavcancel_200.png
+++ b/lcl/images/dbnavigator/dbnavcancel_200.png
--- a/lcl/images/dbnavigator/dbnavdelete.png
+++ b/lcl/images/dbnavigator/dbnavdelete.png
--- a/lcl/images/dbnavigator/dbnavdelete_150.png
+++ b/lcl/images/dbnavigator/dbnavdelete_150.png
--- a/lcl/images/dbnavigator/dbnavdelete_200.png
+++ b/lcl/images/dbnavigator/dbnavdelete_200.png
--- a/lcl/images/dbnavigator/dbnavfirst.png
+++ b/lcl/images/dbnavigator/dbnavfirst.png
--- a/lcl/images/dbnavigator/dbnavfirst_150.png
+++ b/lcl/images/dbnavigator/dbnavfirst_150.png
--- a/lcl/images/dbnavigator/dbnavfirst_200.png
+++ b/lcl/images/dbnavigator/dbnavfirst_200.png
--- a/lcl/images/dbnavigator/dbnavlast.png
+++ b/lcl/images/dbnavigator/dbnavlast.png
--- a/lcl/images/dbnavigator/dbnavlast_150.png
+++ b/lcl/images/dbnavigator/dbnavlast_150.png
--- a/lcl/images/dbnavigator/dbnavlast_200.png
+++ b/lcl/images/dbnavigator/dbnavlast_200.png
--- a/lcl/images/dbnavigator/dbnavnext.png
+++ b/lcl/images/dbnavigator/dbnavnext.png
--- a/lcl/images/dbnavigator/dbnavnext_150.png
+++ b/lcl/images/dbnavigator/dbnavnext_150.png
--- a/lcl/images/dbnavigator/dbnavnext_200.png
+++ b/lcl/images/dbnavigator/dbnavnext_200.png
--- a/lcl/images/dbnavigator/dbnavprior.png
+++ b/lcl/images/dbnavigator/dbnavprior.png
--- a/lcl/images/dbnavigator/dbnavprior_150.png
+++ b/lcl/images/dbnavigator/dbnavprior_150.png
--- a/lcl/images/dbnavigator/dbnavprior_200.png
+++ b/lcl/images/dbnavigator/dbnavprior_200.png
--- a/lcl/images/lcl_dbgrid_images_list.txt
+++ b/lcl/images/lcl_dbgrid_images_list.txt
@ -1,3 +1,9 @@
-dbgridcheckedcb.xpm
-dbgridgrayedcb.xpm
-dbgriduncheckedcb.xpm
+dbgridcheckedcb.png
+dbgridcheckedcb_150.png
+dbgridcheckedcb_200.png
+dbgridgrayedcb.png
+dbgridgrayedcb_150.png
+dbgridgrayedcb_200.png
+dbgriduncheckedcb.png
+dbgriduncheckedcb_150.png
+dbgriduncheckedcb_200.png
--- a/lcl/images/sortasc.png
+++ b/lcl/images/sortasc.png
--- a/lcl/images/sortasc_150.png
+++ b/lcl/images/sortasc_150.png
--- a/lcl/images/sortasc_200.png
+++ b/lcl/images/sortasc_200.png
--- a/lcl/images/sortdesc.png
+++ b/lcl/images/sortdesc.png
--- a/lcl/images/sortdesc_150.png
+++ b/lcl/images/sortdesc_150.png
--- a/lcl/images/sortdesc_200.png
+++ b/lcl/images/sortdesc_200.png
--- a/lcl/lcl_dbgrid_images.res
+++ b/lcl/lcl_dbgrid_images.res
--- a/lcl/lcl_dbnav_images.res
+++ b/lcl/lcl_dbnav_images.res
--- a/lcl/lcl_grid_images.res
+++ b/lcl/lcl_grid_images.res