From ca75962a1dd8e5e629d6d4a794d7460dadf430a5 Mon Sep 17 00:00:00 2001
From: asie
Date: Wed, 28 Nov 2018 10:11:47 +0100
Subject: refactors and bugfixes

---
 src/main/java/cuchaz/enigma/gui/Gui.java           | 19 +++++++++++++++++
 .../java/cuchaz/enigma/gui/elements/MenuBar.java   | 24 ++++------------------
 2 files changed, 23 insertions(+), 20 deletions(-)

(limited to 'src/main/java/cuchaz/enigma/gui')

diff --git a/src/main/java/cuchaz/enigma/gui/Gui.java b/src/main/java/cuchaz/enigma/gui/Gui.java
index cac6ca1..95fde43 100644
--- a/src/main/java/cuchaz/enigma/gui/Gui.java
+++ b/src/main/java/cuchaz/enigma/gui/Gui.java
@@ -16,6 +16,7 @@ import cuchaz.enigma.Constants;
 import cuchaz.enigma.ExceptionIgnorer;
 import cuchaz.enigma.analysis.*;
 import cuchaz.enigma.config.Config;
+import cuchaz.enigma.config.Themes;
 import cuchaz.enigma.gui.dialog.CrashDialog;
 import cuchaz.enigma.gui.elements.MenuBar;
 import cuchaz.enigma.gui.elements.PopupMenuBar;
@@ -306,6 +307,9 @@ public class Gui {
 		panel.setLayout(new FlowLayout());
 		panel.add(new JLabel("Loading..."));
 		this.classesPanel.add(panel);
+
+		Themes.updateTheme(this);
+
 		redraw();
 	}
 
@@ -328,6 +332,8 @@ public class Gui {
 		this.menuBar.exportSourceMenu.setEnabled(true);
 		this.menuBar.exportJarMenu.setEnabled(true);
 
+		Themes.updateTheme(this);
+
 		redraw();
 	}
 
@@ -351,6 +357,8 @@ public class Gui {
 		this.menuBar.exportSourceMenu.setEnabled(false);
 		this.menuBar.exportJarMenu.setEnabled(false);
 
+		Themes.updateTheme(this);
+
 		redraw();
 	}
 
@@ -599,6 +607,8 @@ public class Gui {
 		else
 			text.selectAll();
 
+		Themes.updateTheme(this);
+
 		redraw();
 	}
 
@@ -654,6 +664,9 @@ public class Gui {
 		}
 
 		tabs.setSelectedIndex(0);
+
+		Themes.updateTheme(this);
+
 		redraw();
 	}
 
@@ -683,6 +696,9 @@ public class Gui {
 		}
 
 		tabs.setSelectedIndex(1);
+
+		Themes.updateTheme(this);
+
 		redraw();
 	}
 
@@ -703,6 +719,9 @@ public class Gui {
 		}
 
 		tabs.setSelectedIndex(2);
+
+		Themes.updateTheme(this);
+
 		redraw();
 	}
 
diff --git a/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java b/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
index 68742f4..609aecb 100644
--- a/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
+++ b/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
@@ -225,27 +225,11 @@ public class MenuBar extends JMenuBar {
 			{
 				JMenu themes = new JMenu("Themes");
 				menu.add(themes);
-				{
-					JMenuItem defaultTheme = new JMenuItem("Default");
-					themes.add(defaultTheme);
-					defaultTheme.addActionListener(event -> Themes.setDefault(gui));
-					JMenuItem dark = new JMenuItem("Dank");
-					themes.add(dark);
-					dark.addActionListener(event -> Themes.setDark(gui));
-					themes.addSeparator();
-					JMenuItem refresh = new JMenuItem("Reload From config");
-					themes.add(refresh);
-					refresh.addActionListener(event -> {
-						try {
-							Config.getInstance().reset();
-							Config.getInstance().saveConfig();
-							Themes.updateTheme(gui);
-						} catch (IOException e) {
-							e.printStackTrace();
-						}
-					});
+				for (Config.LookAndFeel lookAndFeel : Config.LookAndFeel.values()) {
+					JMenuItem theme = new JMenuItem(lookAndFeel.getName());
+					themes.add(theme);
+					theme.addActionListener(event -> Themes.setLookAndFeel(gui, lookAndFeel));
 				}
-
 			}
 		}
 		{
-- 
cgit v1.2.3