Version 2.1.2

Reverted back to the old settings panel due to the new one not saving properly after a restart.

3 files changed, 11 insertions, 11 deletions

diff --git a/src/main/kotlin/me/kyren223/trident/ui/SettingsConfigurable.kt b/src/main/kotlin/me/kyren223/trident/ui/SettingsConfigurable.kt
index c0d1247..f6979b1 100644
--- a/src/main/kotlin/me/kyren223/trident/ui/SettingsConfigurable.kt
+++ b/src/main/kotlin/me/kyren223/trident/ui/SettingsConfigurable.kt
@@ -4,7 +4,7 @@ package me.kyren223.trident.ui
 import com.intellij.openapi.options.Configurable
 import com.intellij.openapi.util.NlsContexts.ConfigurableName
 import me.kyren223.trident.data.SettingsData
-import me.kyren223.trident.data.Settings
+import me.kyren223.trident.data.SettingsState
 import javax.swing.JComponent
 
 class SettingsConfigurable : Configurable {
@@ -21,7 +21,7 @@ class SettingsConfigurable : Configurable {
     }
 
     override fun isModified(): Boolean {
-        val settings = Settings.state
+        val settings = SettingsState.instance
         if (settings.width != this.settings!!.getWidth()) return true
         if (settings.height != this.settings!!.getHeight()) return true
         if (settings.fontSize != this.settings!!.getFontSize()) return true
@@ -35,7 +35,7 @@ class SettingsConfigurable : Configurable {
     }
 
     override fun apply() {
-        val settings = Settings.state
+        val settings = SettingsState.instance
         settings.width = this.settings!!.getWidth()
         settings.height = this.settings!!.getHeight()
         settings.fontSize = this.settings!!.getFontSize()
@@ -48,7 +48,7 @@ class SettingsConfigurable : Configurable {
     }
 
     override fun reset() {
-        val settings = Settings.state
+        val settings = SettingsState.instance
         if (this.settings == null) this.settings = SettingsData()
         this.settings!!.setWidth(settings.width)
         this.settings!!.setHeight(settings.height)
diff --git a/src/main/kotlin/me/kyren223/trident/ui/TridentListMenu.kt b/src/main/kotlin/me/kyren223/trident/ui/TridentListMenu.kt
index af04b7c..75e059a 100644
--- a/src/main/kotlin/me/kyren223/trident/ui/TridentListMenu.kt
+++ b/src/main/kotlin/me/kyren223/trident/ui/TridentListMenu.kt
@@ -8,7 +8,7 @@ import com.intellij.openapi.ui.DialogWrapper
 import com.intellij.ui.EditorTextField
 import com.maddyhome.idea.vim.newapi.vim
 import com.maddyhome.idea.vim.state.mode.Mode
-import me.kyren223.trident.data.Settings
+import me.kyren223.trident.data.SettingsState
 import me.kyren223.trident.utils.TridentList
 import me.kyren223.trident.utils.injectEnterToSelectMapping
 import me.kyren223.trident.utils.setEditorMode
@@ -22,7 +22,7 @@ class TridentListMenu(private val content: String) : DialogWrapper(true) {
 
     init {
         this.title = "Trident List"
-        val settings = Settings.state
+        val settings = SettingsState.instance
         setSize(settings.width, settings.height)
         super.init()
     }
@@ -31,9 +31,9 @@ class TridentListMenu(private val content: String) : DialogWrapper(true) {
         editor = EditorTextField(this.content)
         editor.setOneLineMode(false)
         editor.addSettingsProvider {
-            it.setFontSize(Settings.state.fontSize)
+            it.setFontSize(SettingsState.instance.fontSize)
             it.isInsertMode = false
-            val lineNumber = if (Settings.state.rememberLine) line else 0
+            val lineNumber = if (SettingsState.instance.rememberLine) line else 0
             it.caretModel.moveToLogicalPosition(LogicalPosition(lineNumber, 0))
             it.settings.isLineNumbersShown = true
             it.settings.lineNumerationType = EditorSettings.LineNumerationType.ABSOLUTE
diff --git a/src/main/kotlin/me/kyren223/trident/ui/TridentMappingsMenu.kt b/src/main/kotlin/me/kyren223/trident/ui/TridentMappingsMenu.kt
index 4a6d859..79f1df8 100644
--- a/src/main/kotlin/me/kyren223/trident/ui/TridentMappingsMenu.kt
+++ b/src/main/kotlin/me/kyren223/trident/ui/TridentMappingsMenu.kt
@@ -7,7 +7,7 @@ import com.intellij.openapi.ui.DialogWrapper
 import com.intellij.ui.EditorTextField
 import com.maddyhome.idea.vim.newapi.vim
 import com.maddyhome.idea.vim.state.mode.Mode
-import me.kyren223.trident.data.Settings
+import me.kyren223.trident.data.SettingsState
 import me.kyren223.trident.utils.TridentMappings
 import me.kyren223.trident.utils.setEditorMode
 import java.awt.event.FocusEvent
@@ -18,7 +18,7 @@ class TridentMappingsMenu(private val content: String) : DialogWrapper(true) {
     private lateinit var editor: EditorTextField
 
     init {
-        val settings = Settings.state
+        val settings = SettingsState.instance.state
         this.title = "Trident Mappings"
         setSize(settings.width, settings.height)
         super.init()
@@ -28,7 +28,7 @@ class TridentMappingsMenu(private val content: String) : DialogWrapper(true) {
         editor = EditorTextField(this.content)
         editor.setOneLineMode(false)
         editor.addSettingsProvider {
-            it.setFontSize(Settings.state.fontSize)
+            it.setFontSize(SettingsState.instance.fontSize)
             it.isInsertMode = false
             it.caretModel.moveToLogicalPosition(LogicalPosition(0, 0))
             it.settings.isLineNumbersShown = true