bk/2024-05-21-0809

Author: César Cardoso

Package/C4DWizard.dpk

@@ -131,6 +131,6 @@ contains
   C4D.Wizard.FormatSource.View in '..\Src\FormatSource\C4D.Wizard.FormatSource.View.pas' {C4DWizardFormatSourceView},
   C4D.Wizard.Notes.View in '..\Src\Notes\C4D.Wizard.Notes.View.pas' {C4DWizardNotesView},
   C4D.Wizard.Utils.OTA.Codex in '..\Src\Utils\C4D.Wizard.Utils.OTA.Codex.pas',
-  C4D.Wizard.OpenInVsCode in '..\Src\OpenInVsCode\C4D.Wizard.OpenInVsCode.pas';
+  C4D.Wizard.VsCodeIntegration in '..\Src\VsCodeIntegration\C4D.Wizard.VsCodeIntegration.pas';
 
 end.

Package/C4DWizard.dproj

@@ -292,7 +292,7 @@
             <FormType>dfm</FormType>
         </DCCReference>
         <DCCReference Include="..\Src\Utils\C4D.Wizard.Utils.OTA.Codex.pas"/>
-        <DCCReference Include="..\Src\OpenInVsCode\C4D.Wizard.OpenInVsCode.pas"/>
+        <DCCReference Include="..\Src\VsCodeIntegration\C4D.Wizard.VsCodeIntegration.pas"/>
         <RcItem Include="Img\C4D_Logo.bmp">
             <ResourceType>BITMAP</ResourceType>
             <ResourceId>C4D_Logo</ResourceId>
@@ -425,6 +425,10 @@
             <ResourceType>BITMAP</ResourceType>
             <ResourceId>c4d_clean_and_start</ResourceId>
         </RcItem>
+        <RcItem Include="Img\c4d_vscode.bmp">
+            <ResourceType>BITMAP</ResourceType>
+            <ResourceId>c4d_vscode</ResourceId>
+        </RcItem>
         <BuildConfiguration Include="Release">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>

Src/Consts/C4D.Wizard.Consts.pas

@@ -169,6 +169,7 @@   TC4DConsts = class
     TOOL_BAR_UTILITIES_NAME = 'C4DToolBarUtilities';
     TOOL_BAR_UTILITIES_CAPTION = 'C4D Utilities';
     TOOL_BAR_UTILITIES_TOOL_BUTTON_OpenInVsCode_NAME = 'C4DToolButtoUtilitiesOpenInVsCode';
+    TOOL_BAR_UTILITIES_TOOL_BUTTON_OpenInVsCode_CAPTION = 'Open In VS Code';
     TOOL_BAR_UTILITIES_TOOL_BUTTON_UnitInReadOnly_NAME = 'C4DToolButtoUtilitiesUnitInReadOnly';
     TOOL_BAR_UTILITIES_TOOL_BUTTON_GithubDesktop_NAME = 'C4DToolButtonUtilitiesGithubDesktop';
     //TOOLBAR UTILITIES INI

Src/IDE/ImageListMain/C4D.Wizard.IDE.ImageListMain.pas

@@ -37,6 +37,7 @@   TC4DWizardIDEImageListMain = class
     FImgIndexVerifyDocument: Integer;
     FImgIndexNotes: Integer;
     FImgIndexCleanAndStart: Integer;
+    FImgIndexVsCode: Integer;
     constructor Create;
   public
     property ImgIndexC4D_Logo: Integer read FImgIndexC4D_Logo;
@@ -67,6 +68,7 @@   TC4DWizardIDEImageListMain = class
     property ImgIndexVerifyDocument: Integer read FImgIndexVerifyDocument;
     property ImgIndexNotes: Integer read FImgIndexNotes;
     property ImgIndexCleanAndStart: Integer read FImgIndexCleanAndStart;
+    property ImgIndexVsCode: Integer read FImgIndexVsCode;
     class function GetInstance: TC4DWizardIDEImageListMain;
   end;
 
