diff options
| author | 2020-07-14 16:19:29 +0200 | |
|---|---|---|
| committer | 2020-07-14 16:19:29 +0200 | |
| commit | 65ba42443ed20a3531bbb769f4d882c4a4bdb879 (patch) | |
| tree | 08e7594dee2f7dc5954bf7475a0bc54a730f3d57 /enigma-swing | |
| parent | Mapping format fixes (#294) (diff) | |
| download | enigma-65ba42443ed20a3531bbb769f4d882c4a4bdb879.tar.gz enigma-65ba42443ed20a3531bbb769f4d882c4a4bdb879.tar.xz enigma-65ba42443ed20a3531bbb769f4d882c4a4bdb879.zip | |
Allows setting the default editor font in the configuration file. (#295)
Diffstat (limited to 'enigma-swing')
| -rw-r--r-- | enigma-swing/src/main/java/cuchaz/enigma/gui/EnigmaSyntaxKit.java | 4 | ||||
| -rw-r--r-- | enigma-swing/src/main/java/cuchaz/enigma/gui/config/Config.java | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/EnigmaSyntaxKit.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/EnigmaSyntaxKit.java index 4f1b6e6e..45f87bb4 100644 --- a/enigma-swing/src/main/java/cuchaz/enigma/gui/EnigmaSyntaxKit.java +++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/EnigmaSyntaxKit.java | |||
| @@ -52,6 +52,10 @@ public class EnigmaSyntaxKit extends JavaSyntaxKit { | |||
| 52 | configuration.put("RightMarginColumn", "999"); //No need to have a right margin, if someone wants it add a config | 52 | configuration.put("RightMarginColumn", "999"); //No need to have a right margin, if someone wants it add a config |
| 53 | 53 | ||
| 54 | configuration.put("Action.quick-find", "cuchaz.enigma.gui.QuickFindAction, menu F"); | 54 | configuration.put("Action.quick-find", "cuchaz.enigma.gui.QuickFindAction, menu F"); |
| 55 | |||
| 56 | if (Config.getInstance().editorFont != null) { | ||
| 57 | configuration.put("DefaultFont", Config.getInstance().editorFont); | ||
| 58 | } | ||
| 55 | } | 59 | } |
| 56 | 60 | ||
| 57 | /** | 61 | /** |
diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/config/Config.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/config/Config.java index 373dcf04..a389196f 100644 --- a/enigma-swing/src/main/java/cuchaz/enigma/gui/config/Config.java +++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/config/Config.java | |||
| @@ -166,6 +166,8 @@ public class Config { | |||
| 166 | public AlphaColorEntry deobfuscatedColor; | 166 | public AlphaColorEntry deobfuscatedColor; |
| 167 | public AlphaColorEntry deobfuscatedColorOutline; | 167 | public AlphaColorEntry deobfuscatedColorOutline; |
| 168 | 168 | ||
| 169 | public String editorFont; | ||
| 170 | |||
| 169 | public Integer editorBackground; | 171 | public Integer editorBackground; |
| 170 | public Integer highlightColor; | 172 | public Integer highlightColor; |
| 171 | public Integer caretColor; | 173 | public Integer caretColor; |