hotfix/av-ao-desinstalar-wizard-e-fechar-a-ide

Author: César Cardoso

Package/C4DWizard.dproj

@@ -79,10 +79,10 @@ procedure TC4DWizardIDEEditServicesNotifier.EditorViewActivated(const EditWindow
 
 procedure TC4DWizardIDEEditServicesNotifier.EditorViewModified(const EditWindow: INTAEditWindow; const EditView: IOTAEditView);
 begin
-  //   ShowMessage('EditorViewModified: Texto alterado no Editor' + sLineBreak +
-  //               'Linha atual: '       + EditView.Buffer.EditPosition.Row.Tostring     + sLineBreak  +
-  //               'Coluna atual: '      + EditView.Buffer.EditPosition.Column.Tostring  + sLineBreak  +
-  //               'Última linha: '      + EditView.Buffer.EditPosition.LastRow.Tostring + sLineBreak);
+//  AddLogInternal('EditorViewModified: ' +
+//    ' Linha atual: ' + EditView.Buffer.EditPosition.Row.Tostring +
+//    ' Coluna atual: ' + EditView.Buffer.EditPosition.Column.Tostring +
+//    ' Ultima linha: ' + EditView.Buffer.EditPosition.LastRow.Tostring);
 end;
 
 procedure TC4DWizardIDEEditServicesNotifier.WindowActivated(const EditWindow: INTAEditWindow);
@@ -92,38 +92,29 @@ procedure TC4DWizardIDEEditServicesNotifier.WindowActivated(const EditWindow: IN
 
 procedure TC4DWizardIDEEditServicesNotifier.WindowCommand(const EditWindow: INTAEditWindow; Command, Param: Integer; var Handled: Boolean);
 begin
-  //   ShowMessage('WindowCommand' + sLineBreak +
-  //               'Command: ' + Command.Tostring + sLineBreak +
-  //               'Param: '   + Param.Tostring);
-
-  //   if(Command = 22)then
-  //   begin
-  //      ShowMessage('Você teclou Ctrl + C e essa opção não é permitida');
-  //      Abort;
-  //   end;
+  //AddLogInternal('WindowCommand: Command: ' + Command.Tostring +  ' - Param: '   + Param.Tostring);
+  //if(Command = 22)then
+  //begin
+  //  ShowMessage('Você teclou Ctrl + C e essa opção não é permitida');
+  //  Abort;
+  //end;
 end;
 
 procedure TC4DWizardIDEEditServicesNotifier.WindowNotification(const EditWindow: INTAEditWindow; Operation: TOperation);
 begin
 
 end;
 
+//QUANDO O DELPHI É ABERTO E QUANDO OUTRAS JANELAS SÃO ABERTAS
 procedure TC4DWizardIDEEditServicesNotifier.WindowShow(const EditWindow: INTAEditWindow; Show, LoadedFromDesktop: Boolean);
 begin
-  //   ShowMessage('WindowShow: Quando o Delphi é aberto e quando outras janelas são abertas' + sLineBreak +
-  //               'Show: '              + BoolToStr(Show, True)              + sLineBreak +
-  //               'LoadedFromDesktop: ' + BoolToStr(LoadedFromDesktop, True));
-
   TC4DWizardIDEToolBarsRegister.Process;
 end;
 
 initialization
 
 finalization
   if(IndexNotifier >= 0)then
-  begin
     TC4DWizardUtilsOTA.GetIOTAEditorServices.RemoveNotifier(IndexNotifier);
-    IndexNotifier := -1;
-  end;
 
 end.

Src/IDE/EditServicesNotifier/C4D.Wizard.IDE.EditServicesNotifier.pas

@@ -158,7 +158,10 @@ procedure TC4DWizardIDEToolBarsBranch.RemoveToolBarC4D;
   begin
     for i := Pred(FToolBarBranch.ButtonCount) DownTo 0 do
       FToolBarBranch.Buttons[i].Free;
-    FreeAndNil(FToolBarBranch);
+
+    FToolBarBranch.Visible := False;
+    if(not TC4DWizardUtilsOTA.CurrentProjectIsC4DWizardDPROJ)then
+      FreeAndNil(FToolBarBranch);
   end;
 end;
 

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

@@ -75,7 +75,7 @@ constructor TC4DWizardIDEToolBarsBuild.Create;
 begin
   FINTAServices := TC4DWizardUtilsOTA.GetINTAServices;
   Self.NewToolBarBuild;
-  Self.ProcessRefreshComboBox;
+  //Self.ProcessRefreshComboBox;
 end;
 
 destructor TC4DWizardIDEToolBarsBuild.Destroy;
@@ -166,7 +166,9 @@ procedure TC4DWizardIDEToolBarsBuild.RemoveToolBarBuild;
     for i := Pred(FToolBarBuild.ButtonCount) DownTo 0 do
       FToolBarBuild.Buttons[i].Free;
 
-    FreeAndNil(FToolBarBuild);
+    FToolBarBuild.Visible := False;
+    if(not TC4DWizardUtilsOTA.CurrentProjectIsC4DWizardDPROJ)then
+      FreeAndNil(FToolBarBuild);
   end;
 end;
 

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

@@ -92,7 +92,7 @@ finalization
   if(IndexNotifier >= 0)then
   begin
     TC4DWizardUtilsOTA.GetINTAServices.UnregisterToolbarNotifier(IndexNotifier);
-    IndexNotifier := -1;
+    //IndexNotifier := -1;
   end;
 
 end.

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

@@ -5,6 +5,7 @@ interface
 uses
   System.SysUtils,
   System.Classes,
+  C4D.Wizard.Utils,
   C4D.Wizard.IDE.ToolBars.Notifier,
   C4D.Wizard.IDE.ToolBars.Utilities,
   C4D.Wizard.IDE.ToolBars.Build,
@@ -23,7 +24,7 @@ implementation
 class procedure TC4DWizardIDEToolBarsRegister.Process;
 begin
   C4D.Wizard.IDE.ToolBars.Notifier.RegisterSelf;
-  C4D.Wizard.IDE.ToolBars.Build.RegisterSelf;
+  c4D.Wizard.IDE.ToolBars.Build.RegisterSelf;
   C4D.Wizard.IDE.ToolBars.Utilities.RegisterSelf;
   C4D.Wizard.IDE.ToolBars.Branch.RegisterSelf;
 end;

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

@@ -120,9 +120,16 @@ procedure TC4DWizardIDEToolBarsUtilities.RefreshButtons;
 procedure TC4DWizardIDEToolBarsUtilities.RemoveToolBarUtilities;
 begin
   Self.RemoveToolButtons;
-  //FToolBarUtilities := FINTAServices.ToolBar[TC4DConsts.C_TOOL_BAR_UTILITIES_NAME];
+
+  if(not Assigned(FToolBarUtilities))then
+    FToolBarUtilities := FINTAServices.ToolBar[TC4DConsts.C_TOOL_BAR_UTILITIES_NAME];
+
   if(Assigned(FToolBarUtilities))then
-    FreeAndNil(FToolBarUtilities);
+  begin
+    FToolBarUtilities.Visible := False;
+    if(not TC4DWizardUtilsOTA.CurrentProjectIsC4DWizardDPROJ)then
+      FreeAndNil(FToolBarUtilities);
+  end;
 end;
 
 procedure TC4DWizardIDEToolBarsUtilities.RemoveToolButtons;
@@ -145,17 +152,16 @@ function TC4DWizardIDEToolBarsUtilities.GetIniFile: TIniFile;
 procedure TC4DWizardIDEToolBarsUtilities.SetVisibleInINI(AVisible: Boolean);
 begin
   Self.GetIniFile.WriteBool(TC4DConsts.C_TOOL_BAR_UTILITIES_NAME,
-    TC4DConsts.C_TOOL_BAR_UTILITIES_INI_Visible,
-    AVisible);
+    TC4DConsts.C_TOOL_BAR_UTILITIES_INI_Visible, AVisible);
+
   if(AVisible)then
     Self.ProcessRefresh(True);
 end;
 
 function TC4DWizardIDEToolBarsUtilities.GetVisibleInINI: Boolean;
 begin
   Result := Self.GetIniFile.ReadBool(TC4DConsts.C_TOOL_BAR_UTILITIES_NAME,
-    TC4DConsts.C_TOOL_BAR_UTILITIES_INI_Visible,
-    True);
+    TC4DConsts.C_TOOL_BAR_UTILITIES_INI_Visible, True);
 end;
 
 function TC4DWizardIDEToolBarsUtilities.GetReferenceToolBar: string;
