Add support for Configuration overlay menus
This commit is contained in:
@@ -264,6 +264,10 @@ public enum MenuAction
|
|||||||
* Menu action injected by runelite for overlay menu items.
|
* Menu action injected by runelite for overlay menu items.
|
||||||
*/
|
*/
|
||||||
RUNELITE_OVERLAY(1501),
|
RUNELITE_OVERLAY(1501),
|
||||||
|
/**
|
||||||
|
* Menu action for configuring runelite overlays.
|
||||||
|
*/
|
||||||
|
RUNELITE_OVERLAY_CONFIG(1502),
|
||||||
|
|
||||||
FOLLOW(2046),
|
FOLLOW(2046),
|
||||||
TRADE(2047),
|
TRADE(2047),
|
||||||
|
|||||||
@@ -656,6 +656,18 @@ public class ConfigPanel extends PluginPanel
|
|||||||
configManager.setConfiguration(RUNELITE_GROUP_NAME, PINNED_PLUGINS_CONFIG_KEY, value);
|
configManager.setConfiguration(RUNELITE_GROUP_NAME, PINNED_PLUGINS_CONFIG_KEY, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void openConfigurationPanel(String configGroup)
|
||||||
|
{
|
||||||
|
for (PluginListItem pluginListItem : pluginList)
|
||||||
|
{
|
||||||
|
if (pluginListItem.getName().equals(configGroup))
|
||||||
|
{
|
||||||
|
openGroupConfigPanel(pluginListItem, pluginListItem.getConfig(), pluginListItem.getConfigDescriptor());
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onActivate()
|
public void onActivate()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -28,16 +28,21 @@ import java.awt.image.BufferedImage;
|
|||||||
import java.util.concurrent.ScheduledExecutorService;
|
import java.util.concurrent.ScheduledExecutorService;
|
||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
import javax.swing.SwingUtilities;
|
import javax.swing.SwingUtilities;
|
||||||
|
import net.runelite.api.MenuAction;
|
||||||
import net.runelite.client.config.ChatColorConfig;
|
import net.runelite.client.config.ChatColorConfig;
|
||||||
import net.runelite.client.config.ConfigManager;
|
import net.runelite.client.config.ConfigManager;
|
||||||
import net.runelite.client.config.RuneLiteConfig;
|
import net.runelite.client.config.RuneLiteConfig;
|
||||||
import net.runelite.client.eventbus.Subscribe;
|
import net.runelite.client.eventbus.Subscribe;
|
||||||
|
import net.runelite.client.events.OverlayMenuClicked;
|
||||||
import net.runelite.client.events.PluginChanged;
|
import net.runelite.client.events.PluginChanged;
|
||||||
import net.runelite.client.plugins.Plugin;
|
import net.runelite.client.plugins.Plugin;
|
||||||
import net.runelite.client.plugins.PluginDescriptor;
|
import net.runelite.client.plugins.PluginDescriptor;
|
||||||
import net.runelite.client.plugins.PluginManager;
|
import net.runelite.client.plugins.PluginManager;
|
||||||
import net.runelite.client.ui.ClientToolbar;
|
import net.runelite.client.ui.ClientToolbar;
|
||||||
|
import net.runelite.client.ui.ClientUI;
|
||||||
import net.runelite.client.ui.NavigationButton;
|
import net.runelite.client.ui.NavigationButton;
|
||||||
|
import net.runelite.client.ui.overlay.Overlay;
|
||||||
|
import net.runelite.client.ui.overlay.OverlayMenuEntry;
|
||||||
import net.runelite.client.util.ImageUtil;
|
import net.runelite.client.util.ImageUtil;
|
||||||
|
|
||||||
@PluginDescriptor(
|
@PluginDescriptor(
|
||||||
@@ -47,6 +52,9 @@ import net.runelite.client.util.ImageUtil;
|
|||||||
)
|
)
|
||||||
public class ConfigPlugin extends Plugin
|
public class ConfigPlugin extends Plugin
|
||||||
{
|
{
|
||||||
|
@Inject
|
||||||
|
private ClientUI clientUI;
|
||||||
|
|
||||||
@Inject
|
@Inject
|
||||||
private ClientToolbar clientToolbar;
|
private ClientToolbar clientToolbar;
|
||||||
|
|
||||||
@@ -96,4 +104,30 @@ public class ConfigPlugin extends Plugin
|
|||||||
{
|
{
|
||||||
SwingUtilities.invokeLater(configPanel::refreshPluginList);
|
SwingUtilities.invokeLater(configPanel::refreshPluginList);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Subscribe
|
||||||
|
public void onOverlayMenuClicked(OverlayMenuClicked overlayMenuClicked)
|
||||||
|
{
|
||||||
|
OverlayMenuEntry overlayMenuEntry = overlayMenuClicked.getEntry();
|
||||||
|
if (overlayMenuEntry.getMenuAction() == MenuAction.RUNELITE_OVERLAY_CONFIG)
|
||||||
|
{
|
||||||
|
Overlay overlay = overlayMenuClicked.getOverlay();
|
||||||
|
Plugin plugin = overlay.getPlugin();
|
||||||
|
if (plugin == null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Expand config panel for plugin
|
||||||
|
PluginDescriptor descriptor = plugin.getClass().getAnnotation(PluginDescriptor.class);
|
||||||
|
SwingUtilities.invokeLater(() ->
|
||||||
|
{
|
||||||
|
if (!navButton.isSelected())
|
||||||
|
{
|
||||||
|
navButton.getOnSelect().run();
|
||||||
|
}
|
||||||
|
configPanel.openConfigurationPanel(descriptor.name());
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ import javax.annotation.Nullable;
|
|||||||
import javax.swing.ImageIcon;
|
import javax.swing.ImageIcon;
|
||||||
import javax.swing.JLabel;
|
import javax.swing.JLabel;
|
||||||
import javax.swing.JPanel;
|
import javax.swing.JPanel;
|
||||||
|
import lombok.AccessLevel;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import net.runelite.client.config.Config;
|
import net.runelite.client.config.Config;
|
||||||
import net.runelite.client.config.ConfigDescriptor;
|
import net.runelite.client.config.ConfigDescriptor;
|
||||||
@@ -63,6 +64,14 @@ class PluginListItem extends JPanel
|
|||||||
@Nullable
|
@Nullable
|
||||||
private final Plugin plugin;
|
private final Plugin plugin;
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
@Getter(AccessLevel.PACKAGE)
|
||||||
|
private final Config config;
|
||||||
|
|
||||||
|
@Nullable
|
||||||
|
@Getter(AccessLevel.PACKAGE)
|
||||||
|
private final ConfigDescriptor configDescriptor;
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
private final String name;
|
private final String name;
|
||||||
|
|
||||||
@@ -132,6 +141,8 @@ class PluginListItem extends JPanel
|
|||||||
{
|
{
|
||||||
this.configPanel = configPanel;
|
this.configPanel = configPanel;
|
||||||
this.plugin = plugin;
|
this.plugin = plugin;
|
||||||
|
this.config = config;
|
||||||
|
this.configDescriptor = configDescriptor;
|
||||||
this.name = name;
|
this.name = name;
|
||||||
this.description = description;
|
this.description = description;
|
||||||
Collections.addAll(keywords, name.toLowerCase().split(" "));
|
Collections.addAll(keywords, name.toLowerCase().split(" "));
|
||||||
|
|||||||
@@ -55,6 +55,8 @@ import net.runelite.client.events.PluginChanged;
|
|||||||
@Singleton
|
@Singleton
|
||||||
public class OverlayManager
|
public class OverlayManager
|
||||||
{
|
{
|
||||||
|
public static final String OPTION_CONFIGURE = "Configure";
|
||||||
|
|
||||||
private static final String OVERLAY_CONFIG_PREFERRED_LOCATION = "_preferredLocation";
|
private static final String OVERLAY_CONFIG_PREFERRED_LOCATION = "_preferredLocation";
|
||||||
private static final String OVERLAY_CONFIG_PREFERRED_POSITION = "_preferredPosition";
|
private static final String OVERLAY_CONFIG_PREFERRED_POSITION = "_preferredPosition";
|
||||||
private static final String OVERLAY_CONFIG_PREFERRED_SIZE = "_preferredSize";
|
private static final String OVERLAY_CONFIG_PREFERRED_SIZE = "_preferredSize";
|
||||||
|
|||||||
Reference in New Issue
Block a user