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

Author: ghidragon

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

@@ -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;

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

@@ -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,19 +140,21 @@ private void addBundlesAction(String actionName, String description, Icon icon,
 				.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)
 				.toolBarIcon(icon)
 				.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,18 +167,19 @@ private void createActions() {
 			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)
 				.toolBarIcon(icon)
 				.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 @@ private void createActions() {
 				.description("Remove selected bundle(s) from the list")
 				.enabledWhen(c -> bundleStatusTable.getSelectedRows().length > 0)
 				.onAction(c -> doRemoveBundles())
+				.helpLocation(new HelpLocation("BundleManager", "RemoveBundles"))
 				.buildAndInstallLocal(this);
 	}