IDE: Move "View Units" and "View Forms" from View menu to Project menu.

git-svn-id: trunk@30272 -

ide/keymapping.pp

@@ -518,8 +518,6 @@ begin
   ecToggleAssembler: SetResult(VK_D,[ssCtrl,ssAlt],VK_UNKNOWN,[]);
   ecToggleDebugEvents: SetResult(VK_V,[ssCtrl,ssAlt],VK_UNKNOWN,[]);
   ecToggleDebuggerOut: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
-  ecViewUnits: SetResult(VK_F12,[ssCtrl],VK_UNKNOWN,[]);
-  ecViewForms: SetResult(VK_F12,[ssShift],VK_UNKNOWN,[]);
   ecViewUnitDependencies: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
   ecViewUnitInfo: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
   ecToggleFormUnit: SetResult(VK_F12,[],VK_UNKNOWN,[]);
@@ -540,6 +538,8 @@ begin
   ecProjectInspector: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
   ecAddCurUnitToProj: SetResult(VK_F11,[ssShift],VK_UNKNOWN,[]);
   ecRemoveFromProj: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
+  ecViewProjectUnits: SetResult(VK_F12,[ssCtrl],VK_UNKNOWN,[]);
+  ecViewProjectForms: SetResult(VK_F12,[ssShift],VK_UNKNOWN,[]);
   ecViewProjectSource: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
   ecProjectOptions: SetResult(VK_F11,[ssShift,ssCtrl],VK_UNKNOWN,[]);
 
@@ -957,8 +957,6 @@ begin
   ecToggleAssembler: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]);
   ecToggleDebugEvents: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]);
   ecToggleDebuggerOut: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]);
-  ecViewUnits: SetResult(VK_F12,[ssCtrl],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]);
-  ecViewForms: SetResult(VK_F12,[ssShift],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]);
   ecViewUnitDependencies: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]);
   ecViewUnitInfo: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]);
   ecToggleFormUnit: SetResult(VK_F12,[],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]);
@@ -979,6 +977,8 @@ begin
   ecProjectInspector: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]);
   ecAddCurUnitToProj: SetResult(VK_F11,[ssShift],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]);
   ecRemoveFromProj: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]);
+  ecViewProjectUnits: SetResult(VK_F12,[ssCtrl],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]);
+  ecViewProjectForms: SetResult(VK_F12,[ssShift],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]);
   ecViewProjectSource: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]);
   ecProjectOptions: SetResult(VK_F11,[ssShift,ssCtrl],VK_UNKNOWN,[],VK_UNKNOWN,[],VK_UNKNOWN,[]);
 
@@ -1577,8 +1577,6 @@ begin
   ecToggleAssembler: SetResult(VK_D,[ssCtrl,ssAlt],VK_UNKNOWN,[]);
   ecToggleDebugEvents: SetResult(VK_V,[ssCtrl,ssAlt],VK_UNKNOWN,[]);
   ecToggleDebuggerOut: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
-  ecViewUnits: SetResult(VK_U,[ssCtrl,ssAlt],VK_UNKNOWN,[]);
-  ecViewForms: SetResult(VK_U,[ssShift,ssCtrl],VK_UNKNOWN,[]);
   ecViewUnitDependencies: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
   ecViewUnitInfo: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
   ecToggleFormUnit: SetResult(VK_F,[ssMeta,ssAlt],VK_UNKNOWN,[]);
@@ -1599,6 +1597,8 @@ begin
   ecProjectInspector: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
   ecAddCurUnitToProj: SetResult(VK_A,[ssAlt,ssMeta],VK_UNKNOWN,[]);
   ecRemoveFromProj: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
+  ecViewProjectUnits: SetResult(VK_U,[ssCtrl,ssAlt],VK_UNKNOWN,[]);
+  ecViewProjectForms: SetResult(VK_U,[ssShift,ssCtrl],VK_UNKNOWN,[]);
   ecViewProjectSource: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
   ecProjectOptions: SetResult(VK_UNKNOWN,[],VK_UNKNOWN,[]);
 
