bk/2024-01-09-1536

Author: César Cardoso

Src/IDE/CompileNotifier/C4D.Wizard.IDE.CompileNotifier.pas

@@ -59,7 +59,7 @@ procedure TC4DWizardIDECompileNotifier.ProjectCompileStarted(const Project: IOTA
 
   LIOTAProject := TC4DWizardUtilsOTA.GetCurrentProject;
 
-  if(ExtractFileName(LIOTAProject.FileName) = TC4DConsts.C_C4D_WIZARD_DPROJ)then
+  if(TC4DWizardUtils.FileNameIsC4DWizardDPROJ(LIOTAProject.FileName))then
     Exit;
 
   LCurrentBinaryPath := TC4DWizardUtilsOTA.GetBinaryPathCurrent;

Src/IDE/FileNotification/C4D.Wizard.IDE.FileNotification.Notifier.pas

@@ -34,6 +34,7 @@ procedure RegisterSelf;
 implementation
 
 uses
+  C4D.Wizard.Utils,
   C4D.Wizard.Utils.OTA,
   C4D.Wizard.Reopen.Model,
   C4D.Wizard.Reopen.SaveAs,
@@ -135,7 +136,7 @@ procedure TC4DWizardIDEFileNotificationNotifier.ProcessReopenSaveAs;
   if(FExtension <> '.dproj')and(FExtension <> '.groupproj')then
     Exit;
 
-  if(ExtractFileName(FFileName) = TC4DConsts.C_C4D_WIZARD_DPROJ)then
+  if(TC4DWizardUtils.FileNameIsC4DWizardDPROJ(FFileName))then
     Exit;
 
   {$IFDEF RELEASE}

Src/IDE/ToolBars/C4D.Wizard.IDE.ToolBars.Branch.pas

@@ -285,6 +285,6 @@ initialization
 
 finalization
   if(Assigned(C4DWizardIDEToolBarsBranch))then
-    C4DWizardIDEToolBarsBranch.Free;
+    FreeAndNil(C4DWizardIDEToolBarsBranch);
 
 end.

Src/IDE/ToolBars/C4D.Wizard.IDE.ToolBars.Build.pas

@@ -165,6 +165,7 @@ procedure TC4DWizardIDEToolBarsBuild.RemoveToolBarBuild;
   begin
     for i := Pred(FToolBarBuild.ButtonCount) DownTo 0 do
       FToolBarBuild.Buttons[i].Free;
+
     FreeAndNil(FToolBarBuild);
   end;
 end;
@@ -297,21 +298,15 @@ procedure TC4DWizardIDEToolBarsBuild.OnC4DToolButtonBuildInReleaseClick(Sender:
   if(LIOTAProject = nil)then
     Exit;
 
-  if(ExtractFileName(LIOTAProject.FileName) = TC4DConsts.C_C4D_WIZARD_DPROJ)then
+  if(TC4DWizardUtils.FileNameIsC4DWizardDPROJ(LIOTAProject.FileName))then
     TC4DWizardUtils.ShowMsgAndAbort('It is not possible to build in project: ' + TC4DConsts.C_C4D_WIZARD_DPROJ);
 
   LCurrentBinaryPath := TC4DWizardUtilsOTA.GetBinaryPathCurrent;
   if(FileExists(LCurrentBinaryPath))then
-  begin
     if(TC4DWizardUtils.ProcessWindowsExists(ExtractFileName(LCurrentBinaryPath), LCurrentBinaryPath))then
-    begin
       if(not TC4DWizardUtils.ShowQuestion('The application is already running, do you wish to continue?'))then
         Exit;
 
-      //PostMessage(FindWindow(nil, PWideChar(LCurrentBinaryPath)), WM_QUIT, 0, 0);
-    end;
-  end;
-
   LBuildConfCurrent := LIOTAProject.CurrentConfiguration;
   try
     LIOTAProject.CurrentConfiguration := TC4DConsts.C_BUILD_RELEASE;

Src/Messages/C4D.Wizard.Messages.Custom.pas

@@ -200,7 +200,7 @@ function TC4DWizardMessageCustom.GetMessageGroup: IOTAMessageGroup;
   if(FGroupName.Trim.IsEmpty)then
     Exit;
 
-  //if(ExtractFileName(TC4DWizardUtilsOTA.GetCurrentProject.FileName) = TC4DConsts.C_C4D_WIZARD_DPROJ)then
+  //if(TC4DWizardUtils.FileNameIsC4DWizardDPROJ(TC4DWizardUtilsOTA.GetCurrentProject.FileName))then
   //  Exit;
 
   Result := FIOTAMessageServices.AddMessageGroup(FGroupName.Trim);

Src/Utils/C4D.Wizard.Utils.pas

@@ -23,15 +23,11 @@ interface
 type
   TC4DWizardUtils = class
   private
-    class function ShowMsgInternal(
-      const AMsg: string;
-      const ADetails: string;
-      const AIcon: TC4DWizardIcon;
-      const AButtons: TC4DButtons;
-      const ABtnFocu: TC4DBtnFocu;
-      const AWinControlFocu: TWinControl): Boolean;
+    class function ShowMsgInternal(const AMsg, ADetails: string; const AIcon: TC4DWizardIcon;
+      const AButtons: TC4DButtons; const ABtnFocu: TC4DBtnFocu; const AWinControlFocu: TWinControl): Boolean;
     class function GetPathFromProcessID(const AProcessID: cardinal): string;
   public
+    class function FileNameIsC4DWizardDPROJ(const AFileName: string): Boolean;
     class procedure RemoveBlankSpaceInBegin(var AValue: string; const ACount: Integer);
     class function BlankSpaceInBegin(const AValue: string): Integer;
     class procedure WaitingScreenShow(const AMsg: string = '');
@@ -140,6 +136,11 @@ function PathRelativePathTo(pszPath: PChar; pszFrom: PChar; dwAttrFrom: DWORD; p
 function PathCanonicalize(lpszDst: PChar; lpszSrc: PChar): LongBool; stdcall; external 'shlwapi.dll' name 'PathCanonicalizeW';
 {$ENDREGION}
 
+class function TC4DWizardUtils.FileNameIsC4DWizardDPROJ(const AFileName: string): Boolean;
+begin
+  Result := ExtractFileName(AFileName) = TC4DConsts.C_C4D_WIZARD_DPROJ;
+end;
+
 class procedure TC4DWizardUtils.RemoveBlankSpaceInBegin(var AValue: string; const ACount: Integer);
 begin
   if(ACount <= 0)then
@@ -892,12 +893,8 @@ class function TC4DWizardUtils.IsBpr(const AFilePath: string): Boolean;
 
 {$REGION 'MessagesImplementation'}
 
-class function TC4DWizardUtils.ShowMsgInternal(const AMsg: string;
-  const ADetails: string;
-  const AIcon: TC4DWizardIcon;
-  const AButtons: TC4DButtons;
-  const ABtnFocu: TC4DBtnFocu;
-  const AWinControlFocu: TWinControl): Boolean;
+class function TC4DWizardUtils.ShowMsgInternal(const AMsg, ADetails: string; const AIcon: TC4DWizardIcon;
+  const AButtons: TC4DButtons; const ABtnFocu: TC4DBtnFocu; const AWinControlFocu: TWinControl): Boolean;
 begin
   Application.CreateForm(TC4DWizardViewDialog, C4DWizardViewDialog);
   try