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

IDE: Create Source menu and move items there from Edit menu.

Browse Source 
git-svn-id: trunk@29721 -
This commit is contained in:
juha 2011-03-04 07:17:11 +00:00
parent 7bd4807fe6
commit c7a08aeb7f
7 changed files with 303 additions and 260 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/messagecomposer/messagecomposer.pas
View File

@ -885,7 +885,7 @@ begin
Key1, Key2,nil, Key1, Key2,nil,
@ExecuteMessagesComposer); @ExecuteMessagesComposer);
RegisterIDEMenuCommand(itmEditMenuCodeTools, cMessageComposer, RegisterIDEMenuCommand(itmSourceInsertions, cMessageComposer,
SMessageComposerMenuCaption, SMessageComposerMenuCaption,
nil, nil, CmdMessageComposer); nil, nil, CmdMessageComposer);
end; end;

2
components/todolist/tododlg.pas
View File

@ -90,7 +90,7 @@ begin
RegisterIDEMenuCommand(SrcEditMenuSectionFirstStatic, 'InsertToDo', RegisterIDEMenuCommand(SrcEditMenuSectionFirstStatic, 'InsertToDo',
lisTDDInsertToDo,nil,nil,InsertToDoCmd,'item_todo'); lisTDDInsertToDo,nil,nil,InsertToDoCmd,'item_todo');
// add a menu item in the Edit / Insert Text section // add a menu item in the Edit / Insert Text section
RegisterIDEMenuCommand(itmEditInsertText,'itmEditInsertTodo',lisTDDInsertToDo, RegisterIDEMenuCommand(itmSourceInsertions,'itmSourceInsertTodo',lisTDDInsertToDo,
nil,nil,InsertToDoCmd,'item_todo'); nil,nil,InsertToDoCmd,'item_todo');
// register shortcut for view todo list // register shortcut for view todo list

6
ide/lazarusidestrconsts.pas
View File

@ -146,6 +146,7 @@ resourcestring
lisMenuFile = '&File'; lisMenuFile = '&File';
lisMenuEdit = '&Edit'; lisMenuEdit = '&Edit';
lisMenuSearch = '&Search'; lisMenuSearch = '&Search';
lisMenuSource = '&Source';
lisMenuRefactor = 'Ref&actor'; lisMenuRefactor = 'Ref&actor';
lisMenuView = '&View'; lisMenuView = '&View';
lisMenuProject = '&Project'; lisMenuProject = '&Project';
@ -221,9 +222,8 @@ resourcestring
lisMenuSelectLine = 'Select line'; lisMenuSelectLine = 'Select line';
lisMenuSelectParagraph = 'Select paragraph'; lisMenuSelectParagraph = 'Select paragraph';
lisMenuInsertCharacter = 'Insert from Character Map'; lisMenuInsertCharacter = 'Insert from Character Map';
lisMenuInsertText = 'Insert text'; lisMenuInsertCVSKeyword = 'Insert CVS keyword';
lisMenuInsertCVSKeyword = 'CVS keyword'; lisMenuInsertGeneral = 'Insert General';
lisMenuInsertGeneral = 'General';
lisNone2 = 'none'; lisNone2 = 'none';
lisOr = 'or'; lisOr = 'or';
lisNone = '%snone'; lisNone = '%snone';

281
ide/main.pp
View File

