ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #2921 from open-osrs/externals-cleanup-panel

Browse Source 
externals: Cleanup panel
This commit is contained in:
Tyler Bochard
2021-02-19 13:33:17 -05:00
committed by GitHub
parent 07f512edef 06eb9356b6
commit e15886c4e1
4 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/src/main/java/net/runelite/client/plugins/openosrs/OpenOSRSPlugin.java
View File

@@ -91,7 +91,7 @@ public class OpenOSRSPlugin extends Plugin
{ {
ExternalPluginManagerPanel panel = injector.getInstance(ExternalPluginManagerPanel.class); ExternalPluginManagerPanel panel = injector.getInstance(ExternalPluginManagerPanel.class);
final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), "externalmanager_icon.png"); final BufferedImage icon = ImageUtil.loadImageResource(getClass(), "externalmanager_icon.png");
navButton = NavigationButton.builder() navButton = NavigationButton.builder()
.tooltip("External Plugin Manager") .tooltip("External Plugin Manager")

11
runelite-client/src/main/java/net/runelite/client/plugins/openosrs/externals/ExternalPluginManagerPanel.java vendored
View File

@@ -9,7 +9,6 @@ import java.awt.event.MouseEvent;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.util.concurrent.ScheduledExecutorService;
import javax.inject.Inject; import javax.inject.Inject;
import javax.swing.ImageIcon; import javax.swing.ImageIcon;
import javax.swing.JCheckBox; import javax.swing.JCheckBox;
@@ -37,9 +36,9 @@ public class ExternalPluginManagerPanel extends PluginPanel
static static
{ {
final BufferedImage addIconRaw = final BufferedImage addIconRaw =
ImageUtil.getResourceStreamFromClass(ExternalPluginManagerPanel.class, "add_raw_icon.png"); ImageUtil.loadImageResource(ExternalPluginManagerPanel.class, "add_raw_icon.png");
final BufferedImage addIconGh = ImageUtil final BufferedImage addIconGh = ImageUtil
.resizeImage(ImageUtil.getResourceStreamFromClass(ExternalPluginManagerPanel.class, "gh_icon.png"), 14, 14); .resizeImage(ImageUtil.loadImageResource(ExternalPluginManagerPanel.class, "gh_icon.png"), 14, 14);
ADD_ICON_RAW = new ImageIcon(addIconRaw); ADD_ICON_RAW = new ImageIcon(addIconRaw);
ADD_HOVER_ICON_RAW = new ImageIcon(ImageUtil.alphaOffset(addIconRaw, 0.53f)); ADD_HOVER_ICON_RAW = new ImageIcon(ImageUtil.alphaOffset(addIconRaw, 0.53f));
ADD_ICON_GH = new ImageIcon(addIconGh); ADD_ICON_GH = new ImageIcon(addIconGh);
@@ -47,16 +46,14 @@ public class ExternalPluginManagerPanel extends PluginPanel
} }
private final OPRSExternalPluginManager externalPluginManager; private final OPRSExternalPluginManager externalPluginManager;
private final ScheduledExecutorService executor;
private final EventBus eventBus; private final EventBus eventBus;
@Inject @Inject
private ExternalPluginManagerPanel(OPRSExternalPluginManager externalPluginManager, ScheduledExecutorService executor, EventBus eventBus) private ExternalPluginManagerPanel(OPRSExternalPluginManager externalPluginManager, EventBus eventBus)
{ {
super(false); super(false);
this.externalPluginManager = externalPluginManager; this.externalPluginManager = externalPluginManager;
this.executor = executor;
this.eventBus = eventBus; this.eventBus = eventBus;
buildPanel(); buildPanel();
@@ -258,7 +255,7 @@ public class ExternalPluginManagerPanel extends PluginPanel
{ {
JTabbedPane mainTabPane = new JTabbedPane(); JTabbedPane mainTabPane = new JTabbedPane();
PluginsPanel pluginPanel = new PluginsPanel(this.externalPluginManager, this.executor, this.eventBus); PluginsPanel pluginPanel = new PluginsPanel(this.externalPluginManager, this.eventBus);
JScrollPane repositoryPanel = wrapContainer(new RepositoryPanel(this.externalPluginManager, this.eventBus)); JScrollPane repositoryPanel = wrapContainer(new RepositoryPanel(this.externalPluginManager, this.eventBus));
mainTabPane.add("Plugins", pluginPanel); mainTabPane.add("Plugins", pluginPanel);

11
runelite-client/src/main/java/net/runelite/client/plugins/openosrs/externals/PluginsPanel.java vendored
View File

@@ -23,7 +23,6 @@ import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.ScheduledExecutorService;
import javax.swing.ImageIcon; import javax.swing.ImageIcon;
import javax.swing.JComboBox; import javax.swing.JComboBox;
import javax.swing.JLabel; import javax.swing.JLabel;
@@ -64,7 +63,7 @@ public class PluginsPanel extends JPanel
{ {
final BufferedImage addIcon = final BufferedImage addIcon =
ImageUtil.recolorImage( ImageUtil.recolorImage(
ImageUtil.getResourceStreamFromClass(PluginsPanel.class, "add_icon.png"), ColorScheme.BRAND_BLUE ImageUtil.loadImageResource(PluginsPanel.class, "add_icon.png"), ColorScheme.BRAND_BLUE
); );
ADD_ICON = new ImageIcon(addIcon); ADD_ICON = new ImageIcon(addIcon);
ADD_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(addIcon, 0.53f)); ADD_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(addIcon, 0.53f));
@@ -72,7 +71,7 @@ public class PluginsPanel extends JPanel
final BufferedImage deleteImg = final BufferedImage deleteImg =
ImageUtil.recolorImage( ImageUtil.recolorImage(
ImageUtil.resizeCanvas( ImageUtil.resizeCanvas(
ImageUtil.getResourceStreamFromClass(PluginsPanel.class, "delete_icon.png"), 14, 14 ImageUtil.loadImageResource(PluginsPanel.class, "delete_icon.png"), 14, 14
), ColorScheme.BRAND_BLUE ), ColorScheme.BRAND_BLUE
); );
DELETE_ICON = new ImageIcon(deleteImg); DELETE_ICON = new ImageIcon(deleteImg);
@@ -84,8 +83,6 @@ public class PluginsPanel extends JPanel
private final OPRSExternalPluginManager externalPluginManager; private final OPRSExternalPluginManager externalPluginManager;
private final UpdateManager updateManager; private final UpdateManager updateManager;
private final ScheduledExecutorService executor;
private final EventBus eventBus;
private final IconTextField searchBar = new IconTextField(); private final IconTextField searchBar = new IconTextField();
private final JPanel filterwrapper = new JPanel(new BorderLayout(0, 10)); private final JPanel filterwrapper = new JPanel(new BorderLayout(0, 10));
@@ -97,12 +94,10 @@ public class PluginsPanel extends JPanel
private JComboBox<String> filterComboBox; private JComboBox<String> filterComboBox;
private Set<String> deps; private Set<String> deps;
PluginsPanel(OPRSExternalPluginManager externalPluginManager, ScheduledExecutorService executor, EventBus eventBus) PluginsPanel(OPRSExternalPluginManager externalPluginManager, EventBus eventBus)
{ {
this.externalPluginManager = externalPluginManager; this.externalPluginManager = externalPluginManager;
this.updateManager = externalPluginManager.getUpdateManager(); this.updateManager = externalPluginManager.getUpdateManager();
this.executor = executor;
this.eventBus = eventBus;
setLayout(new BorderLayout(0, 10)); setLayout(new BorderLayout(0, 10));
setBackground(ColorScheme.DARK_GRAY_COLOR); setBackground(ColorScheme.DARK_GRAY_COLOR);

4
runelite-client/src/main/java/net/runelite/client/plugins/openosrs/externals/RepositoryBox.java vendored
View File

@@ -37,7 +37,7 @@ public class RepositoryBox extends JPanel
final BufferedImage deleteImg = final BufferedImage deleteImg =
ImageUtil.recolorImage( ImageUtil.recolorImage(
ImageUtil.resizeCanvas( ImageUtil.resizeCanvas(
ImageUtil.getResourceStreamFromClass(ExternalPluginManagerPanel.class, "delete_icon.png"), 14, 14 ImageUtil.loadImageResource(ExternalPluginManagerPanel.class, "delete_icon.png"), 14, 14
), ColorScheme.BRAND_BLUE ), ColorScheme.BRAND_BLUE
); );
DELETE_ICON = new ImageIcon(deleteImg); DELETE_ICON = new ImageIcon(deleteImg);
@@ -46,7 +46,7 @@ public class RepositoryBox extends JPanel
final BufferedImage discordImg = final BufferedImage discordImg =
ImageUtil.recolorImage( ImageUtil.recolorImage(
ImageUtil.resizeCanvas( ImageUtil.resizeCanvas(
ImageUtil.getResourceStreamFromClass(ExternalPluginManagerPanel.class, "discord_icon.png"), 14, 14 ImageUtil.loadImageResource(ExternalPluginManagerPanel.class, "discord_icon.png"), 14, 14
), Color.WHITE ), Color.WHITE
); );
DISCORD_ICON = new ImageIcon(discordImg); DISCORD_ICON = new ImageIcon(discordImg);