From ba5ffc258f6d58bf9d01226baea016db10cfd811 Mon Sep 17 00:00:00 2001
From: Modmuss50
Date: Wed, 7 Jun 2017 08:29:37 +0100
Subject: Added theme switcher + dark theme (#60)

* Initial work on the color config

* Save and read config from file.+

* Allow changing the editor colors

* Remove the right margin

* Move config to the user's home dir

* Use Guava instead of Apache commons

* Add runtime theme switching, includes example "dark" theme.

* Rename dark theme as requested

* Small clean up

* Include suggestions from @Thog
---
 .../java/cuchaz/enigma/gui/MinecraftSyntaxKit.java | 32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

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

diff --git a/src/main/java/cuchaz/enigma/gui/MinecraftSyntaxKit.java b/src/main/java/cuchaz/enigma/gui/MinecraftSyntaxKit.java
index 41de035..96327ab 100644
--- a/src/main/java/cuchaz/enigma/gui/MinecraftSyntaxKit.java
+++ b/src/main/java/cuchaz/enigma/gui/MinecraftSyntaxKit.java
@@ -4,12 +4,8 @@ import cuchaz.enigma.config.Config;
 import de.sciss.syntaxpane.syntaxkits.JavaSyntaxKit;
 import de.sciss.syntaxpane.util.Configuration;
 
-/**
- * Created by Mark on 04/06/2017.
- */
 public class MinecraftSyntaxKit extends JavaSyntaxKit {
-
-    public Configuration configuration = null;
+    private static Configuration configuration = null;
 
     @Override
     public Configuration getConfig() {
@@ -22,17 +18,21 @@ public class MinecraftSyntaxKit extends JavaSyntaxKit {
     public void initConfig(Configuration baseConfig){
         configuration = baseConfig;
         //See de.sciss.syntaxpane.TokenType
-        configuration.put("Style.KEYWORD", Config.INSTANCE.highlightColor + ", 0");
-        configuration.put("Style.KEYWORD2", Config.INSTANCE.highlightColor + ", 3");
-        configuration.put("Style.STRING", Config.INSTANCE.stringColor + ", 0");
-        configuration.put("Style.STRING2", Config.INSTANCE.stringColor + ", 1");
-        configuration.put("Style.NUMBER", Config.INSTANCE.numberColor + ", 1");
-        configuration.put("Style.OPERATOR", Config.INSTANCE.operatorColor + ", 0");
-        configuration.put("Style.DELIMITER", Config.INSTANCE.delimiterColor + ", 1");
-        configuration.put("Style.TYPE", Config.INSTANCE.typeColor + ", 2");
-        configuration.put("Style.TYPE2", Config.INSTANCE.typeColor + ", 1");
-        configuration.put("Style.IDENTIFIER", Config.INSTANCE.identifierColor + ", 0");
-        configuration.put("Style.DEFAULT", Config.INSTANCE.defaultTextColor + ", 0");
+        configuration.put("Style.KEYWORD", Config.getInstance().highlightColor + ", 0");
+        configuration.put("Style.KEYWORD2", Config.getInstance().highlightColor + ", 3");
+        configuration.put("Style.STRING", Config.getInstance().stringColor + ", 0");
+        configuration.put("Style.STRING2", Config.getInstance().stringColor + ", 1");
+        configuration.put("Style.NUMBER", Config.getInstance().numberColor + ", 1");
+        configuration.put("Style.OPERATOR", Config.getInstance().operatorColor + ", 0");
+        configuration.put("Style.DELIMITER", Config.getInstance().delimiterColor + ", 1");
+        configuration.put("Style.TYPE", Config.getInstance().typeColor + ", 2");
+        configuration.put("Style.TYPE2", Config.getInstance().typeColor + ", 1");
+        configuration.put("Style.IDENTIFIER", Config.getInstance().identifierColor + ", 0");
+        configuration.put("Style.DEFAULT", Config.getInstance().defaultTextColor + ", 0");
         configuration.put("RightMarginColumn", "999"); //No need to have a right margin, if someone wants it add a config
     }
+
+    public static void invalidate(){
+        configuration = null;
+    }
 }
-- 
cgit v1.2.3