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

SourceEditor: open package from Tabs in popup

Browse Source 
git-svn-id: trunk@36233 -
This commit is contained in:
martin 2012-03-22 23:50:38 +00:00
parent 46cc0fdc2a
commit 59d651babf
2 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ide/sourceeditor.pp
View File

@ -579,6 +579,7 @@ type
procedure NotebookShowTabHint(Sender: TObject; HintInfo: PHintInfo);
procedure OpenAtCursorClicked(Sender: TObject);
procedure OnPopupMenuOpenFile(Sender: TObject);
procedure OnPopupOpenPackageFile(Sender: TObject);
procedure TabPopUpMenuPopup(Sender: TObject);
procedure SrcPopUpMenuPopup(Sender: TObject);
procedure DbgPopUpMenuPopup(Sender: TObject);
@ -5479,6 +5480,7 @@ begin
begin
EditorCur := TSourceEditor(EdList.Objects[i]);
s := lisMEOther;
P := nil;
if (EditorCur.GetProjectFile <> nil) and (EditorCur.GetProjectFile.IsPartOfProject) then
s := dlgEnvProject
else begin
@ -5487,10 +5489,12 @@ begin
s := Format(lisTabsFor, [p.Name]);
end;
if SrcEditMenuSectionEditors.FindByName(S) is TIDEMenuSection then
if SrcEditMenuSectionEditors.FindByName(S) is TIDEMenuSection then begin
M := TIDEMenuSection(SrcEditMenuSectionEditors.FindByName(S))
else
end else begin
M := RegisterIDESubMenu(SrcEditMenuSectionEditors, S, S);
M.UserTag := PtrUInt(P);
end;
M.Visible := True;
AddEditorToMenuSection(EditorCur, M, i);
@ -5510,20 +5514,22 @@ begin
RecMenu.Visible := True;
end;
for i := 0 to SrcEditMenuSectionEditors.Count - 1 do
for i := 0 to SrcEditMenuSectionEditors.Count - 1 do begin
if SrcEditMenuSectionEditors.Items[i] is TIDEMenuSection then begin
if SrcEditMenuSectionEditors.Items[i].Tag = 0 then
SrcEditMenuSectionEditors.Items[i].Caption
:= SrcEditMenuSectionEditors.Items[i].Caption
+ Format(' (%d)',
[(SrcEditMenuSectionEditors.Items[i] as TIDEMenuSection).Count])
M := SrcEditMenuSectionEditors.Items[i] as TIDEMenuSection;
if M.Tag = 0 then
M.Caption := M.Caption + Format(' (%d)', [M.Count])
else
SrcEditMenuSectionEditors.Items[i].Caption
:= SrcEditMenuSectionEditors.Items[i].Caption
+ Format(' (*%d/%d)',
[SrcEditMenuSectionEditors.Items[i].Tag,
(SrcEditMenuSectionEditors.Items[i] as TIDEMenuSection).Count]);
M.Caption := M.Caption + Format(' (*%d/%d)', [M.Tag, M.Count]);
if M.UserTag <> 0 then
RegisterIDEMenuCommand(
RegisterIDEMenuSection(M as TIDEMenuSection, 'Open lpk sect '+TIDEPackage(M.UserTag).Filename),
'Open lpk '+TIDEPackage(M.UserTag).Filename,
lisCompPalOpenPackage, @OnPopupOpenPackageFile, nil, nil, '', M.UserTag);
end;
end;
end;
finally
SourceTabMenuRoot.EndUpdate;
@ -6694,6 +6700,14 @@ begin
[ofOnlyIfExists,ofAddToRecent,ofRegularFile,ofUseCache,ofDoNotLoadResource]);
end;
procedure TSourceNotebook.OnPopupOpenPackageFile(Sender: TObject);
begin
if (Sender as TIDEMenuItem).UserTag <> 0 then begin
PackageEditingInterface.DoOpenPackageFile
(TIDEPackage((Sender as TIDEMenuItem).UserTag).Filename,[pofAddToRecent],false)
end;
end;
Procedure TSourceNotebook.OpenAtCursorClicked(Sender: TObject);
begin
if assigned(Manager) and Assigned(Manager.OnOpenFileAtCursorClicked) then

4
ideintf/menuintf.pas
View File

@ -59,6 +59,7 @@ type
FSectionIndex: Integer;
FSize: integer;
FTag: Integer;
FUserTag: PtrUInt;
FVisible: Boolean;
FLastVisibleActive: boolean;
procedure MenuItemDestroy(Sender: TObject);
@ -115,6 +116,7 @@ type
property AutoFreeMenuItem: boolean read FAutoFreeMenuItem write FAutoFreeMenuItem;
property ResourceName: String read FResourceName write SetResourceName;
property Tag: Integer read FTag write FTag;
property UserTag: PtrUInt read FUserTag write FUserTag;
end;
TIDEMenuItemClass = class of TIDEMenuItem;
@ -229,7 +231,6 @@ type
FRadioItem: Boolean;
FRightJustify: boolean;
FShowAlwaysCheckable: boolean;
FUserTag: PtrUInt;
protected
procedure MenuItemClick(Sender: TObject); override;
procedure SetAutoCheck(const AValue: boolean); virtual;
@ -254,7 +255,6 @@ type
property RightJustify: boolean read FRightJustify write SetRightJustify;
property ShowAlwaysCheckable: boolean read FShowAlwaysCheckable
write SetShowAlwaysCheckable;
property UserTag: PtrUInt read FUserTag write FUserTag;
end;
TIDEMenuCommandClass = class of TIDEMenuCommand;