Skip to content

Commit

Permalink
Merge pull request #2607 from bardsoftware/settings-dialog-fx
Browse files Browse the repository at this point in the history 
Settings dialog core in JavaFX
  • Loading branch information
@dbarashev
dbarashev authored Nov 2, 2024
2 parents b5cbe01 + fdeb872 commit 7ae2e29
Show file tree
Hide file tree
Showing 15 changed files with 395 additions and 106 deletions.
3 changes: 3 additions & 0 deletions ganttproject/src/main/java/biz/ganttproject/FXUtil.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ import net.sourceforge.ganttproject.gui.ActionUtil
import javax.swing.SwingUtilities
import javax.swing.UIManager

interface FxUiComponent {
fun buildNode(): Node
}
/**
* @author [email protected]
*/
Expand Down
9 changes: 6 additions & 3 deletions ganttproject/src/main/java/biz/ganttproject/app/AppearanceManager.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/
package biz.ganttproject.app

import biz.ganttproject.FXUtil
import biz.ganttproject.core.option.ChangeValueEvent
import biz.ganttproject.core.option.DefaultFontOption
import biz.ganttproject.core.option.FontSpec
Expand All @@ -40,10 +41,12 @@ class AppearanceManager(private val appFontOption: DefaultFontOption) {
reloadCustomCss(c.list)
}
appFontOption.addChangeValueListener { _: ChangeValueEvent ->
setFont(appFontOption.getValue())
reloadCustomCss(Window.getWindows())
FXUtil.runLater {
setFont(appFontOption.value)
reloadCustomCss(Window.getWindows())
}
}
setFont(appFontOption.getValue())
setFont(appFontOption.value)
}

