From 1a7cc1eeaa71a113bf97d452a7b43a44c64c3d1b Mon Sep 17 00:00:00 2001 From: sdburns1998 <49877861+sdburns1998@users.noreply.github.com> Date: Mon, 20 May 2019 18:29:05 +0200 Subject: [PATCH] Jslider (#325) * JSlider changes * Check style ConfigPanel --- .../client/plugins/cannon/CannonConfig.java | 4 ++++ .../client/plugins/config/ConfigPanel.java | 16 ++++++++++++---- .../EquipmentInspectorConfig.java | 7 ++++++- .../runelite/client/plugins/fps/FpsConfig.java | 5 +++++ .../runelite/client/plugins/zoom/ZoomConfig.java | 4 ++-- 5 files changed, 29 insertions(+), 7 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonConfig.java index 15f50725e6..c832ded86b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonConfig.java @@ -29,6 +29,7 @@ import net.runelite.client.config.Alpha; import net.runelite.client.config.Config; import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigItem; +import net.runelite.client.config.Range; @ConfigGroup("cannon") public interface CannonConfig extends Config @@ -84,6 +85,9 @@ public interface CannonConfig extends Config return true; } + @Range( + max = 29 + ) @ConfigItem( keyName = "ammoAmount", name = "Ammo left", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java index 276be04829..7874ad29b9 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java @@ -75,8 +75,8 @@ import net.runelite.client.config.Config; import net.runelite.client.config.ConfigDescriptor; import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigItem; -import net.runelite.client.config.ConfigItemsGroup; import net.runelite.client.config.ConfigItemDescriptor; +import net.runelite.client.config.ConfigItemsGroup; import net.runelite.client.config.ConfigManager; import net.runelite.client.config.Keybind; import net.runelite.client.config.ModifierlessKeybind; @@ -430,11 +430,13 @@ public class ConfigPanel extends PluginPanel JLabel headerLabel = new JLabel(header); headerLabel.setForeground(Color.ORANGE); - headerLabel.setPreferredSize(new Dimension(PANEL_WIDTH, (int)headerLabel.getPreferredSize().getHeight())); + headerLabel.setPreferredSize(new Dimension(PANEL_WIDTH, (int) headerLabel.getPreferredSize().getHeight())); String sCollapsed = configManager.getConfiguration(cd.getGroup().value(), cig.getGroup() + "_collapse"); if (sCollapsed != null) + { collapsed = Boolean.parseBoolean(sCollapsed); + } JButton collapse = new JButton(collapsed ? "+" : "-"); collapse.setPreferredSize(new Dimension(20, 20)); @@ -451,7 +453,9 @@ public class ConfigPanel extends PluginPanel } if (collapsed) + { continue; + } for (ConfigItemDescriptor cid : cig.getItems()) { @@ -465,7 +469,7 @@ public class ConfigPanel extends PluginPanel item.setMinimumSize(new Dimension(PANEL_WIDTH, 0)); name = cid.getItem().name(); JLabel configEntryName = new JLabel(name); - configEntryName.setPreferredSize(new Dimension(PANEL_WIDTH, (int)configEntryName.getPreferredSize().getHeight())); + configEntryName.setPreferredSize(new Dimension(PANEL_WIDTH, (int) configEntryName.getPreferredSize().getHeight())); configEntryName.setForeground(Color.WHITE); configEntryName.setToolTipText("" + name + ":
" + cid.getItem().description() + ""); item.add(configEntryName, BorderLayout.CENTER); @@ -499,13 +503,15 @@ public class ConfigPanel extends PluginPanel { JSlider slider = new JSlider(min, max, value); configEntryName.setText(name.concat(": ").concat(String.valueOf(slider.getValue()))); - slider.setPreferredSize(new Dimension(topPanel.getPreferredSize().width, slider.getHeight())); + slider.setPreferredSize(new Dimension(100, 25)); String finalName = name; slider.addChangeListener((l) -> { configEntryName.setText(finalName.concat(": ").concat(String.valueOf(slider.getValue()))); if (!slider.getValueIsAdjusting()) + { changeConfiguration(listItem, config, slider, cd, cid); + } } ); item.add(slider, BorderLayout.EAST); @@ -726,7 +732,9 @@ public class ConfigPanel extends PluginPanel boolean collapse = true; if (sCollapsed != null) + { collapse = !Boolean.parseBoolean(sCollapsed); + } configManager.setConfiguration(cd.getGroup().value(), cig.getGroup() + "_collapse", collapse); openGroupConfigPanel(listItem, config, cd); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorConfig.java index c88eec0f71..a43592e5d7 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorConfig.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.equipmentinspector; import net.runelite.client.config.Config; import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigItem; +import net.runelite.client.config.Range; @ConfigGroup("grounditems") public interface EquipmentInspectorConfig extends Config @@ -42,9 +43,13 @@ public interface EquipmentInspectorConfig extends Config return true; } + @Range( + min = 1, + max = 4 + ) @ConfigItem( keyName = "protecteditems", - name = "# of protected items", + name = "protected items", description = "Limit 4", position = 2 ) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsConfig.java index 0627f90354..5f737124ed 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsConfig.java @@ -27,6 +27,7 @@ package net.runelite.client.plugins.fps; import net.runelite.client.config.Config; import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigItem; +import net.runelite.client.config.Range; @ConfigGroup(FpsPlugin.CONFIG_GROUP_KEY) public interface FpsConfig extends Config @@ -42,6 +43,10 @@ public interface FpsConfig extends Config return FpsLimitMode.NEVER; } + @Range( + min = 10, + max = 50 + ) @ConfigItem( keyName = "maxFps", name = "FPS target", diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/zoom/ZoomConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/zoom/ZoomConfig.java index 825378cd57..d3fb50007b 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/zoom/ZoomConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/zoom/ZoomConfig.java @@ -13,7 +13,7 @@ public interface ZoomConfig extends Config @ConfigItem( keyName = "inner", - name = "Expand inner zoom limit", + name = "Inner limit", description = "Configures whether or not the inner zoom limit is reduced", position = 1 ) @@ -28,7 +28,7 @@ public interface ZoomConfig extends Config ) @ConfigItem( keyName = "outerLimit", - name = "Expand outer zoom limit", + name = "Outer limit", description = "Configures how much the outer zoom limit is adjusted", position = 2 )