Skip to content

Commit d26f054

Browse files
author
César Cardoso
committed
hotfix/search-in-open-files
1 parent 2ff4c51 commit d26f054

File tree

3 files changed

+20
-45
lines changed

3 files changed

+20
-45
lines changed

Src/Model/Files/C4D.Wizard.Model.Files.Loop.pas

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -175,32 +175,22 @@ procedure TC4DWizardModelFilesLoop.GetFilesOpened;
175175
if(LIOTAModuleServices.GetModule(0).FileName = TC4DConsts.DEFAULT_HTM)then
176176
raise Exception.Create('No Units Opened was found.');
177177

178-
for LContModule := 0 to pred(LIOTAModuleServices.ModuleCount) do
178+
for LContModule := 0 to Pred(LIOTAModuleServices.ModuleCount) do
179179
begin
180180
LIOTAModule := LIOTAModuleServices.GetModule(LContModule);
181-
for LContFile := 0 to pred(LIOTAModule.GetModuleFileCount)do
181+
for LContFile := 0 to Pred(LIOTAModule.GetModuleFileCount)do
182182
begin
183183
LIOTAEditor := LIOTAModule.GetModuleFileEditor(LContFile);
184-
if(Supports(LIOTAEditor, IOTASourceEditor, LIOTASourceEditor))then
184+
if Supports(LIOTAEditor, IOTASourceEditor, LIOTASourceEditor) then
185185
begin
186-
Self.ListFilesAdd(LIOTAEditor.FileName);
187-
Break;
186+
if LIOTASourceEditor.EditViewCount > 0 then
187+
begin
188+
Self.ListFilesAdd(LIOTAEditor.FileName);
189+
Break;
190+
end;
188191
end;
189192
end;
190193
end;
191-
192-
// for LContModule := 0 to Pred(LIOTAModuleServices.ModuleCount) do
193-
// begin
194-
// LIOTAModule := LIOTAModuleServices.Modules[LContModule];
195-
// LIOTAEditor := LIOTAModule.CurrentEditor;
196-
// if LIOTAEditor = nil then
197-
// Continue;
198-
//
199-
// if LIOTAEditor.GetModule = nil then
200-
// Continue;
201-
//
202-
// Self.ListFilesAdd(LIOTAEditor.FileName);
203-
// end;
204194
end;
205195

206196
procedure TC4DWizardModelFilesLoop.GetFileCurrent;

Src/Utils/C4D.Wizard.Utils.OTA.pas

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -348,45 +348,33 @@ class procedure TC4DWizardUtilsOTA.RefreshProjectOrModule;
348348

349349
class function TC4DWizardUtilsOTA.FileIsOpenInIDE(const APathFile: string): Boolean;
350350
var
351+
LIOTAModuleServices: IOTAModuleServices;
351352
LIOTAModule: IOTAModule;
352-
LIOTAEditor: IOTAEditor;
353+
LIOTASourceEditor: IOTASourceEditor;
353354
i: Integer;
354355
begin
355356
Result := False;
356357
if(APathFile.Trim.IsEmpty)then
357358
Exit;
358359

359-
LIOTAModule := Self.GetModule(APathFile);
360-
if(not Assigned(LIOTAModule))then
361-
Exit;
362-
363-
for i := 0 to Pred(LIOTAModule.GetModuleFileCount) do
360+
LIOTAModuleServices := Self.GetIOTAModuleServices;
361+
for i := 0 to Pred(LIOTAModuleServices.ModuleCount) do
364362
begin
365-
LIOTAEditor := LIOTAModule.GetModuleFileEditor(i);
366-
if(not Assigned(LIOTAEditor))then
363+
LIOTAModule := LIOTAModuleServices.Modules[i];
364+
365+
LIOTASourceEditor := TC4DWizardUtilsOTA.GetIOTASourceEditor(LIOTAModule);
366+
if LIOTASourceEditor = nil then
367367
Continue;
368368

369-
Result := SameFileName(APathFile, LIOTAEditor.FileName);
369+
if LIOTASourceEditor.EditViewCount <= 0 then
370+
Continue;
371+
372+
Result := SameFileName(APathFile, LIOTAModule.FileName);
370373
if(Result)then
371374
Exit;
372375
end;
373376
end;
374377

375-
{class function TC4DWizardUtilsOTA.FileIsOpenInIDE(const APathFile: string): Boolean;
376-
var
377-
LIOTAModuleServices: IOTAModuleServices;
378-
i: Integer;
379-
begin
380-
Result := False;
381-
LIOTAModuleServices := Self.GetIOTAModuleServices;
382-
if(LIOTAModuleServices = nil)then
383-
Exit;
384-
385-
for i := 0 to Pred(LIOTAModuleServices.ModuleCount) do
386-
if(LIOTAModuleServices.Modules[i].FileName = APathFile)then
387-
Exit(True);
388-
end;}
389-
390378
class function TC4DWizardUtilsOTA.CheckIfExistFileInCurrentsProjectGroups(const ANameFileWithExtension: string): Boolean;
391379
var
392380
LIOTAModuleServices: IOTAModuleServices;

Src/View/C4D.Wizard.View.About.pas

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,8 @@ procedure TC4DWizardViewAbout.btnTesteClick(Sender: TObject);
134134
LIOTASourceEditor: IOTASourceEditor;
135135
LFileName: string;
136136
i: integer;
137-
LContFile: Integer;
138-
LMsg: string;
139137

140138
LIOTAModule: IOTAModule;
141-
LReader: IOTAEditReader;
142139
begin
143140
LIOTAModule := TC4DWizardUtilsOTA.GetCurrentModule;
144141
LFileName := '';

0 commit comments

Comments
 (0)