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

Jslider (#325)

Browse Source 
* JSlider changes

* Check style ConfigPanel
This commit is contained in:
sdburns1998
2019-05-20 18:29:05 +02:00
committed by Kyleeld
parent 306813fa30
commit 1a7cc1eeaa
5 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runelite-client/src/main/java/net/runelite/client/plugins/cannon/CannonConfig.java
View File

@@ -29,6 +29,7 @@ import net.runelite.client.config.Alpha;
import net.runelite.client.config.Config; import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem; import net.runelite.client.config.ConfigItem;
import net.runelite.client.config.Range;
@ConfigGroup("cannon") @ConfigGroup("cannon")
public interface CannonConfig extends Config public interface CannonConfig extends Config
@@ -84,6 +85,9 @@ public interface CannonConfig extends Config
return true; return true;
} }
@Range(
max = 29
)
@ConfigItem( @ConfigItem(
keyName = "ammoAmount", keyName = "ammoAmount",
name = "Ammo left", name = "Ammo left",

16
runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java
View File

@@ -75,8 +75,8 @@ import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigDescriptor; import net.runelite.client.config.ConfigDescriptor;
import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem; import net.runelite.client.config.ConfigItem;
import net.runelite.client.config.ConfigItemsGroup;
import net.runelite.client.config.ConfigItemDescriptor; import net.runelite.client.config.ConfigItemDescriptor;
import net.runelite.client.config.ConfigItemsGroup;
import net.runelite.client.config.ConfigManager; import net.runelite.client.config.ConfigManager;
import net.runelite.client.config.Keybind; import net.runelite.client.config.Keybind;
import net.runelite.client.config.ModifierlessKeybind; import net.runelite.client.config.ModifierlessKeybind;
@@ -430,11 +430,13 @@ public class ConfigPanel extends PluginPanel
JLabel headerLabel = new JLabel(header); JLabel headerLabel = new JLabel(header);
headerLabel.setForeground(Color.ORANGE); 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"); String sCollapsed = configManager.getConfiguration(cd.getGroup().value(), cig.getGroup() + "_collapse");
if (sCollapsed != null) if (sCollapsed != null)
{
collapsed = Boolean.parseBoolean(sCollapsed); collapsed = Boolean.parseBoolean(sCollapsed);
}
JButton collapse = new JButton(collapsed ? "+" : "-"); JButton collapse = new JButton(collapsed ? "+" : "-");
collapse.setPreferredSize(new Dimension(20, 20)); collapse.setPreferredSize(new Dimension(20, 20));
@@ -451,7 +453,9 @@ public class ConfigPanel extends PluginPanel
} }
if (collapsed) if (collapsed)
{
continue; continue;
}
for (ConfigItemDescriptor cid : cig.getItems()) for (ConfigItemDescriptor cid : cig.getItems())
{ {
@@ -465,7 +469,7 @@ public class ConfigPanel extends PluginPanel
item.setMinimumSize(new Dimension(PANEL_WIDTH, 0)); item.setMinimumSize(new Dimension(PANEL_WIDTH, 0));
name = cid.getItem().name(); name = cid.getItem().name();
JLabel configEntryName = new JLabel(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.setForeground(Color.WHITE);
configEntryName.setToolTipText("<html>" + name + ":<br>" + cid.getItem().description() + "</html>"); configEntryName.setToolTipText("<html>" + name + ":<br>" + cid.getItem().description() + "</html>");
item.add(configEntryName, BorderLayout.CENTER); item.add(configEntryName, BorderLayout.CENTER);
@@ -499,13 +503,15 @@ public class ConfigPanel extends PluginPanel
{ {
JSlider slider = new JSlider(min, max, value); JSlider slider = new JSlider(min, max, value);
configEntryName.setText(name.concat(": ").concat(String.valueOf(slider.getValue()))); 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; String finalName = name;
slider.addChangeListener((l) -> slider.addChangeListener((l) ->
{ {
configEntryName.setText(finalName.concat(": ").concat(String.valueOf(slider.getValue()))); configEntryName.setText(finalName.concat(": ").concat(String.valueOf(slider.getValue())));
if (!slider.getValueIsAdjusting()) if (!slider.getValueIsAdjusting())
{
changeConfiguration(listItem, config, slider, cd, cid); changeConfiguration(listItem, config, slider, cd, cid);
}
} }
); );
item.add(slider, BorderLayout.EAST); item.add(slider, BorderLayout.EAST);
@@ -726,7 +732,9 @@ public class ConfigPanel extends PluginPanel
boolean collapse = true; boolean collapse = true;
if (sCollapsed != null) if (sCollapsed != null)
{
collapse = !Boolean.parseBoolean(sCollapsed); collapse = !Boolean.parseBoolean(sCollapsed);
}
configManager.setConfiguration(cd.getGroup().value(), cig.getGroup() + "_collapse", collapse); configManager.setConfiguration(cd.getGroup().value(), cig.getGroup() + "_collapse", collapse);
openGroupConfigPanel(listItem, config, cd); openGroupConfigPanel(listItem, config, cd);

7
runelite-client/src/main/java/net/runelite/client/plugins/equipmentinspector/EquipmentInspectorConfig.java
View File

@@ -27,6 +27,7 @@ package net.runelite.client.plugins.equipmentinspector;
import net.runelite.client.config.Config; import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem; import net.runelite.client.config.ConfigItem;
import net.runelite.client.config.Range;
@ConfigGroup("grounditems") @ConfigGroup("grounditems")
public interface EquipmentInspectorConfig extends Config public interface EquipmentInspectorConfig extends Config
@@ -42,9 +43,13 @@ public interface EquipmentInspectorConfig extends Config
return true; return true;
} }
@Range(
min = 1,
max = 4
)
@ConfigItem( @ConfigItem(
keyName = "protecteditems", keyName = "protecteditems",
name = "# of protected items", name = "protected items",
description = "Limit 4", description = "Limit 4",
position = 2 position = 2
) )

5
runelite-client/src/main/java/net/runelite/client/plugins/fps/FpsConfig.java
View File

@@ -27,6 +27,7 @@ package net.runelite.client.plugins.fps;
import net.runelite.client.config.Config; import net.runelite.client.config.Config;
import net.runelite.client.config.ConfigGroup; import net.runelite.client.config.ConfigGroup;
import net.runelite.client.config.ConfigItem; import net.runelite.client.config.ConfigItem;
import net.runelite.client.config.Range;
@ConfigGroup(FpsPlugin.CONFIG_GROUP_KEY) @ConfigGroup(FpsPlugin.CONFIG_GROUP_KEY)
public interface FpsConfig extends Config public interface FpsConfig extends Config
@@ -42,6 +43,10 @@ public interface FpsConfig extends Config
return FpsLimitMode.NEVER; return FpsLimitMode.NEVER;
} }
@Range(
min = 10,
max = 50
)
@ConfigItem( @ConfigItem(
keyName = "maxFps", keyName = "maxFps",
name = "FPS target", name = "FPS target",

4
runelite-client/src/main/java/net/runelite/client/plugins/zoom/ZoomConfig.java
View File

@@ -13,7 +13,7 @@ public interface ZoomConfig extends Config
@ConfigItem( @ConfigItem(
keyName = "inner", keyName = "inner",
name = "Expand inner zoom limit", name = "Inner limit",
description = "Configures whether or not the inner zoom limit is reduced", description = "Configures whether or not the inner zoom limit is reduced",
position = 1 position = 1
) )
@@ -28,7 +28,7 @@ public interface ZoomConfig extends Config
) )
@ConfigItem( @ConfigItem(
keyName = "outerLimit", keyName = "outerLimit",
name = "Expand outer zoom limit", name = "Outer limit",
description = "Configures how much the outer zoom limit is adjusted", description = "Configures how much the outer zoom limit is adjusted",
position = 2 position = 2
) )