@@ -2081,8 +2081,6 @@ begin
     ecToggleCallStack         : Result:= srkmecToggleCallStack;
     ecToggleRegisters         : Result:= srkmecToggleRegisters;
     ecToggleAssembler         : Result:= srkmecToggleAssembler;
-    ecViewUnits               : Result:= srkmecViewUnits;
-    ecViewForms               : Result:= srkmecViewForms;
     ecViewUnitDependencies    : Result:= srkmecViewUnitDependencies;
     ecViewUnitInfo            : Result:= srkmecViewUnitInfo;
     ecViewAnchorEditor        : Result:= srkmecViewAnchorEditor;
@@ -2130,6 +2128,8 @@ begin
     ecProjectInspector        : Result:= lisMenuProjectInspector;
     ecAddCurUnitToProj        : Result:= lisMenuAddToProject;
     ecRemoveFromProj          : Result:= lisMenuRemoveFromProject;
+    ecViewProjectUnits        : Result:= srkmecViewUnits;
+    ecViewProjectForms        : Result:= srkmecViewForms;
     ecViewProjectSource       : Result:= lisMenuViewSource;
     ecProjectOptions          : Result:= lisMenuProjectOptions;
 
@@ -2749,8 +2749,6 @@ begin
   AddDefault(C, 'Toggle view Assembler', lisKMToggleViewAssembler, ecToggleAssembler);
   AddDefault(C, 'Toggle view Event Log', lisKMToggleViewDebugEvents, ecToggleDebugEvents);
   AddDefault(C, 'Toggle view Debugger Output', lisKMToggleViewDebuggerOutput, ecToggleDebuggerOut);
-  AddDefault(C, 'View Units', lisHintViewUnits, ecViewUnits);
-  AddDefault(C, 'View Forms', lisHintViewForms, ecViewForms);
   AddDefault(C, 'View Unit Dependencies', lisMenuViewUnitDependencies, ecViewUnitDependencies);
   AddDefault(C, 'View Unit Info', lisKMViewUnitInfo, ecViewUnitInfo);
   AddDefault(C, 'Toggle between Unit and Form', lisKMToggleBetweenUnitAndForm, ecToggleFormUnit);
@@ -2770,6 +2768,8 @@ begin
   AddDefault(C, 'Project Inspector', lisMenuProjectInspector, ecProjectInspector);
   AddDefault(C, 'Add active unit to project', lisKMAddActiveUnitToProject, ecAddCurUnitToProj);
   AddDefault(C, 'Remove active unit from project', lisKMRemoveActiveUnitFromProject, ecRemoveFromProj);
+  AddDefault(C, 'View Units', lisHintViewUnits, ecViewProjectUnits);
+  AddDefault(C, 'View Forms', lisHintViewForms, ecViewProjectForms);
   AddDefault(C, 'View project source', lisKMViewProjectSource, ecViewProjectSource);
   AddDefault(C, 'View project options', lisKMViewProjectOptions, ecProjectOptions);
 

ide/main.pp

@@ -283,8 +283,6 @@ type
     // view menu
     procedure mnuViewInspectorClicked(Sender: TObject);
     procedure mnuViewSourceEditorClicked(Sender: TObject);
-    procedure mnuViewUnitsClicked(Sender: TObject);
-    procedure mnuViewFormsClicked(Sender: TObject);
     procedure mnuViewUnitDependenciesClicked(Sender: TObject);
     procedure mnuViewUnitInfoClicked(Sender: TObject);
     procedure mnuViewFPDocEditorClicked(Sender: TObject);
@@ -312,6 +310,8 @@ type
     procedure mnuProjectInspectorClicked(Sender: TObject);
     procedure mnuAddToProjectClicked(Sender: TObject);
     procedure mnuRemoveFromProjectClicked(Sender: TObject);
+    procedure mnuViewUnitsClicked(Sender: TObject);
+    procedure mnuViewFormsClicked(Sender: TObject);
     procedure mnuViewProjectSourceClicked(Sender: TObject);
     procedure mnuProjectOptionsClicked(Sender: TObject);
 
