Merged revision(s) 59314 #27b8c9d719, 59319 #179cc59ee6, 59321-59323 #436c27ee90-#436c27ee90, 59328 #a313fc1796 from trunk:

IDE/LCL: Modify some high-DPI icons for more consistent style (Roland Hahn)
........
IDE: Add high-DPI images for propertygrid and widgetset issues (by Roland Hahn).
........
IDE: Improve visibility of high-dpi issue_carbon icons on dark background (by Roland Hahn).
........
IDE/Restriction Browser: Fix visibility of icon on customdrawn button.
........
IDE/ObjectInspector: Fix size of widgetset icons on high-dpi screens.
........
IDE: Add high-dpi icons to images/lazdoc (by Roland Hahn)
........

git-svn-id: branches/fixes_2_0@59343 -

.gitattributes

@@ -2034,16 +2034,47 @@ components/ideintf/images/oi_options.png -text svneol=unset#image/png
 components/ideintf/images/oi_options_150.png -text svneol=unset#image/png
 components/ideintf/images/oi_options_200.png -text svneol=unset#image/png
 components/ideintf/images/propertygrid/issue_carbon.png -text svneol=unset#image/png
+components/ideintf/images/propertygrid/issue_carbon_150.png -text svneol=unset#image/png
+components/ideintf/images/propertygrid/issue_carbon_200.png -text svneol=unset#image/png
+components/ideintf/images/propertygrid/issue_cocoa.png -text svneol=unset#image/png
+components/ideintf/images/propertygrid/issue_cocoa_150.png -text svneol=unset#image/png
+components/ideintf/images/propertygrid/issue_cocoa_200.png -text svneol=unset#image/png
+components/ideintf/images/propertygrid/issue_customdrawn.png -text svneol=unset#image/png
+components/ideintf/images/propertygrid/issue_customdrawn_150.png -text svneol=unset#image/png
+components/ideintf/images/propertygrid/issue_customdrawn_200.png -text svneol=unset#image/png
 components/ideintf/images/propertygrid/issue_fpgui.png -text svneol=unset#image/png
+components/ideintf/images/propertygrid/issue_fpgui_150.png -text svneol=unset#image/png
+components/ideintf/images/propertygrid/issue_fpgui_200.png -text svneol=unset#image/png
 components/ideintf/images/propertygrid/issue_gtk.png -text svneol=unset#image/png
 components/ideintf/images/propertygrid/issue_gtk2.png -text svneol=unset#image/png
+components/ideintf/images/propertygrid/issue_gtk2_150.png -text svneol=unset#image/png
+components/ideintf/images/propertygrid/issue_gtk2_200.png -text svneol=unset#image/png
+components/ideintf/images/propertygrid/issue_gtk3.png -text svneol=unset#image/png
+components/ideintf/images/propertygrid/issue_gtk3_150.png -text svneol=unset#image/png
+components/ideintf/images/propertygrid/issue_gtk3_200.png -text svneol=unset#image/png
+components/ideintf/images/propertygrid/issue_gtk_150.png -text svneol=unset#image/png
+components/ideintf/images/propertygrid/issue_gtk_200.png -text svneol=unset#image/png
+components/ideintf/images/propertygrid/issue_mui.png -text svneol=unset#image/png
+components/ideintf/images/propertygrid/issue_mui_150.png -text svneol=unset#image/png
+components/ideintf/images/propertygrid/issue_mui_200.png -text svneol=unset#image/png
 components/ideintf/images/propertygrid/issue_nogui.png -text svneol=unset#image/png
+components/ideintf/images/propertygrid/issue_nogui_150.png -text svneol=unset#image/png
+components/ideintf/images/propertygrid/issue_nogui_200.png -text svneol=unset#image/png
 components/ideintf/images/propertygrid/issue_qt.png -text svneol=unset#image/png
+components/ideintf/images/propertygrid/issue_qt5.png -text svneol=unset#image/png
+components/ideintf/images/propertygrid/issue_qt5_150.png -text svneol=unset#image/png
+components/ideintf/images/propertygrid/issue_qt5_200.png -text svneol=unset#image/png
+components/ideintf/images/propertygrid/issue_qt_150.png -text svneol=unset#image/png
+components/ideintf/images/propertygrid/issue_qt_200.png -text svneol=unset#image/png
 components/ideintf/images/propertygrid/issue_win32.png -text svneol=unset#image/png
