ver. 1.5.2

- Fixed loading images with "spaces" in the filename
- Fixed immediate-loading of new images when editing the file
- During loading of remote images, user can stop loading pressing "Esc"
- Updated Copyright for the Editor

Author: carloBarazzetta

README.md

@@ -1,6 +1,6 @@
 # Markdown Editor and Shell Extensions [![License](https://img.shields.io/badge/License-Apache%202.0-yellowgreen.svg)](https://opensource.org/licenses/Apache-2.0)
 
-**Latest Version 1.5.1 - 26 Jun 2023**
+**Latest Version 1.5.2 - 29 Jun 2023**
 
 **A collection of tools for markdown files, to edit and view content:**
 
@@ -59,6 +59,12 @@ To manually install the SVGShellExtensions.dll follow these steps:
 
 ## Release Notes ##
 
+29 Jun 2023: ver. 1.5.2
+- Fixed loading images with "spaces" in the filename
+- Fixed immediate-loading of new images when editing the file
+- During loading of remote images, user can stop loading pressing "Esc"
+- Updated Copyright for the Editor
+
 26 Jun 2023: ver. 1.5.1
 - Fixed Preview of Markdown files with extensions different from .markdown
 

Setup/MDShellExtensions.iss

@@ -1,7 +1,7 @@
 ; Script generated by the Inno Setup Script Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 #define MyAppName 'MarkDown Shell Extensions and Editor'
