Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: improve Settings UI #672

Merged
merged 1 commit into from
Dec 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ abstract class AbstractEasyApiConfigurable(private var myProject: Project?) : Se
return false
}
if (throttle.acquire(5000L)) {
LOG.info("settings is modified:\npre:----\n${pre.toJson()}\ninUI:----\n${inUI.toJson()}\n----\n")
LOG.info("settings is modified at ${this::class.qualifiedName}:\npre:----\n${pre.toJson()}\ninUI:----\n${inUI.toJson()}\n----\n")
}
return true
}
Expand Down Expand Up @@ -72,33 +72,11 @@ abstract class AbstractEasyApiConfigurable(private var myProject: Project?) : Se
easyApiConfigurableGUI = createGUI()

context.init(easyApiConfigurableGUI)
context.runAsync {
context.runInSwingUI {
easyApiConfigurableGUI.onCreate()
easyApiConfigurableGUI.setSettings(settingBinder.read().copy())
checkUI()
}
}
easyApiConfigurableGUI.onCreate()
easyApiConfigurableGUI.setSettings(settingBinder.read().copy())
return easyApiConfigurableGUI.getRootPanel()
}

private fun checkUI() {
context!!.runAsync {
for (i in 0..8) {
Thread.sleep(250)
if (easyApiConfigurableGUI.checkUI()) {
continue
}
LOG.error("checkUI failed.Try refresh ui again.")
context!!.runInSwingUI {
easyApiConfigurableGUI.setSettings(easyApiConfigurableGUI.getSettings())
checkUI()
}
break
}
}
}

open fun afterBuildActionContext(builder: ActionContext.ActionContextBuilder) {}

protected abstract fun createGUI(): EasyApiSettingGUI
Expand Down
Original file line number Diff line number Diff line change
@@ -1,29 +1,23 @@
package com.itangcent.idea.plugin.configurable

import com.itangcent.idea.plugin.settings.Settings
import com.itangcent.intellij.extend.rx.AutoComputer

abstract class AbstractEasyApiSettingGUI : EasyApiSettingGUI {

protected var settingsInstance: Settings? = null

protected var autoComputer: AutoComputer = AutoComputer()

override fun checkUI(): Boolean {
return true
override fun onCreate() {
//NOP
}

override fun getSettings(): Settings {
return (settingsInstance ?: Settings()).copy()
return (settingsInstance ?: Settings()).copy().also { readSettings((it)) }
}

override fun setSettings(settings: Settings) {
autoComputer.value(this::settingsInstance, settings.copy())
this.settingsInstance = settings
}

override fun readSettings(settings: Settings) {
readSettings(settings, getSettings())
}

protected abstract fun readSettings(settings: Settings, from: Settings)
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,23 @@ import com.itangcent.idea.plugin.settings.Settings
import javax.swing.JComponent

interface EasyApiSettingGUI {

fun getRootPanel(): JComponent?

fun onCreate()

fun checkUI(): Boolean

/**
* get settings in UI
*/
fun getSettings(): Settings

/**
* set settings to UI
*/
fun setSettings(settings: Settings)

/**
* read settings from UI
*/
fun readSettings(settings: Settings)
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,12 @@ class EasyApiSettingBuiltInConfigGUI : AbstractEasyApiSettingGUI() {
return rootPanel
}

override fun onCreate() {
autoComputer.bind(this.builtInConfigTextArea!!)
.with<String?>(this, "settingsInstance.builtInConfig")
.eval { it.takeIf { it.notNullOrBlank() } ?: EasyApiSettingGUI.DEFAULT_BUILT_IN_CONFIG }

autoComputer.bind<String?>(this, "settingsInstance.builtInConfig")
.with(builtInConfigTextArea!!)
.eval { it.takeIf { it != EasyApiSettingGUI.DEFAULT_BUILT_IN_CONFIG } ?: "" }
override fun setSettings(settings: Settings) {
super.setSettings(settings)
this.builtInConfigTextArea!!.text = settings.builtInConfig.takeIf { it.notNullOrBlank() } ?: EasyApiSettingGUI.DEFAULT_BUILT_IN_CONFIG
}

override fun readSettings(settings: Settings, from: Settings) {
settings.builtInConfig = from.builtInConfig
override fun readSettings(settings: Settings) {
settings.builtInConfig = this.builtInConfigTextArea!!.text.takeIf { it != EasyApiSettingGUI.DEFAULT_BUILT_IN_CONFIG } ?: ""
}
}
Loading