+components/ideintf/images/propertygrid/issue_win32_150.png -text svneol=unset#image/png
+components/ideintf/images/propertygrid/issue_win32_200.png -text svneol=unset#image/png
 components/ideintf/images/propertygrid/issue_wince.png -text svneol=unset#image/png
+components/ideintf/images/propertygrid/issue_wince_150.png -text svneol=unset#image/png
+components/ideintf/images/propertygrid/issue_wince_200.png -text svneol=unset#image/png
 components/ideintf/images/propertygrid/pg_active_row.png -text svneol=unset#image/png
-components/ideintf/images/propertygrid/pg_active_row_150.png -text
-components/ideintf/images/propertygrid/pg_active_row_200.png -text
+components/ideintf/images/propertygrid/pg_active_row_150.png -text svneol=unset#image/png
+components/ideintf/images/propertygrid/pg_active_row_200.png -text svneol=unset#image/png
 components/ideintf/keyvalpropeditdlg.lfm svneol=native#text/plain
 components/ideintf/keyvalpropeditdlg.pas svneol=native#text/pascal
 components/ideintf/languages/objinspstrconsts.ca.po svneol=native#text/plain
@@ -7905,11 +7936,23 @@ images/lazaruspackage.ico -text svneol=unset#image/x-icon
 images/lazdoc.bat svneol=native#text/x-msdos-program
 images/lazdoc.txt svneol=native#text/plain
 images/lazdoc/formatbold.png -text
+images/lazdoc/formatbold_150.png -text svneol=unset#image/png
+images/lazdoc/formatbold_200.png -text svneol=unset#image/png
 images/lazdoc/formatitalic.png -text
+images/lazdoc/formatitalic_150.png -text svneol=unset#image/png
+images/lazdoc/formatitalic_200.png -text svneol=unset#image/png
 images/lazdoc/formatunderline.png -text
+images/lazdoc/formatunderline_150.png -text svneol=unset#image/png
+images/lazdoc/formatunderline_200.png -text svneol=unset#image/png
 images/lazdoc/insertcodetag.png -text
+images/lazdoc/insertcodetag_150.png -text svneol=unset#image/png
+images/lazdoc/insertcodetag_200.png -text svneol=unset#image/png
 images/lazdoc/insertremark.png -text
+images/lazdoc/insertremark_150.png -text svneol=unset#image/png
+images/lazdoc/insertremark_200.png -text svneol=unset#image/png
 images/lazdoc/insertvartag.png -text
+images/lazdoc/insertvartag_150.png -text svneol=unset#image/png
+images/lazdoc/insertvartag_200.png -text svneol=unset#image/png
 images/lprfile.ico -text svneol=unset#image/x-icon
 images/mainicon.ico -text svneol=unset#image/ico
 images/mainiconproject.ico -text svneol=unset#image/x-icon

components/ideintf/images/ideintf_images_list.txt

@@ -14,13 +14,45 @@ oi_options.png
 oi_options_150.png
 oi_options_200.png
 propertygrid/issue_carbon.png
+propertygrid/issue_carbon_150.png
+propertygrid/issue_carbon_200.png
+propertygrid/issue_cocoa.png
+propertygrid/issue_cocoa_150.png
+propertygrid/issue_cocoa_200.png
+propertygrid/issue_customdrawn.png
+propertygrid/issue_customdrawn_150.png
+propertygrid/issue_customdrawn_200.png
 propertygrid/issue_fpgui.png
+propertygrid/issue_fpgui_150.png
+propertygrid/issue_fpgui_200.png
 propertygrid/issue_gtk.png
+propertygrid/issue_gtk_150.png
+propertygrid/issue_gtk_200.png
 propertygrid/issue_gtk2.png
+propertygrid/issue_gtk2_150.png
+propertygrid/issue_gtk2_200.png
+propertygrid/issue_gtk3.png
+propertygrid/issue_gtk3_150.png
+propertygrid/issue_gtk3_200.png
+propertygrid/issue_mui.png
+propertygrid/issue_mui_150.png
+propertygrid/issue_mui_200.png
 propertygrid/issue_nogui.png
+propertygrid/issue_nogui_150.png
+propertygrid/issue_nogui_200.png
 propertygrid/issue_qt.png
