diff --git a/components/chmhelp/packages/idehelp/chmhelppkg.lpk b/components/chmhelp/packages/idehelp/chmhelppkg.lpk index ed6edd14bb..4b6728949f 100644 --- a/components/chmhelp/packages/idehelp/chmhelppkg.lpk +++ b/components/chmhelp/packages/idehelp/chmhelppkg.lpk @@ -5,8 +5,7 @@ - - + @@ -24,17 +23,20 @@ - + - + - + + + + - + diff --git a/components/codetools/examples/addeventmethod.lpi b/components/codetools/examples/addeventmethod.lpi index 59ab2dec3c..aec8943db5 100644 --- a/components/codetools/examples/addeventmethod.lpi +++ b/components/codetools/examples/addeventmethod.lpi @@ -10,6 +10,25 @@ </General> + <VersionInfo> + <UseVersionInfo Value="False"/> + <AutoIncrementBuild Value="False"/> + <CurrentVersionNr Value="0"/> + <CurrentMajorRevNr Value="0"/> + <CurrentMinorRevNr Value="0"/> + <CurrentBuildNr Value="0"/> + <ProjectVersion Value="1.0.0.0"/> + <Language Value="0409"/> + <CharSet Value="04E4"/> + <Comments Value=""/> + <CompanyName Value=""/> + <FileDescription Value=""/> + <InternalName Value=""/> + <LegalCopyright Value=""/> + <LegalTrademarks Value=""/> + <OriginalFilename Value=""/> + <ProductName Value=""/> + </VersionInfo> <PublishOptions> <Version Value="2"/> <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/> @@ -21,10 +40,13 @@ <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> </local> </RunParams> - <RequiredPackages Count="1"> + <RequiredPackages Count="2"> <Item1> - <PackageName Value="LCL"/> + <PackageName Value="CodeTools"/> </Item1> + <Item2> + <PackageName Value="LCL"/> + </Item2> </RequiredPackages> <Units Count="3"> <Unit0> @@ -47,7 +69,7 @@ <CompilerOptions> <Version Value="5"/> <SearchPaths> - <OtherUnitFiles Value="$(LazarusDir)/components/codetools/units/$(TargetCPU)-$(TargetOS)/;scanexamples/"/> + <OtherUnitFiles Value="scanexamples/"/> </SearchPaths> <CodeGeneration> <Generate Value="Faster"/> diff --git a/components/codetools/examples/addmethod.lpi b/components/codetools/examples/addmethod.lpi index 73a705c2b7..0732258c78 100644 --- a/components/codetools/examples/addmethod.lpi +++ b/components/codetools/examples/addmethod.lpi @@ -9,6 +9,25 @@ <IconPath Value="./"/> <TargetFileExt Value=""/> </General> + <VersionInfo> + <UseVersionInfo Value="False"/> + <AutoIncrementBuild Value="False"/> + <CurrentVersionNr Value="0"/> + <CurrentMajorRevNr Value="0"/> + <CurrentMinorRevNr Value="0"/> + <CurrentBuildNr Value="0"/> + <ProjectVersion Value="1.0.0.0"/> + <Language Value="0409"/> + <CharSet Value="04E4"/> + <Comments Value=""/> + <CompanyName Value=""/> + <FileDescription Value=""/> + <InternalName Value=""/> + <LegalCopyright Value=""/> + <LegalTrademarks Value=""/> + <OriginalFilename Value=""/> + <ProductName Value=""/> + </VersionInfo> <PublishOptions> <Version Value="2"/> <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/> @@ -20,6 +39,11 @@ <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> </local> </RunParams> + <RequiredPackages Count="1"> + <Item1> + <PackageName Value="CodeTools"/> + </Item1> + </RequiredPackages> <Units Count="2"> <Unit0> <Filename Value="addmethod.lpr"/> @@ -36,7 +60,7 @@ <CompilerOptions> <Version Value="5"/> <SearchPaths> - <OtherUnitFiles Value="$(LazarusDir)/components/codetools/units/$(TargetCPU)-$(TargetOS)/;scanexamples/"/> + <OtherUnitFiles Value="scanexamples/"/> </SearchPaths> <CodeGeneration> <Generate Value="Faster"/> diff --git a/components/codetools/examples/codecompletion.lpi b/components/codetools/examples/codecompletion.lpi index c8e38dddb1..76ed304720 100644 --- a/components/codetools/examples/codecompletion.lpi +++ b/components/codetools/examples/codecompletion.lpi @@ -10,6 +10,25 @@ <TargetFileExt Value=""/> <Title Value="finddeclaration"/> </General> + <VersionInfo> + <UseVersionInfo Value="False"/> + <AutoIncrementBuild Value="False"/> + <CurrentVersionNr Value="0"/> + <CurrentMajorRevNr Value="0"/> + <CurrentMinorRevNr Value="0"/> + <CurrentBuildNr Value="0"/> + <ProjectVersion Value="1.0.0.0"/> + <Language Value="0409"/> + <CharSet Value="04E4"/> + <Comments Value=""/> + <CompanyName Value=""/> + <FileDescription Value=""/> + <InternalName Value=""/> + <LegalCopyright Value=""/> + <LegalTrademarks Value=""/> + <OriginalFilename Value=""/> + <ProductName Value=""/> + </VersionInfo> <PublishOptions> <Version Value="2"/> <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/> @@ -21,6 +40,11 @@ <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> </local> </RunParams> + <RequiredPackages Count="1"> + <Item1> + <PackageName Value="CodeTools"/> + </Item1> + </RequiredPackages> <Units Count="1"> <Unit0> <Filename Value="codecompletion.lpr"/> @@ -32,7 +56,7 @@ <CompilerOptions> <Version Value="5"/> <SearchPaths> - <OtherUnitFiles Value="$(LazarusDir)/components/codetools/units/$(TargetCPU)-$(TargetOS)/;scanexamples/"/> + <OtherUnitFiles Value="scanexamples/"/> </SearchPaths> <CodeGeneration> <Generate Value="Faster"/> diff --git a/components/codetools/examples/finddeclaration.lpi b/components/codetools/examples/finddeclaration.lpi index 347613a433..a9ae516fa9 100644 --- a/components/codetools/examples/finddeclaration.lpi +++ b/components/codetools/examples/finddeclaration.lpi @@ -9,7 +9,25 @@ <IconPath Value="./"/> <TargetFileExt Value=""/> </General> - <LazDoc Paths=""/> + <VersionInfo> + <UseVersionInfo Value="False"/> + <AutoIncrementBuild Value="False"/> + <CurrentVersionNr Value="0"/> + <CurrentMajorRevNr Value="0"/> + <CurrentMinorRevNr Value="0"/> + <CurrentBuildNr Value="0"/> + <ProjectVersion Value="1.0.0.0"/> + <Language Value="0409"/> + <CharSet Value="04E4"/> + <Comments Value=""/> + <CompanyName Value=""/> + <FileDescription Value=""/> + <InternalName Value=""/> + <LegalCopyright Value=""/> + <LegalTrademarks Value=""/> + <OriginalFilename Value=""/> + <ProductName Value=""/> + </VersionInfo> <PublishOptions> <Version Value="2"/> <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/> @@ -21,6 +39,11 @@ <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> </local> </RunParams> + <RequiredPackages Count="1"> + <Item1> + <PackageName Value="CodeTools"/> + </Item1> + </RequiredPackages> <Units Count="2"> <Unit0> <Filename Value="finddeclaration.lpr"/> @@ -37,7 +60,7 @@ <CompilerOptions> <Version Value="5"/> <SearchPaths> - <OtherUnitFiles Value="$(LazarusDir)/components/codetools/units/$(TargetCPU)-$(TargetOS)/;scanexamples/"/> + <OtherUnitFiles Value="scanexamples/"/> </SearchPaths> <CodeGeneration> <Generate Value="Faster"/> diff --git a/components/codetools/examples/fixfilenames.lpi b/components/codetools/examples/fixfilenames.lpi index ee2cb8495b..07d48eac4d 100644 --- a/components/codetools/examples/fixfilenames.lpi +++ b/components/codetools/examples/fixfilenames.lpi @@ -14,7 +14,25 @@ <IconPath Value="./"/> <TargetFileExt Value=""/> </General> - <LazDoc Paths=""/> + <VersionInfo> + <UseVersionInfo Value="False"/> + <AutoIncrementBuild Value="False"/> + <CurrentVersionNr Value="0"/> + <CurrentMajorRevNr Value="0"/> + <CurrentMinorRevNr Value="0"/> + <CurrentBuildNr Value="0"/> + <ProjectVersion Value="1.0.0.0"/> + <Language Value="0409"/> + <CharSet Value="04E4"/> + <Comments Value=""/> + <CompanyName Value=""/> + <FileDescription Value=""/> + <InternalName Value=""/> + <LegalCopyright Value=""/> + <LegalTrademarks Value=""/> + <OriginalFilename Value=""/> + <ProductName Value=""/> + </VersionInfo> <PublishOptions> <Version Value="2"/> <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/> @@ -26,6 +44,11 @@ <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> </local> </RunParams> + <RequiredPackages Count="1"> + <Item1> + <PackageName Value="CodeTools"/> + </Item1> + </RequiredPackages> <Units Count="5"> <Unit0> <Filename Value="fixfilenames.pas"/> @@ -54,9 +77,6 @@ </ProjectOptions> <CompilerOptions> <Version Value="5"/> - <SearchPaths> - <OtherUnitFiles Value="$(LazarusDir)/components/codetools/units/$(TargetCPU)-$(TargetOS)/"/> - </SearchPaths> <CodeGeneration> <Generate Value="Faster"/> </CodeGeneration> diff --git a/components/codetools/examples/getcontext.lpi b/components/codetools/examples/getcontext.lpi index 7fb6e439b3..5d2ba445d6 100644 --- a/components/codetools/examples/getcontext.lpi +++ b/components/codetools/examples/getcontext.lpi @@ -9,6 +9,25 @@ <IconPath Value="./"/> <TargetFileExt Value=""/> </General> + <VersionInfo> + <UseVersionInfo Value="False"/> + <AutoIncrementBuild Value="False"/> + <CurrentVersionNr Value="0"/> + <CurrentMajorRevNr Value="0"/> + <CurrentMinorRevNr Value="0"/> + <CurrentBuildNr Value="0"/> + <ProjectVersion Value="1.0.0.0"/> + <Language Value="0409"/> + <CharSet Value="04E4"/> + <Comments Value=""/> + <CompanyName Value=""/> + <FileDescription Value=""/> + <InternalName Value=""/> + <LegalCopyright Value=""/> + <LegalTrademarks Value=""/> + <OriginalFilename Value=""/> + <ProductName Value=""/> + </VersionInfo> <PublishOptions> <Version Value="2"/> <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/> @@ -20,6 +39,11 @@ <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> </local> </RunParams> + <RequiredPackages Count="1"> + <Item1> + <PackageName Value="CodeTools"/> + </Item1> + </RequiredPackages> <Units Count="2"> <Unit0> <Filename Value="getcontext.lpr"/> @@ -36,7 +60,7 @@ <CompilerOptions> <Version Value="5"/> <SearchPaths> - <OtherUnitFiles Value="$(LazarusDir)/components/codetools/units/$(TargetCPU)-$(TargetOS)/;scanexamples/"/> + <OtherUnitFiles Value="scanexamples/"/> </SearchPaths> <CodeGeneration> <Generate Value="Faster"/> diff --git a/components/codetools/examples/methodjumping.lpi b/components/codetools/examples/methodjumping.lpi index fa67d53688..539a65a46e 100644 --- a/components/codetools/examples/methodjumping.lpi +++ b/components/codetools/examples/methodjumping.lpi @@ -9,7 +9,25 @@ <IconPath Value="./"/> <TargetFileExt Value=""/> </General> - <LazDoc Paths=""/> + <VersionInfo> + <UseVersionInfo Value="False"/> + <AutoIncrementBuild Value="False"/> + <CurrentVersionNr Value="0"/> + <CurrentMajorRevNr Value="0"/> + <CurrentMinorRevNr Value="0"/> + <CurrentBuildNr Value="0"/> + <ProjectVersion Value="1.0.0.0"/> + <Language Value="0409"/> + <CharSet Value="04E4"/> + <Comments Value=""/> + <CompanyName Value=""/> + <FileDescription Value=""/> + <InternalName Value=""/> + <LegalCopyright Value=""/> + <LegalTrademarks Value=""/> + <OriginalFilename Value=""/> + <ProductName Value=""/> + </VersionInfo> <PublishOptions> <Version Value="2"/> <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/> @@ -21,6 +39,11 @@ <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> </local> </RunParams> + <RequiredPackages Count="1"> + <Item1> + <PackageName Value="CodeTools"/> + </Item1> + </RequiredPackages> <Units Count="1"> <Unit0> <Filename Value="methodjumping.pas"/> @@ -31,9 +54,6 @@ </ProjectOptions> <CompilerOptions> <Version Value="5"/> - <SearchPaths> - <OtherUnitFiles Value="$(LazarusDir)/components/codetools/units/$(TargetCPU)-$(TargetOS)/"/> - </SearchPaths> <CodeGeneration> <Generate Value="Faster"/> </CodeGeneration> diff --git a/components/h2pas/h2paswizard.lpk b/components/h2pas/h2paswizard.lpk index 58aee62c84..9bb55afee7 100644 --- a/components/h2pas/h2paswizard.lpk +++ b/components/h2pas/h2paswizard.lpk @@ -5,7 +5,6 @@ <CompilerOptions> <Version Value="5"/> <SearchPaths> - <OtherUnitFiles Value="$(LazarusDir)/components/codetools/units/$(TargetCPU)-$(TargetOS)/"/> <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/> </SearchPaths> <CodeGeneration> @@ -47,17 +46,20 @@ </Item7> </Files> <Type Value="RunAndDesignTime"/> - <RequiredPkgs Count="3"> + <RequiredPkgs Count="4"> <Item1> - <PackageName Value="SynEdit"/> + <PackageName Value="CodeTools"/> </Item1> <Item2> - <PackageName Value="IDEIntf"/> + <PackageName Value="SynEdit"/> </Item2> <Item3> + <PackageName Value="IDEIntf"/> + </Item3> + <Item4> <PackageName Value="FCL"/> <MinVersion Major="1" Valid="True"/> - </Item3> + </Item4> </RequiredPkgs> <UsageOptions> <UnitPath Value="$(PkgOutDir)"/> diff --git a/examples/codetools/jumptoimplementation/jumptoimplementation.lpk b/examples/codetools/jumptoimplementation/jumptoimplementation.lpk index 935d68698e..40015f3651 100644 --- a/examples/codetools/jumptoimplementation/jumptoimplementation.lpk +++ b/examples/codetools/jumptoimplementation/jumptoimplementation.lpk @@ -5,8 +5,7 @@ <CompilerOptions> <Version Value="5"/> <SearchPaths> - <OtherUnitFiles Value="$(LazarusDir)/components/codetools/units/$(TargetCPU)-$(TargetOS)/"/> - <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)/"/> + <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/> </SearchPaths> <CodeGeneration> <Generate Value="Faster"/> @@ -23,14 +22,17 @@ </Item1> </Files> <Type Value="RunAndDesignTime"/> - <RequiredPkgs Count="2"> + <RequiredPkgs Count="3"> <Item1> - <PackageName Value="IDEIntf"/> + <PackageName Value="CodeTools"/> </Item1> <Item2> + <PackageName Value="IDEIntf"/> + </Item2> + <Item3> <PackageName Value="FCL"/> <MinVersion Major="1" Valid="True"/> - </Item2> + </Item3> </RequiredPkgs> <UsageOptions> <UnitPath Value="$(PkgOutDir)"/> diff --git a/examples/idequickfix/quickfixexample.lpk b/examples/idequickfix/quickfixexample.lpk index 9986eee340..84a8140ef4 100644 --- a/examples/idequickfix/quickfixexample.lpk +++ b/examples/idequickfix/quickfixexample.lpk @@ -5,8 +5,7 @@ <CompilerOptions> <Version Value="5"/> <SearchPaths> - <OtherUnitFiles Value="$(LazarusDir)/components/codetools/units/$(TargetCPU)-$(TargetOS)/"/> - <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)/"/> + <UnitOutputDirectory Value="lib/$(TargetCPU)-$(TargetOS)"/> </SearchPaths> <CodeGeneration> <Generate Value="Faster"/> @@ -23,7 +22,7 @@ </Item1> </Files> <Type Value="RunAndDesignTime"/> - <RequiredPkgs Count="2"> + <RequiredPkgs Count="3"> <Item1> <PackageName Value="IDEIntf"/> </Item1> @@ -31,9 +30,12 @@ <PackageName Value="FCL"/> <MinVersion Major="1" Valid="True"/> </Item2> + <Item3> + <PackageName Value="CodeTools"/> + </Item3> </RequiredPkgs> <UsageOptions> - <UnitPath Value="$(PkgOutDir)/;$(LazarusDir)/components/codetools/units/$(TargetCPU)-$(TargetOS)/"/> + <UnitPath Value="$(PkgOutDir)/"/> </UsageOptions> <PublishOptions> <Version Value="2"/> diff --git a/examples/xmlstreaming/streamasxmldemo.lpi b/examples/xmlstreaming/streamasxmldemo.lpi index af5e7c85ec..effe5c5282 100644 --- a/examples/xmlstreaming/streamasxmldemo.lpi +++ b/examples/xmlstreaming/streamasxmldemo.lpi @@ -9,6 +9,25 @@ <IconPath Value="./"/> <TargetFileExt Value=""/> </General> + <VersionInfo> + <UseVersionInfo Value="False"/> + <AutoIncrementBuild Value="False"/> + <CurrentVersionNr Value="0"/> + <CurrentMajorRevNr Value="0"/> + <CurrentMinorRevNr Value="0"/> + <CurrentBuildNr Value="0"/> + <ProjectVersion Value="1.0.0.0"/> + <Language Value="0409"/> + <CharSet Value="04E4"/> + <Comments Value=""/> + <CompanyName Value=""/> + <FileDescription Value=""/> + <InternalName Value=""/> + <LegalCopyright Value=""/> + <LegalTrademarks Value=""/> + <OriginalFilename Value=""/> + <ProductName Value=""/> + </VersionInfo> <PublishOptions> <Version Value="2"/> <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/> @@ -20,10 +39,13 @@ <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> </local> </RunParams> - <RequiredPackages Count="1"> + <RequiredPackages Count="2"> <Item1> - <PackageName Value="LCL"/> + <PackageName Value="CodeTools"/> </Item1> + <Item2> + <PackageName Value="LCL"/> + </Item2> </RequiredPackages> <Units Count="2"> <Unit0> @@ -42,9 +64,6 @@ </ProjectOptions> <CompilerOptions> <Version Value="5"/> - <SearchPaths> - <OtherUnitFiles Value="$(LazarusDir)/components/codetools/units/$(TargetCPU)-$(TargetOS)/"/> - </SearchPaths> <CodeGeneration> <Generate Value="Faster"/> </CodeGeneration> diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas index c491023111..565c39f3b4 100644 --- a/ide/lazarusidestrconsts.pas +++ b/ide/lazarusidestrconsts.pas @@ -2512,6 +2512,8 @@ resourcestring +'Component Library contains all base components for form editing.'; lisPkgSysSynEditTheEditorComponentUsedByLazarus = 'SynEdit - the editor ' +'component used by Lazarus. http://sourceforge.net/projects/synedit/'; + lisPkgSysCodeToolsToolsAndFunctionsToParseBrowseAndEditPasc = 'CodeTools - ' + +'tools and functions to parse, browse and edit pascal sources'; lisPkgSysThisIsTheDefaultPackageUsedOnlyForComponents = 'This is the ' +'default package. Used only for components without a package. These ' +'components are outdated.'; diff --git a/ide/uniteditor.pp b/ide/uniteditor.pp index 1aa25f2aac..efff4db4a7 100644 --- a/ide/uniteditor.pp +++ b/ide/uniteditor.pp @@ -50,7 +50,7 @@ uses SynEditTypes, SynEdit, SynRegExpr, SynEditHighlighter, SynEditAutoComplete, SynEditKeyCmds, SynCompletion, // IDE interface - MacroIntf, ProjectIntf, SrcEditorIntf, MenuIntf, LazIDEIntf, + MacroIntf, ProjectIntf, SrcEditorIntf, MenuIntf, LazIDEIntf, PackageIntf, IDEWindowIntf, // IDE units LazarusIDEStrConsts, LazConf, IDECommands, EditorOptions, KeyMapping, Project, @@ -435,6 +435,7 @@ type procedure OnPopupMenuOpenPFile(Sender: TObject); procedure OnPopupMenuOpenLFMFile(Sender: TObject); procedure OnPopupMenuOpenLRSFile(Sender: TObject); + procedure OnPopupMenuOpenFile(Sender: TObject); procedure ShowUnitInfo(Sender: TObject); procedure SrcPopUpMenuPopup(Sender: TObject); procedure ToggleLineNumbersClicked(Sender: TObject); @@ -3622,33 +3623,38 @@ begin // add context specific menu items CurFilename:=ASrcEdit.FileName; - if FilenameIsPascalUnit(CurFilename) - and (FilenameIsAbsolute(CurFilename)) then begin - if FileExists(ChangeFileExt(CurFilename,'.lfm')) then - AddContextPopupMenuItem( - 'Open '+ChangeFileExt(ExtractFileName(CurFilename),'.lfm'), - true,@OnPopupMenuOpenLFMFile); - if FileExists(ChangeFileExt(CurFilename,'.lrs')) then - AddContextPopupMenuItem( - 'Open '+ChangeFileExt(ExtractFileName(CurFilename),'.lrs'), - true,@OnPopupMenuOpenLRSFile); + if (FilenameIsAbsolute(CurFilename)) then begin + if FilenameIsPascalUnit(CurFilename) then begin + if FileExists(ChangeFileExt(CurFilename,'.lfm')) then + AddContextPopupMenuItem( + 'Open '+ChangeFileExt(ExtractFileName(CurFilename),'.lfm'), + true,@OnPopupMenuOpenLFMFile); + if FileExists(ChangeFileExt(CurFilename,'.lrs')) then + AddContextPopupMenuItem( + 'Open '+ChangeFileExt(ExtractFileName(CurFilename),'.lrs'), + true,@OnPopupMenuOpenLRSFile); + end; + if (CompareFileExt(CurFilename,'.lfm',true)=0) then begin + if FileExists(ChangeFileExt(CurFilename,'.pas')) then + AddContextPopupMenuItem( + 'Open '+ChangeFileExt(ExtractFileName(CurFilename),'.pas'), + true,@OnPopupMenuOpenPasFile); + if FileExists(ChangeFileExt(CurFilename,'.pp')) then + AddContextPopupMenuItem( + 'Open '+ChangeFileExt(ExtractFileName(CurFilename),'.pp'), + true,@OnPopupMenuOpenPPFile); + if FileExists(ChangeFileExt(CurFilename,'.p')) then + AddContextPopupMenuItem( + 'Open '+ChangeFileExt(ExtractFileName(CurFilename),'.p'), + true,@OnPopupMenuOpenPFile); + end; + if (CompareFileExt(CurFilename,'.lpi',true)=0) + or (CompareFileExt(CurFilename,'.lpk',true)=0) then begin + AddContextPopupMenuItem('Open '+ExtractFileName(CurFilename),true, + @OnPopupMenuOpenFile); + end; end; - if (CompareFileExt(CurFilename,'.lfm',true)=0) - and (FilenameIsAbsolute(CurFilename)) then begin - if FileExists(ChangeFileExt(CurFilename,'.pas')) then - AddContextPopupMenuItem( - 'Open '+ChangeFileExt(ExtractFileName(CurFilename),'.pas'), - true,@OnPopupMenuOpenPasFile); - if FileExists(ChangeFileExt(CurFilename,'.pp')) then - AddContextPopupMenuItem( - 'Open '+ChangeFileExt(ExtractFileName(CurFilename),'.pp'), - true,@OnPopupMenuOpenPPFile); - if FileExists(ChangeFileExt(CurFilename,'.p')) then - AddContextPopupMenuItem( - 'Open '+ChangeFileExt(ExtractFileName(CurFilename),'.p'), - true,@OnPopupMenuOpenPFile); - end; - + if Assigned(OnPopupMenu) then OnPopupMenu(@AddContextPopupMenuItem); SourceEditorMenuRoot.NotifySubSectionOnShow(Self); @@ -4574,6 +4580,18 @@ begin [ofOnlyIfExists,ofAddToRecent,ofRegularFile,ofUseCache,ofDoNotLoadResource]); end; +procedure TSourceNotebook.OnPopupMenuOpenFile(Sender: TObject); +var + AFilename: String; +begin + AFilename:=GetActiveSE.Filename; + if CompareFileExt(AFilename,'.lpi')=0 then + MainIDEInterface.DoOpenProjectFile(AFilename, + [ofOnlyIfExists,ofAddToRecent,ofUseCache]) + else if CompareFileExt(AFilename,'.lpk')=0 then + PackageEditingInterface.DoOpenPackageFile(AFilename,[pofAddToRecent]); +end; + Procedure TSourceNotebook.ShowUnitInfo(Sender: TObject); begin if Assigned(FOnShowUnitInfo) then FOnShowUnitInfo(Sender); diff --git a/packager/packagesystem.pas b/packager/packagesystem.pas index 92dcc3faee..65f18ad1ee 100644 --- a/packager/packagesystem.pas +++ b/packager/packagesystem.pas @@ -1119,14 +1119,14 @@ begin Result:=TLazPackage.Create; with Result do begin AutoCreated:=true; - Name:='CodeToolst'; + Name:='CodeTools'; Filename:=SetDirSeparators('$(LazarusDir)/components/codetools/'); Version.SetValues(1,0,0,0); Author:='Mattias Gaertner'; License:='GPL-2'; AutoInstall:=pitStatic; AutoUpdate:=pupManually; - Description:='CodeTools - tools and functions to parse, browse and edit pascal sources'; + Description:=lisPkgSysCodeToolsToolsAndFunctionsToParseBrowseAndEditPasc; PackageType:=lptRunAndDesignTime; Installed:=pitStatic; CompilerOptions.UnitOutputDirectory:='';