IDE: Show icons in menu 'Window'. Issue #37026, patch (modified) from FTurtle.

git-svn-id: trunk@63212 -

.gitattributes

@@ -8456,6 +8456,15 @@ images/icons/lazarus_orange.ico -text
 images/icons/transparent.ico -text svneol=unset#image/ico
 images/ide_icon48x48.png -text svneol=unset#image/png
 images/includefile.ico -text svneol=unset#image/x-icon
+images/items/datamodule_designer.png -text svneol=unset#image/png
+images/items/datamodule_designer_150.png -text svneol=unset#image/png
+images/items/datamodule_designer_200.png -text svneol=unset#image/png
+images/items/form_designer.png -text svneol=unset#image/png
+images/items/form_designer_150.png -text svneol=unset#image/png
+images/items/form_designer_200.png -text svneol=unset#image/png
+images/items/frame_designer.png -text svneol=unset#image/png
+images/items/frame_designer_150.png -text svneol=unset#image/png
+images/items/frame_designer_200.png -text svneol=unset#image/png
 images/items/item_character.png -text svneol=unset#image/png
 images/items/item_character_150.png -text svneol=unset#image/png
 images/items/item_character_200.png -text svneol=unset#image/png

components/ideintf/ideimagesintf.pas

@@ -47,7 +47,8 @@ type
     function GetImages_24: TLCLGlyphs;
 
     class function CreateBitmapFromRes(const ImageName: string): TCustomBitmap;
-    class function CreateBestBitmapForScalingFromRes(const ImageName: string; const aDefScale: Integer; out aBitmap: TCustomBitmap): Integer;
+    class function CreateBestBitmapForScalingFromRes(const ImageName: string;
+      const aDefScale: Integer; out aBitmap: TCustomBitmap): Integer;
   public
     destructor Destroy; override;
 
@@ -245,9 +246,8 @@ begin
     Result := CreateBitmapFromResourceName(HInstance, ImageName);
 end;
 
-class function TIDEImages.CreateBestBitmapForScalingFromRes(
-  const ImageName: string; const aDefScale: Integer; out aBitmap: TCustomBitmap
-  ): Integer;
+class function TIDEImages.CreateBestBitmapForScalingFromRes(const ImageName: string;
+  const aDefScale: Integer; out aBitmap: TCustomBitmap): Integer;
 begin
   aBitmap := nil;
   Result := aDefScale;
@@ -274,14 +274,12 @@ begin
   Result := CreateImage(ImageName, ImageSize);
 end;
 
-function TIDEImages.GetImageIndex(ImageSize: Integer; ImageName: String
-  ): Integer;
+function TIDEImages.GetImageIndex(ImageSize: Integer; ImageName: String): Integer;
 begin
   Result := GetImageIndex(ImageName, ImageSize);
 end;
 
-function TIDEImages.GetImageIndex(ImageName: String; ImageSize: Integer
-  ): Integer;
+function TIDEImages.GetImageIndex(ImageName: String; ImageSize: Integer): Integer;
 var
   List: TLCLGlyphs;
 begin

ide/mainbase.pas

@@ -89,6 +89,7 @@ type
     FWindowMenuActiveForm: TCustomForm;
     FDisplayState: TDisplayState;
     procedure SetDisplayState(AValue: TDisplayState);
+    procedure UpdateWindowMenu;
   protected
     FNeedUpdateHighlighters: boolean;
 
@@ -134,8 +135,6 @@ type
     procedure mnuWindowSourceItemClick(Sender: TObject); virtual;
     procedure mnuBuildModeClicked(Sender: TObject); virtual; abstract;
 
-    procedure UpdateWindowMenu;
-
   public
     function DoResetToolStatus(AFlags: TResetToolFlags): boolean; virtual; abstract;
 
@@ -1520,17 +1519,82 @@ begin
                   [ofOnlyIfExists,ofAddToRecent,ofRegularFile,ofConvertMacros]);
 end;
 
-procedure TMainIDEBase.UpdateWindowMenu;
+function GetIconIndex(AForm: TWinControl): Integer;
+begin
+  if csDesigning in AForm.ComponentState then             // in designer
+    case AForm.ClassName of
+      'TFrameProxyDesignerForm':
+        Exit(IDEImages.GetImageIndex('frame_designer'));      // frame
+      'TNonControlProxyDesignerForm':
+        Exit(IDEImages.GetImageIndex('datamodule_designer')); // datamodule
+    else
+      Exit(IDEImages.GetImageIndex('form_designer'));         // own form class (TForm1, TForm2, etc.)
+    end;
 
