github/ghidra
1
1
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-01-09 14:08:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-0-dragonmacher-help-fixes-12-27-24'

Browse Source
This commit is contained in:
ghidragon
2024-12-27 18:50:29 -05:00
parent 59ef363880 a57b481cb4
commit 1b27a76de2
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/interpreter/InterpreterComponentProvider.java
View File

@@ -41,7 +41,7 @@ public class InterpreterComponentProvider extends ComponentProviderAdapter
public InterpreterComponentProvider(InterpreterPanelPlugin plugin,
InterpreterConnection interpreter, boolean visible) {
super(plugin.getTool(), interpreter.getTitle(), plugin.getName());
super(plugin.getTool(), interpreter.getTitle(), interpreter.getTitle());
this.panel = new InterpreterPanel(plugin.getTool(), interpreter);
this.interpreter = interpreter;

12
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/osgi/BundleStatusComponentProvider.java
View File

@@ -73,7 +73,7 @@ public class BundleStatusComponentProvider extends ComponentProviderAdapter {
* @param bundleHost the bundle host
*/
public BundleStatusComponentProvider(PluginTool tool, String owner, BundleHost bundleHost) {
super(tool, "BundleManager", owner);
super(tool, "Bundle Manager", owner);
setHelpLocation(new HelpLocation("BundleManager", "BundleManager"));
setTitle("Bundle Manager");
@@ -140,12 +140,13 @@ public class BundleStatusComponentProvider extends ComponentProviderAdapter {
.enabled(false)
.enabledWhen(context -> bundleStatusTable.getSelectedRows().length > 0)
.onAction(context -> runnable.run())
.helpLocation(new HelpLocation("BundleManager", actionName))
.buildAndInstallLocal(this);
}
private void createActions() {
Icon icon = Icons.REFRESH_ICON;
new ActionBuilder("RefreshBundles", getOwner())
new ActionBuilder("Refresh Bundles", getOwner())
.popupMenuPath("Refresh all")
.popupMenuIcon(icon)
.popupMenuGroup(BUNDLE_LIST_GROUP)
@@ -153,6 +154,7 @@ public class BundleStatusComponentProvider extends ComponentProviderAdapter {
.toolBarGroup(BUNDLE_LIST_GROUP)
.description("Refresh state by cleaning and reactivating all enabled bundles")
.onAction(c -> doRefresh())
.helpLocation(new HelpLocation("BundleManager", "RefreshBundles"))
.buildAndInstallLocal(this);
addBundlesAction("EnableBundles", "Enable selected bundle(s)",
@@ -165,7 +167,7 @@ public class BundleStatusComponentProvider extends ComponentProviderAdapter {
this::doCleanBundleBuildCaches);
icon = Icons.ADD_ICON;
new ActionBuilder("AddBundles", getOwner())
new ActionBuilder("Add Bundles", getOwner())
.popupMenuPath("Add bundle(s)")
.popupMenuIcon(icon)
.popupMenuGroup(BUNDLE_LIST_GROUP)
@@ -173,10 +175,11 @@ public class BundleStatusComponentProvider extends ComponentProviderAdapter {
.toolBarGroup(BUNDLE_LIST_GROUP)
.description("Display file chooser to add bundles to list")
.onAction(c -> showAddBundlesFileChooser())
.helpLocation(new HelpLocation("BundleManager", "AddBundles"))
.buildAndInstallLocal(this);
icon = Icons.DELETE_ICON;
new ActionBuilder("RemoveBundles", getOwner())
new ActionBuilder("Remove Bundles", getOwner())
.popupMenuPath("Remove selected bundle(s)")
.popupMenuIcon(icon)
.popupMenuGroup(BUNDLE_LIST_GROUP)
@@ -185,6 +188,7 @@ public class BundleStatusComponentProvider extends ComponentProviderAdapter {
.description("Remove selected bundle(s) from the list")
.enabledWhen(c -> bundleStatusTable.getSelectedRows().length > 0)
.onAction(c -> doRemoveBundles())
.helpLocation(new HelpLocation("BundleManager", "RemoveBundles"))
.buildAndInstallLocal(this);
}