allow configuring markers via the gui

Author: supersaiyansubtlety

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

@@ -0,0 +1,75 @@
+package org.quiltmc.enigma.gui.element.menu_bar.view;
+
+import org.quiltmc.config.api.values.TrackedValue;
+import org.quiltmc.enigma.gui.Gui;
+import org.quiltmc.enigma.gui.config.Config;
+import org.quiltmc.enigma.gui.config.EntryMarkersSection;
+import org.quiltmc.enigma.gui.element.menu_bar.AbstractEnigmaMenu;
+import org.quiltmc.enigma.util.I18n;
+
+import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JMenu;
+
+public class EntryMarkersMenu extends AbstractEnigmaMenu {
+	private static void syncStateWithConfig(JCheckBoxMenuItem box, TrackedValue<Boolean> config) {
+		box.setState(config.value());
+
+		box.addActionListener(e -> {
+			final boolean checked = box.getState();
+			if (checked != config.value()) {
+				config.setValue(checked);
+			}
+		});
+
+		config.registerCallback(updated -> {
+			final boolean configured = updated.value();
+			if (configured != box.getState()) {
+				box.setState(configured);
+			}
+		});
+	}
+
+	private final JCheckBoxMenuItem interactable = new JCheckBoxMenuItem();
+
+	private final JMenu markMenu = new JMenu();
+	private final JCheckBoxMenuItem markObfuscated = new JCheckBoxMenuItem();
+	private final JCheckBoxMenuItem markFallback = new JCheckBoxMenuItem();
+	private final JCheckBoxMenuItem markProposed = new JCheckBoxMenuItem();
+	private final JCheckBoxMenuItem markDeobfuscated = new JCheckBoxMenuItem();
+
+	public EntryMarkersMenu(Gui gui) {
+		super(gui);
+
+		this.add(this.interactable);
+
+		this.markMenu.add(this.markObfuscated);
+		this.markMenu.add(this.markFallback);
+		this.markMenu.add(this.markProposed);
+		this.markMenu.add(this.markDeobfuscated);
+
+		this.add(this.markMenu);
+
+		final EntryMarkersSection markerConfig = Config.editor().entryMarkers;
+		syncStateWithConfig(this.interactable, markerConfig.interactable);
+		syncStateWithConfig(this.markObfuscated, markerConfig.markObfuscated);
+		syncStateWithConfig(this.markFallback, markerConfig.markFallback);
+		syncStateWithConfig(this.markProposed, markerConfig.markProposed);
+		syncStateWithConfig(this.markDeobfuscated, markerConfig.markDeobfuscated);
+
+		this.retranslate();
+	}
+
+	@Override
+	public void retranslate() {
+		this.setText(I18n.translate("menu.view.entry_markers"));
+
+		this.interactable.setText(I18n.translate("menu.view.entry_markers.interactable"));
+
+		this.markMenu.setText(I18n.translate("menu.view.entry_markers.mark"));
+
+		this.markObfuscated.setText(I18n.translate("menu.view.entry_markers.mark.obfuscated"));
+		this.markFallback.setText(I18n.translate("menu.view.entry_markers.mark.fallback"));
+		this.markProposed.setText(I18n.translate("menu.view.entry_markers.mark.proposed"));
+		this.markDeobfuscated.setText(I18n.translate("menu.view.entry_markers.mark.deobfuscated"));
+	}
+}

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

@@ -15,6 +15,7 @@ public class ViewMenu extends AbstractEnigmaMenu {
 	private final ThemesMenu themes;
 	private final ScaleMenu scale;
 	private final SelectionHighlightMenu selectionHighlight;
+	private final EntryMarkersMenu entryMarkers;
 
 	private final JMenuItem fontItem = new JMenuItem();
 
@@ -26,13 +27,15 @@ public ViewMenu(Gui gui) {
 		this.themes = new ThemesMenu(gui);
 		this.scale = new ScaleMenu(gui);
 		this.selectionHighlight = new SelectionHighlightMenu(gui);
+		this.entryMarkers = new EntryMarkersMenu(gui);
 
 		this.add(this.themes);
 		this.add(this.selectionHighlight);
 		this.add(this.languages);
 		this.add(this.notifications);
 		this.add(this.scale);
 		this.add(this.stats);
+		this.add(this.entryMarkers);
 		this.add(this.fontItem);
 
 		this.fontItem.addActionListener(e -> this.onFontClicked(this.gui));
@@ -48,6 +51,7 @@ public void retranslate() {
 		this.scale.retranslate();
 		this.stats.retranslate();
 		this.selectionHighlight.retranslate();
+		this.entryMarkers.retranslate();
 		this.fontItem.setText(I18n.translate("menu.view.font"));
 	}
 

enigma-swing/src/main/java/org/quiltmc/enigma/gui/panel/EditorPanel.java

@@ -511,7 +511,7 @@ Optional<MarkerParams> getParams(Token token, TokenType type, TokenStore tokenSt
 						? Optional.of(new MarkerParams(colors.obfuscatedOutline.value(), OBFUSCATED_PRIORITY))
 						: Optional.empty();
 					case DEOBFUSCATED -> this.deobfuscated
-						? Optional.of(new MarkerParams(colors.deobfuscated.value(), DEOBFUSCATED_PRIORITY))
+						? Optional.of(new MarkerParams(colors.deobfuscatedOutline.value(), DEOBFUSCATED_PRIORITY))
 						: Optional.empty();
 					case JAR_PROPOSED, DYNAMIC_PROPOSED -> this.proposed
 						? Optional.of(new MarkerParams(colors.proposedOutline.value(), PROPOSED_PRIORITY))

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

@@ -91,6 +91,13 @@
 	"menu.view.stat_icons.count_fallback": "Count fallback-proposed names",
 	"menu.view.stat_icons.included_types": "Included types",
 	"menu.view.stat_icons.enable_icons": "Enable icons",
+	"menu.view.entry_markers": "Entry Markers",
+	"menu.view.entry_markers.interactable": "Clickable markers",
+	"menu.view.entry_markers.mark": "Mark entries",
+	"menu.view.entry_markers.mark.obfuscated": "Obfuscated",
+	"menu.view.entry_markers.mark.fallback": "Fallback",
+	"menu.view.entry_markers.mark.proposed": "Proposed",
+	"menu.view.entry_markers.mark.deobfuscated": "Deobfuscated",
 	"menu.view.font": "Fonts...",
 	"menu.view.change.title": "Changes",
 	"menu.view.change.summary": "Changes will be applied after the next restart.",