From a57b481cb468be5bf623fbcc8863a39c17a5fa14 Mon Sep 17 00:00:00 2001 From: dragonmacher <48328597+dragonmacher@users.noreply.github.com> Date: Fri, 27 Dec 2024 16:31:01 -0500 Subject: [PATCH] Fixed bad help links --- .../interpreter/InterpreterComponentProvider.java | 2 +- .../core/osgi/BundleStatusComponentProvider.java | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/interpreter/InterpreterComponentProvider.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/interpreter/InterpreterComponentProvider.java index 981534379e..ebf7ddc7f4 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/interpreter/InterpreterComponentProvider.java +++ b/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; diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/osgi/BundleStatusComponentProvider.java b/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/osgi/BundleStatusComponentProvider.java index c78e2d4749..0e9e47149b 100644 --- a/Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/osgi/BundleStatusComponentProvider.java +++ b/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,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); }