paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-24 15:19:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: add/remove active file to/from package

Browse Source 
git-svn-id: trunk@32143 -
This commit is contained in:
mattias 2011-09-01 17:38:45 +00:00
parent 3f9a1eba05
commit 478b63f35b
8 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/tachart/tachartlazaruspkg.lpk
View File

@ -30,7 +30,7 @@
for details about the copyright.
"/>
<Version Major="1"/>
<Files Count="33">
<Files Count="34">
<Item1>
<Filename Value="tagraph.pas"/>
<HasRegisterProc Value="True"/>
@ -179,6 +179,10 @@
<HasRegisterProc Value="True"/>
<UnitName Value="TAToolEditors"/>
</Item33>
<Item34>
<Filename Value="tagraph.lrs"/>
<Type Value="LRS"/>
</Item34>
</Files>
<LazDoc Paths="$(LazarusDir)\components\tachart\fpdoc"/>
<Type Value="RunAndDesignTime"/>

12
ide/keymapping.pp
View File

@ -584,7 +584,7 @@ begin
ecOpenPackage: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecOpenPackageFile: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecOpenPackageOfCurUnit: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecAddCurUnitToPkg: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecAddCurFileToPkg: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecPackageGraph: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecEditInstallPkgs: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecConfigCustomComps: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
@ -1035,7 +1035,7 @@ begin
ecOpenPackage: SetSingle(VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecOpenPackageFile: SetSingle(VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecOpenPackageOfCurUnit: SetSingle(VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecAddCurUnitToPkg: SetSingle(VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecAddCurFileToPkg: SetSingle(VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecPackageGraph: SetSingle(VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecEditInstallPkgs: SetSingle(VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecConfigCustomComps: SetSingle(VK_UNKNOWN,[],VK_UNKNOWN,[]);
@ -1668,7 +1668,7 @@ begin
ecOpenPackage: SetSingle(VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecOpenPackageFile: SetSingle(VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecOpenPackageOfCurUnit: SetSingle(VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecAddCurUnitToPkg: SetSingle(VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecAddCurFileToPkg: SetSingle(VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecPackageGraph: SetSingle(VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecEditInstallPkgs: SetSingle(VK_UNKNOWN,[],VK_UNKNOWN,[]);
ecConfigCustomComps: SetSingle(VK_UNKNOWN,[],VK_UNKNOWN,[]);
@ -2214,7 +2214,7 @@ begin
ecOpenPackage : Result:= lisMenuOpenPackage;
ecOpenPackageFile : Result:= lisMenuOpenPackageFile;
ecOpenPackageOfCurUnit : Result:= lisMenuOpenPackageOfCurUnit;
ecAddCurUnitToPkg : Result:= lisMenuAddCurUnitToPkg;
ecAddCurFileToPkg : Result:= lisMenuAddCurFileToPkg;
ecPackageGraph : Result:= lisMenuPackageGraph;
ecEditInstallPkgs : Result:= lisMenuEditInstallPkgs;
ecConfigCustomComps : Result:= lisMenuConfigCustomComps;
@ -2827,7 +2827,7 @@ begin
AddDefault(C, 'Publish project', lisKMPublishProject, ecPublishProject);
AddDefault(C, 'Project Inspector', lisMenuProjectInspector, ecProjectInspector);
AddDefault(C, 'Add editor file to Project', lisMenuAddToProject, ecAddCurUnitToProj);
AddDefault(C, 'Remove active unit from project', lisKMRemoveActiveUnitFromProject, ecRemoveFromProj);
AddDefault(C, 'Remove active unit from project', lisKMRemoveActiveFileFromProject, ecRemoveFromProj);
AddDefault(C, 'View Units', lisHintViewUnits, ecViewProjectUnits);
AddDefault(C, 'View Forms', lisHintViewForms, ecViewProjectForms);
AddDefault(C, 'View project source', lisKMViewProjectSource, ecViewProjectSource);
@ -2869,7 +2869,7 @@ begin
AddDefault(C, 'Open package', lisCompPalOpenPackage, ecOpenPackage);
AddDefault(C, 'Open package file', lisKMOpenPackageFile, ecOpenPackageFile);
AddDefault(C, 'Open package of current unit', lisMenuOpenPackageOfCurUnit, ecOpenPackageOfCurUnit);
AddDefault(C, 'Add active unit to a package', lisMenuAddCurUnitToPkg, ecAddCurUnitToPkg);
AddDefault(C, 'Add active unit to a package', lisMenuAddCurFileToPkg, ecAddCurFileToPkg);
AddDefault(C, 'Package graph', lisMenuPackageGraph, ecPackageGraph);
AddDefault(C, 'Configure installed packages', lisInstallUninstallPackages, ecEditInstallPkgs);
AddDefault(C, 'Configure custom components', lisKMConfigureCustomComponents, ecConfigCustomComps);

4
ide/lazarusidestrconsts.pas
View File

@ -319,7 +319,7 @@ resourcestring
lisMenuSaveProjectAs = 'Save Project As ...';
lisMenuPublishProject = 'Publish Project ...';
lisMenuProjectInspector = 'Project Inspector';
lisKMRemoveActiveUnitFromProject = 'Remove active unit from project';
lisKMRemoveActiveFileFromProject = 'Remove active file from project';
lisKMViewProjectSource = 'View project source';
lisMenuAddToProject = 'Add editor file to Project';
lisMenuRemoveFromProject = 'Remove from Project ...';
@ -395,7 +395,7 @@ resourcestring
lisMenuOpenRecentPkg = 'Open recent package';
lisMenuOpenPackageFile = 'Open package file (.lpk) ...';
lisMenuOpenPackageOfCurUnit = 'Open package of current unit';
lisMenuAddCurUnitToPkg = 'Add active unit to a package ...';
lisMenuAddCurFileToPkg = 'Add active file to a package ...';
lisKMConfigureCustomComponents = 'Configure custom components';
lisMenuConfigCustomComps = 'Configure custom components ...';

14
ide/main.pp
View File

@ -3937,19 +3937,19 @@ var
ASrcEdit: TSourceEditor;
AUnitInfo: TUnitInfo;
PkgFile: TPkgFile;
OpenPkgCurU, AddCurU: Boolean;
OpenPkgCurF, AddCurF: Boolean;
begin
OpenPkgCurU:=False;
AddCurU:=False;
OpenPkgCurF:=False;
AddCurF:=False;
GetCurrentUnit(ASrcEdit,AUnitInfo);
if Assigned(ASrcEdit) then begin
PkgFile:=PackageGraph.FindFileInAllPackages(AUnitInfo.Filename,true,
not AUnitInfo.IsPartOfProject);
OpenPkgCurU:=Assigned(PkgFile);
AddCurU:=(not AUnitInfo.IsVirtual) and FileExistsUTF8(AUnitInfo.Filename);
OpenPkgCurF:=Assigned(PkgFile);
AddCurF:=(not AUnitInfo.IsVirtual) and FileExistsUTF8(AUnitInfo.Filename);
end;
MainIDEBar.itmPkgOpenPackageOfCurUnit.Enabled:=OpenPkgCurU;
MainIDEBar.itmPkgAddCurUnitToPkg.Enabled:=AddCurU;
MainIDEBar.itmPkgOpenPackageOfCurUnit.Enabled:=OpenPkgCurF;
MainIDEBar.itmPkgAddCurFileToPkg.Enabled:=AddCurF;
end;
{------------------------------------------------------------------------------}

2
ide/mainbar.pas
View File

@ -312,7 +312,7 @@ type
itmPkgOpenPackageOfCurUnit: TIDEMenuCommand;
//itmPkgOpenRecent: TIDEMenuSection;
//itmPkgUnits: TIDEMenuSection;
itmPkgAddCurUnitToPkg: TIDEMenuCommand;
itmPkgAddCurFileToPkg: TIDEMenuCommand;
//itmPkgGraphSection: TIDEMenuSection;
itmPkgPkgGraph: TIDEMenuCommand;
itmPkgEditInstallPkgs: TIDEMenuCommand;

4
ide/mainbase.pas
View File

@ -719,7 +719,7 @@ begin
CreateMenuSeparatorSection(mnuComponent,itmPkgUnits,'itmPkgUnits');
ParentMI:=itmPkgUnits;
CreateMenuItem(ParentMI,itmPkgAddCurUnitToPkg,'itmPkgAddCurUnitToPkg',lisMenuAddCurUnitToPkg,'pkg_add');
CreateMenuItem(ParentMI,itmPkgAddCurFileToPkg,'itmPkgAddCurFileToPkg',lisMenuAddCurFileToPkg,'pkg_add');
CreateMenuSeparatorSection(mnuComponent,itmPkgGraphSection,'itmPkgGraphSection');
ParentMI:=itmPkgGraphSection;
@ -988,7 +988,7 @@ begin
itmPkgOpenPackage.Command:=GetCommand(ecOpenPackage);
itmPkgOpenPackageFile.Command:=GetCommand(ecOpenPackageFile);
itmPkgOpenPackageOfCurUnit.Command:=GetCommand(ecOpenPackageOfCurUnit);
itmPkgAddCurUnitToPkg.Command:=GetCommand(ecAddCurUnitToPkg);
itmPkgAddCurFileToPkg.Command:=GetCommand(ecAddCurFileToPkg);
itmPkgPkgGraph.Command:=GetCommand(ecPackageGraph);
itmPkgEditInstallPkgs.Command:=GetCommand(ecEditInstallPkgs);
{$IFDEF CustomIDEComps}

3
ideintf/idecommands.pas
View File

@ -281,7 +281,8 @@ const
ecOpenPackage = ecFirstLazarus + 600;
ecOpenPackageFile = ecFirstLazarus + 601;
ecOpenPackageOfCurUnit = ecFirstLazarus + 602;
ecAddCurUnitToPkg = ecFirstLazarus + 603;
ecAddCurFileToPkg = ecFirstLazarus + 603;
ecAddCurUnitToPkg = ecAddCurFileToPkg deprecated;
ecPackageGraph = ecFirstLazarus + 604;
ecEditInstallPkgs = ecFirstLazarus + 605;
ecConfigCustomComps = ecFirstLazarus + 606;

8
packager/pkgmanager.pas
View File

@ -127,7 +127,7 @@ type
procedure MainIDEitmPkgOpenPackageFileClick(Sender: TObject);
procedure MainIDEitmPkgPkgGraphClick(Sender: TObject);
procedure MainIDEitmPkgEditInstallPkgsClick(Sender: TObject);
procedure MainIDEitmPkgAddCurUnitToPkgClick(Sender: TObject);
procedure MainIDEitmPkgAddCurFileToPkgClick(Sender: TObject);
procedure MainIDEitmPkgOpenPackageOfCurUnitClicked(Sender: TObject);
procedure MainIDEitmConfigCustomCompsClicked(Sender: TObject);
procedure MainIDEitmOpenRecentPackageClicked(Sender: TObject);
@ -551,7 +551,7 @@ begin
end;
end;
procedure TPkgManager.MainIDEitmPkgAddCurUnitToPkgClick(Sender: TObject);
procedure TPkgManager.MainIDEitmPkgAddCurFileToPkgClick(Sender: TObject);
begin
DoAddActiveUnitToAPackage;
end;
@ -1559,7 +1559,7 @@ begin
itmPkgOpenPackage.OnClick :=@MainIDEitmPkgOpenPackageClicked;
itmPkgOpenPackageFile.OnClick:=@MainIDEitmPkgOpenPackageFileClick;
itmPkgOpenPackageOfCurUnit.OnClick :=@MainIDEitmPkgOpenPackageOfCurUnitClicked;
itmPkgAddCurUnitToPkg.OnClick:=@MainIDEitmPkgAddCurUnitToPkgClick;
itmPkgAddCurFileToPkg.OnClick:=@MainIDEitmPkgAddCurFileToPkgClick;
itmPkgPkgGraph.OnClick:=@MainIDEitmPkgPkgGraphClick;
itmPkgEditInstallPkgs.OnClick:=@MainIDEitmPkgEditInstallPkgsClick;
{$IFDEF CustomIDEComps}
@ -1673,7 +1673,7 @@ begin
ecOpenPackage: MainIDEitmPkgOpenPackageClicked(Self);
ecOpenPackageFile: MainIDEitmPkgOpenPackageFileClick(Self);
ecOpenPackageOfCurUnit: MainIDEitmPkgOpenPackageOfCurUnitClicked(Self);
ecAddCurUnitToPkg: MainIDEitmPkgAddCurUnitToPkgClick(Self);
ecAddCurFileToPkg: MainIDEitmPkgAddCurFileToPkgClick(Self);
ecPackageGraph: MainIDEitmPkgPkgGraphClick(Self);
ecEditInstallPkgs: MainIDEitmPkgEditInstallPkgsClick(Self);
else