@@ -251,9 +257,7 @@ procedure TC4DWizardIDEToolBarsUtilities.ConfigButtonUnitInReadOnly(const AInRea
 procedure TC4DWizardIDEToolBarsUtilities.OpenExternalFillList;
 begin
   FList.Clear;
-  TC4DWizardOpenExternalModel
-    .New
-    .ReadIniFile(
+  TC4DWizardOpenExternalModel.New.ReadIniFile(
     procedure(AC4DWizardOpenExternal: TC4DWizardOpenExternal)
     var
       LC4DWizardOpenExternal: TC4DWizardOpenExternal;

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

@@ -20,6 +20,7 @@   TC4DWizardUtilsOTA = class
     class function EditorAsstring(AIOTAModule: IOTAModule): string;
     class procedure DoCloseFile(AInfoFile: TC4DWizardInfoFile);
   public
+    class function CurrentProjectIsC4DWizardDPROJ: Boolean;
     class function CurrentModuleIsReadOnly: Boolean;
     class procedure CloseFilesOpened(AC4DWizardExtensions: TC4DExtensionsOfFiles);
     class function AddImgIDEResourceName(AResourceName: string): Integer;
@@ -83,11 +84,25 @@   TC4DWizardUtilsOTA = class
 implementation
 
 uses
+  C4D.Wizard.Consts,
   C4D.Wizard.LogFile,
   C4D.Wizard.Model.Files.Loop,
   C4D.Wizard.Utils,
   C4D.Wizard.Utils.OTA.BinaryPath;
 
+class function TC4DWizardUtilsOTA.CurrentProjectIsC4DWizardDPROJ: Boolean;
+var
+  LIOTAProject: IOTAProject;
+begin
+  Result := False;
+
+  LIOTAProject := Self.GetCurrentProject;
+  if(LIOTAProject = nil)then
+    Exit;
+
+  Result := TC4DWizardUtils.FileNameIsC4DWizardDPROJ(LIOTAProject.FileName);
+end;
+
 class function TC4DWizardUtilsOTA.CurrentModuleIsReadOnly: Boolean;
 var
   LIOTAEditBuffer: IOTAEditBuffer;