View Issue Details

IDProjectCategoryView StatusLast Update
0035850PackagesPackagespublic2019-10-20 23:17
ReporterFTurtleAssigned ToJuha Manninen 
PrioritynormalSeverityminorReproducibilityN/A
Status closedResolutionfixed 
Product Version2.1 (SVN)Product Build61591 
Target VersionFixed in Version 
Summary0035850: New icons for Project Groups
DescriptionNew icons for Project Groups
TagsNo tags attached.
Fixed in Revisionr62098
LazTarget-
Widgetset
Attached Files
  • images.zip (25,622 bytes)
  • patch.diff (6,133 bytes)
    Index: components/projectgroups/images/copyright.txt
    ===================================================================
    --- components/projectgroups/images/copyright.txt	(revision 0)
    +++ components/projectgroups/images/copyright.txt	(revision 0)
    @@ -0,0 +1,13 @@
    +Following images were created by FTurtle (this holds also for the equally named
    +files with appendix _150 and _200):
    +
    +pg_add_project.png
    +pg_add_project_from_file.png
    +pg_item.png
    +pg_new.png
    +pg_open.png
    +pg_open_recent.png
    +pg_save.png
    +pg_save_as.png
    +pg_save_as_simple.png
    +pg_save_simple.png
    Index: components/projectgroups/images/pg_images_list.txt
    ===================================================================
    --- components/projectgroups/images/pg_images_list.txt	(revision 61591)
    +++ components/projectgroups/images/pg_images_list.txt	(working copy)
    @@ -1,2 +1,32 @@
     projectgroup.png
    -pg_active.png
    \ No newline at end of file
    +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
    Index: components/projectgroups/projectgroupeditor.pas
    ===================================================================
    --- components/projectgroups/projectgroupeditor.pas	(revision 61591)
    +++ components/projectgroups/projectgroupeditor.pas	(working copy)
    @@ -413,11 +413,11 @@
       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 @@
     
     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;
    Index: components/projectgroups/regprojectgroup.pp
    ===================================================================
    --- components/projectgroups/regprojectgroup.pp	(revision 61591)
    +++ components/projectgroups/regprojectgroup.pp	(working copy)
    @@ -90,10 +90,11 @@
     
       procedure RegisterMnuCmd(out Cmd: TIDECommand; out MenuCmd: TIDEMenuCommand;
         Section: TIDEMenuSection; const Name, Caption: string;
    -    const OnExecuteMethod: TNotifyEvent);
    +    const OnExecuteMethod: TNotifyEvent;
    +    const ResourceName: String = '');
       begin
         Cmd:=RegisterIDECommand(PGCmdCategory,Name,Caption,OnExecuteMethod);
    -    MenuCmd:=RegisterIDEMenuCommand(Section,Name,Caption,nil,nil,Cmd);
    +    MenuCmd:=RegisterIDEMenuCommand(Section,Name,Caption,nil,nil,Cmd,ResourceName);
         RegisterIDEButtonCommand(Cmd);
       end;
     
    @@ -107,16 +108,21 @@
       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;
    
    patch.diff (6,133 bytes)
  • patch2.diff (7,413 bytes)
    Index: components/projectgroups/images/copyright.txt
    ===================================================================
    --- components/projectgroups/images/copyright.txt	(revision 0)
    +++ components/projectgroups/images/copyright.txt	(revision 0)
    @@ -0,0 +1,13 @@
    +Following images were created by FTurtle (this holds also for the equally named
    +files with appendix _150 and _200):
    +
    +pg_add_project.png
    +pg_add_project_from_file.png
    +pg_item.png
    +pg_new.png
    +pg_open.png
    +pg_open_recent.png
    +pg_save.png
    +pg_save_as.png
    +pg_save_as_simple.png
    +pg_save_simple.png
    Index: components/projectgroups/images/pg_images_list.txt
    ===================================================================
    --- components/projectgroups/images/pg_images_list.txt	(revision 61600)
    +++ components/projectgroups/images/pg_images_list.txt	(working copy)
    @@ -1,2 +1,32 @@
     projectgroup.png
    -pg_active.png
    \ No newline at end of file
    +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
    Index: components/projectgroups/projectgroupeditor.pas
    ===================================================================
    --- components/projectgroups/projectgroupeditor.pas	(revision 61600)
    +++ components/projectgroups/projectgroupeditor.pas	(working copy)
    @@ -413,11 +413,11 @@
       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 @@
     
     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;
    Index: components/projectgroups/regprojectgroup.pp
    ===================================================================
    --- components/projectgroups/regprojectgroup.pp	(revision 61600)
    +++ components/projectgroups/regprojectgroup.pp	(working copy)
    @@ -90,15 +90,20 @@
     
       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 @@
       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 @@
     
       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 @@
         if ViewProjectGroupsCommand <> nil then
         begin
           ViewProjectGroupsButtonCommand := RegisterIDEButtonCommand(ViewProjectGroupsCommand);
    -      if ViewProjectGroupsButtonCommand=nil then ;
    +      if ViewProjectGroupsButtonCommand<>nil then
    +        ViewProjectGroupsButtonCommand.ImageIndex:=ViewProjectGroupsIDEMenuCommand.ImageIndex
    +      else
    +        ;
         end;
       end;
     
    
    patch2.diff (7,413 bytes)

Activities

FTurtle

2019-07-15 21:25

reporter  

images.zip (25,622 bytes)

FTurtle

2019-07-15 21:27

reporter   ~0117272

Patch