@@ -2491,8 +2491,6 @@ begin
     itmViewRestrictionBrowser.OnClick := @mnuViewRestrictionBrowserClick;
     itmViewComponents.OnClick := @mnuViewComponentsClick;
     itmViewFPDocEditor.OnClick := @mnuViewFPDocEditorClicked;
-    itmViewUnits.OnClick := @mnuViewUnitsClicked;
-    itmViewForms.OnClick := @mnuViewFormsClicked;
     itmViewUnitDependencies.OnClick := @mnuViewUnitDependenciesClicked;
     itmViewUnitInfo.OnClick := @mnuViewUnitInfoClicked;
     itmViewToggleFormUnit.OnClick := @mnuToggleFormUnitClicked;
@@ -2580,6 +2578,8 @@ begin
     itmProjectOptions.OnClick := @mnuProjectOptionsClicked;
     itmProjectAddTo.OnClick := @mnuAddToProjectClicked;
     itmProjectRemoveFrom.OnClick := @mnuRemoveFromProjectClicked;
+    itmProjectViewUnits.OnClick := @mnuViewUnitsClicked;
+    itmProjectViewForms.OnClick := @mnuViewFormsClicked;
     itmProjectViewSource.OnClick := @mnuViewProjectSourceClicked;
   end;
 end;
@@ -3309,10 +3309,10 @@ begin
   ecToggleFPDocEditor:
     DoShowFPDocEditor(true,true);
 
-  ecViewUnits:
+  ecViewProjectUnits:
     DoViewUnitsAndForms(false);
 
-  ecViewForms:
+  ecViewProjectForms:
     DoViewUnitsAndForms(true);
 
   ecProjectInspector:

ide/mainbar.pas

@@ -173,8 +173,6 @@ type
         itmViewComponents: TIDEMenuCommand;
         itmJumpHistory: TIDEMenuCommand;
       //itmViewUnitWindows: TIDEMenuSection;
-        itmViewUnits: TIDEMenuCommand;
-        itmViewForms: TIDEMenuCommand;
         itmViewUnitDependencies: TIDEMenuCommand;
         itmViewUnitInfo: TIDEMenuCommand;
         itmViewToggleFormUnit: TIDEMenuCommand;
@@ -266,6 +264,8 @@ type
       //itmProjectAddRemoveSection: TIDEMenuSection;
         itmProjectAddTo: TIDEMenuCommand;
         itmProjectRemoveFrom: TIDEMenuCommand;
+        itmProjectViewUnits: TIDEMenuCommand;
+        itmProjectViewForms: TIDEMenuCommand;
         itmProjectViewSource: TIDEMenuCommand;
 
     // run menu

ide/mainbase.pas

@@ -511,8 +511,6 @@ begin
 
     CreateMenuSeparatorSection(mnuView,itmViewUnitWindows,'itmViewUnitWindows');
     ParentMI:=itmViewUnitWindows;
-    CreateMenuItem(ParentMI,itmViewUnits,'itmViewUnits',lisMenuViewUnits, 'menu_view_units');
-    CreateMenuItem(ParentMI,itmViewForms,'itmViewForms',lisMenuViewForms, 'menu_view_forms');
     CreateMenuItem(ParentMI,itmViewUnitDependencies,'itmViewUnitDependencies',lisMenuViewUnitDependencies);
     CreateMenuItem(ParentMI,itmViewUnitInfo,'itmViewUnitInfo',lisMenuViewUnitInfo, 'menu_view_unit_info');
     CreateMenuItem(ParentMI,itmViewToggleFormUnit,'itmViewToggleFormUnit',lisMenuViewToggleFormUnit, 'menu_view_toggle_form_unit');
@@ -655,6 +653,8 @@ begin
     ParentMI:=itmProjectAddRemoveSection;
     CreateMenuItem(ParentMI,itmProjectAddTo,'itmProjectAddTo',lisMenuAddToProject, 'menu_project_add');
     CreateMenuItem(ParentMI,itmProjectRemoveFrom,'itmProjectRemoveFrom',lisMenuRemoveFromProject, 'menu_project_remove');
