ver.2.4.0 uses Image32 ver.3.0

EtheaDev · Jul 22, 2021 · fea7ed0 · fea7ed0
1 parent 550a3b7
commit fea7ed0
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 6 deletions.
diff --git a/Demo/Images/ComponentEditor.jpg b/Demo/Images/ComponentEditor.jpg
diff --git a/Packages/SVGIconImageListEditorUnit.pas b/Packages/SVGIconImageListEditorUnit.pas
@@ -60,6 +60,9 @@ interface
 resourcestring
   SELECT_DIR = 'Select directory';
   FILES_SAVED = '%d File(s) saved into "%s" folder';
+  USING_ENGINE = 'Using %s';
+  ENGINE_HINT = 'Current Active Engine for rendering SVG images';
+
 type
   TOpenPictureDialogSvg = class(TOpenPictureDialog)
   protected
@@ -727,6 +730,8 @@ procedure TSVGIconImageListEditor.SVGTextChange(Sender: TObject);
   except
     on E: Exception do
     begin
+      SVGErrorStaticText.Font.Color := clRed;
+      SVGErrorStaticText.Font.Style := [fsBold];
       SVGErrorStaticText.Caption := E.Message;
       SVGErrorStaticText.Hint := E.Message;
       SelectedIcon.SVGText := '';
@@ -739,8 +744,9 @@ procedure TSVGIconImageListEditor.SVGTextChange(Sender: TObject);
 
 procedure TSVGIconImageListEditor.ResetError;
 begin
-  SVGErrorStaticText.Caption := '';
-  SVGErrorStaticText.Hint := '';
+  SVGErrorStaticText.Font.Color := clWindowText;
+  SVGErrorStaticText.Caption := Format(USING_ENGINE, [GetGlobalSVGFactoryDesc]);
+  SVGErrorStaticText.Hint := ENGINE_HINT;
 end;
 
 procedure TSVGIconImageListEditor.SVGTextEnter(Sender: TObject);
@@ -882,6 +888,7 @@ procedure TSVGIconImageListEditor.FormClose(Sender: TObject;
 procedure TSVGIconImageListEditor.FormCreate(Sender: TObject);
 begin
   inherited;
+  ResetError;
   FEditingList := TSVGIconImageList.Create(Self);
   FOpenDialog := TOpenPictureDialogSvg.Create(Self);
   FOpenDialog.Filter := 'Scalable Vector Graphics (*.svg)|*.svg';
@@ -893,8 +900,6 @@ procedure TSVGIconImageListEditor.FormCreate(Sender: TObject);
   FModified := False;
   SVGText.Font.Name := 'Courier New';
   Caption := Format(Caption, [SVGIconImageListVersion]);
-  SVGErrorStaticText.Font.Color := clRed;
-  SVGErrorStaticText.Font.Style := [fsBold];
 end;
 
 procedure TSVGIconImageListEditor.Apply;

diff --git a/Source/FMX.SVGIconImageList.pas b/Source/FMX.SVGIconImageList.pas
@@ -48,7 +48,7 @@ interface
   ;
 
 const
-  SVGIconImageListVersion = '2.3.1';
+  SVGIconImageListVersion = '2.4.0';
   DEFAULT_SIZE = 32;
   ZOOM_DEFAULT = 100;
   SVG_INHERIT_COLOR = TAlphaColors.Null;

diff --git a/Source/SVGIconImageListBase.pas b/Source/SVGIconImageListBase.pas
@@ -48,7 +48,7 @@ interface
   SvgInterfaces;
 
 const
-  SVGIconImageListVersion = '2.3.1';
+  SVGIconImageListVersion = '2.4.0';
   DEFAULT_SIZE = 16;
 
 type

diff --git a/Source/SVGInterfaces.pas b/Source/SVGInterfaces.pas
@@ -66,6 +66,7 @@ interface
 
 function GlobalSVGFactory: ISVGFactory;
 procedure SetGlobalSVGFactory(const SVGFactory : ISVGFactory);
+function GetGlobalSVGFactoryDesc: string;
 
 implementation
 
@@ -132,4 +133,20 @@ procedure SetGlobalSVGFactory(const SVGFactory : ISVGFactory);
   FGlobalSVGFactory := SVGFactory;
 end;
 
+function GetGlobalSVGFactoryDesc: string;
+begin
+  {$IFDEF PreferNativeSvgSupport}
+  if WinSvgSupported then
+    Result := 'Direct2D Windows Engine'
+  else
+  {$ENDIF}
+  {$IF DEFINED(Delphi_SVGEngine)}
+    Result := 'Delphi TSVG Engine'
+  {$ELSEIF DEFINED(Image32_SVGEngine)}
+    Result := 'Delphi Image32 Engine'
+  {$ELSEIF DEFINED(Cairo_SVGEngine)}
+    Result := 'Cairo Engine'
+  {$ENDIF}
+end;
+
 end.