diff options
| author | 2017-06-07 08:29:37 +0100 | |
|---|---|---|
| committer | 2017-06-07 08:29:37 +0100 | |
| commit | ba5ffc258f6d58bf9d01226baea016db10cfd811 (patch) | |
| tree | 4fd3b77e619198a47d95ee55a742c8057dea591a /src/main/java/cuchaz/enigma/gui/Gui.java | |
| parent | Add support for custom themes (#59) (diff) | |
| download | enigma-fork-ba5ffc258f6d58bf9d01226baea016db10cfd811.tar.gz enigma-fork-ba5ffc258f6d58bf9d01226baea016db10cfd811.tar.xz enigma-fork-ba5ffc258f6d58bf9d01226baea016db10cfd811.zip | |
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
Diffstat (limited to 'src/main/java/cuchaz/enigma/gui/Gui.java')
| -rw-r--r-- | src/main/java/cuchaz/enigma/gui/Gui.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/cuchaz/enigma/gui/Gui.java b/src/main/java/cuchaz/enigma/gui/Gui.java index 86c97aa..4a891cf 100644 --- a/src/main/java/cuchaz/enigma/gui/Gui.java +++ b/src/main/java/cuchaz/enigma/gui/Gui.java | |||
| @@ -68,13 +68,13 @@ public class Gui { | |||
| 68 | public JFileChooser exportJarFileChooser; | 68 | public JFileChooser exportJarFileChooser; |
| 69 | private GuiController controller; | 69 | private GuiController controller; |
| 70 | private JFrame frame; | 70 | private JFrame frame; |
| 71 | private PanelEditor editor; | 71 | public PanelEditor editor; |
| 72 | private JPanel classesPanel; | 72 | private JPanel classesPanel; |
| 73 | private JSplitPane splitClasses; | 73 | private JSplitPane splitClasses; |
| 74 | private PanelIdentifier infoPanel; | 74 | private PanelIdentifier infoPanel; |
| 75 | private ObfuscatedHighlightPainter obfuscatedHighlightPainter; | 75 | public ObfuscatedHighlightPainter obfuscatedHighlightPainter; |
| 76 | private DeobfuscatedHighlightPainter deobfuscatedHighlightPainter; | 76 | public DeobfuscatedHighlightPainter deobfuscatedHighlightPainter; |
| 77 | private OtherHighlightPainter otherHighlightPainter; | 77 | public OtherHighlightPainter otherHighlightPainter; |
| 78 | private SelectionHighlightPainter selectionHighlightPainter; | 78 | private SelectionHighlightPainter selectionHighlightPainter; |
| 79 | private JTree inheritanceTree; | 79 | private JTree inheritanceTree; |
| 80 | private JTree implementationsTree; | 80 | private JTree implementationsTree; |
| @@ -134,7 +134,7 @@ public class Gui { | |||
| 134 | this.editor = new PanelEditor(this); | 134 | this.editor = new PanelEditor(this); |
| 135 | JScrollPane sourceScroller = new JScrollPane(this.editor); | 135 | JScrollPane sourceScroller = new JScrollPane(this.editor); |
| 136 | this.editor.setContentType("text/minecraft"); | 136 | this.editor.setContentType("text/minecraft"); |
| 137 | this.editor.setBackground(new Color(Config.INSTANCE.editorBackground)); | 137 | this.editor.setBackground(new Color(Config.getInstance().editorBackground)); |
| 138 | DefaultSyntaxKit kit = (DefaultSyntaxKit) this.editor.getEditorKit(); | 138 | DefaultSyntaxKit kit = (DefaultSyntaxKit) this.editor.getEditorKit(); |
| 139 | kit.toggleComponent(this.editor, "de.sciss.syntaxpane.components.TokenMarker"); | 139 | kit.toggleComponent(this.editor, "de.sciss.syntaxpane.components.TokenMarker"); |
| 140 | 140 | ||