+    CreateMenuItem(ParentMI,itmProjectViewUnits,'itmProjectViewUnits',lisMenuViewUnits, 'menu_view_units');
+    CreateMenuItem(ParentMI,itmProjectViewForms,'itmProjectViewForms',lisMenuViewForms, 'menu_view_forms');
     CreateMenuItem(ParentMI,itmProjectViewSource,'itmProjectViewSource',lisMenuViewSource, 'menu_project_viewsource');
   end;
 end;
@@ -928,7 +928,6 @@ begin
     // view menu
     itmViewInspector.Command:=GetCommand(ecToggleObjectInsp);
     itmViewSourceEditor.Command:=GetCommand(ecToggleSourceEditor);
-    itmViewUnits.Command:=GetCommand(ecViewUnits);
     itmViewCodeExplorer.Command:=GetCommand(ecToggleCodeExpl);
     itmViewFPDocEditor.Command:=GetCommand(ecToggleFPDocEditor);
     itmViewCodeBrowser.Command:=GetCommand(ecToggleCodeBrowser);
@@ -936,7 +935,6 @@ begin
     itmViewComponents.Command:=GetCommand(ecViewComponents);
     itmViewUnitDependencies.Command:=GetCommand(ecViewUnitDependencies);
     itmViewUnitInfo.Command:=GetCommand(ecViewUnitInfo);
-    itmViewForms.Command:=GetCommand(ecViewForms);
     itmViewToggleFormUnit.Command:=GetCommand(ecToggleFormUnit);
     itmViewMessage.Command:=GetCommand(ecToggleMessages);
     itmViewSearchResults.Command:=GetCommand(ecToggleSearchResults);
@@ -958,6 +956,8 @@ begin
     itmProjectOptions.Command:=GetCommand(ecProjectOptions);
     itmProjectAddTo.Command:=GetCommand(ecAddCurUnitToProj);
     itmProjectRemoveFrom.Command:=GetCommand(ecRemoveFromProj);
+    itmProjectViewUnits.Command:=GetCommand(ecViewProjectUnits);
+    itmProjectViewForms.Command:=GetCommand(ecViewProjectForms);
     itmProjectViewSource.Command:=GetCommand(ecViewProjectSource);
 
     // run menu

ideintf/idecommands.pas

@@ -169,8 +169,6 @@ const
   ecToggleWatches           = ecFirstLazarus + 307;
   ecToggleBreakPoints       = ecFirstLazarus + 308;
   ecToggleDebuggerOut       = ecFirstLazarus + 309;
-  ecViewUnits               = ecFirstLazarus + 310;
-  ecViewForms               = ecFirstLazarus + 311;
   ecViewUnitDependencies    = ecFirstLazarus + 312;
   ecViewUnitInfo            = ecFirstLazarus + 313;
   ecToggleLocals            = ecFirstLazarus + 314;
@@ -187,7 +185,6 @@ const
   ecToggleAssembler         = ecFirstLazarus + 325;
   ecToggleDebugEvents       = ecFirstLazarus + 326;
 
-
   // sourcenotebook commands
   ecNextEditor              = ecFirstLazarus + 330;
   ecPrevEditor              = ecFirstLazarus + 331;
@@ -266,8 +263,10 @@ const
   ecProjectInspector        = ecFirstLazarus + 507;
   ecAddCurUnitToProj        = ecFirstLazarus + 508;
   ecRemoveFromProj          = ecFirstLazarus + 509;
-  ecViewProjectSource       = ecFirstLazarus + 510;
+  ecViewProjectUnits        = ecFirstLazarus + 510;
-  ecProjectOptions          = ecFirstLazarus + 512;
+  ecViewProjectForms        = ecFirstLazarus + 511;
+  ecViewProjectSource       = ecFirstLazarus + 512;
+  ecProjectOptions          = ecFirstLazarus + 513;
 
   // components menu
   ecOpenPackage             = ecFirstLazarus + 600;