IDE: New icons for the Source > "Enclose selection" and "Enclose in ifdef" menu items. Some new general-purpose icons (font, grid). Reworked quickfix icon. All by Roland Hahn.

ide/mainbase.pas

@@ -978,6 +978,9 @@ begin
   end;
 end;
 
+{ Note: Icons are specified as last argument in the CreateMenuItem call. If these
+  icons do not show up in the IDE there may be another registration place somewhere
+  else, usually in RegisterStandardSourceEditorMenuItems (sourceeditor unit). }
 procedure TMainIDEBase.SetupEditMenu;
 var
   ParentMI: TIDEMenuSection;
@@ -1024,6 +1027,9 @@ begin
   end;
 end;
 
+{ Note: Icons are specified as last argument in the CreateMenuItem call. If these
+  icons do not show up in the IDE there may be another registration place somewhere
+  else, usually in RegisterStandardSourceEditorMenuItems (sourceeditor unit). }
 procedure TMainIDEBase.SetupSearchMenu;
 var
   ParentMI: TIDEMenuSection;
@@ -1140,6 +1146,9 @@ begin
   end;
 end;
 
+{ Note: Icons are specified as last argument in the CreateMenuItem call. If these
+  icons do not show up in the IDE there may be another registration place somewhere
+  else, usually in RegisterStandardSourceEditorMenuItems (sourceeditor unit). }
 procedure TMainIDEBase.SetupSourceMenu;
 var
   ParentMI, SubParentMI: TIDEMenuSection;
@@ -1150,8 +1159,8 @@ begin
     CreateMenuItem(ParentMI,itmSourceCommentBlock,'itmSourceCommentBlock',lisMenuCommentSelection, 'menu_comment');
     CreateMenuItem(ParentMI,itmSourceUncommentBlock,'itmSourceUncommentBlock',lisMenuUncommentSelection, 'menu_uncomment');
     CreateMenuItem(ParentMI,itmSourceToggleComment,'itmSourceToggleComment',lisMenuToggleComment, 'menu_togglecomment');
-    CreateMenuItem(ParentMI,itmSourceEncloseBlock,'itmSourceEncloseBlock',lisMenuEncloseSelection);
-    CreateMenuItem(ParentMI,itmSourceEncloseInIFDEF,'itmSourceEncloseInIFDEF',lisMenuEncloseInIFDEF);
+    CreateMenuItem(ParentMI,itmSourceEncloseBlock,'itmSourceEncloseBlock',lisMenuEncloseSelection, 'menu_source_encloseselection');
+    CreateMenuItem(ParentMI,itmSourceEncloseInIFDEF,'itmSourceEncloseInIFDEF',lisMenuEncloseInIFDEF, 'menu_source_encloseinifdef');
     CreateMenuItem(ParentMI,itmSourceCompleteCodeInteractive,'itmSourceCompleteCodeInteractive',lisMenuCompleteCodeInteractive, 'menu_source_completecode');
     CreateMenuItem(ParentMI,itmRefactorInvertAssignment,'itmInvertAssignment',uemInvertAssignment);
     CreateMenuItem(ParentMI,itmSourceUseUnit,'itmSourceUseUnit',lisMenuUseUnit);

ide/sourceeditor.pp

@@ -1803,9 +1803,9 @@ begin
         'Source', uemSource, nil, nil, 'item_unit');
     AParent:=SrcEditSubMenuSource;
     SrcEditMenuEncloseSelection := RegisterIDEMenuCommand(AParent,
-        'EncloseSelection', lisMenuEncloseSelection);
+        'EncloseSelection', lisMenuEncloseSelection, nil, nil, nil, 'menu_source_encloseselection');
     SrcEditMenuEncloseInIFDEF := RegisterIDEMenuCommand(AParent,
-        'itmSourceEncloseInIFDEF', lisMenuEncloseInIFDEF);
+        'itmSourceEncloseInIFDEF', lisMenuEncloseInIFDEF, nil, nil, nil, 'menu_source_encloseinifdef');
     SrcEditMenuCompleteCode := RegisterIDEMenuCommand(AParent,
         'CompleteCode', lisMenuCompleteCode, nil, @ExecuteIdeMenuClick);
     SrcEditMenuInvertAssignment := RegisterIDEMenuCommand(AParent,

images/laz_images_list.txt

@@ -822,6 +822,12 @@ menu/menu_set_free_bookmark_200.png
 menu/menu_source_completecode.png
 menu/menu_source_completecode_150.png
 menu/menu_source_completecode_200.png
+menu/menu_source_encloseselection.png
+menu/menu_source_encloseselection_150.png
+menu/menu_source_encloseselection_200.png
+menu/menu_source_encloseinifdef.png
+menu/menu_source_encloseinifdef_150.png
+menu/menu_source_encloseinifdef_200.png
 menu/menu_source_makeresourcestring.png
 menu/menu_source_makeresourcestring_150.png
 menu/menu_source_makeresourcestring_200.png