replace blink dialog with radio selector

Author: supersaiyansubtlety

enigma-swing/src/main/java/org/quiltmc/enigma/gui/element/menu_bar/view/SelectionHighlightMenu.java

@@ -5,21 +5,24 @@
 import org.quiltmc.enigma.gui.config.SelectionHighlightSection;
 import org.quiltmc.enigma.gui.element.IntRangeConfigMenuItem;
 import org.quiltmc.enigma.gui.element.menu_bar.AbstractEnigmaMenu;
+import org.quiltmc.enigma.gui.util.GuiUtil;
 import org.quiltmc.enigma.util.I18n;
 
+import javax.swing.JMenu;
+
 public class SelectionHighlightMenu extends AbstractEnigmaMenu {
-	private final IntRangeConfigMenuItem blinks;
+	private final JMenu blinksMenu;
 	private final IntRangeConfigMenuItem blinkDelay;
 
 	protected SelectionHighlightMenu(Gui gui) {
 		super(gui);
 
 		final SelectionHighlightSection config = Config.editor().selectionHighlight;
 
-		this.blinks = new IntRangeConfigMenuItem(
-				gui, config.blinks,
+		this.blinksMenu = GuiUtil.createIntConfigRadioMenu(
+				config.blinks,
 				SelectionHighlightSection.MIN_BLINKS, SelectionHighlightSection.MAX_BLINKS,
-				"menu.view.selection_highlight.blinks"
+				this::retranslateBlinksMenu
 		);
 
 		this.blinkDelay = new IntRangeConfigMenuItem(
@@ -28,15 +31,24 @@ protected SelectionHighlightMenu(Gui gui) {
 				"menu.view.selection_highlight.blink_delay"
 		);
 
-		this.add(this.blinks);
+		this.add(this.blinksMenu);
 		this.add(this.blinkDelay);
+
+		this.retranslate();
 	}
 
 	@Override
 	public void retranslate() {
 		this.setText(I18n.translate("menu.view.selection_highlight"));
 
-		this.blinks.retranslate();
+		this.retranslateBlinksMenu();
 		this.blinkDelay.retranslate();
 	}
+
+	private void retranslateBlinksMenu() {
+		this.blinksMenu.setText(I18n.translateFormatted(
+				"menu.view.selection_highlight.blinks",
+				Config.editor().selectionHighlight.blinks.value())
+		);
+	}
 }

enigma-swing/src/main/java/org/quiltmc/enigma/gui/util/GuiUtil.java

@@ -18,13 +18,16 @@
 import javax.swing.AbstractButton;
 import javax.swing.Action;
 import javax.swing.ActionMap;
+import javax.swing.ButtonGroup;
 import javax.swing.Icon;
 import javax.swing.InputMap;
 import javax.swing.JCheckBox;
 import javax.swing.JCheckBoxMenuItem;
 import javax.swing.JComponent;
 import javax.swing.JLabel;
+import javax.swing.JMenu;
 import javax.swing.JPanel;
+import javax.swing.JRadioButtonMenuItem;
 import javax.swing.JToolTip;
 import javax.swing.JTree;
 import javax.swing.KeyStroke;
@@ -70,7 +73,10 @@
 import java.util.Optional;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 public final class GuiUtil {
 	private GuiUtil() {
@@ -472,6 +478,68 @@ private static void syncStateWithConfigImpl(
 		});
 	}
 
+	/**
+	 * Creates a {@link JMenu} containing one {@linkplain JRadioButtonMenuItem radio item} for each value between the
+	 * passed {@code min} and {@code max}, inclusive.
+	 *
+	 * <p> Listeners are added to keep the selected radio item and the passed {@code config}'s
+	 * {@link TrackedValue#value() value} in sync.
+	 *
+	 * @param config   the config value to sync with
+	 * @param min      the minimum allowed value
+	 * 	 *             this should coincide with any minimum imposed on the passed {@code config}
+	 * @param max      the maximum allowed value
+	 * 	 *             this should coincide with any maximum imposed on the passed {@code config}
+	 * @param onUpdate a function to run whenever the passed {@code config} changes, whether because a radio item was
+	 *                 clicked or because another source updated it
+	 *
+	 *  @return a newly created menu allowing configuration of the passed {@code config}
+	 */
+	public static JMenu createIntConfigRadioMenu(
+			TrackedValue<Integer> config, int min, int max, Runnable onUpdate
+	) {
+		final Map<Integer, JRadioButtonMenuItem> radiosByChoice = IntStream.range(min, max + 1)
+				.boxed()
+				.collect(Collectors.toMap(
+					Function.identity(),
+					choice -> {
+						final JRadioButtonMenuItem choiceItem = new JRadioButtonMenuItem();
+						choiceItem.setText(Integer.toString(choice));
+						if (choice.equals(config.value())) {
+							choiceItem.setSelected(true);
+						}
+
+						final int finalChoice = choice;
+						choiceItem.addActionListener(e -> {
+							if (!choiceItem.isSelected()) {
+								config.setValue(finalChoice);
+								onUpdate.run();
+							}
+						});
+
+						return choiceItem;
+					}
+				));
+
+		final ButtonGroup choicesGroup = new ButtonGroup();
+		final JMenu menu = new JMenu();
+		for (final JRadioButtonMenuItem radio : radiosByChoice.values()) {
+			choicesGroup.add(radio);
+			menu.add(radio);
+		}
+
+		config.registerCallback(updated -> {
+			final JRadioButtonMenuItem choiceItem = radiosByChoice.get(updated.value());
+
+			if (!choiceItem.isSelected()) {
+				choiceItem.setSelected(true);
+				onUpdate.run();
+			}
+		});
+
+		return menu;
+	}
+
 	public enum FocusCondition {
 		/**
 		 * @see JComponent#WHEN_IN_FOCUSED_WINDOW

enigma/src/main/resources/lang/en_us.json

@@ -75,9 +75,6 @@
 	"menu.view.themes.none": "None (JVM Default)",
 	"menu.view.selection_highlight": "Selection Highlight",
 	"menu.view.selection_highlight.blinks": "Blink count (%s)",
-	"menu.view.selection_highlight.blinks.dialog_title": "Blink Count",
-	"menu.view.selection_highlight.blinks.dialog_explanation":
-	"The number of times to blink highlighting that indicates an entry that has been navigated to.",
 	"menu.view.selection_highlight.blink_delay": "Blink delay (%sms)",
 	"menu.view.selection_highlight.blink_delay.dialog_title": "Blink Delay",
 	"menu.view.selection_highlight.blink_delay.dialog_explanation":