1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-12 05:14:10 +02:00

Show more shortcuts in right-click menus

This commit is contained in:
Brian Fiete 2022-07-02 12:09:10 -07:00
parent 52897cc936
commit 066a83e60b
4 changed files with 25 additions and 10 deletions

View file

@ -90,10 +90,11 @@ namespace IDE
{ {
if (mParent == null) if (mParent == null)
return; return;
int startIdx = strBuffer.Length;
mParent.ToString(strBuffer); mParent.ToString(strBuffer);
if (mBoundKeyState != null) if (mBoundKeyState != null)
{ {
if (!strBuffer.IsEmpty) if (strBuffer.Length > startIdx)
strBuffer.Append(", "); strBuffer.Append(", ");
mBoundKeyState.ToString(strBuffer); mBoundKeyState.ToString(strBuffer);
} }

View file

@ -5402,6 +5402,20 @@ namespace IDE
sysMenu.Modify(null, null, null, true, checkVal ? 1 : 0); sysMenu.Modify(null, null, null, true, checkVal ? 1 : 0);
} }
public Menu AddMenuItem(Menu menu, StringView label, StringView command = default)
{
var command;
if (command.IsEmpty)
command = label;
String labelStr = scope String(label);
if (mCommands.mCommandMap.TryGetAlt(command, var matchKey, var ideCommand))
{
labelStr.Append("|");
ideCommand.ToString(labelStr);
}
return menu.AddItem(labelStr);
}
public bool AreTestsRunning() public bool AreTestsRunning()
{ {
return (mTestManager != null); return (mTestManager != null);

View file

@ -2717,7 +2717,7 @@ namespace IDE.ui
}); });
} }
item = menu.AddItem("Remove..."); item = menu.AddItem("Remove...|Del");
if (gApp.IsCompiling) if (gApp.IsCompiling)
item.SetDisabled(true); item.SetDisabled(true);
item.mOnMenuItemSelected.Add(new (item) => item.mOnMenuItemSelected.Add(new (item) =>
@ -2725,7 +2725,7 @@ namespace IDE.ui
RemoveSelectedItems(); RemoveSelectedItems();
}); });
item = menu.AddItem("Rename"); item = gApp.AddMenuItem(menu, "Rename", "Rename Item");
if (gApp.IsCompiling) if (gApp.IsCompiling)
item.SetDisabled(true); item.SetDisabled(true);
item.mOnMenuItemSelected.Add(new (item) => item.mOnMenuItemSelected.Add(new (item) =>
@ -2769,13 +2769,13 @@ namespace IDE.ui
if ((projectItem != null) && (!isProject)) if ((projectItem != null) && (!isProject))
{ {
item = menu.AddItem("Remove ..."); item = menu.AddItem("Remove ...|Del");
item.mOnMenuItemSelected.Add(new (item) => item.mOnMenuItemSelected.Add(new (item) =>
{ {
RemoveSelectedItems(); RemoveSelectedItems();
}); });
item = menu.AddItem("Rename"); item = gApp.AddMenuItem(menu, "Rename", "Rename Item");
item.mOnMenuItemSelected.Add(new (item) => item.mOnMenuItemSelected.Add(new (item) =>
{ {
var projectItem = GetSelectedProjectItem(); var projectItem = GetSelectedProjectItem();

View file

@ -4819,15 +4819,15 @@ namespace IDE.ui
{ {
Menu menuItem; Menu menuItem;
menuItem = menu.AddItem("Go to Definition"); menuItem = gApp.AddMenuItem(menu, "Go to Definition", "Goto Definition");
menuItem.SetDisabled(!hasText); menuItem.SetDisabled(!hasText);
menuItem.mOnMenuItemSelected.Add(new (evt) => gApp.GoToDefinition(true)); menuItem.mOnMenuItemSelected.Add(new (evt) => gApp.GoToDefinition(true));
menuItem = menu.AddItem("Find All References"); menuItem = gApp.AddMenuItem(menu, "Find All References");
menuItem.SetDisabled(!hasText); menuItem.SetDisabled(!hasText);
menuItem.mOnMenuItemSelected.Add(new (evt) => gApp.Cmd_FindAllReferences()); menuItem.mOnMenuItemSelected.Add(new (evt) => gApp.Cmd_FindAllReferences());
menuItem = menu.AddItem("Rename Symbol"); menuItem = gApp.AddMenuItem(menu, "Rename Symbol");
menuItem.SetDisabled(!hasText); menuItem.SetDisabled(!hasText);
menuItem.mOnMenuItemSelected.Add(new (evt) => gApp.Cmd_RenameSymbol()); menuItem.mOnMenuItemSelected.Add(new (evt) => gApp.Cmd_RenameSymbol());
@ -4950,11 +4950,11 @@ namespace IDE.ui
menu.AddItem(); menu.AddItem();
var debugger = IDEApp.sApp.mDebugger; var debugger = IDEApp.sApp.mDebugger;
bool isPaused = debugger.IsPaused(); bool isPaused = debugger.IsPaused();
menuItem = menu.AddItem("Show Disassembly"); menuItem = gApp.AddMenuItem(menu, "Show Disassembly");
menuItem.SetDisabled(!isPaused); menuItem.SetDisabled(!isPaused);
menuItem.mOnMenuItemSelected.Add(new (evt) => IDEApp.sApp.ShowDisassemblyAtCursor()); menuItem.mOnMenuItemSelected.Add(new (evt) => IDEApp.sApp.ShowDisassemblyAtCursor());
menuItem = menu.AddItem("Set Next Statement"); menuItem = gApp.AddMenuItem(menu, "Set Next Statement");
menuItem.SetDisabled(!isPaused); menuItem.SetDisabled(!isPaused);
menuItem.mOnMenuItemSelected.Add(new (evt) => IDEApp.sApp.[Friend]SetNextStatement()); menuItem.mOnMenuItemSelected.Add(new (evt) => IDEApp.sApp.[Friend]SetNextStatement());