yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 02:39:44 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-3000-dragonmacher-theme-fixes--SQUASHED'

Browse source
This commit is contained in:
Ryan Kurtz 2023-02-13 15:17:20 -05:00
commit ff93d4cfb1
38 changed files with 323 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ghidra/Framework/Project/src/main/java/ghidra/app/plugin/gui/ThemeManagerPlugin.java
View file

@ -57,7 +57,7 @@ public class ThemeManagerPlugin extends Plugin implements ApplicationLevelOnlyPl
.onAction(e -> switchTheme())
.buildAndInstall(tool);
new ActionBuilder("Configure", owner).menuPath("Edit", "Theme", "Configure...")
new ActionBuilder("Configure", owner).menuPath("Edit", "Theme", "Configure")
.menuGroup(group, "2")
.helpLocation(new HelpLocation("Theming", "Edit_Theme"))
.onAction(e -> configure())

5
Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/PluginTool.java
View file

@ -988,9 +988,8 @@ public abstract class PluginTool extends AbstractDockingTool {
optionsAction.setAddToAllWindows(true);
optionsAction.setHelpLocation(
new HelpLocation(ToolConstants.FRONT_END_HELP_TOPIC, "Tool Options"));
MenuData menuData =
new MenuData(new String[] { ToolConstants.MENU_EDIT, "&Tool Options..." }, null,
ToolConstants.TOOL_OPTIONS_MENU_GROUP);
MenuData menuData = new MenuData(new String[] { ToolConstants.MENU_EDIT, "&Tool Options" },
null, ToolConstants.TOOL_OPTIONS_MENU_GROUP);
menuData.setMenuSubGroup(ToolConstants.TOOL_OPTIONS_MENU_GROUP);
optionsAction.setMenuBarData(menuData);

5
Ghidra/Framework/Project/src/main/java/ghidra/framework/project/tool/GhidraTool.java
View file

@ -101,7 +101,8 @@ public class GhidraTool extends PluginTool {
@Override
public PluginClassManager getPluginClassManager() {
if (pluginClassManager == null) {
pluginClassManager = new PluginClassManager(Plugin.class, ApplicationLevelOnlyPlugin.class);
pluginClassManager =
new PluginClassManager(Plugin.class, ApplicationLevelOnlyPlugin.class);
}
return pluginClassManager;
}
@ -206,7 +207,7 @@ public class GhidraTool extends PluginTool {
};
configureToolAction.setMenuBarData(new MenuData(
new String[] { ToolConstants.MENU_FILE, "Configure..." }, null, "PrintPost_PreTool"));
new String[] { ToolConstants.MENU_FILE, "Configure" }, null, "PrintPost_PreTool"));
configureToolAction.setEnabled(true);
addAction(configureToolAction);