paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-12 14:29:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE/Desktops: Move the "Desktops ..." item from the Tools menu to the Window menu. Merge request !402.

Browse Source
This commit is contained in:
n7800 2024-12-13 01:52:30 +05:00 committed by Juha
parent a0d1766a2e
commit 17b997ee28
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ide/main.pp
View File

@ -383,7 +383,6 @@ type
procedure mnuToolConvertDelphiProjectClicked(Sender: TObject); procedure mnuToolConvertDelphiProjectClicked(Sender: TObject);
procedure mnuToolConvertDelphiPackageClicked(Sender: TObject); procedure mnuToolConvertDelphiPackageClicked(Sender: TObject);
procedure mnuToolConvertEncodingClicked(Sender: TObject); procedure mnuToolConvertEncodingClicked(Sender: TObject);
procedure mnuToolManageDesktopsClicked(Sender: TObject);
procedure mnuToolBuildLazarusClicked(Sender: TObject); procedure mnuToolBuildLazarusClicked(Sender: TObject);
procedure mnuToolBuildAdvancedLazarusClicked(Sender: TObject); procedure mnuToolBuildAdvancedLazarusClicked(Sender: TObject);
procedure mnuToolConfigBuildLazClicked(Sender: TObject); procedure mnuToolConfigBuildLazClicked(Sender: TObject);
@ -398,6 +397,7 @@ type
// windows menu // windows menu
procedure mnuWindowManagerClicked(Sender: TObject); procedure mnuWindowManagerClicked(Sender: TObject);
procedure mnuWindowManageDesktopsClicked(Sender: TObject);
// help menu // help menu
// see helpmanager.pas // see helpmanager.pas
@ -2885,7 +2885,6 @@ begin
itmEnvCodeToolsDefinesEditor.OnClick := @mnuEnvCodeToolsDefinesEditorClicked; itmEnvCodeToolsDefinesEditor.OnClick := @mnuEnvCodeToolsDefinesEditorClicked;
itmToolConfigure.OnClick := @mnuToolConfigureUserExtToolsClicked; itmToolConfigure.OnClick := @mnuToolConfigureUserExtToolsClicked;
itmToolManageDesktops.OnClick := @mnuToolManageDesktopsClicked;
itmToolDiff.OnClick := @mnuToolDiffClicked; itmToolDiff.OnClick := @mnuToolDiffClicked;
@ -2909,6 +2908,7 @@ procedure TMainIDE.SetupWindowsMenu;
begin begin
inherited SetupWindowsMenu; inherited SetupWindowsMenu;
MainIDEBar.itmWindowManager.OnClick := @mnuWindowManagerClicked; MainIDEBar.itmWindowManager.OnClick := @mnuWindowManagerClicked;
MainIDEBar.itmWindowManageDesktops.OnClick := @mnuWindowManageDesktopsClicked;
end; end;
procedure TMainIDE.SetupHelpMenu; procedure TMainIDE.SetupHelpMenu;
@ -3158,7 +3158,7 @@ begin
itmToolConfigure.Command:=GetIdeCmdRegToolBtn(ecExtToolSettings); itmToolConfigure.Command:=GetIdeCmdRegToolBtn(ecExtToolSettings);
itmToolManageDesktops.Command:=GetCommand(ecManageDesktops, nil, TShowDesktopsToolButton); itmWindowManageDesktops.Command:=GetCommand(ecManageDesktops, nil, TShowDesktopsToolButton);
itmToolDiff.Command:=GetIdeCmdRegToolBtn(ecDiff); itmToolDiff.Command:=GetIdeCmdRegToolBtn(ecDiff);
@ -4952,7 +4952,7 @@ begin
ShowConvertEncodingDlg; ShowConvertEncodingDlg;
end; end;
procedure TMainIDE.mnuToolManageDesktopsClicked(Sender: TObject); procedure TMainIDE.mnuWindowManageDesktopsClicked(Sender: TObject);
begin begin
ShowDesktopManagerDlg; ShowDesktopManagerDlg;
end; end;

2
ide/mainbar.pas
View File

@ -355,7 +355,6 @@ type
//itmCustomTools: TIDEMenuSection; //itmCustomTools: TIDEMenuSection;
itmToolConfigure: TIDEMenuCommand; itmToolConfigure: TIDEMenuCommand;
//itmSecondaryTools: TIDEMenuSection; //itmSecondaryTools: TIDEMenuSection;
itmToolManageDesktops: TIDEMenuCommand;
itmToolDiff: TIDEMenuCommand; itmToolDiff: TIDEMenuCommand;
//itmDelphiConversion: TIDEMenuSection; //itmDelphiConversion: TIDEMenuSection;
itmToolCheckLFM: TIDEMenuCommand; itmToolCheckLFM: TIDEMenuCommand;
@ -372,6 +371,7 @@ type
//mnuWindow: TIDEMenuSection; //mnuWindow: TIDEMenuSection;
//itmWindowManagers: TIDEMenuSection; //itmWindowManagers: TIDEMenuSection;
itmWindowManager: TIDEMenuCommand; itmWindowManager: TIDEMenuCommand;
itmWindowManageDesktops: TIDEMenuCommand;
// help menu // help menu
//mnuHelp: TIDEMenuSection; //mnuHelp: TIDEMenuSection;

2
ide/mainbase.pas
View File

@ -1456,7 +1456,6 @@ begin
CreateMenuSeparatorSection(mnuTools,itmSecondaryTools,'itmSecondaryTools'); CreateMenuSeparatorSection(mnuTools,itmSecondaryTools,'itmSecondaryTools');
ParentMI:=itmSecondaryTools; ParentMI:=itmSecondaryTools;
CreateMenuItem(ParentMI,itmToolManageDesktops,'itmToolManageDesktops', lisDesktops, 'menu_manage_desktops');
CreateMenuItem(ParentMI,itmToolDiff,'itmToolDiff',lisMenuCompareFiles, 'menu_tool_diff'); CreateMenuItem(ParentMI,itmToolDiff,'itmToolDiff',lisMenuCompareFiles, 'menu_tool_diff');
CreateMenuSeparatorSection(mnuTools,itmConversion,'itmConversion'); CreateMenuSeparatorSection(mnuTools,itmConversion,'itmConversion');
@ -1487,6 +1486,7 @@ begin
CreateMenuSeparatorSection(mnuWindow,itmWindowManagers,'itmWindowManagers'); CreateMenuSeparatorSection(mnuWindow,itmWindowManagers,'itmWindowManagers');
ParentMI:=itmWindowManagers; ParentMI:=itmWindowManagers;
CreateMenuItem(ParentMI,itmWindowManager,'itmWindowManager', lisManageSourceEditors, 'menu_manage_source_editors'); CreateMenuItem(ParentMI,itmWindowManager,'itmWindowManager', lisManageSourceEditors, 'menu_manage_source_editors');
CreateMenuItem(ParentMI,itmWindowManageDesktops,'itmWindowManageDesktops', lisDesktops, 'menu_manage_desktops');
// Populated later with a list of editor names // Populated later with a list of editor names
CreateMenuSeparatorSection(mnuWindow,itmWindowLists,'itmWindowLists'); CreateMenuSeparatorSection(mnuWindow,itmWindowLists,'itmWindowLists');
CreateMenuSeparatorSection(mnuWindow,itmCenterWindowLists,'itmCenterWindowLists'); CreateMenuSeparatorSection(mnuWindow,itmCenterWindowLists,'itmCenterWindowLists');