fun setFont(font: FontSpec) {
Expand Down
2 changes: 1 addition & 1 deletion ganttproject/src/main/java/biz/ganttproject/app/Dialog.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ fun dialogFxBuild(owner: Window? = null, id: String? = null, contentBuilder: (Di
owner?.let(::initOwner)
initModality(Modality.APPLICATION_MODAL)


DialogControllerFx(dialogPane, this).let { dialogBuildApi ->
dialogPane.styleClass.addAll("dlg")
dialogPane.stylesheets.addAll(DIALOG_STYLESHEET)
Expand Down Expand Up @@ -607,6 +606,7 @@ class DialogControllerPane(private val root: BorderPane) : DialogController {
}

override fun removeButtonBar() {
root.bottom = null
}

override fun toggleProgress(shown: Boolean): () -> Unit {
Expand Down
2 changes: 1 addition & 1 deletion ganttproject/src/main/java/biz/ganttproject/ganttview/ColumnManager.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ internal class CustomPropertyEditor(
selectedItemProperty: ObservableProperty<ColumnAsListItem?>,
private val btnDeleteController: BtnController<Unit>,
escCloseEnabled: BooleanProperty,
) : ItemEditorPane<ColumnAsListItem>(model.allOptions, selectedItemProperty, dialogModel, ourEditorLocalizer) {
) : ItemEditorPaneImpl<ColumnAsListItem>(model.allOptions, selectedItemProperty, dialogModel, ourEditorLocalizer) {

init {
escCloseEnabled.bind(propertySheet.isEscCloseEnabled)
Expand Down
2 changes: 1 addition & 1 deletion ganttproject/src/main/java/biz/ganttproject/ganttview/FilterDialog.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ internal class FilterEditor(
editItem: ObservableObject<TaskFilter?>,
model: ItemListDialogModel<TaskFilter>
)
: ItemEditorPane<TaskFilter>(
: ItemEditorPaneImpl<TaskFilter>(
editorModel.fields, editItem, model, i18n
) {
override fun loadData(item: TaskFilter?) {
Expand Down
158 changes: 88 additions & 70 deletions ganttproject/src/main/java/biz/ganttproject/ganttview/SharedUiComponents.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ package biz.ganttproject.ganttview
import biz.ganttproject.app.DialogController
import biz.ganttproject.app.Localizer
import biz.ganttproject.app.PropertySheetBuilder
import biz.ganttproject.app.RootLocalizer
import biz.ganttproject.core.option.GPObservable
import biz.ganttproject.core.option.ObservableBoolean
import biz.ganttproject.core.option.ObservableProperty
import biz.ganttproject.lib.fx.VBoxBuilder
import biz.ganttproject.lib.fx.createToggleSwitch
Expand Down Expand Up @@ -52,13 +49,14 @@ import java.util.WeakHashMap
/**
* This is an object that is rendered in a list view.
*/
data class ShowHideListItem(val text: ()->String, val isVisible: ()->Boolean, val toggleVisible: ()->Unit)
data class ShowHideListItem(val text: ()->String, val isVisible: ()->Boolean, val toggleVisible: ()->Unit, val styleClass: String = "", val hasVisibilityToggle: Boolean = true)

private val ourCells = WeakHashMap<ShowHideListCell<*>, Boolean>()
/**
* A list cell is a UI component that renders items in a list view. It adds a show/hide icon to the item title.
*/
internal class ShowHideListCell<T>(private val converter: (T)-> ShowHideListItem) : ListCell<T>() {
private var initialStyles: List<String>
private val iconVisible = MaterialIconView(MaterialIcon.VISIBILITY)
private val iconHidden = MaterialIconView(MaterialIcon.VISIBILITY_OFF)
private val iconPane = StackPane().also {
Expand All @@ -70,16 +68,21 @@ internal class ShowHideListCell<T>(private val converter: (T)-> ShowHideListItem

val theItem by lazy { converter(item) }
init {
styleClass.add("column-item-cell")
initialStyles = mutableListOf<String>().also { it.addAll(styleClass) }
alignment = Pos.CENTER_LEFT
ourCells.put(this, true)
}

override fun updateItem(item: T?, empty: Boolean) {
super.updateItem(item, empty)
styleClass.clear()
styleClass.addAll(initialStyles)
styleClass.add("column-item-cell")
//font = applicationFont.value
if (item == null || empty) {
text = ""
graphic = null
styleClass.add("column-item-cell-empty")
return
}
updateTheItem(converter(item))
Expand All @@ -93,15 +96,20 @@ internal class ShowHideListCell<T>(private val converter: (T)-> ShowHideListItem
if (graphic == null) {
graphic = iconPane
}
if (item.isVisible()) {
styleClass.add("is-visible")
styleClass.remove("is-hidden")
iconPane.children.setAll(iconVisible)
} else {
if (!styleClass.contains("is-hidden")) {
styleClass.remove("is-visible")
styleClass.add("is-hidden")
iconPane.children.setAll(iconHidden)
if (item.styleClass.isNotBlank()) {
styleClass.add(item.styleClass)
}
if (item.hasVisibilityToggle) {
if (item.isVisible()) {
styleClass.add("is-visible")
styleClass.remove("is-hidden")
iconPane.children.setAll(iconVisible)
} else {
if (!styleClass.contains("is-hidden")) {
styleClass.remove("is-visible")
styleClass.add("is-hidden")
iconPane.children.setAll(iconHidden)
}
}
}
}
Expand All @@ -113,21 +121,25 @@ internal class ShowHideListCell<T>(private val converter: (T)-> ShowHideListItem
}
}

interface ItemEditorPane {
val node: Node
fun focus()
}
/**
* UI for editing properties of the selected list item.
*/
internal open class ItemEditorPane<T: Item<T>>(
internal open class ItemEditorPaneImpl<T: Item<T>>(
// Fields that need to be shown in the UI.
fields: List<ObservableProperty<*>>,
protected val editItem: ObservableProperty<T?>,
// The whole dialog model.
private val dialogModel: ItemListDialogModel<T>,
// i18n
localizer: Localizer) {
localizer: Localizer): ItemEditorPane {

private var isEditIgnored = false

val node: Node by lazy {
override val node: Node by lazy {
vbox {
addClasses("property-sheet-box")
add(visibilityTogglePane)
Expand Down Expand Up @@ -201,7 +213,7 @@ internal open class ItemEditorPane<T: Item<T>>(
dialogModel.requireRefresh.set(true)
}

internal fun focus() {
override fun focus() {
propertySheet.requestFocus()
onEdit()
}
Expand Down Expand Up @@ -239,7 +251,7 @@ data class BtnController<T>(
*/
internal class ItemListDialogModel<T: Item<T>>(
private val listItems: ObservableList<T>,
private val newItemFactory: ()->T,
private val newItemFactory: ()->T?,
private val i18n: Localizer,
) {
val btnAddController = BtnController(onAction = this::onAddColumn)
Expand All @@ -248,24 +260,25 @@ internal class ItemListDialogModel<T: Item<T>>(
internal var selection: ()-> Collection<T> = { emptyList() }
val requireRefresh = SimpleBooleanProperty(false)

fun onAddColumn(): T {
val item = newItemFactory()
val title = i18n.create("addItem").also {
it.update("")
}
var count = 1
while (listItems.any { it.title == title.value.trim() }) {
val prevValue = title.value
title.update(count.toString())
if (prevValue == title.value) {
break
fun onAddColumn(): T? =
newItemFactory()?.let { item ->
val title = i18n.create("addItem").also {
it.update("")
}
var count = 1
while (listItems.any { it.title == title.value.trim() }) {
val prevValue = title.value
title.update(count.toString())
if (prevValue == title.value) {
break
}
count++
}
count++
item.title = title.value.trim()
listItems.add(item)
item
}
item.title = title.value.trim()
listItems.add(item)
return item
}


fun onDeleteColumn() {
listItems.removeAll(selection())
Expand All @@ -285,12 +298,18 @@ internal class ItemListDialogPane<T: Item<T>>(
// The dialog model.
private val dialogModel: ItemListDialogModel<T>,
// The editor pane UI.
val editor: ItemEditorPane<T>,
val editor: ItemEditorPane,
// i18n.
private val localizer: Localizer) {

internal val listView: ListView<T> = ListView()

var isAddRemoveEnabled = true
var isHeaderEnabled = true
var contentNode = HBox().also {
it.children.addAll(listView, editor.node)
HBox.setHgrow(editor.node, Priority.ALWAYS)
}
init {
listView.apply {
this@ItemListDialogPane.dialogModel.selection = { selectionModel.selectedItems }
Expand All @@ -317,46 +336,45 @@ internal class ItemListDialogPane<T: Item<T>>(
fun build(dlg: DialogController) {
dlg.addStyleClass("dlg-list-view-editor")
dlg.addStyleSheet("/biz/ganttproject/ganttview/ListViewEditorDialog.css")
dlg.setHeader(
VBoxBuilder("header").apply {
addTitle(localizer.create("title")).also { hbox ->
hbox.alignment = Pos.CENTER_LEFT
hbox.isFillHeight = true
}
}.vbox
)

dlg.setContent(HBox().also {
it.children.addAll(listView, editor.node)
HBox.setHgrow(editor.node, Priority.ALWAYS)
})
if (isHeaderEnabled) {
dlg.setHeader(
VBoxBuilder("header").apply {
addTitle(localizer.create("title")).also { hbox ->
hbox.alignment = Pos.CENTER_LEFT
hbox.isFillHeight = true
}
}.vbox
)
}
dlg.setContent(contentNode)

dlg.setupButton(ButtonType(localizer.formatText("add"))) { btn ->
btn.text = localizer.formatText("add")
ButtonBar.setButtonData(btn, ButtonBar.ButtonData.HELP)
btn.disableProperty().bind(dialogModel.btnAddController.isDisabled)
btn.styleClass.addAll("btn-attention", "secondary")
btn.addEventFilter(ActionEvent.ACTION) {
it.consume()
dialogModel.btnAddController.onAction().also { item ->
listView.scrollTo(item)
listView.selectionModel.select(item)
editor.focus()
if (isAddRemoveEnabled) {
dlg.setupButton(ButtonType(localizer.formatText("add"))) { btn ->
btn.text = localizer.formatText("add")
ButtonBar.setButtonData(btn, ButtonBar.ButtonData.HELP)
btn.disableProperty().bind(dialogModel.btnAddController.isDisabled)
btn.styleClass.addAll("btn-attention", "secondary")
btn.addEventFilter(ActionEvent.ACTION) {
it.consume()
dialogModel.btnAddController.onAction().also { item ->
listView.scrollTo(item)
listView.selectionModel.select(item)
editor.focus()
}
}
}
}

dlg.setupButton(ButtonType(localizer.formatText("delete"))) { btn ->
btn.text = localizer.formatText("delete")
ButtonBar.setButtonData(btn, ButtonBar.ButtonData.HELP_2)
btn.disableProperty().bind(dialogModel.btnDeleteController.isDisabled)
btn.addEventFilter(ActionEvent.ACTION) {
it.consume()
dialogModel.btnDeleteController.onAction()
dlg.setupButton(ButtonType(localizer.formatText("delete"))) { btn ->
btn.text = localizer.formatText("delete")
ButtonBar.setButtonData(btn, ButtonBar.ButtonData.HELP_2)
btn.disableProperty().bind(dialogModel.btnDeleteController.isDisabled)
btn.addEventFilter(ActionEvent.ACTION) {
it.consume()
dialogModel.btnDeleteController.onAction()
}
btn.styleClass.addAll("btn-regular", "secondary")
}
btn.styleClass.addAll("btn-regular", "secondary")
}

dlg.setupButton(ButtonType.APPLY) { btn ->
btn.text = localizer.formatText("apply")
btn.styleClass.add("btn-attention")
Expand Down
Loading

0 comments on commit 7ae2e29

Please sign in to comment.