@ -206,43 +206,11 @@ type
procedure mnuEditCutClicked(Sender: TObject); procedure mnuEditCutClicked(Sender: TObject);
procedure mnuEditCopyClicked(Sender: TObject); procedure mnuEditCopyClicked(Sender: TObject);
procedure mnuEditPasteClicked(Sender: TObject); procedure mnuEditPasteClicked(Sender: TObject);
procedure mnuEditIndentBlockClicked(Sender: TObject);
procedure mnuEditUnindentBlockClicked(Sender: TObject);
procedure mnuEditEncloseBlockClicked(Sender: TObject);
procedure mnuEditUpperCaseBlockClicked(Sender: TObject);
procedure mnuEditLowerCaseBlockClicked(Sender: TObject);
procedure mnuEditTabsToSpacesBlockClicked(Sender: TObject);
procedure mnuEditCommentBlockClicked(Sender: TObject);
procedure mnuEditUncommentBlockClicked(Sender: TObject);
procedure mnuEditToggleCommentClicked(Sender: TObject);
procedure mnuEditConditionalBlockClicked(Sender: TObject);
procedure mnuEditSortBlockClicked(Sender: TObject);
procedure mnuEditSelectionBreakLinesClicked(Sender: TObject);
procedure mnuEditSelectAllClick(Sender: TObject); procedure mnuEditSelectAllClick(Sender: TObject);
procedure mnuEditSelectCodeBlockClick(Sender: TObject); procedure mnuEditSelectCodeBlockClick(Sender: TObject);
procedure mnuEditSelectToBraceClick(Sender: TObject); procedure mnuEditSelectToBraceClick(Sender: TObject);
procedure mnuEditSelectLineClick(Sender: TObject); procedure mnuEditSelectLineClick(Sender: TObject);
procedure mnuEditSelectParagraphClick(Sender: TObject); procedure mnuEditSelectParagraphClick(Sender: TObject);
procedure mnuEditInsertCharacterClicked(Sender: TObject);
// edit->insert text->CVS keyword
procedure mnuEditInsertCVSAuthorClick(Sender: TObject);
procedure mnuEditInsertCVSDateClick(Sender: TObject);
procedure mnuEditInsertCVSHeaderClick(Sender: TObject);
procedure mnuEditInsertCVSIDClick(Sender: TObject);
procedure mnuEditInsertCVSLogClick(Sender: TObject);
procedure mnuEditInsertCVSNameClick(Sender: TObject);
procedure mnuEditInsertCVSRevisionClick(Sender: TObject);
procedure mnuEditInsertCVSSourceClick(Sender: TObject);
// edit->insert text->general
procedure mnuEditInsertGPLNoticeClick(Sender: TObject);
procedure mnuEditInsertLGPLNoticeClick(Sender: TObject);
procedure mnuEditInsertModifiedLGPLNoticeClick(Sender: TObject);
procedure mnuEditInsertUsernameClick(Sender: TObject);
procedure mnuEditInsertDateTimeClick(Sender: TObject);
procedure mnuEditInsertChangeLogEntryClick(Sender: TObject);
procedure mnuEditInsertGUID(Sender: TObject);
// search menu // search menu
procedure mnuSearchFindInFiles(Sender: TObject); procedure mnuSearchFindInFiles(Sender: TObject);
@ -256,6 +224,41 @@ type
procedure mnuSearchProcedureList(Sender: TObject); procedure mnuSearchProcedureList(Sender: TObject);
procedure mnuSetFreeBookmark(Sender: TObject); procedure mnuSetFreeBookmark(Sender: TObject);
// source menu
procedure mnuSourceClicked(Sender: TObject);
procedure mnuSourceIndentBlockClicked(Sender: TObject);
procedure mnuSourceUnindentBlockClicked(Sender: TObject);
procedure mnuSourceEncloseBlockClicked(Sender: TObject);
procedure mnuSourceUpperCaseBlockClicked(Sender: TObject);
procedure mnuSourceLowerCaseBlockClicked(Sender: TObject);
procedure mnuSourceTabsToSpacesBlockClicked(Sender: TObject);
procedure mnuSourceCommentBlockClicked(Sender: TObject);
procedure mnuSourceUncommentBlockClicked(Sender: TObject);
procedure mnuSourceToggleCommentClicked(Sender: TObject);
procedure mnuSourceConditionalBlockClicked(Sender: TObject);
procedure mnuSourceSortBlockClicked(Sender: TObject);
procedure mnuSourceSelectionBreakLinesClicked(Sender: TObject);
procedure mnuSourceInsertCharacterClicked(Sender: TObject);
// edit->insert text->CVS keyword
procedure mnuSourceInsertCVSAuthorClick(Sender: TObject);
procedure mnuSourceInsertCVSDateClick(Sender: TObject);
procedure mnuSourceInsertCVSHeaderClick(Sender: TObject);
procedure mnuSourceInsertCVSIDClick(Sender: TObject);
procedure mnuSourceInsertCVSLogClick(Sender: TObject);
procedure mnuSourceInsertCVSNameClick(Sender: TObject);
procedure mnuSourceInsertCVSRevisionClick(Sender: TObject);
procedure mnuSourceInsertCVSSourceClick(Sender: TObject);
// edit->insert text->general
procedure mnuSourceInsertGPLNoticeClick(Sender: TObject);
procedure mnuSourceInsertLGPLNoticeClick(Sender: TObject);
procedure mnuSourceInsertModifiedLGPLNoticeClick(Sender: TObject);
procedure mnuSourceInsertUsernameClick(Sender: TObject);
procedure mnuSourceInsertDateTimeClick(Sender: TObject);
procedure mnuSourceInsertChangeLogEntryClick(Sender: TObject);
procedure mnuSourceInsertGUID(Sender: TObject);
// refactor menu // refactor menu
procedure mnuRefactorClicked(Sender: TObject); procedure mnuRefactorClicked(Sender: TObject);
procedure mnuRefactorCompleteCodeClicked(Sender: TObject); procedure mnuRefactorCompleteCodeClicked(Sender: TObject);
@ -636,6 +639,7 @@ type
procedure SetupFileMenu; override; procedure SetupFileMenu; override;
procedure SetupEditMenu; override; procedure SetupEditMenu; override;
procedure SetupSearchMenu; override; procedure SetupSearchMenu; override;
procedure SetupSourceMenu; override;
procedure SetupRefactorMenu; override; procedure SetupRefactorMenu; override;
procedure SetupViewMenu; override; procedure SetupViewMenu; override;
procedure SetupProjectMenu; override; procedure SetupProjectMenu; override;
@ -2275,6 +2279,7 @@ begin
SetupFileMenu; SetupFileMenu;
SetupEditMenu; SetupEditMenu;
SetupSearchMenu; SetupSearchMenu;
SetupSourceMenu;
SetupRefactorMenu; SetupRefactorMenu;
SetupViewMenu; SetupViewMenu;
SetupProjectMenu; SetupProjectMenu;
@ -2372,43 +2377,11 @@ begin
itmEditCut.OnClick:=@mnuEditCutClicked; itmEditCut.OnClick:=@mnuEditCutClicked;
itmEditCopy.OnClick:=@mnuEditCopyClicked; itmEditCopy.OnClick:=@mnuEditCopyClicked;
itmEditPaste.OnClick:=@mnuEditPasteClicked; itmEditPaste.OnClick:=@mnuEditPasteClicked;
itmEditIndentBlock.OnClick:=@mnuEditIndentBlockClicked;
itmEditUnindentBlock.OnClick:=@mnuEditUnindentBlockClicked;
itmEditEncloseBlock.OnClick:=@mnuEditEncloseBlockClicked;
itmEditUpperCaseBlock.OnClick:=@mnuEditUpperCaseBlockClicked;
itmEditLowerCaseBlock.OnClick:=@mnuEditLowerCaseBlockClicked;
itmEditTabsToSpacesBlock.OnClick:=@mnuEditTabsToSpacesBlockClicked;
itmEditCommentBlock.OnClick:=@mnuEditCommentBlockClicked;
itmEditUncommentBlock.OnClick:=@mnuEditUncommentBlockClicked;
itmEditToggleComment.OnClick:=@mnuEditToggleCommentClicked;
itmEditConditionalBlock.OnClick:=@mnuEditConditionalBlockClicked;
itmEditSortBlock.OnClick:=@mnuEditSortBlockClicked;
itmEditSelectionBreakLines.OnClick:=@mnuEditSelectionBreakLinesClicked;
itmEditSelectAll.OnClick:=@mnuEditSelectAllClick; itmEditSelectAll.OnClick:=@mnuEditSelectAllClick;
itmEditSelectToBrace.OnClick:=@mnuEditSelectToBraceClick; itmEditSelectToBrace.OnClick:=@mnuEditSelectToBraceClick;
itmEditSelectCodeBlock.OnClick:=@mnuEditSelectCodeBlockClick; itmEditSelectCodeBlock.OnClick:=@mnuEditSelectCodeBlockClick;
itmEditSelectLine.OnClick:=@mnuEditSelectLineClick; itmEditSelectLine.OnClick:=@mnuEditSelectLineClick;
itmEditSelectParagraph.OnClick:=@mnuEditSelectParagraphClick; itmEditSelectParagraph.OnClick:=@mnuEditSelectParagraphClick;
itmEditInsertCharacter.OnClick:=@mnuEditInsertCharacterClicked;
// insert text->CVS keyword
itmEditInsertCVSAuthor.OnClick:=@mnuEditInsertCVSAuthorClick;
itmEditInsertCVSDate.OnClick:=@mnuEditInsertCVSDateClick;
itmEditInsertCVSHeader.OnClick:=@mnuEditInsertCVSHeaderClick;
itmEditInsertCVSID.OnClick:=@mnuEditInsertCVSIDClick;
itmEditInsertCVSLog.OnClick:=@mnuEditInsertCVSLogClick;
itmEditInsertCVSName.OnClick:=@mnuEditInsertCVSNameClick;
itmEditInsertCVSRevision.OnClick:=@mnuEditInsertCVSRevisionClick;
itmEditInsertCVSSource.OnClick:=@mnuEditInsertCVSSourceClick;
// insert text->general
itmEditInsertGPLNotice.OnClick:=@mnuEditInsertGPLNoticeClick;
itmEditInsertLGPLNotice.OnClick:=@mnuEditInsertLGPLNoticeClick;
itmEditInsertModifiedLGPLNotice.OnClick:=@mnuEditInsertModifiedLGPLNoticeClick;
itmEditInsertUsername.OnClick:=@mnuEditInsertUsernameClick;
itmEditInsertDateTime.OnClick:=@mnuEditInsertDateTimeClick;
itmEditInsertChangeLogEntry.OnClick:=@mnuEditInsertChangeLogEntryClick;
itmEditInsertGUID.OnClick:=@mnuEditInsertGUID;
end; end;
end; end;
@ -2416,6 +2389,7 @@ procedure TMainIDE.SetupSearchMenu;
begin begin
inherited SetupSearchMenu; inherited SetupSearchMenu;
with MainIDEBar do begin with MainIDEBar do begin
// mnuSearch.OnClick:=@mnuSearchClicked;
itmSearchFindIdentifierRefs.OnClick:=@mnuSearchFindIdentifierRefsClicked; itmSearchFindIdentifierRefs.OnClick:=@mnuSearchFindIdentifierRefsClicked;
itmGotoIncludeDirective.OnClick:=@mnuGotoIncludeDirectiveClicked; itmGotoIncludeDirective.OnClick:=@mnuGotoIncludeDirectiveClicked;
itmSearchProcedureList.OnClick := @mnuSearchProcedureList; itmSearchProcedureList.OnClick := @mnuSearchProcedureList;
@ -2423,6 +2397,46 @@ begin
end; end;
end; end;
procedure TMainIDE.SetupSourceMenu;
begin
inherited SetupSourceMenu;
with MainIDEBar do begin
mnuSource.OnClick:=@mnuSourceClicked;
itmSourceIndentBlock.OnClick:=@mnuSourceIndentBlockClicked;
itmSourceUnindentBlock.OnClick:=@mnuSourceUnindentBlockClicked;
itmSourceEncloseBlock.OnClick:=@mnuSourceEncloseBlockClicked;
itmSourceUpperCaseBlock.OnClick:=@mnuSourceUpperCaseBlockClicked;
itmSourceLowerCaseBlock.OnClick:=@mnuSourceLowerCaseBlockClicked;
itmSourceTabsToSpacesBlock.OnClick:=@mnuSourceTabsToSpacesBlockClicked;
itmSourceCommentBlock.OnClick:=@mnuSourceCommentBlockClicked;
itmSourceUncommentBlock.OnClick:=@mnuSourceUncommentBlockClicked;
itmSourceToggleComment.OnClick:=@mnuSourceToggleCommentClicked;
itmSourceConditionalBlock.OnClick:=@mnuSourceConditionalBlockClicked;
itmSourceSortBlock.OnClick:=@mnuSourceSortBlockClicked;
itmSourceSelectionBreakLines.OnClick:=@mnuSourceSelectionBreakLinesClicked;
itmSourceInsertCharacter.OnClick:=@mnuSourceInsertCharacterClicked;
// insert text->CVS keyword
itmSourceInsertCVSAuthor.OnClick:=@mnuSourceInsertCVSAuthorClick;
itmSourceInsertCVSDate.OnClick:=@mnuSourceInsertCVSDateClick;
itmSourceInsertCVSHeader.OnClick:=@mnuSourceInsertCVSHeaderClick;
itmSourceInsertCVSID.OnClick:=@mnuSourceInsertCVSIDClick;
itmSourceInsertCVSLog.OnClick:=@mnuSourceInsertCVSLogClick;
itmSourceInsertCVSName.OnClick:=@mnuSourceInsertCVSNameClick;
itmSourceInsertCVSRevision.OnClick:=@mnuSourceInsertCVSRevisionClick;
itmSourceInsertCVSSource.OnClick:=@mnuSourceInsertCVSSourceClick;
// insert text->general
itmSourceInsertGPLNotice.OnClick:=@mnuSourceInsertGPLNoticeClick;
itmSourceInsertLGPLNotice.OnClick:=@mnuSourceInsertLGPLNoticeClick;
itmSourceInsertModifiedLGPLNotice.OnClick:=@mnuSourceInsertModifiedLGPLNoticeClick;
itmSourceInsertUsername.OnClick:=@mnuSourceInsertUsernameClick;
itmSourceInsertDateTime.OnClick:=@mnuSourceInsertDateTimeClick;
itmSourceInsertChangeLogEntry.OnClick:=@mnuSourceInsertChangeLogEntryClick;
itmSourceInsertGUID.OnClick:=@mnuSourceInsertGUID;
end;
end;
procedure TMainIDE.SetupRefactorMenu; procedure TMainIDE.SetupRefactorMenu;
begin begin
inherited SetupRefactorMenu; inherited SetupRefactorMenu;
@ -3281,7 +3295,7 @@ begin
mnuSearchProcedureList(self); mnuSearchProcedureList(self);
ecInsertGUID: ecInsertGUID:
mnuEditInsertGUID(self); mnuSourceInsertGUID(self);
else else
Handled:=false; Handled:=false;
@ -3721,44 +3735,61 @@ begin
itmEditCut.Enabled:=SelEditable; itmEditCut.Enabled:=SelEditable;
itmEditCopy.Enabled:=SelAvail; itmEditCopy.Enabled:=SelAvail;
itmEditPaste.Enabled:=Editable; itmEditPaste.Enabled:=Editable;
//itmEditBlockIndentation: TIDEMenuSection;
itmEditIndentBlock.Enabled:=SelEditable;
itmEditUnindentBlock.Enabled:=SelEditable;
itmEditEncloseBlock.Enabled:=SelEditable;
itmEditCommentBlock.Enabled:=SelEditable;
itmEditUncommentBlock.Enabled:=SelEditable;
itmEditConditionalBlock.Enabled:=SelEditable;
itmEditSortBlock.Enabled:=SelEditable;
//itmEditBlockCharConversion: TIDEMenuSection;
itmEditUpperCaseBlock.Enabled:=SelEditable;
itmEditLowerCaseBlock.Enabled:=SelEditable;
itmEditTabsToSpacesBlock.Enabled:=SelEditable;
itmEditSelectionBreakLines.Enabled:=SelEditable;
//itmEditSelect: TIDEMenuSection; //itmEditSelect: TIDEMenuSection;
//itmEditSelectAll: TIDEMenuCommand; //itmEditSelectAll: TIDEMenuCommand;
//itmEditSelectToBrace: TIDEMenuCommand; //itmEditSelectToBrace: TIDEMenuCommand;
//itmEditSelectCodeBlock: TIDEMenuCommand; //itmEditSelectCodeBlock: TIDEMenuCommand;
//itmEditSelectLine: TIDEMenuCommand; //itmEditSelectLine: TIDEMenuCommand;
//itmEditSelectParagraph: TIDEMenuCommand; //itmEditSelectParagraph: TIDEMenuCommand;
//itmEditInsertions: TIDEMenuSection; end;
itmEditInsertCharacter.Enabled:=Editable; end;
//itmEditInsertText: TIDEMenuSection;
//itmEditInsertCVSKeyWord: TIDEMenuSection; {------------------------------------------------------------------------------}
itmEditInsertCVSAuthor.Enabled:=Editable;
itmEditInsertCVSDate.Enabled:=Editable; procedure TMainIDE.mnuSourceClicked(Sender: TObject);
itmEditInsertCVSHeader.Enabled:=Editable; var
itmEditInsertCVSID.Enabled:=Editable; ASrcEdit: TSourceEditor;
itmEditInsertCVSLog.Enabled:=Editable; AnUnitInfo: TUnitInfo;
itmEditInsertCVSName.Enabled:=Editable; Editable: Boolean;
itmEditInsertCVSRevision.Enabled:=Editable; SelAvail: Boolean;
itmEditInsertCVSSource.Enabled:=Editable; SelEditable: Boolean;
//itmEditInsertGeneral: TIDEMenuSection; begin
itmEditInsertGPLNotice.Enabled:=Editable; GetCurrentUnit(ASrcEdit,AnUnitInfo);
itmEditInsertLGPLNotice.Enabled:=Editable; Editable:=(ASrcEdit<>nil) and (not ASrcEdit.ReadOnly);
itmEditInsertModifiedLGPLNotice.Enabled:=Editable; SelAvail:=(ASrcEdit<>nil) and (ASrcEdit.SelectionAvailable);
itmEditInsertUsername.Enabled:=Editable; SelEditable:=Editable and SelAvail;
itmEditInsertDateTime.Enabled:=Editable; with MainIDEBar do begin
itmEditInsertChangeLogEntry.Enabled:=Editable; //itmSourceBlockIndentation: TIDEMenuSection;
itmSourceIndentBlock.Enabled:=SelEditable;
itmSourceUnindentBlock.Enabled:=SelEditable;
itmSourceEncloseBlock.Enabled:=SelEditable;
itmSourceCommentBlock.Enabled:=SelEditable;
itmSourceUncommentBlock.Enabled:=SelEditable;
itmSourceConditionalBlock.Enabled:=SelEditable;
itmSourceSortBlock.Enabled:=SelEditable;
//itmSourceBlockCharConversion: TIDEMenuSection;
itmSourceUpperCaseBlock.Enabled:=SelEditable;
itmSourceLowerCaseBlock.Enabled:=SelEditable;
itmSourceTabsToSpacesBlock.Enabled:=SelEditable;
itmSourceSelectionBreakLines.Enabled:=SelEditable;
//itmSourceInsertions: TIDEMenuSection;
itmSourceInsertCharacter.Enabled:=Editable;
//itmSourceInsertCVSKeyWord: TIDEMenuSection;
itmSourceInsertCVSAuthor.Enabled:=Editable;
itmSourceInsertCVSDate.Enabled:=Editable;
itmSourceInsertCVSHeader.Enabled:=Editable;
itmSourceInsertCVSID.Enabled:=Editable;
itmSourceInsertCVSLog.Enabled:=Editable;
itmSourceInsertCVSName.Enabled:=Editable;
itmSourceInsertCVSRevision.Enabled:=Editable;
itmSourceInsertCVSSource.Enabled:=Editable;
//itmSourceInsertGeneral: TIDEMenuSection;
itmSourceInsertGPLNotice.Enabled:=Editable;
itmSourceInsertLGPLNotice.Enabled:=Editable;
itmSourceInsertModifiedLGPLNotice.Enabled:=Editable;
itmSourceInsertUsername.Enabled:=Editable;
itmSourceInsertDateTime.Enabled:=Editable;
itmSourceInsertChangeLogEntry.Enabled:=Editable;
end; end;
end; end;
@ -17486,62 +17517,62 @@ begin
DoSourceEditorCommand(ecUndo); DoSourceEditorCommand(ecUndo);
end; end;
procedure TMainIDE.mnuEditIndentBlockClicked(Sender: TObject); procedure TMainIDE.mnuSourceIndentBlockClicked(Sender: TObject);
begin begin
DoSourceEditorCommand(ecBlockIndent); DoSourceEditorCommand(ecBlockIndent);
end; end;
procedure TMainIDE.mnuEditUnindentBlockClicked(Sender: TObject); procedure TMainIDE.mnuSourceUnindentBlockClicked(Sender: TObject);
begin begin
DoSourceEditorCommand(ecBlockUnindent); DoSourceEditorCommand(ecBlockUnindent);
end; end;
procedure TMainIDE.mnuEditEncloseBlockClicked(Sender: TObject); procedure TMainIDE.mnuSourceEncloseBlockClicked(Sender: TObject);
begin begin
DoSourceEditorCommand(ecSelectionEnclose); DoSourceEditorCommand(ecSelectionEnclose);
end; end;
procedure TMainIDE.mnuEditUpperCaseBlockClicked(Sender: TObject); procedure TMainIDE.mnuSourceUpperCaseBlockClicked(Sender: TObject);
begin begin
DoSourceEditorCommand(ecSelectionUpperCase); DoSourceEditorCommand(ecSelectionUpperCase);
end; end;
procedure TMainIDE.mnuEditLowerCaseBlockClicked(Sender: TObject); procedure TMainIDE.mnuSourceLowerCaseBlockClicked(Sender: TObject);
begin begin
DoSourceEditorCommand(ecSelectionLowerCase); DoSourceEditorCommand(ecSelectionLowerCase);
end; end;
procedure TMainIDE.mnuEditTabsToSpacesBlockClicked(Sender: TObject); procedure TMainIDE.mnuSourceTabsToSpacesBlockClicked(Sender: TObject);
begin begin
DoSourceEditorCommand(ecSelectionTabs2Spaces); DoSourceEditorCommand(ecSelectionTabs2Spaces);
end; end;
procedure TMainIDE.mnuEditCommentBlockClicked(Sender: TObject); procedure TMainIDE.mnuSourceCommentBlockClicked(Sender: TObject);
begin begin
DoSourceEditorCommand(ecSelectionComment); DoSourceEditorCommand(ecSelectionComment);
end; end;
procedure TMainIDE.mnuEditUncommentBlockClicked(Sender: TObject); procedure TMainIDE.mnuSourceUncommentBlockClicked(Sender: TObject);
begin begin
DoSourceEditorCommand(ecSelectionUncomment); DoSourceEditorCommand(ecSelectionUncomment);
end; end;
procedure TMainIDE.mnuEditToggleCommentClicked(Sender: TObject); procedure TMainIDE.mnuSourceToggleCommentClicked(Sender: TObject);
begin begin
DoSourceEditorCommand(ecToggleComment); DoSourceEditorCommand(ecToggleComment);
end; end;
procedure TMainIDE.mnuEditConditionalBlockClicked(Sender: TObject); procedure TMainIDE.mnuSourceConditionalBlockClicked(Sender: TObject);
begin begin
DoSourceEditorCommand(ecSelectionConditional); DoSourceEditorCommand(ecSelectionConditional);
end; end;
procedure TMainIDE.mnuEditSortBlockClicked(Sender: TObject); procedure TMainIDE.mnuSourceSortBlockClicked(Sender: TObject);
begin begin
DoSourceEditorCommand(ecSelectionSort); DoSourceEditorCommand(ecSelectionSort);
end; end;
procedure TMainIDE.mnuEditSelectionBreakLinesClicked(Sender: TObject); procedure TMainIDE.mnuSourceSelectionBreakLinesClicked(Sender: TObject);
begin begin
DoSourceEditorCommand(ecSelectionBreakLines); DoSourceEditorCommand(ecSelectionBreakLines);
end; end;
@ -17571,37 +17602,37 @@ begin
DoSourceEditorCommand(ecSelectParagraph); DoSourceEditorCommand(ecSelectParagraph);
end; end;
procedure TMainIDE.mnuEditInsertGPLNoticeClick(Sender: TObject); procedure TMainIDE.mnuSourceInsertGPLNoticeClick(Sender: TObject);
begin begin
DoSourceEditorCommand(ecInsertGPLNotice); DoSourceEditorCommand(ecInsertGPLNotice);
end; end;
procedure TMainIDE.mnuEditInsertLGPLNoticeClick(Sender: TObject); procedure TMainIDE.mnuSourceInsertLGPLNoticeClick(Sender: TObject);
begin begin
DoSourceEditorCommand(ecInsertLGPLNotice); DoSourceEditorCommand(ecInsertLGPLNotice);
end; end;
procedure TMainIDE.mnuEditInsertModifiedLGPLNoticeClick(Sender: TObject); procedure TMainIDE.mnuSourceInsertModifiedLGPLNoticeClick(Sender: TObject);
begin begin
DoSourceEditorCommand(ecInsertModifiedLGPLNotice); DoSourceEditorCommand(ecInsertModifiedLGPLNotice);
end; end;
procedure TMainIDE.mnuEditInsertUsernameClick(Sender: TObject); procedure TMainIDE.mnuSourceInsertUsernameClick(Sender: TObject);
begin begin
DoSourceEditorCommand(ecInsertUserName); DoSourceEditorCommand(ecInsertUserName);
end; end;
procedure TMainIDE.mnuEditInsertDateTimeClick(Sender: TObject); procedure TMainIDE.mnuSourceInsertDateTimeClick(Sender: TObject);
begin begin
DoSourceEditorCommand(ecInsertDateTime); DoSourceEditorCommand(ecInsertDateTime);
end; end;
procedure TMainIDE.mnuEditInsertChangeLogEntryClick(Sender: TObject); procedure TMainIDE.mnuSourceInsertChangeLogEntryClick(Sender: TObject);
begin begin
DoSourceEditorCommand(ecInsertChangeLogEntry); DoSourceEditorCommand(ecInsertChangeLogEntry);
end; end;
procedure TMainIDE.mnuEditInsertGUID(Sender: TObject); procedure TMainIDE.mnuSourceInsertGUID(Sender: TObject);
begin begin
DoInsertGUID; DoInsertGUID;
end; end;
@ -17616,47 +17647,47 @@ begin
DoFindRenameIdentifier(false); DoFindRenameIdentifier(false);
end; end;
procedure TMainIDE.mnuEditInsertCharacterClicked(Sender: TObject); procedure TMainIDE.mnuSourceInsertCharacterClicked(Sender: TObject);
begin begin
DoSourceEditorCommand(ecInsertCharacter); DoSourceEditorCommand(ecInsertCharacter);
end; end;
procedure TMainIDE.mnuEditInsertCVSAuthorClick(Sender: TObject); procedure TMainIDE.mnuSourceInsertCVSAuthorClick(Sender: TObject);
begin begin
DoSourceEditorCommand(ecInsertCVSAuthor); DoSourceEditorCommand(ecInsertCVSAuthor);
end; end;
procedure TMainIDE.mnuEditInsertCVSDateClick(Sender: TObject); procedure TMainIDE.mnuSourceInsertCVSDateClick(Sender: TObject);
begin begin
DoSourceEditorCommand(ecInsertCVSDate); DoSourceEditorCommand(ecInsertCVSDate);
end; end;
procedure TMainIDE.mnuEditInsertCVSHeaderClick(Sender: TObject); procedure TMainIDE.mnuSourceInsertCVSHeaderClick(Sender: TObject);
begin begin
DoSourceEditorCommand(ecInsertCVSHeader); DoSourceEditorCommand(ecInsertCVSHeader);
end; end;
procedure TMainIDE.mnuEditInsertCVSIDClick(Sender: TObject); procedure TMainIDE.mnuSourceInsertCVSIDClick(Sender: TObject);
begin begin
DoSourceEditorCommand(ecInsertCVSID); DoSourceEditorCommand(ecInsertCVSID);
end; end;
procedure TMainIDE.mnuEditInsertCVSLogClick(Sender: TObject); procedure TMainIDE.mnuSourceInsertCVSLogClick(Sender: TObject);
begin begin
DoSourceEditorCommand(ecInsertCVSLog); DoSourceEditorCommand(ecInsertCVSLog);
end; end;
procedure TMainIDE.mnuEditInsertCVSNameClick(Sender: TObject); procedure TMainIDE.mnuSourceInsertCVSNameClick(Sender: TObject);
begin begin
DoSourceEditorCommand(ecInsertCVSName); DoSourceEditorCommand(ecInsertCVSName);
end; end;
procedure TMainIDE.mnuEditInsertCVSRevisionClick(Sender: TObject); procedure TMainIDE.mnuSourceInsertCVSRevisionClick(Sender: TObject);
begin begin
DoSourceEditorCommand(ecInsertCVSRevision); DoSourceEditorCommand(ecInsertCVSRevision);
end; end;
procedure TMainIDE.mnuEditInsertCVSSourceClick(Sender: TObject); procedure TMainIDE.mnuSourceInsertCVSSourceClick(Sender: TObject);
begin begin
DoSourceEditorCommand(ecInsertCVSSource); DoSourceEditorCommand(ecInsertCVSSource);
end; end;