@@ -115,6 +117,7 @@ constructor TC4DWizardIDEImageListMain.Create;
   FImgIndexVerifyDocument := TC4DWizardUtilsOTA.AddImgIDEResourceName('c4d_verify_document');
   FImgIndexNotes := TC4DWizardUtilsOTA.AddImgIDEResourceName('c4d_notes');
   FImgIndexCleanAndStart := TC4DWizardUtilsOTA.AddImgIDEResourceName('c4d_clean_and_start');
+  FImgIndexVsCode := TC4DWizardUtilsOTA.AddImgIDEResourceName('c4d_vscode');
 end;
 
 initialization

Src/IDE/MainMenu/C4D.Wizard.IDE.MainMenu.Clicks.pas

@@ -54,7 +54,7 @@ implementation
   C4D.Wizard.DefaultFilesInOpeningProject,
   C4D.Wizard.FormatSource.View,
   C4D.Wizard.Notes.View,
-  C4D.Wizard.OpenInVsCode;
+  C4D.Wizard.VsCodeIntegration;
 
 class procedure TC4DWizardIDEMainMenuClicks.UsesOrganizationClick(Sender: TObject);
 var
@@ -136,7 +136,7 @@ class procedure TC4DWizardIDEMainMenuClicks.NotesClick(Sender: TObject);
 
 class procedure TC4DWizardIDEMainMenuClicks.OpenInVsCodeClick(Sender: TObject);
 begin
-  TC4DWizardOpenInVsCode.Open;
+  TC4DWizardVsCodeIntegration.Open;
 end;
 
 class procedure TC4DWizardIDEMainMenuClicks.DefaultFilesInOpeningProjectClick(Sender: TObject);

Src/IDE/MainMenu/C4D.Wizard.IDE.MainMenu.pas

@@ -124,7 +124,7 @@ procedure TC4DWizardIDEMainMenu.CreateMenus;
   Self.CreateSubMenu(TC4DConsts.MENU_IDE_OPEN_IN_VSCODE_NAME,
     TC4DConsts.MENU_IDE_OPEN_IN_VSCODE_CAPTION,
     TC4DWizardIDEMainMenuClicks.OpenInVsCodeClick,
-    TC4DWizardIDEImageListMain.GetInstance.ImgIndexOpenInExplorerFile,
+    TC4DWizardIDEImageListMain.GetInstance.ImgIndexVsCode,
     Self.GetShortcutOpenInVsCode);
 
   Self.CreateSubMenu('C4DSeparator50', '-', nil);

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

@@ -64,7 +64,8 @@ implementation
   C4D.Wizard.Utils.OTA,
   C4D.Wizard.IDE.ImageListMain,
   C4D.Wizard.OpenExternal.Model,
-  C4D.Wizard.OpenExternal.Utils;
+  C4D.Wizard.OpenExternal.Utils,
+  C4D.Wizard.VsCodeIntegration;
 
 procedure RegisterSelf;
 begin
@@ -111,8 +112,8 @@ procedure TC4DWizardIDEToolBarsUtilities.CreateAllButtons;
 begin
   Self.OpenExternalFillList;
   Self.OpenExternalCreateButtonList;
-  Self.AddButtonOpenInVsCode;
   Self.AddButtonUnitInReadOnly;
+  Self.AddButtonOpenInVsCode;
 end;
 
 procedure TC4DWizardIDEToolBarsUtilities.RefreshButtons;
@@ -206,28 +207,21 @@ procedure TC4DWizardIDEToolBarsUtilities.AddButtonOpenInVsCode;
 
   FToolButtonOpenInVsCode := TToolButton.Create(FToolBarUtilities);
   FToolButtonOpenInVsCode.Parent := FToolBarUtilities;
