ProjectGroups: New icons. Issue #35850, patch from FTurtle.

git-svn-id: trunk@62098 -

.gitattributes

@@ -4214,8 +4214,38 @@ components/printers/win32/winutilprn.pas svneol=native#text/pascal
 components/printers/win32/winutilprnconst.inc svneol=native#text/pascal
 components/projectgroups/README.txt svneol=native#text/plain
 components/projectgroups/images/pg_active.png -text svneol=unset#image/png
+components/projectgroups/images/pg_add_project.png -text svneol=unset#image/png
+components/projectgroups/images/pg_add_project_150.png -text svneol=unset#image/png
+components/projectgroups/images/pg_add_project_200.png -text svneol=unset#image/png
+components/projectgroups/images/pg_add_project_from_file.png -text svneol=unset#image/png
+components/projectgroups/images/pg_add_project_from_file_150.png -text svneol=unset#image/png
+components/projectgroups/images/pg_add_project_from_file_200.png -text svneol=unset#image/png
 components/projectgroups/images/pg_images.bat svneol=native#text/plain
 components/projectgroups/images/pg_images_list.txt svneol=native#text/plain
+components/projectgroups/images/pg_item.png -text svneol=unset#image/png
+components/projectgroups/images/pg_item_150.png -text svneol=unset#image/png
+components/projectgroups/images/pg_item_200.png -text svneol=unset#image/png
+components/projectgroups/images/pg_new.png -text svneol=unset#image/png
+components/projectgroups/images/pg_new_150.png -text svneol=unset#image/png
+components/projectgroups/images/pg_new_200.png -text svneol=unset#image/png
+components/projectgroups/images/pg_open.png -text svneol=unset#image/png
+components/projectgroups/images/pg_open_150.png -text svneol=unset#image/png
+components/projectgroups/images/pg_open_200.png -text svneol=unset#image/png
+components/projectgroups/images/pg_open_recent.png -text svneol=unset#image/png
+components/projectgroups/images/pg_open_recent_150.png -text svneol=unset#image/png
+components/projectgroups/images/pg_open_recent_200.png -text svneol=unset#image/png
+components/projectgroups/images/pg_save.png -text svneol=unset#image/png
+components/projectgroups/images/pg_save_150.png -text svneol=unset#image/png
+components/projectgroups/images/pg_save_200.png -text svneol=unset#image/png
+components/projectgroups/images/pg_save_as.png -text svneol=unset#image/png
+components/projectgroups/images/pg_save_as_150.png -text svneol=unset#image/png
+components/projectgroups/images/pg_save_as_200.png -text svneol=unset#image/png
+components/projectgroups/images/pg_save_as_simple.png -text svneol=unset#image/png
+components/projectgroups/images/pg_save_as_simple_150.png -text svneol=unset#image/png
+components/projectgroups/images/pg_save_as_simple_200.png -text svneol=unset#image/png
+components/projectgroups/images/pg_save_simple.png -text svneol=unset#image/png
+components/projectgroups/images/pg_save_simple_150.png -text svneol=unset#image/png
+components/projectgroups/images/pg_save_simple_200.png -text svneol=unset#image/png
 components/projectgroups/images/projectgroup.png -text svneol=unset#image/png
 components/projectgroups/languages/projectgroupstrconst.de.po svneol=native#text/plain
 components/projectgroups/languages/projectgroupstrconst.fr.po svneol=native#text/plain

components/projectgroups/images/pg_images_list.txt

@@ -1,2 +1,32 @@
 projectgroup.png
-pg_active.png
+pg_active.png
+pg_add_project.png
+pg_add_project_150.png
+pg_add_project_200.png
+pg_add_project_from_file.png
+pg_add_project_from_file_150.png
+pg_add_project_from_file_200.png
+pg_item.png
+pg_item_150.png
+pg_item_200.png
+pg_new.png
+pg_new_150.png
+pg_new_200.png
+pg_open.png
+pg_open_150.png
+pg_open_200.png
+pg_open_recent.png
+pg_open_recent_150.png
+pg_open_recent_200.png
+pg_save.png
+pg_save_150.png
+pg_save_200.png
+pg_save_as.png
+pg_save_as_150.png
+pg_save_as_200.png
+pg_save_as_simple.png
+pg_save_as_simple_150.png
+pg_save_as_simple_200.png
+pg_save_simple.png
+pg_save_simple_150.png
+pg_save_simple_200.png