72
ide/mainbar.pas
View File

@ -113,47 +113,12 @@ type
itmEditCut: TIDEMenuCommand; itmEditCut: TIDEMenuCommand;
itmEditCopy: TIDEMenuCommand; itmEditCopy: TIDEMenuCommand;
itmEditPaste: TIDEMenuCommand; itmEditPaste: TIDEMenuCommand;
//itmEditBlockIndentation: TIDEMenuSection;
itmEditIndentBlock: TIDEMenuCommand;
itmEditUnindentBlock: TIDEMenuCommand;
itmEditEncloseBlock: TIDEMenuCommand;
itmEditCommentBlock: TIDEMenuCommand;
itmEditUncommentBlock: TIDEMenuCommand;
itmEditToggleComment: TIDEMenuCommand;
itmEditConditionalBlock: TIDEMenuCommand;
itmEditSortBlock: TIDEMenuCommand;
//itmEditBlockCharConversion: TIDEMenuSection;
itmEditUpperCaseBlock: TIDEMenuCommand;
itmEditLowerCaseBlock: TIDEMenuCommand;
itmEditTabsToSpacesBlock: TIDEMenuCommand;
itmEditSelectionBreakLines: TIDEMenuCommand;
//itmEditSelect: TIDEMenuSection; //itmEditSelect: TIDEMenuSection;
itmEditSelectAll: TIDEMenuCommand; itmEditSelectAll: TIDEMenuCommand;
itmEditSelectToBrace: TIDEMenuCommand; itmEditSelectToBrace: TIDEMenuCommand;
itmEditSelectCodeBlock: TIDEMenuCommand; itmEditSelectCodeBlock: TIDEMenuCommand;
itmEditSelectLine: TIDEMenuCommand; itmEditSelectLine: TIDEMenuCommand;
itmEditSelectParagraph: TIDEMenuCommand; itmEditSelectParagraph: TIDEMenuCommand;
//itmEditInsertions: TIDEMenuSection;
itmEditInsertCharacter: TIDEMenuCommand;
//itmEditInsertText: TIDEMenuSection;
//itmEditInsertCVSKeyWord: TIDEMenuSection;
itmEditInsertCVSAuthor: TIDEMenuCommand;
itmEditInsertCVSDate: TIDEMenuCommand;
itmEditInsertCVSHeader: TIDEMenuCommand;
itmEditInsertCVSID: TIDEMenuCommand;
itmEditInsertCVSLog: TIDEMenuCommand;
itmEditInsertCVSName: TIDEMenuCommand;
itmEditInsertCVSRevision: TIDEMenuCommand;
itmEditInsertCVSSource: TIDEMenuCommand;
//itmEditInsertGeneral: TIDEMenuSection;
itmEditInsertGPLNotice: TIDEMenuCommand;
itmEditInsertLGPLNotice: TIDEMenuCommand;
itmEditInsertModifiedLGPLNotice: TIDEMenuCommand;
itmEditInsertUsername: TIDEMenuCommand;
itmEditInsertDateTime: TIDEMenuCommand;
itmEditInsertChangeLogEntry: TIDEMenuCommand;
itmEditInsertGUID: TIDEMenuCommand;
itmEditInsertTodo: TIDEMenuCommand;
// search menu // search menu
//mnuSearch: TIDEMenuSection; //mnuSearch: TIDEMenuSection;
@ -184,6 +149,43 @@ type
itmSearchFindIdentifierRefs: TIDEMenuCommand; itmSearchFindIdentifierRefs: TIDEMenuCommand;
itmSearchProcedureList: TIDEMenuCommand; itmSearchProcedureList: TIDEMenuCommand;
// source menu
//mnuSource: TIDEMenuSection;
//itmSourceBlockIndentation: TIDEMenuSection;
itmSourceIndentBlock: TIDEMenuCommand;
itmSourceUnindentBlock: TIDEMenuCommand;
itmSourceEncloseBlock: TIDEMenuCommand;
itmSourceCommentBlock: TIDEMenuCommand;
itmSourceUncommentBlock: TIDEMenuCommand;
itmSourceToggleComment: TIDEMenuCommand;
itmSourceConditionalBlock: TIDEMenuCommand;
itmSourceSortBlock: TIDEMenuCommand;
//itmSourceBlockCharConversion: TIDEMenuSection;
itmSourceUpperCaseBlock: TIDEMenuCommand;
itmSourceLowerCaseBlock: TIDEMenuCommand;
itmSourceTabsToSpacesBlock: TIDEMenuCommand;
itmSourceSelectionBreakLines: TIDEMenuCommand;
//itmSourceInsertions: TIDEMenuSection;
itmSourceInsertCharacter: TIDEMenuCommand;
//itmSourceInsertCVSKeyWord: TIDEMenuSection;
itmSourceInsertCVSAuthor: TIDEMenuCommand;
itmSourceInsertCVSDate: TIDEMenuCommand;
itmSourceInsertCVSHeader: TIDEMenuCommand;
itmSourceInsertCVSID: TIDEMenuCommand;
itmSourceInsertCVSLog: TIDEMenuCommand;
itmSourceInsertCVSName: TIDEMenuCommand;
itmSourceInsertCVSRevision: TIDEMenuCommand;
itmSourceInsertCVSSource: TIDEMenuCommand;
//itmSourceInsertGeneral: TIDEMenuSection;
itmSourceInsertGPLNotice: TIDEMenuCommand;
itmSourceInsertLGPLNotice: TIDEMenuCommand;
itmSourceInsertModifiedLGPLNotice: TIDEMenuCommand;
itmSourceInsertUsername: TIDEMenuCommand;
itmSourceInsertDateTime: TIDEMenuCommand;
itmSourceInsertChangeLogEntry: TIDEMenuCommand;
itmSourceInsertGUID: TIDEMenuCommand;
itmSourceInsertTodo: TIDEMenuCommand;
// refactor menu // refactor menu
//mnuRefactor: TIDEMenuSection; //mnuRefactor: TIDEMenuSection;
//itmEditMenuCodeTools: TIDEMenuSection; //itmEditMenuCodeTools: TIDEMenuSection;

