Manually merge conflicting r56373 #7da2064e99 lcl: Minor revision of HiRes images of lcl controls (by Roland Hahn)

git-svn-id: branches/fixes_1_8@56412 -
2025-08-25 19:40:06 +02:00 · 2017-11-14 23:34:14 +00:00 · 2017-11-14 23:34:14 +00:00 · 1c8900906e
commit 1c8900906e
parent 83fa86e699
21 changed files with 24 additions and 0 deletions
--- a/.gitattributes
+++ b/.gitattributes
@ -7753,11 +7753,23 @@ lcl/images/btncalcok.xpm -text svneol=native#image/x-xpixmap
 lcl/images/btncalcplus.xpm -text svneol=native#image/x-xpixmap
 lcl/images/btncalcpmin.xpm -text svneol=native#image/x-xpixmap
 lcl/images/btncalculator.png -text svneol=unset#image/png
+lcl/images/btncalculator_150.png -text
+lcl/images/btncalculator_200.png -text
 lcl/images/btncalendar.png -text svneol=unset#image/png
+lcl/images/btncalendar_150.png -text
+lcl/images/btncalendar_200.png -text
 lcl/images/btnfiltercancel.png -text
+lcl/images/btnfiltercancel_150.png -text
+lcl/images/btnfiltercancel_200.png -text
 lcl/images/btnseldir.png -text svneol=unset#image/png
+lcl/images/btnseldir_150.png -text
+lcl/images/btnseldir_200.png -text
 lcl/images/btnselfile.png -text svneol=unset#image/png
+lcl/images/btnselfile_150.png -text
+lcl/images/btnselfile_200.png -text
 lcl/images/btntime.png -text svneol=unset#image/png
+lcl/images/btntime_150.png -text
+lcl/images/btntime_200.png -text
 lcl/images/buttons/btn_abort.png -text svneol=unset#image/png
 lcl/images/buttons/btn_all.png -text svneol=unset#image/png
 lcl/images/buttons/btn_arrowright.png -text
--- a/lcl/images/btncalculator.png
+++ b/lcl/images/btncalculator.png
--- a/lcl/images/btncalculator_150.png
+++ b/lcl/images/btncalculator_150.png
--- a/lcl/images/btncalculator_200.png
+++ b/lcl/images/btncalculator_200.png
--- a/lcl/images/btncalendar.png
+++ b/lcl/images/btncalendar.png
--- a/lcl/images/btncalendar_150.png
+++ b/lcl/images/btncalendar_150.png
--- a/lcl/images/btncalendar_200.png
+++ b/lcl/images/btncalendar_200.png
--- a/lcl/images/btnfiltercancel.png
+++ b/lcl/images/btnfiltercancel.png
--- a/lcl/images/btnfiltercancel_150.png
+++ b/lcl/images/btnfiltercancel_150.png
--- a/lcl/images/btnfiltercancel_200.png
+++ b/lcl/images/btnfiltercancel_200.png
--- a/lcl/images/btnseldir.png
+++ b/lcl/images/btnseldir.png
--- a/lcl/images/btnseldir_150.png
+++ b/lcl/images/btnseldir_150.png
--- a/lcl/images/btnseldir_200.png
+++ b/lcl/images/btnseldir_200.png
--- a/lcl/images/btnselfile.png
+++ b/lcl/images/btnselfile.png
--- a/lcl/images/btnselfile_150.png
+++ b/lcl/images/btnselfile_150.png
--- a/lcl/images/btnselfile_200.png
+++ b/lcl/images/btnselfile_200.png
--- a/lcl/images/btntime.png
+++ b/lcl/images/btntime.png
--- a/lcl/images/btntime_150.png
+++ b/lcl/images/btntime_150.png
--- a/lcl/images/btntime_200.png
+++ b/lcl/images/btntime_200.png
--- a/lcl/images/lcl_edbtnimg_list.txt
+++ b/lcl/images/lcl_edbtnimg_list.txt
@ -1,6 +1,18 @@
 btnfiltercancel.png
+btnfiltercancel_150.png
+btnfiltercancel_200.png
 btncalculator.png
+btncalculator_150.png
+btncalculator_200.png
 btncalendar.png
+btncalendar_150.png
+btncalendar_200.png
 btnseldir.png
+btnseldir_150.png
+btnseldir_200.png
 btnselfile.png
+btnselfile_150.png
+btnselfile_200.png
 btntime.png
+btntime_150.png
+btntime_200.png
--- a/lcl/lcl_edbtnimg.res
+++ b/lcl/lcl_edbtnimg.res