-  FToolButtonOpenInVsCode.Caption := '';
+  FToolButtonOpenInVsCode.Caption := TC4DConsts.TOOL_BAR_UTILITIES_TOOL_BUTTON_OpenInVsCode_CAPTION;
   FToolButtonOpenInVsCode.Hint := FToolButtonOpenInVsCode.Caption;
   FToolButtonOpenInVsCode.ShowHint := True;
   FToolButtonOpenInVsCode.Name := TC4DConsts.TOOL_BAR_UTILITIES_TOOL_BUTTON_OpenInVsCode_NAME;
   FToolButtonOpenInVsCode.Style := tbsButton;
-  FToolButtonOpenInVsCode.ImageIndex := TC4DWizardIDEImageListMain.GetInstance.ImgIndexLockOFF;
+  FToolButtonOpenInVsCode.ImageIndex := TC4DWizardIDEImageListMain.GetInstance.ImgIndexVsCode;
   FToolButtonOpenInVsCode.Visible := True;
   FToolButtonOpenInVsCode.OnClick := OnC4DToolButtonOpenInVsCodeClick;
   FToolButtonOpenInVsCode.AutoSize := True;
   FToolButtonOpenInVsCode.Left := 0;
 end;
 
 procedure TC4DWizardIDEToolBarsUtilities.OnC4DToolButtonOpenInVsCodeClick(Sender: TObject);
-var
-  LIOTAEditBuffer: IOTAEditBuffer;
 begin
-  LIOTAEditBuffer := TC4DWizardUtilsOTA.GetIOTAEditBufferCurrentModule;
-  if(LIOTAEditBuffer = nil)then
-    Exit;
-
-  LIOTAEditBuffer.IsReadOnly := not LIOTAEditBuffer.IsReadOnly;
-  Self.ConfigButtonUnitInReadOnly(LIOTAEditBuffer.IsReadOnly);
+  TC4DWizardVsCodeIntegration.Open;
 end;
 
 procedure TC4DWizardIDEToolBarsUtilities.AddButtonUnitInReadOnly;
@@ -247,7 +241,7 @@ procedure TC4DWizardIDEToolBarsUtilities.AddButtonUnitInReadOnly;
   FToolButtonUnitInReadOnly.Visible := True;
   FToolButtonUnitInReadOnly.OnClick := OnC4DToolButtonUnitInReadOnlyClick;
   FToolButtonUnitInReadOnly.AutoSize := True;
-  FToolButtonUnitInReadOnly.Left := FToolButtonOpenInVsCode.Width + FToolButtonOpenInVsCode.Left;
+  FToolButtonUnitInReadOnly.Left := 0;
 end;
 
 procedure TC4DWizardIDEToolBarsUtilities.OnC4DToolButtonUnitInReadOnlyClick(Sender: TObject);

…OpenInVsCode/C4D.Wizard.OpenInVsCode.pas …gration/C4D.Wizard.VsCodeIntegration.pasSrc/OpenInVsCode/C4D.Wizard.OpenInVsCode.pas renamed to Src/VsCodeIntegration/C4D.Wizard.VsCodeIntegration.pas Src/OpenInVsCode/C4D.Wizard.OpenInVsCode.pas renamed to Src/VsCodeIntegration/C4D.Wizard.VsCodeIntegration.pas

@@ -1,4 +1,4 @@
-unit C4D.Wizard.OpenInVsCode;
+unit C4D.Wizard.VsCodeIntegration;
 
 interface
 
@@ -7,7 +7,7 @@ interface
   ToolsAPI;
 
 type
-  TC4DWizardOpenInVsCode = class
+  TC4DWizardVsCodeIntegration = class
   private
 
   public
@@ -21,7 +21,7 @@ implementation
   C4D.Wizard.Utils.OTA,
   C4D.Wizard.ProcessDelphi;
 
-class procedure TC4DWizardOpenInVsCode.Open;
+class procedure TC4DWizardVsCodeIntegration.Open;
 var
   LIOTAModuleServices: IOTAModuleServices;
   LIOTAModule: IOTAModule;