Add a gui setting for enabling spellcheck. Also move it to advanced.

mattmess1221 · May 2, 2016 · ba2ebc1 · ba2ebc1
1 parent a91dd3c
commit ba2ebc1
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 10 deletions.
diff --git a/src/main/java/mnm/mods/tabbychat/gui/TextBox.java b/src/main/java/mnm/mods/tabbychat/gui/TextBox.java
@@ -179,7 +179,7 @@ public List<String> getWrappedLines() {
 
     public List<IChatComponent> getFormattedLines() {
         List<String> lines = getWrappedLines();
-        if (TabbyChat.getInstance().settings.general.spelling.enabled.get()) {
+        if (TabbyChat.getInstance().settings.advanced.spelling.get()) {
             spellcheck.checkSpelling(textField.getValue());
             return lines.stream()
                     .map(new SpellingFormatter(spellcheck))

diff --git a/src/main/java/mnm/mods/tabbychat/gui/settings/GuiAdvancedSettings.java b/src/main/java/mnm/mods/tabbychat/gui/settings/GuiAdvancedSettings.java
@@ -41,6 +41,9 @@ public void initGUI() {
         addComponent(new GuiLabel(new ChatComponentTranslation(ADVANCED_HIDE_DELIMS)), new int[] { 2, 7 });
         addComponent(new GuiSettingBoolean(getSettings().advanced.hideTag), new int[] { 1, 7 });
 
+        addComponent(new GuiLabel(new ChatComponentTranslation(ADVANCED_SPELLCHECK)), new int[] { 2, 8 });
+        addComponent(new GuiSettingBoolean(getSettings().advanced.spelling), new int[] { 1, 8 });
+
         addComponent(new GuiLabel(new ChatComponentTranslation(EXPERIMENTAL)), new int[] { 0, 13 });
     }
 

diff --git a/src/main/java/mnm/mods/tabbychat/settings/AdvancedSettings.java b/src/main/java/mnm/mods/tabbychat/settings/AdvancedSettings.java
@@ -16,5 +16,6 @@ public class AdvancedSettings extends ValueObject {
     public Value<Integer> msgDelay = value(500);
     public Value<Boolean> hideTag = value(false);
     public Value<Boolean> keepChatOpen = value(false);
+    public Value<Boolean> spelling = value(true);
     public Value<ChatVisibility> visibility = value(ChatVisibility.NORMAL);
 }
diff --git a/src/main/java/mnm/mods/tabbychat/settings/GeneralSettings.java b/src/main/java/mnm/mods/tabbychat/settings/GeneralSettings.java
@@ -1,7 +1,5 @@
 package mnm.mods.tabbychat.settings;
 
-import com.google.gson.annotations.Expose;
-
 import mnm.mods.tabbychat.util.TimeStamps;
 import mnm.mods.util.config.Value;
 import mnm.mods.util.config.ValueObject;
@@ -18,11 +16,4 @@ public class GeneralSettings extends ValueObject {
     public Value<Double> antiSpamPrejudice = value(0D);
     public Value<Boolean> unreadFlashing = value(true);
     public Value<Boolean> checkUpdates = value(true);
-    public Spelling spelling = new Spelling();
-
-    public class Spelling extends ValueObject {
-
-        @Expose
-        public Value<Boolean> enabled = new Value<Boolean>(true);
-    }
 }
diff --git a/src/main/java/mnm/mods/tabbychat/util/Translation.java b/src/main/java/mnm/mods/tabbychat/util/Translation.java
@@ -89,6 +89,7 @@ public final class Translation {
     public static final String ADVANCED_CHAT_DELAY = "tabbychat.settings.advanced.chatdelay";
     public static final String ADVANCED_CHAT_VISIBILITY = "tabbychat.settings.advanced.chatvisibility";
     public static final String ADVANCED_HIDE_DELIMS = "tabbychat.settings.advanced.hidedelims";
+    public static final String ADVANCED_SPELLCHECK = "tabbychat.settings.advanced.spellcheck";
     public static final String EXPERIMENTAL = "tabbychat.settings.experimental";
 
     private Translation() {}

diff --git a/src/main/resources/assets/tabbychat/lang/en_US.lang b/src/main/resources/assets/tabbychat/lang/en_US.lang
@@ -78,5 +78,6 @@ tabbychat.settings.advanced.fadetime=Fade time (ticks)
 tabbychat.settings.advanced.chatdelay=Chat delay (ms)
 tabbychat.settings.advanced.chatvisibility=Chat visibility
 tabbychat.settings.advanced.hidedelims=Hide channel delimeters*
+tabbychat.settings.advanced.spellcheck=Enable spellcheck
 
 tabbychat.settings.experimental=* Experimental and may not work right.