patch.diff (6,133 bytes)
Index: components/projectgroups/images/copyright.txt
===================================================================
--- components/projectgroups/images/copyright.txt	(revision 0)
+++ components/projectgroups/images/copyright.txt	(revision 0)
@@ -0,0 +1,13 @@
+Following images were created by FTurtle (this holds also for the equally named
+files with appendix _150 and _200):
+
+pg_add_project.png
+pg_add_project_from_file.png
+pg_item.png
+pg_new.png
+pg_open.png
+pg_open_recent.png
+pg_save.png
+pg_save_as.png
+pg_save_as_simple.png
+pg_save_simple.png
Index: components/projectgroups/images/pg_images_list.txt
===================================================================
--- components/projectgroups/images/pg_images_list.txt	(revision 61591)
+++ components/projectgroups/images/pg_images_list.txt	(working copy)
@@ -1,2 +1,32 @@
 projectgroup.png
-pg_active.png
\ No newline at end of file
+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
Index: components/projectgroups/projectgroupeditor.pas
===================================================================
--- components/projectgroups/projectgroupeditor.pas	(revision 61591)
+++ components/projectgroups/projectgroupeditor.pas	(working copy)
@@ -413,11 +413,11 @@
   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 @@
 
 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;
Index: components/projectgroups/regprojectgroup.pp
===================================================================
--- components/projectgroups/regprojectgroup.pp	(revision 61591)
+++ components/projectgroups/regprojectgroup.pp	(working copy)
@@ -90,10 +90,11 @@
 
   procedure RegisterMnuCmd(out Cmd: TIDECommand; out MenuCmd: TIDEMenuCommand;
     Section: TIDEMenuSection; const Name, Caption: string;
-    const OnExecuteMethod: TNotifyEvent);
+    const OnExecuteMethod: TNotifyEvent;
+    const ResourceName: String = '');
   begin
     Cmd:=RegisterIDECommand(PGCmdCategory,Name,Caption,OnExecuteMethod);
-    MenuCmd:=RegisterIDEMenuCommand(Section,Name,Caption,nil,nil,Cmd);
+    MenuCmd:=RegisterIDEMenuCommand(Section,Name,Caption,nil,nil,Cmd,ResourceName);
     RegisterIDEButtonCommand(Cmd);
   end;
 
@@ -107,16 +108,21 @@
   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;
patch.diff (6,133 bytes)

FTurtle

2019-07-18 05:32

reporter   ~0117296

Attached enhanced patch: patch2.diff

patch2.diff (7,413 bytes)
Index: components/projectgroups/images/copyright.txt
===================================================================
--- components/projectgroups/images/copyright.txt	(revision 0)
+++ components/projectgroups/images/copyright.txt	(revision 0)
@@ -0,0 +1,13 @@
+Following images were created by FTurtle (this holds also for the equally named
+files with appendix _150 and _200):
+
+pg_add_project.png
+pg_add_project_from_file.png
+pg_item.png
+pg_new.png
+pg_open.png
+pg_open_recent.png
+pg_save.png
+pg_save_as.png
+pg_save_as_simple.png
+pg_save_simple.png
Index: components/projectgroups/images/pg_images_list.txt
===================================================================
--- components/projectgroups/images/pg_images_list.txt	(revision 61600)
+++ components/projectgroups/images/pg_images_list.txt	(working copy)
@@ -1,2 +1,32 @@
 projectgroup.png
-pg_active.png
\ No newline at end of file
+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
Index: components/projectgroups/projectgroupeditor.pas
===================================================================
--- components/projectgroups/projectgroupeditor.pas	(revision 61600)
+++ components/projectgroups/projectgroupeditor.pas	(working copy)
@@ -413,11 +413,11 @@
   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 @@
 
 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;
Index: components/projectgroups/regprojectgroup.pp
===================================================================
--- components/projectgroups/regprojectgroup.pp	(revision 61600)
+++ components/projectgroups/regprojectgroup.pp	(working copy)
@@ -90,15 +90,20 @@
 
   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 @@
   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 @@
 
   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 @@
     if ViewProjectGroupsCommand <> nil then
     begin
       ViewProjectGroupsButtonCommand := RegisterIDEButtonCommand(ViewProjectGroupsCommand);
-      if ViewProjectGroupsButtonCommand=nil then ;
+      if ViewProjectGroupsButtonCommand<>nil then
+        ViewProjectGroupsButtonCommand.ImageIndex:=ViewProjectGroupsIDEMenuCommand.ImageIndex
+      else
+        ;
     end;
   end;
 
patch2.diff (7,413 bytes)

Juha Manninen

2019-10-20 20:24

developer   ~0118737

Applied, thanks.

FTurtle

2019-10-20 23:17

reporter   ~0118740

Thank you.

Issue History

Date Modified Username Field Change
2019-07-15 21:25 FTurtle New Issue
2019-07-15 21:25 FTurtle File Added: images.zip
2019-07-15 21:27 FTurtle File Added: patch.diff
2019-07-15 21:27 FTurtle Note Added: 0117272
2019-07-18 05:32 FTurtle File Added: patch2.diff
2019-07-18 05:32 FTurtle Note Added: 0117296
2019-10-20 18:19 Juha Manninen Assigned To => Juha Manninen
2019-10-20 18:19 Juha Manninen Status new => assigned
2019-10-20 20:24 Juha Manninen Status assigned => resolved
2019-10-20 20:24 Juha Manninen Resolution open => fixed
2019-10-20 20:24 Juha Manninen Fixed in Revision => r62098
2019-10-20 20:24 Juha Manninen LazTarget => -
2019-10-20 20:24 Juha Manninen Note Added: 0118737
2019-10-20 23:17 FTurtle Status resolved => closed
2019-10-20 23:17 FTurtle Note Added: 0118740