This commit is contained in:
parent
eebf3864a9
commit
af3a291536
@ -115,8 +115,12 @@ internal class EntryCell(private val resources: ResourceBundle, private val conf
|
|||||||
separator = " / "
|
separator = " / "
|
||||||
) { it.joinToString(separator = "; ") }
|
) { it.joinToString(separator = "; ") }
|
||||||
|
|
||||||
entry.crossStraitsDefinitions.isNotEmpty() -> entry.crossStraitsDefinitions.joinToString(separator = " / ") { it.definition }
|
entry.crossStraitsDefinitions.isNotEmpty() -> entry.crossStraitsDefinitions.joinToString(
|
||||||
entry.moedictDefinitions.isNotEmpty() -> entry.moedictDefinitions.joinToString(separator = " / ") { it.definition }
|
separator = " / "
|
||||||
|
) { it.definition }
|
||||||
|
entry.moedictDefinitions.isNotEmpty() -> entry.moedictDefinitions.joinToString(
|
||||||
|
separator = " / "
|
||||||
|
) { it.definition }
|
||||||
else -> error("No definition for entry")
|
else -> error("No definition for entry")
|
||||||
}
|
}
|
||||||
labelDefinition.text = definition
|
labelDefinition.text = definition
|
||||||
|
@ -37,8 +37,8 @@ class PreferencesDialog(
|
|||||||
}
|
}
|
||||||
|
|
||||||
val root = fxmlLoader.load(javaClass.getResourceAsStream("/fxml/dialogs/preferences.fxml")) as DialogPane
|
val root = fxmlLoader.load(javaClass.getResourceAsStream("/fxml/dialogs/preferences.fxml")) as DialogPane
|
||||||
root.prefHeightProperty().bind(dialogPane.scene.heightProperty());
|
root.prefHeightProperty().bind(dialogPane.scene.heightProperty())
|
||||||
root.prefWidthProperty().bind(dialogPane.scene.widthProperty());
|
root.prefWidthProperty().bind(dialogPane.scene.widthProperty())
|
||||||
|
|
||||||
dialogPane = root
|
dialogPane = root
|
||||||
title = "Settings"
|
title = "Settings"
|
||||||
|
Loading…
Reference in New Issue
Block a user