-  function GetMenuItem(Index: Integer; ASection: TIDEMenuSection): TIDEMenuItem;
-  begin
-    Result := RegisterIDEMenuCommand(ASection,'Window'+IntToStr(Index)+ASection.Name,'');
-    Result.CreateMenuItem;
+  with MainIDEBar do
+  case AForm.ClassName of
+    'TCharacterMapDialog':     Exit(-1);                      // for future icon
+    'TObjectInspectorDlg':     Exit(itmViewInspector.ImageIndex);
+    'TSourceNotebook':         Exit(itmViewSourceEditor.ImageIndex);
+    'TMessagesView':           Exit(itmViewMessage.ImageIndex);
+    'TCodeExplorerView':       Exit(itmViewCodeExplorer.ImageIndex);
+    'TFPDocEditor':            Exit(-1);                      // for future icon
+    'TCodeBrowserView':        Exit(itmViewCodeBrowser.ImageIndex);
+    'TUnitDependenciesWindow': Exit(-1);                      // for future icon
+    'TRestrictionBrowserView': Exit(itmViewRestrictionBrowser.ImageIndex);
+    'TComponentListForm':      Exit(itmViewComponents.ImageIndex);
+    'TJumpHistoryViewWin':     Exit(itmJumpHistory.ImageIndex);
+    'TMacroListView':          Exit(-1);                      // for future icon
+    'TTabOrderDialog':         Exit(itmViewTabOrder.ImageIndex);
+    'TSearchResultsView':      Exit(itmViewSearchResults.ImageIndex);
+    'TWatchesDlg':             Exit(itmViewWatches.ImageIndex);
+    'TBreakPointsDlg':         Exit(itmViewBreakPoints.ImageIndex);
+    'TLocalsDlg':              Exit(-1);                      // for future icon
+    'TRegistersDlg':           Exit(-1);                      // for future icon
+    'TCallStackDlg':           Exit(itmViewCallStack.ImageIndex);
+    'TThreadsDlg':             Exit(-1);                      // for future icon
+    'TAssemblerDlg':           Exit(-1);                      // for future icon
+    'TDbgEventsForm':          Exit(-1);                      // for future icon
+    'THistoryDialog':          Exit(-1);                      // for future icon
+    'TDbgOutputForm':          Exit(itmViewDebugOutput.ImageIndex);
+    'TProjectInspectorForm':   Exit(itmProjectInspector.ImageIndex);
+    'TPkgGraphExplorerDlg':    Exit(itmPkgPkgGraph.ImageIndex);
+    'TPackageEditorForm':      Exit(IDEImages.GetImageIndex('item_package'));
+    'TDSFieldsEditorFrm':               Exit(-1);             // for future icon
+    'TDBGridColumnsPropertyEditorForm': Exit(-1);             // for future icon
+    'TActionListEditor':                Exit(-1);             // for future icon
+    'TCollectionPropertyEditorForm':    Exit(-1);             // for future icon
+    'TSeriesEditorForm':                Exit(-1);             // for future icon
+    // In packages, may not be installed:
+    'TProjectGroupEditorForm': Exit(IDEImages.GetImageIndex('pg_item'));
+    'THeapTrcViewForm':        Exit(-1);                      // for future icon
+    'TIDETodoWindow':          Exit(IDEImages.GetImageIndex('menu_view_todo'));
+    'TAnchorDesigner':         Exit(IDEImages.GetImageIndex('menu_view_anchor_editor'));
+  else
+    Exit(-1);
   end;
+end;
 
+function GetMenuItem(Index: Integer; ASection: TIDEMenuSection): TIDEMenuItem;
+begin
+  Result := RegisterIDEMenuCommand(ASection,'Window'+IntToStr(Index)+ASection.Name,'');
+  Result.CreateMenuItem;
+end;
+
+procedure InitMenuItem(AMenuItem: TIDEMenuItem; AForm: TCustomForm; AIcon: Integer);
+begin
+  AMenuItem.ImageIndex := AIcon;
+  if EnvironmentOptions.Desktop.IDENameForDesignedFormList and IsFormDesign(AForm) then
+    AMenuItem.Caption := AForm.Name
+  else
+    AMenuItem.Caption := AForm.Caption;
+  AMenuItem.UserTag := {%H-}PtrUInt(AForm);
+end;
+
+procedure TMainIDEBase.UpdateWindowMenu;
 var
   WindowsList: TFPList;