+propertygrid/issue_qt_150.png
+propertygrid/issue_qt_200.png
+propertygrid/issue_qt5.png
+propertygrid/issue_qt5_150.png
+propertygrid/issue_qt5_200.png
 propertygrid/issue_win32.png
+propertygrid/issue_win32_150.png
+propertygrid/issue_win32_200.png
 propertygrid/issue_wince.png
+propertygrid/issue_wince_150.png
+propertygrid/issue_wince_200.png
 propertygrid/pg_active_row.png
 propertygrid/pg_active_row_150.png
 propertygrid/pg_active_row_200.png
+

components/ideintf/objectinspector.pp

@@ -2990,9 +2990,11 @@ var
     OldFont: TFont;
     X, Y: Integer;
     lclPlatform: TLCLPlatform;
+    ImagesRes: TScaledImageListResolution;
   begin
+    ImagesRes := IDEImages.Images_16.ResolutionForPPI[0, Font.PixelsPerInch, GetCanvasScaleFactor];
     X := NameRect.Right - 2;
-    Y := (NameRect.Top + NameRect.Bottom - IDEImages.Images_16.Height) div 2;
+    Y := (NameRect.Top + NameRect.Bottom - ImagesRes.Height) div 2;
     OldFont:=Canvas.Font;
     Canvas.Font:=FNameFont;
     Canvas.Font.Color := clRed;
@@ -3000,8 +3002,8 @@ var
     begin
       if lclPlatform in CurRow.FWidgetSets then
       begin
-        Dec(X, IDEImages.Images_16.Width);
-        IDEImages.Images_16.Draw(Canvas, X, Y,
+        Dec(X, ImagesRes.Width);
+        ImagesRes.Draw(Canvas, X, Y,
           IDEImages.LoadImage('issue_'+LCLPlatformDirNames[lclPlatform]));
       end;
     end;
@@ -5299,9 +5301,13 @@ var
   lclPlatform: TLCLPlatform;
   None: Boolean;
   OldStyle: TBrushStyle;
+  ImagesRes: TScaledImageListResolution;
+  dist: Integer;
 begin
+  ImagesRes := IDEImages.Images_16.ResolutionForPPI[0, Font.PixelsPerInch, GetCanvasScaleFactor];
+  dist := Scale96ToForm(4);
   X := 0;
-  Y := (ABox.Height - IDEImages.Images_16.Height) div 2;
+  Y := (ABox.Height - ImagesRes.Height) div 2;
   OldStyle := ABox.Canvas.Brush.Style;
   try
     ABox.Canvas.Brush.Style := bsClear;
@@ -5310,11 +5316,12 @@ begin
     begin
       if ARestrictions[lclPlatform] = 0 then continue;
       None := False;
-      IDEImages.Images_16.Draw(
+      ImagesRes.Draw(
         ABox.Canvas, X, Y,
-        IDEImages.LoadImage('issue_' + LCLPlatformDirNames[lclPlatform]));
-      Inc(X, Scale96ToForm(16));
+        IDEImages.LoadImage('issue_'+LCLPlatformDirNames[lclPlatform]));
+      Inc(X, ImagesRes.Width);
       Inc(X, Scale96ToForm(OutVertCentered(X, IntToStr(ARestrictions[lclPlatform])).CX));
+      Inc(X, dist);
     end;
 
     if None then

images/lazdoc.txt

@@ -1,6 +1,19 @@
 lazdoc/formatbold.png
+lazdoc/formatbold_150.png
+lazdoc/formatbold_200.png
 lazdoc/formatitalic.png
+lazdoc/formatitalic_150.png
+lazdoc/formatitalic_200.png
 lazdoc/formatunderline.png
+lazdoc/formatunderline_150.png
+lazdoc/formatunderline_200.png
 lazdoc/insertcodetag.png
+lazdoc/insertcodetag_150.png
+lazdoc/insertcodetag_200.png
 lazdoc/insertremark.png
+lazdoc/insertremark_150.png
+lazdoc/insertremark_200.png
 lazdoc/insertvartag.png
+lazdoc/insertvartag_150.png
+lazdoc/insertvartag_200.png
+

lcl/lclplatformdef.pas

@@ -69,7 +69,7 @@ const
     'fpGUI (alpha)',
     'NoGUI',
     'cocoa (alpha)',
-    'customdraw (alpha)',
+    'customdrawn (alpha)',
     'MUI'
     );