MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Finish converting EditorTabsConfigurable to property bindings

Browse Source
This commit is contained in:
Dmitry Jemerov
2019-04-15 19:11:33 +02:00
parent 289712daa4
commit ef12431a87
5 changed files with 61 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/credential-store/src/PasswordSafeConfigurable.kt
+1 -1
View File
@@ -227,7 +227,7 @@ internal class PasswordSafeConfigurableUi(private val mySettings: PasswordSafeSe
{ getSelectedPgpKey() ?: pgpListModel.items.firstOrNull() },
{ mySettings.state.pgpKeyId = if (usePgpKey.isSelected) it?.keyId else null },
growPolicy = GrowPolicy.MEDIUM_TEXT,
renderer = { value, _, _ -> append("${value.userId} (${value.keyId})") }
renderer = listCellRenderer { value, _, _ -> append("${value.userId} (${value.keyId})") }
)
.enableIf(usePgpKey.selected)
.component
platform/lang-impl/src/com/intellij/application/options/editor/EditorTabsConfigurable.kt
+16 -67
View File
@@ -20,42 +20,14 @@ class EditorTabsConfigurable : EditorOptionsProvider {
private const val NONE = "None"
private val EDITOR_TABS_RANGE = UINumericRange(10, 1, Math.max(10, Registry.intValue("ide.max.editor.tabs", 100)))
val tabPlacements = arrayOf(SwingConstants.TOP, SwingConstants.LEFT, SwingConstants.BOTTOM, SwingConstants.RIGHT, UISettings.TABS_NONE)
}
private val myEditorTabPlacement: JComboBox<Int> = ComboBox(
arrayOf(SwingConstants.TOP, SwingConstants.LEFT, SwingConstants.BOTTOM, SwingConstants.RIGHT, UISettings.TABS_NONE)
)
private val myScrollTabLayoutInEditorCheckBox = JCheckBox(message("checkbox.editor.tabs.in.single.row"))
private val myHideTabsCheckbox = JCheckBox(message("checkbox.editor.scroll.if.need"))
private lateinit var myCloseButtonPlacementRow: Row
private lateinit var myEditorTabPlacement: JComboBox<Int>
private lateinit var myScrollTabLayoutInEditorCheckBox: JCheckBox
private val panel = doCreateComponent()
init {
myEditorTabPlacement.renderer = MyTabsPlacementComboBoxRenderer()
myEditorTabPlacement.addItemListener { revalidateSingleRowCheckbox() }
revalidateSingleRowCheckbox()
myScrollTabLayoutInEditorCheckBox.addChangeListener { myHideTabsCheckbox.isEnabled = myScrollTabLayoutInEditorCheckBox.isSelected }
}
private fun revalidateSingleRowCheckbox() {
val i = (myEditorTabPlacement.selectedItem as Int).toInt()
val none = i == UISettings.TABS_NONE
myHideTabsCheckbox.isEnabled = !none && myScrollTabLayoutInEditorCheckBox.isSelected
myScrollTabLayoutInEditorCheckBox.isEnabled = !none
myCloseButtonPlacementRow.enabled = !none
if (SwingConstants.TOP == i) {
myScrollTabLayoutInEditorCheckBox.isEnabled = true
}
else {
myScrollTabLayoutInEditorCheckBox.isSelected = true
myScrollTabLayoutInEditorCheckBox.isEnabled = false
}
}
override fun getDisplayName() = "Editor Tabs (New)"
override fun getDisplayName() = "Editor Tabs"
override fun getHelpTopic() = "reference.settingsdialog.IDE.editor.tabs"
@@ -71,13 +43,17 @@ class EditorTabsConfigurable : EditorOptionsProvider {
row {
cell {
Label(message("combobox.editor.tab.placement"))()
myEditorTabPlacement()
myEditorTabPlacement = comboBox(DefaultComboBoxModel<Int>(tabPlacements), uiSettings::editorTabPlacement,
renderer = MyTabsPlacementComboBoxRenderer()).component
}
}
row {
myScrollTabLayoutInEditorCheckBox()
myScrollTabLayoutInEditorCheckBox = checkBox(message("checkbox.editor.tabs.in.single.row"), uiSettings::scrollTabLayoutInEditor)
.enableIf(myEditorTabPlacement.selectedValueIs(SwingConstants.TOP)).component
row {
myHideTabsCheckbox()
checkBox(message("checkbox.editor.scroll.if.need"), uiSettings::hideTabsIfNeed)
.enableIf(myEditorTabPlacement.selectedValueMatches { it != UISettings.TABS_NONE } and
myScrollTabLayoutInEditorCheckBox.selected)
}
}
row {
@@ -90,7 +66,7 @@ class EditorTabsConfigurable : EditorOptionsProvider {
row { checkBox(message("checkbox.show.directory.for.non.unique.files"), uiSettings::showDirectoryForNonUniqueFilenames).enableIfTabsVisible() }
row { checkBox(message("checkbox.mark.modified.tabs.with.asterisk"), uiSettings::markModifiedTabsWithAsterisk).enableIfTabsVisible() }
row { checkBox(message("checkbox.show.tabs.tooltips"), uiSettings::showTabsTooltips).enableIfTabsVisible() }
myCloseButtonPlacementRow = row {
row {
cell {
Label(message("tabs.close.button.placement"))()
comboBox(
@@ -104,7 +80,7 @@ class EditorTabsConfigurable : EditorOptionsProvider {
}
)
}
}
}.enableIf((myEditorTabPlacement.selectedValueMatches { it != UISettings.TABS_NONE }))
}
titledRow(message("group.tab.closing.policy")) {
row {
@@ -140,18 +116,11 @@ class EditorTabsConfigurable : EditorOptionsProvider {
}
private fun <T : JComponent> CellBuilder<T>.enableIfTabsVisible() {
enableIf(myEditorTabPlacement.hasSelection { it != UISettings.TABS_NONE })
enableIf(myEditorTabPlacement.selectedValueMatches { it != UISettings.TABS_NONE })
}
override fun reset() {
panel.reset()
val uiSettings = UISettings.instance.state
myScrollTabLayoutInEditorCheckBox.isSelected = uiSettings.scrollTabLayoutInEditor
myHideTabsCheckbox.isEnabled = myScrollTabLayoutInEditorCheckBox.isSelected
myHideTabsCheckbox.isSelected = uiSettings.hideTabsIfNeed
myEditorTabPlacement.selectedItem = uiSettings.editorTabPlacement
}
private fun getCloseButtonPlacement(uiSettings: UISettingsState): String {
@@ -166,20 +135,9 @@ class EditorTabsConfigurable : EditorOptionsProvider {
}
override fun apply() {
var uiSettingsChanged = panel.isModified()
val uiSettingsChanged = panel.isModified()
panel.apply()
val settingsManager = UISettings.instance
val uiSettings = settingsManager.state
if (isModified(myScrollTabLayoutInEditorCheckBox, uiSettings.scrollTabLayoutInEditor)) uiSettingsChanged = true
uiSettings.scrollTabLayoutInEditor = myScrollTabLayoutInEditorCheckBox.isSelected
if (isModified(myHideTabsCheckbox, uiSettings.hideTabsIfNeed)) uiSettingsChanged = true
uiSettings.hideTabsIfNeed = myHideTabsCheckbox.isSelected
val tabPlacement = (myEditorTabPlacement.selectedItem as Int).toInt()
if (uiSettings.editorTabPlacement != tabPlacement) uiSettingsChanged = true
uiSettings.editorTabPlacement = tabPlacement
if (uiSettingsChanged) {
settingsManager.fireUISettingsChanged()
@@ -187,16 +145,7 @@ class EditorTabsConfigurable : EditorOptionsProvider {
}
override fun isModified(): Boolean {
if (panel.isModified()) return true
val uiSettings = UISettings.instance.state
val tabPlacement = (myEditorTabPlacement.selectedItem as Int).toInt()
var isModified = tabPlacement != uiSettings.editorTabPlacement
isModified = isModified or (myScrollTabLayoutInEditorCheckBox.isSelected != uiSettings.scrollTabLayoutInEditor)
isModified = isModified or (myHideTabsCheckbox.isSelected != uiSettings.hideTabsIfNeed)
return isModified
return panel.isModified()
}
private class MyTabsPlacementComboBoxRenderer internal constructor() : ListCellRendererWrapper<Int>() {
platform/platform-impl/src/com/intellij/ui/layout/Cell.kt
+12 -14
View File
@@ -172,20 +172,8 @@ abstract class Cell {
return builder.withBinding({ component.selectedItem as T? }, { component.setSelectedItem(it) }, getter, setter)
}
fun <T> comboBox(
model: ComboBoxModel<T>,
getter: () -> T?,
setter: (T?) -> Unit,
growPolicy: GrowPolicy? = null,
renderer: ColoredListCellRenderer<T?>.(value: T, index: Int, isSelected: Boolean) -> Unit
): CellBuilder<ComboBox<T>> {
return comboBox(model, getter, setter, growPolicy, object : ColoredListCellRenderer<T?>() {
override fun customizeCellRenderer(list: JList<out T?>, value: T?, index: Int, selected: Boolean, hasFocus: Boolean) {
if (value != null) {
renderer(this, value, index, selected)
}
}
})
fun <T> comboBox(model: ComboBoxModel<T>, prop: KMutableProperty0<T>, growPolicy: GrowPolicy? = null, renderer: ListCellRenderer<T?>? = null): CellBuilder<ComboBox<T>> {
return comboBox(model, prop.getter, { prop.set(it!!) }, growPolicy, renderer)
}
fun textField(prop: KMutableProperty0<String>, columns: Int? = null): CellBuilder<JTextField> {
@@ -280,3 +268,13 @@ abstract class Cell {
): CellBuilder<T>
}
fun <T> listCellRenderer(renderer: ColoredListCellRenderer<T?>.(value: T, index: Int, isSelected: Boolean) -> Unit): ColoredListCellRenderer<T?> {
return object : ColoredListCellRenderer<T?>() {
override fun customizeCellRenderer(list: JList<out T?>, value: T?, index: Int, selected: Boolean, hasFocus: Boolean) {
if (value != null) {
renderer(this, value, index, selected)
}
}
}
}
platform/platform-impl/src/com/intellij/ui/layout/ComponentPredicate.kt
+26 -6
View File
@@ -13,16 +13,36 @@ val AbstractButton.selected: ComponentPredicate
override fun invoke(): Boolean = isSelected
override fun addListener(listener: (Boolean) -> Unit) {
addChangeListener { listener(isSelected()) }
addChangeListener { listener(isSelected) }
}
}
fun <T> JComboBox<T>.hasSelection(predicate: (T?) -> Boolean): ComponentPredicate {
return object : ComponentPredicate() {
override fun invoke(): Boolean = predicate(selectedItem as T?)
fun <T> JComboBox<T>.selectedValueMatches(predicate: (T?) -> Boolean): ComponentPredicate {
return ComboBoxPredicate(this, predicate)
}
override fun addListener(listener: (Boolean) -> Unit) {
addActionListener { listener(predicate(selectedItem as T?)) }
class ComboBoxPredicate<T>(private val comboBox: JComboBox<T>, private val predicate: (T?) -> Boolean) : ComponentPredicate() {
override fun invoke(): Boolean = predicate(comboBox.selectedItem as T?)
override fun addListener(listener: (Boolean) -> Unit) {
comboBox.addActionListener {
listener(predicate(comboBox.selectedItem as T?))
}
}
}
fun <T> JComboBox<T>.selectedValueIs(value: T): ComponentPredicate = selectedValueMatches { it == value }
infix fun ComponentPredicate.and(other: ComponentPredicate): ComponentPredicate {
return AndPredicate(this, other)
}
private class AndPredicate(private val lhs: ComponentPredicate, private val rhs: ComponentPredicate) : ComponentPredicate() {
override fun invoke(): Boolean = lhs.invoke() && rhs.invoke()
override fun addListener(listener: (Boolean) -> Unit) {
val andListener: (Boolean) -> Unit = { listener(lhs.invoke() && rhs.invoke()) }
lhs.addListener(andListener)
rhs.addListener(andListener)
}
}
platform/platform-impl/src/com/intellij/ui/layout/Row.kt
+6 -1
View File
@@ -92,4 +92,9 @@ abstract class Row : Cell() {
enum class GrowPolicy {
SHORT_TEXT, MEDIUM_TEXT
}
}
fun Row.enableIf(predicate: ComponentPredicate) {
enabled = predicate()
predicate.addListener { enabled = it }
}