-  i, EditorIndex, ItemCountProject, ItemCountOther: Integer;
+  i, EditorIndex, ItemCountProject, ItemCountOther, IconInd: Integer;
   CurMenuItem: TIDEMenuItem;
   AForm: TForm;
   EdList: TStringList;
@@ -1553,8 +1617,8 @@ begin
     WindowsList.Add(MainIDEBar);
   {$ENDIF}
   // add special IDE windows
-  for i:=0 to Screen.FormCount-1 do begin
-    AForm:=Screen.Forms[i];
+  for i := 0 to Screen.FormCount-1 do begin
+    AForm := Screen.Forms[i];
     //debugln(['TMainIDEBase.UpdateWindowMenu ',DbgSName(AForm),' Vis=',AForm.IsVisible,' Des=',DbgSName(AForm.Designer)]);
     if (AForm=MainIDEBar) or (AForm=SplashForm) or IsFormDesign(AForm)
     or (WindowsList.IndexOf(AForm)>=0) then
@@ -1568,33 +1632,24 @@ begin
     WindowsList.Add(AForm);
   end;
   // add designer forms and datamodule forms
-  for i:=0 to Screen.FormCount-1 do begin
-    AForm:=Screen.Forms[i];
+  for i := 0 to Screen.FormCount-1 do begin
+    AForm := Screen.Forms[i];
     if (AForm.Designer<>nil) and (WindowsList.IndexOf(AForm)<0) then
       WindowsList.Add(AForm);
   end;
   // create menuitems for all windows
-  for i:=0 to WindowsList.Count-1 do
+  for i := 0 to WindowsList.Count-1 do
   begin
+    IconInd := GetIconIndex(TWinControl(WindowsList[i]));
     // in the 'bring to front' list
     CurMenuItem := GetMenuItem(i, itmWindowLists);
-    if EnvironmentOptions.Desktop.IDENameForDesignedFormList
-    and IsFormDesign(TWinControl(WindowsList[i])) then
-      CurMenuItem.Caption:=TCustomForm(WindowsList[i]).Name
-    else
-      CurMenuItem.Caption:=TCustomForm(WindowsList[i]).Caption;
+    InitMenuItem(CurMenuItem, TCustomForm(WindowsList[i]), IconInd);
     CurMenuItem.Checked := WindowMenuActiveForm = TCustomForm(WindowsList[i]);
-    CurMenuItem.UserTag := {%H-}PtrUInt(WindowsList[i]);
-    CurMenuItem.OnClick:=@mnuWindowItemClick;
+    CurMenuItem.OnClick := @mnuWindowItemClick;
     // in the 'center' list
     CurMenuItem := GetMenuItem(i, itmCenterWindowLists);
-    if EnvironmentOptions.Desktop.IDENameForDesignedFormList
-    and IsFormDesign(TWinControl(WindowsList[i])) then
-      CurMenuItem.Caption:=TCustomForm(WindowsList[i]).Name
-    else
-      CurMenuItem.Caption:=TCustomForm(WindowsList[i]).Caption;
-    CurMenuItem.UserTag := {%H-}PtrUInt(WindowsList[i]);
-    CurMenuItem.OnClick:=@mnuCenterWindowItemClick;
+    InitMenuItem(CurMenuItem, TCustomForm(WindowsList[i]), IconInd);
+    CurMenuItem.OnClick := @mnuCenterWindowItemClick;
   end;
   //create source page menuitems
   itmTabListProject.Visible := False;

images/copyright.txt

@@ -57,6 +57,9 @@ designer directory:
 	tab_order.png
 
 items directory:
+	datamodule_designer.png    (used 'tdatasource.png' created by Roland Hahn)
+	form_designer.png
+	frame_designer.png
 	item_form.png
 	item_project.png
 	item_project_source.png

images/laz_images_list.txt

@@ -456,6 +456,15 @@ designer/size_200.png
 designer/tab_order.png
 designer/tab_order_150.png
 designer/tab_order_200.png
+items/datamodule_designer.png
+items/datamodule_designer_150.png
+items/datamodule_designer_200.png
+items/form_designer.png
+items/form_designer_150.png
+items/form_designer_200.png
+items/frame_designer.png
+items/frame_designer_150.png
+items/frame_designer_200.png
 items/item_character.png
 items/item_character_150.png
 items/item_character_200.png