components/projectgroups/projectgroupeditor.pas

@@ -413,11 +413,11 @@ procedure TProjectGroupEditorForm.Localize;
   end;
 
 begin
-  ConfigAction(AProjectGroupSave,'laz_save',lisProjectGroupSaveCaption,lisProjectGroupSaveHint,Nil);
-  ConfigAction(AProjectGroupSaveAs,'menu_saveas',lisProjectGroupSaveAsCaption,lisProjectGroupSaveAsHint,Nil);
-  ConfigAction(AProjectGroupNew,'laz_wand',lisProjectGroupNewCaption,lisProjectGroupNewHint,Nil);
-  ConfigAction(AProjectGroupAddExisting,'menu_project_open',lisProjectGroupAddExistingCaption,lisProjectGroupAddExistingHint,Nil);
-  ConfigAction(AProjectGroupAddCurrent,'menu_project_add',lisProjectGroupAddCurrentProjectCaption,lisProjectGroupAddCurrentProjectHint,Nil);
+  ConfigAction(AProjectGroupSave,'pg_save_simple',lisProjectGroupSaveCaption,lisProjectGroupSaveHint,Nil);
+  ConfigAction(AProjectGroupSaveAs,'pg_save_as_simple',lisProjectGroupSaveAsCaption,lisProjectGroupSaveAsHint,Nil);
+  ConfigAction(AProjectGroupNew,'pg_new',lisProjectGroupNewCaption,lisProjectGroupNewHint,Nil);
+  ConfigAction(AProjectGroupAddExisting,'pg_add_project_from_file',lisProjectGroupAddExistingCaption,lisProjectGroupAddExistingHint,Nil);
+  ConfigAction(AProjectGroupAddCurrent,'pg_add_project',lisProjectGroupAddCurrentProjectCaption,lisProjectGroupAddCurrentProjectHint,Nil);
   ConfigAction(AProjectGroupDelete,'laz_delete',lisProjectGroupDeleteCaption,lisProjectGroupDeleteHint,Nil);
   ConfigAction(AProjectGroupAddNew,'menu_project_new',lisProjectGroupAddNewCaption,lisProjectGroupAddNewHint,Nil);
   ConfigAction(ATargetEarlier,'arrow_up',lisTargetEarlierCaption,lisTargetEarlierHint,Nil);
@@ -1312,7 +1312,7 @@ end;
 
 procedure TProjectGroupEditorForm.LoadImages;
 begin
-  NIProjectGroup := IDEImages.GetImageIndex('projectgroup');
+  NIProjectGroup := IDEImages.GetImageIndex('pg_item');
   NITargetProject := IDEImages.GetImageIndex('item_project');
   NITargetPackage := IDEImages.GetImageIndex('item_package');
   NITargetProjectGroup := NIProjectGroup;

components/projectgroups/regprojectgroup.pp

@@ -90,15 +90,20 @@ procedure Register;
 
   procedure RegisterMnuCmd(out Cmd: TIDECommand; out MenuCmd: TIDEMenuCommand;
     Section: TIDEMenuSection; const Name, Caption: string;
-    const OnExecuteMethod: TNotifyEvent);
+    const OnExecuteMethod: TNotifyEvent;
+    const ResourceName: String = '');
+  var
+    ButtonCmd: TIDEButtonCommand;
   begin
     Cmd:=RegisterIDECommand(PGCmdCategory,Name,Caption,OnExecuteMethod);
