paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-14 20:19:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE, SourceEditor: bookmark menus, add key shortcuts

Browse Source 
git-svn-id: trunk@58518 -
This commit is contained in:
martin 2018-07-14 12:34:12 +00:00
parent dbfe4e3ba4
commit aa6fdbb9fa
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ide/lazarusidestrconsts.pas
View File

@ -2838,7 +2838,9 @@ resourcestring
uemSetFreeBookmark = 'Set a Free Bookmark'; uemSetFreeBookmark = 'Set a Free Bookmark';
uemNextBookmark = 'Goto Next Bookmark'; uemNextBookmark = 'Goto Next Bookmark';
uemPrevBookmark = 'Goto Previous Bookmark'; uemPrevBookmark = 'Goto Previous Bookmark';
uemBookmarkN = 'Bookmark'; uemBookmarkNUnSetDisabled = 'Bookmark %s';
uemBookmarkNUnSet = 'Bookmark &%s';
uemBookmarkNSet = 'Bookmark &%s: %s';
lisChangeEncoding = 'Change Encoding'; lisChangeEncoding = 'Change Encoding';
lisChangeFile = 'Change file'; lisChangeFile = 'Change file';
lisEncodingOfFileOnDiskIsNewEncodingIs = 'Encoding of file "%s"%son disk is %s. New encoding is %s.'; lisEncodingOfFileOnDiskIsNewEncodingIs = 'Encoding of file "%s"%son disk is %s. New encoding is %s.';
@ -2849,6 +2851,8 @@ resourcestring
lisOpenLfm = 'Open %s'; lisOpenLfm = 'Open %s';
lisUtf8WithBOM = 'UTF-8 with BOM'; lisUtf8WithBOM = 'UTF-8 with BOM';
uemToggleBookmark = '&Toggle Bookmark'; uemToggleBookmark = '&Toggle Bookmark';
uemToggleBookmarkNUnset = 'Toggle Bookmark &%s';
uemToggleBookmarkNset = 'Toggle Bookmark &%s: %s';
uemToggleBookmarks = 'Toggle Bookmark...'; uemToggleBookmarks = 'Toggle Bookmark...';
uemReadOnly = 'Read Only'; uemReadOnly = 'Read Only';
uemShowLineNumbers = 'Show Line Numbers'; uemShowLineNumbers = 'Show Line Numbers';

14
ide/main.pp
View File

@ -8522,7 +8522,7 @@ begin
Exit; Exit;
for BookMarkID in TBookmarkNumRange do begin for BookMarkID in TBookmarkNumRange do begin
MarkDesc:=' '+IntToStr(BookMarkID); MarkDesc:='';
BookmarkAvail:=False; BookmarkAvail:=False;
i := 0; i := 0;
while i < SourceEditorManager.SourceEditorCount do begin while i < SourceEditorManager.SourceEditorCount do begin
@ -8530,7 +8530,7 @@ begin
BookMarkX:=0; BookMarkY:=0; BookMarkX:=0; BookMarkY:=0;
if se.EditorComponent.GetBookMark(BookMarkID,BookMarkX,BookMarkY) then if se.EditorComponent.GetBookMark(BookMarkID,BookMarkX,BookMarkY) then
begin begin
MarkDesc:=MarkDesc+': '+se.PageName+' ('+IntToStr(BookMarkY)+','+IntToStr(BookMarkX)+')'; MarkDesc:=se.PageName+' ('+IntToStr(BookMarkY)+','+IntToStr(BookMarkX)+')';
BookmarkAvail:=True; BookmarkAvail:=True;
break; break;
end; end;
@ -8538,11 +8538,17 @@ begin
end; end;
// goto book mark item // goto book mark item
MarkComand:=IDECommandList.FindIDECommand(ecGotoMarker0+BookMarkID); MarkComand:=IDECommandList.FindIDECommand(ecGotoMarker0+BookMarkID);
MarkComand.Caption:=uemBookmarkN+MarkDesc; if BookmarkAvail then
MarkComand.Caption:=Format(uemBookmarkNSet, [IntToStr(BookMarkID), MarkDesc])
else // Needed, because (on win) disabled menus still capture there shortcut key
MarkComand.Caption:=Format(uemBookmarkNUnSetDisabled, [IntToStr(BookMarkID), MarkDesc]);
MarkComand.Enabled:=BookmarkAvail; MarkComand.Enabled:=BookmarkAvail;
// set book mark item // set book mark item
MarkComand:=IDECommandList.FindIDECommand(ecToggleMarker0+BookMarkID); MarkComand:=IDECommandList.FindIDECommand(ecToggleMarker0+BookMarkID);
MarkComand.Caption:=uemToggleBookmark+MarkDesc; if BookmarkAvail then
MarkComand.Caption:=Format(uemToggleBookmarkNset, [IntToStr(BookMarkID), MarkDesc])
else
MarkComand.Caption:=Format(uemToggleBookmarkNUnset, [IntToStr(BookMarkID)])
end; end;
end; end;

4
ide/sourceeditor.pp
View File

@ -1686,7 +1686,7 @@ begin
AParent:=SrcEditSubMenuGotoBookmarks; AParent:=SrcEditSubMenuGotoBookmarks;
for I in TBookmarkNumRange do for I in TBookmarkNumRange do
SrcEditMenuGotoBookmark[I]:=RegisterIDEMenuCommand(AParent, SrcEditMenuGotoBookmark[I]:=RegisterIDEMenuCommand(AParent,
'GotoBookmark'+IntToStr(I), uemBookmarkN+IntToStr(I), 'GotoBookmark'+IntToStr(I), Format(uemBookmarkNUnSet, [IntToStr(I)]),
nil, @ExecuteIdeMenuClick, nil, nil, @ExecuteIdeMenuClick, nil,
'menu_goto_bookmark'+IntToStr(I)); 'menu_goto_bookmark'+IntToStr(I));
@ -1712,7 +1712,7 @@ begin
AParent:=SrcEditSubMenuToggleBookmarks; AParent:=SrcEditSubMenuToggleBookmarks;
for I in TBookmarkNumRange do for I in TBookmarkNumRange do
SrcEditMenuToggleBookmark[I]:=RegisterIDEMenuCommand(AParent, SrcEditMenuToggleBookmark[I]:=RegisterIDEMenuCommand(AParent,
'ToggleBookmark'+IntToStr(I), uemBookmarkN+IntToStr(I), 'ToggleBookmark'+IntToStr(I), Format(uemToggleBookmarkNUnset, [IntToStr(I)]),
nil, @ExecuteIdeMenuClick, nil, nil, @ExecuteIdeMenuClick, nil,
'menu_toggle_bookmark'+IntToStr(I)); 'menu_toggle_bookmark'+IntToStr(I));