186
ide/mainbase.pas
View File

@ -107,6 +107,7 @@ type
procedure SetupFileMenu; virtual; procedure SetupFileMenu; virtual;
procedure SetupEditMenu; virtual; procedure SetupEditMenu; virtual;
procedure SetupSearchMenu; virtual; procedure SetupSearchMenu; virtual;
procedure SetupSourceMenu; virtual;
procedure SetupRefactorMenu; virtual; procedure SetupRefactorMenu; virtual;
procedure SetupViewMenu; virtual; procedure SetupViewMenu; virtual;
procedure SetupProjectMenu; virtual; procedure SetupProjectMenu; virtual;
@ -355,6 +356,7 @@ begin
CreateMainMenuItem(mnuFile,'File',lisMenuFile); CreateMainMenuItem(mnuFile,'File',lisMenuFile);
CreateMainMenuItem(mnuEdit,'Edit',lisMenuEdit); CreateMainMenuItem(mnuEdit,'Edit',lisMenuEdit);
CreateMainMenuItem(mnuSearch,'Search',lisMenuSearch); CreateMainMenuItem(mnuSearch,'Search',lisMenuSearch);
CreateMainMenuItem(mnuSource,'Source',lisMenuSource);
CreateMainMenuItem(mnuRefactor,'Refactor',lisMenuRefactor); CreateMainMenuItem(mnuRefactor,'Refactor',lisMenuRefactor);
CreateMainMenuItem(mnuView,'View',lisMenuView); CreateMainMenuItem(mnuView,'View',lisMenuView);
CreateMainMenuItem(mnuProject,'Project',lisMenuProject); CreateMainMenuItem(mnuProject,'Project',lisMenuProject);
@ -407,9 +409,7 @@ end;
procedure TMainIDEBase.SetupEditMenu; procedure TMainIDEBase.SetupEditMenu;
var var
ParentMI: TIDEMenuSection; ParentMI, SubParentMI: TIDEMenuSection;
SubParentMI: TIDEMenuSection;
SubSubParentMI: TIDEMenuSection;
begin begin
with MainIDEBar do begin with MainIDEBar do begin
CreateMenuSeparatorSection(mnuEdit,itmEditReUndo,'itmEditReUndo'); CreateMenuSeparatorSection(mnuEdit,itmEditReUndo,'itmEditReUndo');
@ -424,27 +424,7 @@ begin
CreateMenuItem(ParentMI,itmEditCopy,'itmEditCopy',lisMenuCopy,'laz_copy'); CreateMenuItem(ParentMI,itmEditCopy,'itmEditCopy',lisMenuCopy,'laz_copy');
CreateMenuItem(ParentMI,itmEditPaste,'itmEditPaste',lisMenuPaste,'laz_paste'); CreateMenuItem(ParentMI,itmEditPaste,'itmEditPaste',lisMenuPaste,'laz_paste');
CreateMenuSeparatorSection(mnuEdit,itmEditBlockIndentation,'itmEditBlockIndentation'); CreateMenuSeparatorSection(mnuEdit,itmEditSelect,'itmEditSelect');
ParentMI:=itmEditBlockIndentation;
CreateMenuItem(ParentMI,itmEditIndentBlock,'itmEditIndentBlock',lisMenuIndentSelection,'menu_indent');
CreateMenuItem(ParentMI,itmEditUnindentBlock,'itmEditUnindentBlock',lisMenuUnindentSelection,'menu_unindent');
CreateMenuItem(ParentMI,itmEditEncloseBlock,'itmEditEncloseBlock',lisMenuEncloseSelection);
CreateMenuItem(ParentMI,itmEditCommentBlock,'itmEditCommentBlock',lisMenuCommentSelection, 'menu_comment');
CreateMenuItem(ParentMI,itmEditUncommentBlock,'itmEditUncommentBlock',lisMenuUncommentSelection, 'menu_uncomment');
CreateMenuItem(ParentMI,itmEditToggleComment,'itmEditToggleComment',lisMenuToggleComment, 'menu_comment');
CreateMenuItem(ParentMI,itmEditConditionalBlock,'itmEditConditionalBlock',lisMenuConditionalSelection);
CreateMenuItem(ParentMI,itmEditSortBlock,'itmEditSortBlock',lisMenuSortSelection, 'menu_edit_sort');
CreateMenuSeparatorSection(mnuEdit,itmEditBlockCharConversion,'itmEditBlockCharConversion');
ParentMI:=itmEditBlockCharConversion;
CreateMenuItem(ParentMI,itmEditUpperCaseBlock,'itmEditUpperCaseBlock',lisMenuUpperCaseSelection, 'menu_edit_uppercase');
CreateMenuItem(ParentMI,itmEditLowerCaseBlock,'itmEditLowerCaseBlock',lisMenuLowerCaseSelection, 'menu_edit_lowercase');
CreateMenuItem(ParentMI,itmEditTabsToSpacesBlock,'itmEditTabsToSpacesBlock',lisMenuTabsToSpacesSelection);
CreateMenuItem(ParentMI,itmEditSelectionBreakLines,'itmEditSelectionBreakLines',lisMenuBeakLinesInSelection);
CreateMenuSubSection(mnuEdit,itmEditSelect,'itmEditSelect',lisMenuSelect);
begin begin
// select sub menu items // select sub menu items
SubParentMI:=itmEditSelect; SubParentMI:=itmEditSelect;
@ -454,42 +434,6 @@ begin
CreateMenuItem(SubParentMI,itmEditSelectLine,'itmEditSelectLine',lisMenuSelectLine); CreateMenuItem(SubParentMI,itmEditSelectLine,'itmEditSelectLine',lisMenuSelectLine);
CreateMenuItem(SubParentMI,itmEditSelectParagraph,'itmEditSelectParagraph',lisMenuSelectParagraph); CreateMenuItem(SubParentMI,itmEditSelectParagraph,'itmEditSelectParagraph',lisMenuSelectParagraph);
end; end;
CreateMenuSeparatorSection(mnuEdit,itmEditInsertions,'itmEditInsertions');
ParentMI:=itmEditInsertions;
CreateMenuItem(ParentMI,itmEditInsertCharacter,'itmEditInsertCharacter',lisMenuInsertCharacter);
CreateMenuSubSection(ParentMI,itmEditInsertText,'itmEditInsertText',lisMenuInsertText);
begin
// insert text sub menu items
SubParentMI:=itmEditInsertText;
CreateMenuSubSection(SubParentMI,itmEditInsertCVSKeyWord,'itmEditInsertCVSKeyWord',lisMenuInsertCVSKeyword);
begin
// insert CVS keyword sub menu items
SubSubParentMI:=itmEditInsertCVSKeyWord;
CreateMenuItem(SubSubParentMI,itmEditInsertCVSAuthor,'itmEditInsertCVSAuthor','Author');
CreateMenuItem(SubSubParentMI,itmEditInsertCVSDate,'itmEditInsertCVSDate','Date');
CreateMenuItem(SubSubParentMI,itmEditInsertCVSHeader,'itmEditInsertCVSHeader','Header');
CreateMenuItem(SubSubParentMI,itmEditInsertCVSID,'itmEditInsertCVSID','ID');
CreateMenuItem(SubSubParentMI,itmEditInsertCVSLog,'itmEditInsertCVSLog','Log');
CreateMenuItem(SubSubParentMI,itmEditInsertCVSName,'itmEditInsertCVSName','Name');
CreateMenuItem(SubSubParentMI,itmEditInsertCVSRevision,'itmEditInsertCVSRevision','Revision');
CreateMenuItem(SubSubParentMI,itmEditInsertCVSSource,'itmEditInsertCVSSource','Source');
end;
CreateMenuSubSection(SubParentMI,itmEditInsertGeneral,'itmEditInsertGeneral',lisMenuInsertGeneral);
begin
// insert general text sub menu items
SubSubParentMI:=itmEditInsertGeneral;
CreateMenuItem(SubSubParentMI,itmEditInsertGPLNotice,'itmEditInsertGPLNotice',lisMenuInsertGPLNotice);
CreateMenuItem(SubSubParentMI,itmEditInsertLGPLNotice,'itmEditInsertLGPLNotice',lisMenuInsertLGPLNotice);
CreateMenuItem(SubSubParentMI,itmEditInsertModifiedLGPLNotice,'itmEditInsertModifiedLGPLNotice',lisMenuInsertModifiedLGPLNotice);
CreateMenuItem(SubSubParentMI,itmEditInsertUsername,'itmEditInsertUsername',lisMenuInsertUsername);
CreateMenuItem(SubSubParentMI,itmEditInsertDateTime,'itmEditInsertDateTime',lisMenuInsertDateTime);
CreateMenuItem(SubSubParentMI,itmEditInsertChangeLogEntry,'itmEditInsertChangeLogEntry',lisMenuInsertChangeLogEntry);
CreateMenuItem(SubSubParentMI,itmEditInsertGUID,'itmEditInsertGUID',srkmecInsertGUID);
end;
end;
end; end;
end; end;
@ -539,6 +483,67 @@ begin
end; end;
end; end;
procedure TMainIDEBase.SetupSourceMenu;
var
ParentMI, SubParentMI: TIDEMenuSection;
begin
with MainIDEBar do begin
CreateMenuSeparatorSection(mnuSource,itmSourceBlockIndentation,'itmSourceBlockIndentation');
ParentMI:=itmSourceBlockIndentation;
CreateMenuItem(ParentMI,itmSourceIndentBlock,'itmSourceIndentBlock',lisMenuIndentSelection,'menu_indent');
CreateMenuItem(ParentMI,itmSourceUnindentBlock,'itmSourceUnindentBlock',lisMenuUnindentSelection,'menu_unindent');
CreateMenuItem(ParentMI,itmSourceEncloseBlock,'itmSourceEncloseBlock',lisMenuEncloseSelection);
CreateMenuItem(ParentMI,itmSourceCommentBlock,'itmSourceCommentBlock',lisMenuCommentSelection, 'menu_comment');
CreateMenuItem(ParentMI,itmSourceUncommentBlock,'itmSourceUncommentBlock',lisMenuUncommentSelection, 'menu_uncomment');
CreateMenuItem(ParentMI,itmSourceToggleComment,'itmSourceToggleComment',lisMenuToggleComment, 'menu_comment');
CreateMenuItem(ParentMI,itmSourceConditionalBlock,'itmSourceConditionalBlock',lisMenuConditionalSelection);
CreateMenuItem(ParentMI,itmSourceSortBlock,'itmSourceSortBlock',lisMenuSortSelection, 'menu_edit_sort');
CreateMenuSeparatorSection(mnuSource,itmSourceBlockCharConversion,'itmSourceBlockCharConversion');
ParentMI:=itmSourceBlockCharConversion;
CreateMenuItem(ParentMI,itmSourceUpperCaseBlock,'itmSourceUpperCaseBlock',lisMenuUpperCaseSelection, 'menu_edit_uppercase');
CreateMenuItem(ParentMI,itmSourceLowerCaseBlock,'itmSourceLowerCaseBlock',lisMenuLowerCaseSelection, 'menu_edit_lowercase');
CreateMenuItem(ParentMI,itmSourceTabsToSpacesBlock,'itmSourceTabsToSpacesBlock',lisMenuTabsToSpacesSelection);
CreateMenuItem(ParentMI,itmSourceSelectionBreakLines,'itmSourceSelectionBreakLines',lisMenuBeakLinesInSelection);
CreateMenuSeparatorSection(mnuSource,itmSourceInsertions,'itmSourceInsertions');
ParentMI:=itmSourceInsertions;
CreateMenuItem(ParentMI,itmSourceInsertCharacter,'itmSourceInsertCharacter',lisMenuInsertCharacter);
begin
// insert text sub menu items
CreateMenuSubSection(ParentMI,itmSourceInsertCVSKeyWord,'itmSourceInsertCVSKeyWord',lisMenuInsertCVSKeyword);
begin
// insert CVS keyword sub menu items
SubParentMI:=itmSourceInsertCVSKeyWord;
CreateMenuItem(SubParentMI,itmSourceInsertCVSAuthor,'itmSourceInsertCVSAuthor','Author');
CreateMenuItem(SubParentMI,itmSourceInsertCVSDate,'itmSourceInsertCVSDate','Date');
CreateMenuItem(SubParentMI,itmSourceInsertCVSHeader,'itmSourceInsertCVSHeader','Header');
CreateMenuItem(SubParentMI,itmSourceInsertCVSID,'itmSourceInsertCVSID','ID');
CreateMenuItem(SubParentMI,itmSourceInsertCVSLog,'itmSourceInsertCVSLog','Log');
CreateMenuItem(SubParentMI,itmSourceInsertCVSName,'itmSourceInsertCVSName','Name');
CreateMenuItem(SubParentMI,itmSourceInsertCVSRevision,'itmSourceInsertCVSRevision','Revision');
CreateMenuItem(SubParentMI,itmSourceInsertCVSSource,'itmSourceInsertCVSSource','Source');
end;
CreateMenuSubSection(ParentMI,itmSourceInsertGeneral,'itmSourceInsertGeneral',lisMenuInsertGeneral);
begin
// insert general text sub menu items
SubParentMI:=itmSourceInsertGeneral;
CreateMenuItem(SubParentMI,itmSourceInsertGPLNotice,'itmSourceInsertGPLNotice',lisMenuInsertGPLNotice);
CreateMenuItem(SubParentMI,itmSourceInsertLGPLNotice,'itmSourceInsertLGPLNotice',lisMenuInsertLGPLNotice);
CreateMenuItem(SubParentMI,itmSourceInsertModifiedLGPLNotice,'itmSourceInsertModifiedLGPLNotice',lisMenuInsertModifiedLGPLNotice);
CreateMenuItem(SubParentMI,itmSourceInsertUsername,'itmSourceInsertUsername',lisMenuInsertUsername);
CreateMenuItem(SubParentMI,itmSourceInsertDateTime,'itmSourceInsertDateTime',lisMenuInsertDateTime);
CreateMenuItem(SubParentMI,itmSourceInsertChangeLogEntry,'itmSourceInsertChangeLogEntry',lisMenuInsertChangeLogEntry);
CreateMenuItem(SubParentMI,itmSourceInsertGUID,'itmSourceInsertGUID',srkmecInsertGUID);
end;
end;
end;
end;
procedure TMainIDEBase.SetupRefactorMenu; procedure TMainIDEBase.SetupRefactorMenu;
var var
ParentMI: TIDEMenuSection; ParentMI: TIDEMenuSection;
@ -859,41 +864,13 @@ begin
itmEditCut.Command:=GetCommand(ecCut); itmEditCut.Command:=GetCommand(ecCut);
itmEditCopy.Command:=GetCommand(ecCopy); itmEditCopy.Command:=GetCommand(ecCopy);
itmEditPaste.Command:=GetCommand(ecPaste); itmEditPaste.Command:=GetCommand(ecPaste);
itmEditIndentBlock.Command:=GetCommand(ecBlockIndent);
itmEditUnindentBlock.Command:=GetCommand(ecBlockUnindent);
itmEditEncloseBlock.Command:=GetCommand(ecSelectionEnclose);
itmEditUpperCaseBlock.Command:=GetCommand(ecSelectionUpperCase);
itmEditLowerCaseBlock.Command:=GetCommand(ecSelectionLowerCase);
itmEditTabsToSpacesBlock.Command:=GetCommand(ecSelectionTabs2Spaces);
itmEditCommentBlock.Command:=GetCommand(ecSelectionComment);
itmEditUncommentBlock.Command:=GetCommand(ecSelectionUncomment);
itmEditToggleComment.Command:=GetCommand(ecToggleComment);
itmEditConditionalBlock.Command:=GetCommand(ecSelectionConditional);
itmEditSortBlock.Command:=GetCommand(ecSelectionSort);
itmEditSelectionBreakLines.Command:=GetCommand(ecSelectionBreakLines);
itmEditSelectAll.Command:=GetCommand(ecSelectAll); itmEditSelectAll.Command:=GetCommand(ecSelectAll);
itmEditSelectToBrace.Command:=GetCommand(ecSelectToBrace); itmEditSelectToBrace.Command:=GetCommand(ecSelectToBrace);
itmEditSelectCodeBlock.Command:=GetCommand(ecSelectCodeBlock); itmEditSelectCodeBlock.Command:=GetCommand(ecSelectCodeBlock);
itmEditSelectLine.Command:=GetCommand(ecSelectLine); itmEditSelectLine.Command:=GetCommand(ecSelectLine);
itmEditSelectParagraph.Command:=GetCommand(ecSelectParagraph); itmEditSelectParagraph.Command:=GetCommand(ecSelectParagraph);
itmEditInsertCVSAuthor.Command:=GetCommand(ecInsertCVSAuthor);
itmEditInsertCVSDate.Command:=GetCommand(ecInsertCVSDate);
itmEditInsertCVSHeader.Command:=GetCommand(ecInsertCVSHeader);
itmEditInsertCVSID.Command:=GetCommand(ecInsertCVSID);
itmEditInsertCVSLog.Command:=GetCommand(ecInsertCVSLog);
itmEditInsertCVSName.Command:=GetCommand(ecInsertCVSName);
itmEditInsertCVSRevision.Command:=GetCommand(ecInsertCVSRevision);
itmEditInsertCVSSource.Command:=GetCommand(ecInsertCVSSource);
itmEditInsertGPLNotice.Command:=GetCommand(ecInsertGPLNotice);
itmEditInsertLGPLNotice.Command:=GetCommand(ecInsertLGPLNotice);
itmEditInsertModifiedLGPLNotice.Command:=GetCommand(ecInsertModifiedLGPLNotice);
itmEditInsertUsername.Command:=GetCommand(ecInsertUserName);
itmEditInsertDateTime.Command:=GetCommand(ecInsertDateTime);
itmEditInsertChangeLogEntry.Command:=GetCommand(ecInsertChangeLogEntry);
itmEditInsertGUID.Command:=GetCommand(ecInsertGUID);
// search menu // search menu
itmSearchFind.Command:=GetCommand(ecFind); itmSearchFind.Command:=GetCommand(ecFind);
itmSearchFindNext.Command:=GetCommand(ecFindNext); itmSearchFindNext.Command:=GetCommand(ecFindNext);
@ -918,6 +895,37 @@ begin
itmGotoIncludeDirective.Command:=GetCommand(ecGotoIncludeDirective); itmGotoIncludeDirective.Command:=GetCommand(ecGotoIncludeDirective);
itmSearchProcedureList.Command:=GetCommand(ecProcedureList); itmSearchProcedureList.Command:=GetCommand(ecProcedureList);
// source menu
itmSourceIndentBlock.Command:=GetCommand(ecBlockIndent);
itmSourceUnindentBlock.Command:=GetCommand(ecBlockUnindent);
itmSourceEncloseBlock.Command:=GetCommand(ecSelectionEnclose);
itmSourceUpperCaseBlock.Command:=GetCommand(ecSelectionUpperCase);
itmSourceLowerCaseBlock.Command:=GetCommand(ecSelectionLowerCase);
itmSourceTabsToSpacesBlock.Command:=GetCommand(ecSelectionTabs2Spaces);
itmSourceCommentBlock.Command:=GetCommand(ecSelectionComment);
itmSourceUncommentBlock.Command:=GetCommand(ecSelectionUncomment);
itmSourceToggleComment.Command:=GetCommand(ecToggleComment);
itmSourceConditionalBlock.Command:=GetCommand(ecSelectionConditional);
itmSourceSortBlock.Command:=GetCommand(ecSelectionSort);
itmSourceSelectionBreakLines.Command:=GetCommand(ecSelectionBreakLines);
itmSourceInsertCVSAuthor.Command:=GetCommand(ecInsertCVSAuthor);
itmSourceInsertCVSDate.Command:=GetCommand(ecInsertCVSDate);
itmSourceInsertCVSHeader.Command:=GetCommand(ecInsertCVSHeader);
itmSourceInsertCVSID.Command:=GetCommand(ecInsertCVSID);
itmSourceInsertCVSLog.Command:=GetCommand(ecInsertCVSLog);
itmSourceInsertCVSName.Command:=GetCommand(ecInsertCVSName);
itmSourceInsertCVSRevision.Command:=GetCommand(ecInsertCVSRevision);
itmSourceInsertCVSSource.Command:=GetCommand(ecInsertCVSSource);
itmSourceInsertGPLNotice.Command:=GetCommand(ecInsertGPLNotice);
itmSourceInsertLGPLNotice.Command:=GetCommand(ecInsertLGPLNotice);
itmSourceInsertModifiedLGPLNotice.Command:=GetCommand(ecInsertModifiedLGPLNotice);
itmSourceInsertUsername.Command:=GetCommand(ecInsertUserName);
itmSourceInsertDateTime.Command:=GetCommand(ecInsertDateTime);
itmSourceInsertChangeLogEntry.Command:=GetCommand(ecInsertChangeLogEntry);
itmSourceInsertGUID.Command:=GetCommand(ecInsertGUID);
// refactor menu // refactor menu
itmRefactorCompleteCode.Command:=GetCommand(ecCompleteCode); itmRefactorCompleteCode.Command:=GetCommand(ecCompleteCode);
itmRefactorExtractProc.Command:=GetCommand(ecExtractProc); itmRefactorExtractProc.Command:=GetCommand(ecExtractProc);