-    MenuCmd:=RegisterIDEMenuCommand(Section,Name,Caption,nil,nil,Cmd);
-    RegisterIDEButtonCommand(Cmd);
+    MenuCmd:=RegisterIDEMenuCommand(Section,Name,Caption,nil,nil,Cmd,ResourceName);
+    ButtonCmd:=RegisterIDEButtonCommand(Cmd);
+    ButtonCmd.ImageIndex:=MenuCmd.ImageIndex;
   end;
 
 var
   IDECommandCategory: TIDECommandCategory;
+  ViewProjectGroupsIDEMenuCommand: TIDEMenuCommand;
 begin
   IDEProjectGroupManager:=TIDEProjectGroupManager.Create;
   ProjectGroupManager:=IDEProjectGroupManager;
@@ -107,16 +112,21 @@ begin
   PGCmdCategory:=RegisterIDECommandCategory(nil,ProjectGroupCmdCategoryName,lisProjectGroups);
 
   RegisterMnuCmd(CmdNewProjectGroup,MnuCmdNewProjectGroup,itmProjectNewSection,
-    'New Project Group',lisNewProjectGroupMenuC,@IDEProjectGroupManager.DoNewClick);
+    'New Project Group',lisNewProjectGroupMenuC,@IDEProjectGroupManager.DoNewClick,
+    'pg_new');
   RegisterMnuCmd(CmdOpenProjectGroup,MnuCmdOpenProjectGroup,itmProjectOpenSection,
-    'Open Project Group',lisOpenProjectGroup,@IDEProjectGroupManager.DoOpenClick);
+    'Open Project Group',lisOpenProjectGroup,@IDEProjectGroupManager.DoOpenClick,
+    'pg_open');
   PGOpenRecentSubMenu:=RegisterIDESubMenu(itmProjectOpenSection,
-    'Open recent Project Group',lisOpenRecentProjectGroup);
+    'Open recent Project Group',lisOpenRecentProjectGroup, nil, nil,
+    'pg_open_recent');
   RegisterMnuCmd(CmdSaveProjectGroup,MnuCmdSaveProjectGroup,itmProjectSaveSection,
-    'Save Project Group',lisSaveProjectGroup,@IDEProjectGroupManager.DoSaveClick);
+    'Save Project Group',lisSaveProjectGroup,@IDEProjectGroupManager.DoSaveClick,
+    'pg_save');
   MnuCmdSaveProjectGroup.Enabled:=false;
   RegisterMnuCmd(CmdSaveProjectGroupAs,MnuCmdSaveProjectGroupAs,itmProjectSaveSection,
-    'Save Project Group as',lisSaveProjectGroupAs,@IDEProjectGroupManager.DoSaveAsClick);
+    'Save Project Group as',lisSaveProjectGroupAs,@IDEProjectGroupManager.DoSaveAsClick,
+    'pg_save_as');
   MnuCmdSaveProjectGroupAs.Enabled:=false;
 
   RegisterProjectGroupEditorMenuItems;
@@ -125,8 +135,9 @@ begin
 
   SetProjectGroupEditorCallBack;
 
-  RegisterIDEMenuCommand(itmViewMainWindows, 'mnuProjectGroups',
-    lisProjectGroups, nil, @ViewProjectGroupsClicked);
+  ViewProjectGroupsIDEMenuCommand:=RegisterIDEMenuCommand(itmViewMainWindows,
+    'mnuProjectGroups', lisProjectGroups, nil, @ViewProjectGroupsClicked, nil,
+    'pg_item');
 
   ViewProjGrpShortCutX := IDEShortCut(VK_UNKNOWN, [], VK_UNKNOWN, []);
   IDECommandCategory := IDECommandList.FindCategoryByName(CommandCategoryViewName);
@@ -137,7 +148,10 @@ begin
     if ViewProjectGroupsCommand <> nil then
     begin
       ViewProjectGroupsButtonCommand := RegisterIDEButtonCommand(ViewProjectGroupsCommand);
-      if ViewProjectGroupsButtonCommand=nil then ;
+      if ViewProjectGroupsButtonCommand<>nil then
+        ViewProjectGroupsButtonCommand.ImageIndex:=ViewProjectGroupsIDEMenuCommand.ImageIndex
+      else
+        ;
     end;
   end;