-#define MyAppVersion '1.5.1'
+#define MyAppVersion '1.5.2'
 
 [Setup]
 AppName={#MyAppName}
@@ -60,7 +60,7 @@ Source: "..\Bin64\ssleay32.dll"; DestDir: {app}; Components: ShellExtensions; Fl
 
 [Icons]
 Name: "{group}\MDTextEditor"; Filename: "{app}\MDTextEditor.exe"; WorkingDir: "{app}"; IconFilename: "{app}\MDTextEditor.exe"; Components: Editor
-Name: "{commondesktop}\LottieTextEditor"; Filename: "{app}\MDTextEditor.exe"; Tasks: desktopicon; Components: Editor
+Name: "{commondesktop}\MarkdownTextEditor"; Filename: "{app}\MDTextEditor.exe"; Tasks: desktopicon; Components: Editor
 
 [Run]
 Filename: {app}\MDTextEditor.exe; Description: {cm:LaunchProgram,'MD Text Editor'}; Flags: nowait postinstall skipifsilent; Components: Editor

Source/MDShellEx.Resources.pas

@@ -209,11 +209,11 @@ procedure TdmResources.HtmlViewerImageRequest(Sender: TObject;
   AStream := nil;
 
   // is "fullName" a local file, if not aquire file from internet
-  If FileExists(ASource) then
-    LFullName := ASource
-  else
+  // replace %20 spaces to normal spaces
+  LFullName := StringReplace(ASource,'%20',' ',[rfReplaceAll]);
+  If not FileExists(LFullName) then
   begin
-    LFullName := IncludeTrailingPathDelimiter(LHtmlViewer.ServerRoot)+ASource;
+    LFullName := IncludeTrailingPathDelimiter(LHtmlViewer.ServerRoot)+LFullName;
     If not FileExists(LFullName) then
       LFullName := ASource;
   end;

Source/MDTextEditor.ViewerMainForm.dfm

@@ -11,13 +11,15 @@ object frmMain: TfrmMain
   Font.Height = -12
   Font.Name = 'Segoe UI'
   Font.Style = []
+  KeyPreview = True
   Position = poScreenCenter
   ShowHint = True
   OnAfterMonitorDpiChanged = FormAfterMonitorDpiChanged
   OnBeforeMonitorDpiChanged = FormBeforeMonitorDpiChanged
   OnClose = FormClose
   OnCreate = FormCreate
   OnDestroy = FormDestroy
+  OnKeyPress = FormKeyPress
   OnMouseWheelDown = FormMouseWheelDown
   OnMouseWheelUp = FormMouseWheelUp
   OnResize = FormResize
@@ -234,7 +236,7 @@ object frmMain: TfrmMain
       36)
     object lblTitle: TLabel
       AlignWithMargins = True
-      Left = 41
+      Left = 40
       Top = 3
       Width = 116
       Height = 30
@@ -245,7 +247,7 @@ object frmMain: TfrmMain
       ExplicitHeight = 15
     end
     object ProcessorDialectLabel: TLabel
-      Left = 427
+      Left = 423
       Top = 11
       Width = 83
       Height = 15
@@ -316,7 +318,7 @@ object frmMain: TfrmMain
       AlignWithMargins = True
       Left = 3
       Top = 3
-      Width = 32
+      Width = 31
       Height = 30
       Align = alLeft
       AutoSize = True
@@ -339,7 +341,7 @@ object frmMain: TfrmMain
       end
     end
     object ProcessorDialectComboBox: TComboBox
-      Left = 513
+      Left = 509
       Top = 8
       Width = 170
       Height = 23
@@ -1086,4 +1088,10 @@ object frmMain: TfrmMain
     Left = 448
     Top = 368
   end
+  object LoadTimer: TTimer
+    Enabled = False
+    OnTimer = LoadTimerTimer
+    Left = 272
+    Top = 352
+  end
 end

Source/MDTextEditor.ViewerMainForm.pas

@@ -197,6 +197,7 @@   TfrmMain = class(TForm, IDragDrop)
     VirtualImageList20: TVirtualImageList;
     PanelCloseButton: TPanel;
     SVGIconImageCloseButton: TSVGIconImage;
+    LoadTimer: TTimer;
     procedure WMGetMinMaxInfo(var Message: TWMGetMinMaxInfo); message WM_GETMINMAXINFO;
     procedure acOpenFileExecute(Sender: TObject);
     procedure acSaveExecute(Sender: TObject);
@@ -274,7 +275,10 @@   TfrmMain = class(TForm, IDragDrop)
     procedure PageControlMouseEnter(Sender: TObject);
     procedure PageControlMouseLeave(Sender: TObject);
     procedure SVGIconImageCloseButtonClick(Sender: TObject);
+    procedure FormKeyPress(Sender: TObject; var Key: Char);
+    procedure LoadTimerTimer(Sender: TObject);
   private
+    FEditingInProgress: Boolean;
     FirstAction: Boolean;
     MinFormWidth, MinFormHeight, MaxFormWidth, MaxFormHeight: Integer;
     FProcessingFiles: Boolean;
@@ -631,6 +635,12 @@ procedure TfrmMain.FormDestroy(Sender: TObject);
   inherited;
 end;
 
+procedure TfrmMain.FormKeyPress(Sender: TObject; var Key: Char);
+begin
+  if Key = Chr(27) then
+    dmResources.StopLoadingImages(True);
+end;
+
 procedure TfrmMain.FormMouseWheelDown(Sender: TObject; Shift: TShiftState;
   MousePos: TPoint; var Handled: Boolean);
 begin
@@ -889,6 +899,16 @@ procedure TfrmMain.LoadOpenedFiles;
   UpdateMDViewer(True);
 end;
 
+procedure TfrmMain.LoadTimerTimer(Sender: TObject);
+begin
+  if FEditingInProgress then
+  begin
+    FEditingInProgress := False;
+    dmResources.StopLoadingImages(False);
+    UpdateMDViewer(True);
+  end;
+end;
+
 procedure TfrmMain.FormCreate(Sender: TObject);
 var
   FileVersionStr: string;
@@ -1012,6 +1032,8 @@ procedure TfrmMain.SynEditChange(Sender: TObject);
 begin
   if Sender = CurrentEditor then
   begin
+    FEditingInProgress := True;
+    LoadTimer.Enabled := False;
     dmResources.StopLoadingImages(True);
     UpdateMDViewer(False);
   end;
@@ -1260,6 +1282,8 @@ procedure TfrmMain.RemoveEditingFile(EditingFile: TEditingFile);
   //Confirm save changes
   ConfirmChanges(EditingFile);
 
+  PanelCloseButton.Visible := False;
+
   //Rimuovo il riferimento
   if FMDFile = EditingFile then
     FMDFile := nil;
@@ -1287,6 +1311,7 @@ procedure TfrmMain.acCloseAllExecute(Sender: TObject);
 begin
   FProcessingFiles := True;
   try
+    PanelCloseButton.Visible := False;
     while EditFileList.Count > 0 do
       RemoveEditingFile(TEditingFile(EditFileList.items[0]));
   finally
@@ -1755,6 +1780,7 @@ procedure TfrmMain.ActionListUpdate(Action: TBasicAction;
     OpenDialog.InitialDir := InitialDir;
     SaveDialog.InitialDir := InitialDir;
   end;
+  LoadTimer.Enabled := True;
 end;
 
 procedure TfrmMain.actMenuExecute(Sender: TObject);

Source/MDTextEditor.dpr

@@ -61,7 +61,8 @@ uses
 begin
   Application.Initialize;
   Application.MainFormOnTaskBar := True;
-  Application.Title := Title_MDViewer+'- © 2021-2022 Ethea S.r.l.';
+  Application.ActionUpdateDelay := 50;
+  Application.Title := Title_MDViewer+'- © 2021-2023 Ethea S.r.l.';
   with TSplashForm.Create(nil) do
   Try
     Show;

Source/MDTextEditor.dproj

@@ -67,7 +67,7 @@
         <Icon_MainIcon>..\Icons\logo.ico</Icon_MainIcon>
         <Manifest_File>$(BDS)\bin\default_app.manifest</Manifest_File>
         <VerInfo_Locale>1040</VerInfo_Locale>
-        <VerInfo_Keys>CompanyName=Ethea S.r.l.;FileDescription=Markdown files Editor;FileVersion=1.5.1.0;InternalName=;LegalCopyright=Copyright © 2021-2023 - Ethea S.r.l.;LegalTrademarks=;OriginalFilename=;ProductName=Markdown files Editor;ProductVersion=1.5;Comments=</VerInfo_Keys>
+        <VerInfo_Keys>CompanyName=Ethea S.r.l.;FileDescription=Markdown files Editor;FileVersion=1.5.2.0;InternalName=;LegalCopyright=Copyright © 2021-2023 - Ethea S.r.l.;LegalTrademarks=;OriginalFilename=;ProductName=Markdown files Editor;ProductVersion=1.5;Comments=</VerInfo_Keys>
         <Custom_Styles>Glow|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Glow.vsf;Sky|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Sky.vsf;Windows10|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10.vsf;&quot;Windows10 Dark|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10Dark.vsf&quot;;&quot;Windows10 SlateGray|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows10SlateGray.vsf&quot;;&quot;Windows11 Modern Dark|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows11_Modern_Dark.vsf&quot;;&quot;Windows11 Modern Light|VCLSTYLE|$(BDSCOMMONDIR)\Styles\Windows11_Modern_Light.vsf&quot;</Custom_Styles>
         <DCC_DebugInformation>0</DCC_DebugInformation>
         <DCC_ImportedDataReferences>false</DCC_ImportedDataReferences>
@@ -76,7 +76,7 @@
         <DCC_DcuOutput>..\Dcu\$(Platform)\$(Config)</DCC_DcuOutput>
         <DCC_DependencyCheckOutputName>..\..\exe\InstantXMLEditor.exe</DCC_DependencyCheckOutputName>
         <VerInfo_MinorVer>5</VerInfo_MinorVer>
-        <VerInfo_Release>1</VerInfo_Release>
+        <VerInfo_Release>2</VerInfo_Release>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win32)'!=''">
         <DCC_Namespace>System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
@@ -130,7 +130,6 @@
         <DCC_MapFile>3</DCC_MapFile>
         <DCC_DebugInformation>2</DCC_DebugInformation>
         <DCC_IntegerOverflowCheck>true</DCC_IntegerOverflowCheck>
-        <Debugger_RunParams>D:\ETHEA\GitHub_EtheaDev\InstantObjects\InstantObjects.wiki\Home.md</Debugger_RunParams>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
         <AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>