Fixing unit naming convention

Author: lmbelo

Packages/Delphi/Delphi 10.4+/PythonFmx.dpk

@@ -60,6 +60,6 @@ contains
   WrapFmxStyles in '..\..\..\Source\fmx\WrapFmxStyles.pas',
   WrapFmxTypes in '..\..\..\Source\fmx\WrapFmxTypes.pas',
   WrapFmxDateTime in '..\..\..\Source\fmx\WrapFmxDateTime.pas',
-  WrapFMXImgList in '..\..\..\Source\fmx\WrapFMXImgList.pas';
+  WrapFmxImgList in '..\..\..\Source\fmx\WrapFmxImgList.pas';
 
 end.

Source/fmx/WrapFMXImgList.pas renamed to Source/fmx/WrapFmxImgList.pas

@@ -1,6 +1,6 @@
 {$I Definition.Inc}
 
-unit WrapFMXImgList;
+unit WrapFmxImgList;
 
 interface
 
@@ -16,6 +16,7 @@   TPyDelphiCustomImageList = class (TPyDelphiBaseImageList)
   protected
     function BitmapItemByName_Wrapper(AArgs: PPyObject): PPyObject; cdecl;
     function BestSize_Wrapper(AArgs: PPyObject): PPyObject; cdecl;
+    function AddOrSet_Wrapper(AArgs: PPyObject): PPyObject; cdecl;
   public
     class function DelphiObjectClass : TClass; override;
     class procedure RegisterMethods(PythonType: TPythonType); override;
@@ -39,7 +40,7 @@ implementation
   System.Types,
   FMX.MultiResBitmap,
   WrapDelphiTypes,
-  WrapFmxTypes;
+  WrapFmxTypes, System.UITypes;
 
 { Register the wrappers, the globals and the constants }
 type
@@ -66,6 +67,52 @@ procedure TFmxImageListRegistration.RegisterWrappers(
 
 { TPyDelphiCustomImageList }
 
+function TPyDelphiCustomImageList.AddOrSet_Wrapper(AArgs: PPyObject): PPyObject;
+var
+  LPySourceName: PPyObject;
+  LPyScales: PPyObject;
+  LPyFileNames: PPyObject;
+
+  LSourceName: string;
+  LScales: array of single;
+  LFileNames: array of string;
+  LTransparentColor: integer;
+  LWidth: integer;
+  LHeight: integer;
+  I: integer;
+begin
+  Adjust(@Self);
+  LTransparentColor := TColors.SysNone;
+  LWidth := 0;
+  LHeight := 0;
+  if GetPythonEngine().PyArg_ParseTuple(AArgs, 'OOO|iii:AddOrSet',
+    @LPySourceName, @LPyScales, @LPyFileNames, @LTransparentColor, @LWidth, @LHeight) <> 0 then
+  begin
+    if not CheckStrAttribute(LPySourceName, 'SourceName', LSourceName) then
+      Exit(nil);
+
+    if not GetPythonEngine().PyList_Check(LPyScales) then
+      Exit(nil);
+
+    if not GetPythonEngine().PyList_Check(LPyFileNames) then
+      Exit(nil);
+
+    SetLength(LScales, PythonType.Engine.PyList_Size(LPyScales));
+    for I := 0 to GetPythonEngine().PyList_Size(LPyScales) - 1 do
+      LScales[I] := GetPythonEngine().PyFloat_AsDouble(
+        GetPythonEngine().PyList_GetItem(LPyScales, I));
+
+    SetLength(LFileNames, PythonType.Engine.PyList_Size(LPyFileNames));
+    for I := 0 to GetPythonEngine().PyList_Size(LPyFileNames) - 1 do
+      LFileNames[I] := GetPythonEngine.PyUnicodeAsString(
+        GetPythonEngine().PyList_GetItem(LPyFileNames, I));
+
+    Result := GetPythonEngine().PyLong_FromLong(
+      DelphiObject.AddOrSet(LSourceName, LScales, LFileNames, LTransparentColor, LWidth, LHeight));
+  end else
+    Result := nil;
+end;
+
 function TPyDelphiCustomImageList.BestSize_Wrapper(AArgs: PPyObject): PPyObject;
 
   procedure Append(const AList, AItem: PPyObject; const AIx: integer);
@@ -77,7 +124,6 @@ function TPyDelphiCustomImageList.BestSize_Wrapper(AArgs: PPyObject): PPyObject;
   end;
 
 var
-  LPyIndex: PPyObject;
   LPySize: PPyObject;
   LIndex: integer;
   LSize: TSize;
@@ -89,11 +135,9 @@ function TPyDelphiCustomImageList.BestSize_Wrapper(AArgs: PPyObject): PPyObject;
 
   // We adjust the transmitted self argument
   Adjust(@Self);
-  if GetPythonEngine().PyArg_ParseTuple(AArgs, 'iO:BestSize', @LPyIndex, @LPySize) <> 0 then begin
-    if CheckIntAttribute(LPyIndex, 'Index', LIndex)
-      and (CheckSizeAttribute(LPySize, 'Size', LSize)
-          or
-          (CheckSizeFAttribute(LPySize, 'Size', LSizeF))) then
+  if GetPythonEngine().PyArg_ParseTuple(AArgs, 'iO:BestSize', @LIndex, @LPySize) <> 0 then begin
+    if (CheckSizeAttribute(LPySize, 'Size', LSize) or
+      (CheckSizeFAttribute(LPySize, 'Size', LSizeF))) then
     begin
       if not CheckIndex(LIndex, DelphiObject.Count) then
         Exit(nil);
@@ -141,7 +185,7 @@ function TPyDelphiCustomImageList.BitmapItemByName_Wrapper(
 
   // We adjust the transmitted self argument
   Adjust(@Self);
-  if GetPythonEngine().PyArg_ParseTuple(AArgs, 'sOO:BitmapItemByName', @LPyName, @LPyItem, @LPySize) <> 0 then begin
+  if GetPythonEngine().PyArg_ParseTuple(AArgs, 'OOO:BitmapItemByName', @LPyName, @LPyItem, @LPySize) <> 0 then begin
     if CheckStrAttribute(LPyName, 'Name', LName)
       and CheckObjAttribute(LPyItem, 'Item', TCustomBitmapItem, TObject(LItem))
       and CheckSizeAttribute(LPySize, 'Size', LSize) then
@@ -175,6 +219,19 @@ class procedure TPyDelphiCustomImageList.RegisterMethods(
     @TPyDelphiCustomImageList.BitmapItemByName_Wrapper,
     'TCustomImageList.BitmapItemByName()'#10 +
     'Tries to find, in the source collection, the bitmap item specified by name.');
+
+  PythonType.AddMethod('BestSize',
+    @TPyDelphiCustomImageList.BestSize_Wrapper,
+    'TCustomImageList.BestSize()'#10 +
+    'Tries to find, in the source collection, the bitmap item specified by name. ' +
+    'This method trying to determine the maximum size of layer, which less than input size. '+
+    'If TLayer.MultiResBitmap has multiple images for different scales, then the search is performed among all images.');
+
+  PythonType.AddMethod('AddOrSet',
+    @TPyDelphiCustomImageList.AddOrSet_Wrapper,
+    'TCustomImageList.AddOrSet()'#10 +
+    'Adds or replaces several files in the source collection, ' +
+    'and adds the item to the destination collection if it does not exist.');
 end;
 
 procedure TPyDelphiCustomImageList.SetDelphiObject(