implemented source editor popupmenu item for open package of current file

git-svn-id: trunk@7449 -
This commit is contained in:
mattias 2005-07-30 00:10:11 +00:00
parent 64c7c29a3f
commit 7e8d0cc9c9
3 changed files with 16 additions and 10 deletions

View File

@ -2918,7 +2918,8 @@ begin
'Open '+ChangeFileExt(ExtractFileName(CurFilename),'.pp'),
true,@OnPopupMenuOpenPPFile);
end;
if Assigned(OnPopupMenu) then OnPopupMenu(@AddUserDefinedPopupMenuItem);
if Assigned(OnPopupMenu) then OnPopupMenu(@AddContextPopupMenuItem);
end;
procedure TSourceNotebook.NotebookShowTabHint(Sender: TObject;

View File

@ -647,7 +647,7 @@ type
function NeedsDefineTemplates: boolean;
// files
function IndexOfPkgFile(PkgFile: TPkgFile): integer;
function SearchFile(const AFilename: string;
function SearchFile(const ShortFilename: string;
SearchFlags: TSearchIDEFileFlags): TPkgFile;
procedure ShortenFilename(var ExpandedFilename: string; UseUp: boolean);
procedure LongenFilename(var AFilename: string);
@ -3000,7 +3000,7 @@ begin
while (Files[Result]<>PkgFile) do dec(Result);
end;
function TLazPackage.SearchFile(const AFilename: string;
function TLazPackage.SearchFile(const ShortFilename: string;
SearchFlags: TSearchIDEFileFlags): TPkgFile;
var
SearchedFilename: String;
@ -3012,7 +3012,7 @@ var
TheFileName:=ExtractFilenameOnly(TheFileName);
if FilenameIsAbsolute(TheFileName) then
TheFileName:=ExtractFilename(TheFileName);
debugln('TLazPackage.SearchFile A ',SearchedFilename,' ',TheFilename);
//debugln('TLazPackage.SearchFile A ',SearchedFilename,' ',TheFilename);
if siffCaseSensitive in SearchFlags then
Result:=SearchedFilename=TheFilename
else
@ -3020,7 +3020,7 @@ var
end;
begin
SearchedFilename:=AFilename;
SearchedFilename:=ShortFilename;
if siffIgnoreExtension in SearchFlags then
SearchedFilename:=ExtractFilenameOnly(SearchedFilename);

View File

@ -3330,7 +3330,7 @@ var
SrcEdit: TSourceEditor;
begin
SrcEdit:=SourceNotebook.GetActiveSE;
debugln('TPkgManager.GetPackageOfCurrentSourceEditor ',SrcEdit.Filename);
//debugln('TPkgManager.GetPackageOfCurrentSourceEditor ',SrcEdit.Filename);
if SrcEdit<>nil then
Result:=SearchFile(SrcEdit.Filename,[],nil)
else
@ -3368,17 +3368,22 @@ function TPkgManager.SearchFile(const AFilename: string;
var
i: Integer;
APackage: TLazPackage;
CurFilename: String;
begin
if InObject is TLazPackage then begin
APackage:=TLazPackage(InObject);
Result:=APackage.SearchFile(AFilename,SearchFlags);
CurFilename:=AFilename;
APackage.ShortenFilename(CurFilename,true);
Result:=APackage.SearchFile(CurFilename,SearchFlags);
if Result<>nil then exit;
end;
if not (siffDoNotCheckAllPackages in SearchFlags) then begin
for i:=0 to PackageGraph.Count-1 do begin
APackage:=PackageGraph[i];
Result:=APackage.SearchFile(AFilename,SearchFlags);
debugln('TPkgManager.SearchFile ',APackage.Files[0].Filename);
CurFilename:=AFilename;
APackage.ShortenFilename(CurFilename,true);
Result:=APackage.SearchFile(CurFilename,SearchFlags);
//debugln('TPkgManager.SearchFile ',APackage.Files[0].Filename);
if Result<>nil then exit;
end;
end;