14
ideintf/menuintf.pas
View File

@ -299,13 +299,7 @@ var
mnuEdit: TIDEMenuSection; mnuEdit: TIDEMenuSection;
itmEditReUndo: TIDEMenuSection; itmEditReUndo: TIDEMenuSection;
itmEditClipboard: TIDEMenuSection; itmEditClipboard: TIDEMenuSection;
itmEditBlockIndentation: TIDEMenuSection;
itmEditBlockCharConversion: TIDEMenuSection;
itmEditSelect: TIDEMenuSection; itmEditSelect: TIDEMenuSection;
itmEditInsertions: TIDEMenuSection;
itmEditInsertText: TIDEMenuSection;
itmEditInsertCVSKeyWord: TIDEMenuSection;
itmEditInsertGeneral: TIDEMenuSection;
// search menu // search menu
mnuSearch: TIDEMenuSection; mnuSearch: TIDEMenuSection;
@ -314,6 +308,14 @@ var
itmBookmarks: TIDEMenuSection; itmBookmarks: TIDEMenuSection;
itmCodeToolSearches: TIDEMenuSection; itmCodeToolSearches: TIDEMenuSection;
// source menu
mnuSource: TIDEMenuSection;
itmSourceBlockIndentation: TIDEMenuSection;
itmSourceBlockCharConversion: TIDEMenuSection;
itmSourceInsertions: TIDEMenuSection;
itmSourceInsertCVSKeyWord: TIDEMenuSection;
itmSourceInsertGeneral: TIDEMenuSection;
// refactor menu // refactor menu
mnuRefactor: TIDEMenuSection; mnuRefactor: TIDEMenuSection;
itmRefactorMenuCodeTools: TIDEMenuSection; itmRefactorMenuCodeTools: TIDEMenuSection;