marvinelsen/willow
1
0
Fork 0
Code Issues 2 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Remove DictionaryEntryFx and SentenceFx

Browse Source
This commit is contained in:
Marvin Elsen 2024-11-07 19:48:54 +01:00
parent 892058c47e
commit 1077735b98
Signed by: marvinelsen
GPG Key ID: 820672408CC318C2
14 changed files with 79 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/main/kotlin/com/marvinelsen/willow/Model.kt
View File

@ -2,10 +2,8 @@ package com.marvinelsen.willow
import com.marvinelsen.willow.domain.SearchMode import com.marvinelsen.willow.domain.SearchMode
import com.marvinelsen.willow.domain.SqliteDictionary import com.marvinelsen.willow.domain.SqliteDictionary
import com.marvinelsen.willow.ui.DictionaryEntryFx import com.marvinelsen.willow.domain.entities.DictionaryEntry
import com.marvinelsen.willow.ui.SentenceFx import com.marvinelsen.willow.domain.entities.Sentence
import com.marvinelsen.willow.ui.toDomain
import com.marvinelsen.willow.ui.toFx
import com.marvinelsen.willow.ui.util.ClipboardHelper import com.marvinelsen.willow.ui.util.ClipboardHelper
import javafx.beans.property.BooleanProperty import javafx.beans.property.BooleanProperty
import javafx.beans.property.ObjectProperty import javafx.beans.property.ObjectProperty
@ -21,12 +19,12 @@ import kotlinx.coroutines.launch
class Model( class Model(
private val dictionary: SqliteDictionary, private val dictionary: SqliteDictionary,
) { ) {
private val internalSelectedEntry: ObjectProperty<DictionaryEntryFx> = SimpleObjectProperty() private val internalSelectedEntry: ObjectProperty<DictionaryEntry> = SimpleObjectProperty()
private val internalSearchResults: ObservableList<DictionaryEntryFx> = FXCollections.observableArrayList() private val internalSearchResults: ObservableList<DictionaryEntry> = FXCollections.observableArrayList()
private val internalWordsBeginning: ObservableList<DictionaryEntryFx> = FXCollections.observableArrayList() private val internalWordsBeginning: ObservableList<DictionaryEntry> = FXCollections.observableArrayList()
private val internalWordsContaining: ObservableList<DictionaryEntryFx> = FXCollections.observableArrayList() private val internalWordsContaining: ObservableList<DictionaryEntry> = FXCollections.observableArrayList()
private val internalCharacters: ObservableList<DictionaryEntryFx> = FXCollections.observableArrayList() private val internalCharacters: ObservableList<DictionaryEntry> = FXCollections.observableArrayList()
private val internalSentences: ObservableList<SentenceFx> = FXCollections.observableArrayList() private val internalSentences: ObservableList<Sentence> = FXCollections.observableArrayList()
private val internalIsSearching: BooleanProperty = SimpleBooleanProperty(false) private val internalIsSearching: BooleanProperty = SimpleBooleanProperty(false)
private val internalIsFindingWordsBeginning: BooleanProperty = SimpleBooleanProperty(false) private val internalIsFindingWordsBeginning: BooleanProperty = SimpleBooleanProperty(false)
@ -39,17 +37,17 @@ class Model(
private val internalFinishedFindingCharacters: BooleanProperty = SimpleBooleanProperty(false) private val internalFinishedFindingCharacters: BooleanProperty = SimpleBooleanProperty(false)
private val internalFinishedFindingSentences: BooleanProperty = SimpleBooleanProperty(false) private val internalFinishedFindingSentences: BooleanProperty = SimpleBooleanProperty(false)
val selectedEntry: ReadOnlyObjectProperty<DictionaryEntryFx> = internalSelectedEntry val selectedEntry: ReadOnlyObjectProperty<DictionaryEntry> = internalSelectedEntry
val searchResults: ObservableList<DictionaryEntryFx> = val searchResults: ObservableList<DictionaryEntry> =
FXCollections.unmodifiableObservableList(internalSearchResults) FXCollections.unmodifiableObservableList(internalSearchResults)
val wordsBeginning: ObservableList<DictionaryEntryFx> = val wordsBeginning: ObservableList<DictionaryEntry> =
FXCollections.unmodifiableObservableList(internalWordsBeginning) FXCollections.unmodifiableObservableList(internalWordsBeginning)
val wordsContaining: ObservableList<DictionaryEntryFx> = val wordsContaining: ObservableList<DictionaryEntry> =
FXCollections.unmodifiableObservableList(internalWordsContaining) FXCollections.unmodifiableObservableList(internalWordsContaining)
val characters: ObservableList<DictionaryEntryFx> = val characters: ObservableList<DictionaryEntry> =
FXCollections.unmodifiableObservableList(internalCharacters) FXCollections.unmodifiableObservableList(internalCharacters)
val sentences: ObservableList<SentenceFx> = val sentences: ObservableList<Sentence> =
FXCollections.unmodifiableObservableList(internalSentences) FXCollections.unmodifiableObservableList(internalSentences)
val isSearching: ReadOnlyBooleanProperty = internalIsSearching val isSearching: ReadOnlyBooleanProperty = internalIsSearching
@ -68,7 +66,7 @@ class Model(
fun search(query: String, searchMode: SearchMode) { fun search(query: String, searchMode: SearchMode) {
coroutineScope.launch { coroutineScope.launch {
internalIsSearching.value = true internalIsSearching.value = true
internalSearchResults.setAll(dictionary.search(query, searchMode).map { it.toFx() }) internalSearchResults.setAll(dictionary.search(query, searchMode))
internalIsSearching.value = false internalIsSearching.value = false
} }
} }
@ -78,8 +76,7 @@ class Model(
internalIsFindingWordsBeginning.value = true internalIsFindingWordsBeginning.value = true
internalWordsBeginning.setAll( internalWordsBeginning.setAll(
dictionary dictionary
.findWordsBeginningWith(internalSelectedEntry.value.toDomain()) .findWordsBeginningWith(internalSelectedEntry.value)
.map { it.toFx() }
) )
internalIsFindingWordsBeginning.value = false internalIsFindingWordsBeginning.value = false
internalFinishedFindingWordsBeginning.value = true internalFinishedFindingWordsBeginning.value = true
@ -91,8 +88,7 @@ class Model(
internalIsFindingWordsContaining.value = true internalIsFindingWordsContaining.value = true
internalWordsContaining.setAll( internalWordsContaining.setAll(
dictionary dictionary
.findWordsContaining(internalSelectedEntry.value.toDomain()) .findWordsContaining(internalSelectedEntry.value)
.map { it.toFx() }
) )
internalIsFindingWordsContaining.value = false internalIsFindingWordsContaining.value = false
internalFinishedFindingWordsContaining.value = true internalFinishedFindingWordsContaining.value = true
@ -104,8 +100,7 @@ class Model(
internalIsFindingCharacters.value = true internalIsFindingCharacters.value = true
internalCharacters.setAll( internalCharacters.setAll(
dictionary dictionary
.findCharactersOf(internalSelectedEntry.value.toDomain()) .findCharactersOf(internalSelectedEntry.value)
.map { it.toFx() }
) )
internalIsFindingCharacters.value = false internalIsFindingCharacters.value = false
internalFinishedFindingCharacters.value = true internalFinishedFindingCharacters.value = true
@ -117,15 +112,14 @@ class Model(
internalIsFindingSentences.value = true internalIsFindingSentences.value = true
internalSentences.setAll( internalSentences.setAll(
dictionary dictionary
.findExampleSentencesFor(internalSelectedEntry.value.toDomain()) .findExampleSentencesFor(internalSelectedEntry.value)
.map { it.toFx() }
) )
internalIsFindingSentences.value = false internalIsFindingSentences.value = false
internalFinishedFindingSentences.value = true internalFinishedFindingSentences.value = true
} }
} }
fun selectEntry(entry: DictionaryEntryFx) { fun selectEntry(entry: DictionaryEntry) {
internalWordsBeginning.setAll(emptyList()) internalWordsBeginning.setAll(emptyList())
internalWordsContaining.setAll(emptyList()) internalWordsContaining.setAll(emptyList())
internalCharacters.setAll(emptyList()) internalCharacters.setAll(emptyList())
@ -140,10 +134,10 @@ class Model(
} }
fun copyHeadwordOfSelectedEntry() { fun copyHeadwordOfSelectedEntry() {
ClipboardHelper.copyString(internalSelectedEntry.value.traditionalProperty.value) ClipboardHelper.copyString(internalSelectedEntry.value.traditional)
} }
fun copyPronunciationOfSelectedEntry() { fun copyPronunciationOfSelectedEntry() {
ClipboardHelper.copyString(internalSelectedEntry.value.pinyinWithToneMarksProperty.value) ClipboardHelper.copyString(internalSelectedEntry.value.pinyinWithToneMarks)
} }
} }

3
src/main/kotlin/com/marvinelsen/willow/domain/Dictionary.kt
View File

@ -1,5 +1,8 @@
package com.marvinelsen.willow.domain package com.marvinelsen.willow.domain
import com.marvinelsen.willow.domain.entities.DictionaryEntry
import com.marvinelsen.willow.domain.entities.Sentence
interface Dictionary { interface Dictionary {
suspend fun search(query: String, searchMode: SearchMode): List<DictionaryEntry> suspend fun search(query: String, searchMode: SearchMode): List<DictionaryEntry>

2
src/main/kotlin/com/marvinelsen/willow/domain/SqliteDictionary.kt
View File

@ -8,6 +8,8 @@ import com.github.houbb.segment.support.segment.impl.Segments
import com.github.houbb.segment.support.segment.mode.impl.SegmentModes import com.github.houbb.segment.support.segment.mode.impl.SegmentModes
import com.github.houbb.segment.support.segment.result.impl.SegmentResultHandlers import com.github.houbb.segment.support.segment.result.impl.SegmentResultHandlers
import com.github.houbb.segment.support.tagging.pos.tag.impl.SegmentPosTaggings import com.github.houbb.segment.support.tagging.pos.tag.impl.SegmentPosTaggings
import com.marvinelsen.willow.domain.entities.DictionaryEntry
import com.marvinelsen.willow.domain.entities.Sentence
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import kotlinx.serialization.json.Json import kotlinx.serialization.json.Json

5
src/main/kotlin/com/marvinelsen/willow/domain/DictionaryEntry.kt → src/main/kotlin/com/marvinelsen/willow/domain/entities/DictionaryEntry.kt
View File

@ -1,4 +1,7 @@
package com.marvinelsen.willow.domain package com.marvinelsen.willow.domain.entities
import com.marvinelsen.willow.domain.entities.definitions.CrossStraitsDefinition
import com.marvinelsen.willow.domain.entities.definitions.MoedictDefinition
data class DictionaryEntry( data class DictionaryEntry(
val traditional: String, val traditional: String,

2
src/main/kotlin/com/marvinelsen/willow/domain/Sentence.kt → src/main/kotlin/com/marvinelsen/willow/domain/entities/Sentence.kt
View File

@ -1,4 +1,4 @@
package com.marvinelsen.willow.domain package com.marvinelsen.willow.domain.entities
data class Sentence( data class Sentence(
val traditional: String, val traditional: String,

2
src/main/kotlin/com/marvinelsen/willow/domain/CrossStraitsDefinition.kt → src/main/kotlin/com/marvinelsen/willow/domain/entities/definitions/CrossStraitsDefinition.kt
View File

@ -1,4 +1,4 @@
package com.marvinelsen.willow.domain package com.marvinelsen.willow.domain.entities.definitions
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable

2
src/main/kotlin/com/marvinelsen/willow/domain/MoedictDefinition.kt → src/main/kotlin/com/marvinelsen/willow/domain/entities/definitions/MoedictDefinition.kt
View File

@ -1,4 +1,4 @@
package com.marvinelsen.willow.domain package com.marvinelsen.willow.domain.entities.definitions
import kotlinx.serialization.SerialName import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable

42
src/main/kotlin/com/marvinelsen/willow/ui/DictionaryEntryFx.kt
View File

@ -1,42 +0,0 @@
package com.marvinelsen.willow.ui
import com.marvinelsen.willow.domain.CrossStraitsDefinition
import com.marvinelsen.willow.domain.DictionaryEntry
import com.marvinelsen.willow.domain.MoedictDefinition
import javafx.beans.property.SimpleStringProperty
import javafx.beans.property.StringProperty
import javafx.collections.FXCollections
import javafx.collections.ObservableList
data class DictionaryEntryFx(
val traditionalProperty: StringProperty,
val simplifiedProperty: StringProperty,
val pinyinWithToneMarksProperty: StringProperty,
val pinyinWithToneNumbersProperty: StringProperty,
val zhuyinProperty: StringProperty,
val cedictDefinitions: ObservableList<List<String>>,
val crossStraitsDefinitions: ObservableList<CrossStraitsDefinition>,
val moedictDefinitions: ObservableList<MoedictDefinition>,
)
fun DictionaryEntry.toFx() = DictionaryEntryFx(
traditionalProperty = SimpleStringProperty(this.traditional),
simplifiedProperty = SimpleStringProperty(this.simplified),
pinyinWithToneMarksProperty = SimpleStringProperty(this.pinyinWithToneMarks),
pinyinWithToneNumbersProperty = SimpleStringProperty(this.pinyinWithToneNumbers),
zhuyinProperty = SimpleStringProperty(this.zhuyin),
cedictDefinitions = FXCollections.observableList(this.cedictDefinitions),
crossStraitsDefinitions = FXCollections.observableList(this.crossStraitsDefinitions),
moedictDefinitions = FXCollections.observableList(this.moedictDefinitions),
)
fun DictionaryEntryFx.toDomain() = DictionaryEntry(
traditional = this.traditionalProperty.value,
simplified = this.simplifiedProperty.value,
pinyinWithToneMarks = this.pinyinWithToneMarksProperty.value,
pinyinWithToneNumbers = this.pinyinWithToneNumbersProperty.value,
zhuyin = this.zhuyinProperty.value,
cedictDefinitions = this.cedictDefinitions.toList(),
crossStraitsDefinitions = this.crossStraitsDefinitions.toList(),
moedictDefinitions = this.moedictDefinitions.toList(),
)

20
src/main/kotlin/com/marvinelsen/willow/ui/SentenceFx.kt
View File

@ -1,20 +0,0 @@
package com.marvinelsen.willow.ui
import com.marvinelsen.willow.domain.Sentence
import javafx.beans.property.SimpleStringProperty
import javafx.beans.property.StringProperty
data class SentenceFx(
val traditionalProperty: StringProperty,
val simplifiedProperty: StringProperty,
)
fun Sentence.toFx() = SentenceFx(
traditionalProperty = SimpleStringProperty(this.traditional),
simplifiedProperty = SimpleStringProperty(this.simplified),
)
fun SentenceFx.toDomain() = Sentence(
traditional = this.traditionalProperty.value,
simplified = this.simplifiedProperty.value,
)

20
src/main/kotlin/com/marvinelsen/willow/ui/cells/DictionaryEntryCellFactory.kt
View File

@ -3,7 +3,7 @@ package com.marvinelsen.willow.ui.cells
import com.marvinelsen.willow.config.Config import com.marvinelsen.willow.config.Config
import com.marvinelsen.willow.config.Pronunciation import com.marvinelsen.willow.config.Pronunciation
import com.marvinelsen.willow.config.Script import com.marvinelsen.willow.config.Script
import com.marvinelsen.willow.ui.DictionaryEntryFx import com.marvinelsen.willow.domain.entities.DictionaryEntry
import com.marvinelsen.willow.ui.util.createContextMenuForEntry import com.marvinelsen.willow.ui.util.createContextMenuForEntry
import javafx.application.HostServices import javafx.application.HostServices
import javafx.beans.binding.Bindings import javafx.beans.binding.Bindings
@ -20,9 +20,9 @@ class DictionaryEntryCellFactory(
private val resources: ResourceBundle, private val resources: ResourceBundle,
private val config: Config, private val config: Config,
private val hostServices: HostServices, private val hostServices: HostServices,
) : Callback<ListView<DictionaryEntryFx?>, ListCell<DictionaryEntryFx?>> { ) : Callback<ListView<DictionaryEntry?>, ListCell<DictionaryEntry?>> {
override fun call(listView: ListView<DictionaryEntryFx?>): ListCell<DictionaryEntryFx?> { override fun call(listView: ListView<DictionaryEntry?>): ListCell<DictionaryEntry?> {
val entryCell = EntryCell(resources, config, hostServices) val entryCell = EntryCell(resources, config, hostServices)
entryCell.prefWidthProperty().bind(listView.widthProperty().subtract(CELL_PADDING)) entryCell.prefWidthProperty().bind(listView.widthProperty().subtract(CELL_PADDING))
return entryCell return entryCell
@ -37,7 +37,7 @@ private class EntryCell(
private val resources: ResourceBundle, private val resources: ResourceBundle,
private val config: Config, private val config: Config,
private val hostServices: HostServices, private val hostServices: HostServices,
) : ListCell<DictionaryEntryFx?>() { ) : ListCell<DictionaryEntry?>() {
private val labelHeadword by lazy { private val labelHeadword by lazy {
Label().apply { Label().apply {
@ -99,7 +99,7 @@ private class EntryCell(
text = null text = null
} }
override fun updateItem(entry: DictionaryEntryFx?, empty: Boolean) { override fun updateItem(entry: DictionaryEntry?, empty: Boolean) {
super.updateItem(entry, empty) super.updateItem(entry, empty)
if (empty || entry == null) { if (empty || entry == null) {
graphic = null graphic = null
@ -109,8 +109,8 @@ private class EntryCell(
Bindings.createStringBinding( Bindings.createStringBinding(
{ {
when (config.script.value!!) { when (config.script.value!!) {
Script.SIMPLIFIED -> entry.simplifiedProperty.value Script.SIMPLIFIED -> entry.simplified
Script.TRADITIONAL -> entry.traditionalProperty.value Script.TRADITIONAL -> entry.traditional
} }
}, },
config.script config.script
@ -120,9 +120,9 @@ private class EntryCell(
Bindings.createStringBinding( Bindings.createStringBinding(
{ {
when (config.searchResults.pronunciation.value!!) { when (config.searchResults.pronunciation.value!!) {
Pronunciation.PINYIN_WITH_TONE_MARKS -> entry.pinyinWithToneMarksProperty.value Pronunciation.PINYIN_WITH_TONE_MARKS -> entry.pinyinWithToneMarks
Pronunciation.PINYIN_WITH_TONE_NUMBERS -> entry.pinyinWithToneNumbersProperty.value Pronunciation.PINYIN_WITH_TONE_NUMBERS -> entry.pinyinWithToneNumbers
Pronunciation.ZHUYIN -> entry.zhuyinProperty.value Pronunciation.ZHUYIN -> entry.zhuyin
} }
}, },
config.searchResults.pronunciation config.searchResults.pronunciation

14
src/main/kotlin/com/marvinelsen/willow/ui/cells/SentenceCellFactory.kt
View File

@ -2,7 +2,7 @@ package com.marvinelsen.willow.ui.cells
import com.marvinelsen.willow.config.Config import com.marvinelsen.willow.config.Config
import com.marvinelsen.willow.config.Script import com.marvinelsen.willow.config.Script
import com.marvinelsen.willow.ui.SentenceFx import com.marvinelsen.willow.domain.entities.Sentence
import com.marvinelsen.willow.ui.util.createContextMenuForSentence import com.marvinelsen.willow.ui.util.createContextMenuForSentence
import javafx.application.HostServices import javafx.application.HostServices
import javafx.beans.binding.Bindings import javafx.beans.binding.Bindings
@ -17,9 +17,9 @@ class SentenceCellFactory(
private val resources: ResourceBundle, private val resources: ResourceBundle,
private val config: Config, private val config: Config,
private val hostServices: HostServices, private val hostServices: HostServices,
) : Callback<ListView<SentenceFx?>, ListCell<SentenceFx?>> { ) : Callback<ListView<Sentence?>, ListCell<Sentence?>> {
override fun call(listView: ListView<SentenceFx?>): ListCell<SentenceFx?> { override fun call(listView: ListView<Sentence?>): ListCell<Sentence?> {
val sentenceCell = SentenceCell(resources, config, hostServices) val sentenceCell = SentenceCell(resources, config, hostServices)
sentenceCell.prefWidthProperty().bind(listView.widthProperty().subtract(CELL_PADDING)) sentenceCell.prefWidthProperty().bind(listView.widthProperty().subtract(CELL_PADDING))
return sentenceCell return sentenceCell
@ -34,7 +34,7 @@ private class SentenceCell(
private val resources: ResourceBundle, private val resources: ResourceBundle,
private val config: Config, private val config: Config,
private val hostServices: HostServices, private val hostServices: HostServices,
) : ListCell<SentenceFx?>() { ) : ListCell<Sentence?>() {
private val labelSentence by lazy { private val labelSentence by lazy {
Label().apply { Label().apply {
@ -51,7 +51,7 @@ private class SentenceCell(
text = null text = null
} }
override fun updateItem(sentence: SentenceFx?, empty: Boolean) { override fun updateItem(sentence: Sentence?, empty: Boolean) {
super.updateItem(sentence, empty) super.updateItem(sentence, empty)
if (empty || sentence == null) { if (empty || sentence == null) {
graphic = null graphic = null
@ -61,8 +61,8 @@ private class SentenceCell(
Bindings.createStringBinding( Bindings.createStringBinding(
{ {
when (config.script.value!!) { when (config.script.value!!) {
Script.SIMPLIFIED -> sentence.simplifiedProperty.value Script.SIMPLIFIED -> sentence.simplified
Script.TRADITIONAL -> sentence.traditionalProperty.value Script.TRADITIONAL -> sentence.traditional
} }
}, },
config.script config.script

43
src/main/kotlin/com/marvinelsen/willow/ui/controllers/DetailsController.kt
View File

@ -4,8 +4,8 @@ import com.marvinelsen.willow.Model
import com.marvinelsen.willow.config.Config import com.marvinelsen.willow.config.Config
import com.marvinelsen.willow.config.Pronunciation import com.marvinelsen.willow.config.Pronunciation
import com.marvinelsen.willow.config.Script import com.marvinelsen.willow.config.Script
import com.marvinelsen.willow.ui.DictionaryEntryFx import com.marvinelsen.willow.domain.entities.DictionaryEntry
import com.marvinelsen.willow.ui.SentenceFx import com.marvinelsen.willow.domain.entities.Sentence
import com.marvinelsen.willow.ui.cells.DictionaryEntryCellFactory import com.marvinelsen.willow.ui.cells.DictionaryEntryCellFactory
import com.marvinelsen.willow.ui.cells.SentenceCellFactory import com.marvinelsen.willow.ui.cells.SentenceCellFactory
import com.marvinelsen.willow.ui.util.createContextMenuForEntry import com.marvinelsen.willow.ui.util.createContextMenuForEntry
@ -60,13 +60,13 @@ class DetailsController(
private lateinit var webViewDefinition: WebView private lateinit var webViewDefinition: WebView
@FXML @FXML
private lateinit var listViewWordsContaining: ListView<DictionaryEntryFx> private lateinit var listViewWordsContaining: ListView<DictionaryEntry>
@FXML @FXML
private lateinit var listViewWordsBeginning: ListView<DictionaryEntryFx> private lateinit var listViewWordsBeginning: ListView<DictionaryEntry>
@FXML @FXML
private lateinit var listViewCharacters: ListView<DictionaryEntryFx> private lateinit var listViewCharacters: ListView<DictionaryEntry>
@FXML @FXML
private lateinit var progressIndicatorCharacters: ProgressIndicator private lateinit var progressIndicatorCharacters: ProgressIndicator
@ -87,7 +87,7 @@ class DetailsController(
private lateinit var labelNoWordsBeginningFound: Label private lateinit var labelNoWordsBeginningFound: Label
@FXML @FXML
private lateinit var listViewSentences: ListView<SentenceFx> private lateinit var listViewSentences: ListView<Sentence>
@FXML @FXML
private lateinit var progressIndicatorSentences: ProgressIndicator private lateinit var progressIndicatorSentences: ProgressIndicator
@ -114,8 +114,8 @@ class DetailsController(
{ {
val selectedEntry = model.selectedEntry.value val selectedEntry = model.selectedEntry.value
when (config.script.value!!) { when (config.script.value!!) {
Script.SIMPLIFIED -> selectedEntry?.simplifiedProperty?.value Script.SIMPLIFIED -> selectedEntry?.simplified
Script.TRADITIONAL -> selectedEntry?.traditionalProperty?.value Script.TRADITIONAL -> selectedEntry?.traditional
} }
}, },
config.script, config.script,
@ -139,20 +139,9 @@ class DetailsController(
{ {
val selectedEntry = model.selectedEntry.value val selectedEntry = model.selectedEntry.value
when (config.details.pronunciation.value!!) { when (config.details.pronunciation.value!!) {
Pronunciation.PINYIN_WITH_TONE_MARKS -> Pronunciation.PINYIN_WITH_TONE_MARKS -> selectedEntry?.pinyinWithToneMarks
selectedEntry Pronunciation.PINYIN_WITH_TONE_NUMBERS -> selectedEntry?.pinyinWithToneNumbers
?.pinyinWithToneMarksProperty Pronunciation.ZHUYIN -> selectedEntry?.zhuyin
?.value
Pronunciation.PINYIN_WITH_TONE_NUMBERS ->
selectedEntry
?.pinyinWithToneNumbersProperty
?.value
Pronunciation.ZHUYIN ->
selectedEntry
?.zhuyinProperty
?.value
} }
}, },
config.details.pronunciation, config.details.pronunciation,
@ -189,7 +178,7 @@ class DetailsController(
tabCharacters.disableProperty().bind( tabCharacters.disableProperty().bind(
Bindings.createBooleanBinding( Bindings.createBooleanBinding(
{ {
(model.selectedEntry.value?.traditionalProperty?.value?.length ?: 0) < 2 (model.selectedEntry.value?.traditional?.length ?: 0) < 2
}, },
model.selectedEntry model.selectedEntry
) )
@ -299,7 +288,7 @@ class DetailsController(
} }
} }
private fun createDefinitionHtml(entry: DictionaryEntryFx) = createHTML().html { private fun createDefinitionHtml(entry: DictionaryEntry) = createHTML().html {
body { body {
if (entry.cedictDefinitions.isNotEmpty()) { if (entry.cedictDefinitions.isNotEmpty()) {
div(classes = "cedict-definition") { div(classes = "cedict-definition") {
@ -331,7 +320,7 @@ class DetailsController(
} }
} }
private fun DIV.cedictDefinition(entry: DictionaryEntryFx) = ol { private fun DIV.cedictDefinition(entry: DictionaryEntry) = ol {
for (definition in entry.cedictDefinitions) { for (definition in entry.cedictDefinitions) {
li { li {
+definition.joinToString(separator = "; ") +definition.joinToString(separator = "; ")
@ -339,7 +328,7 @@ private fun DIV.cedictDefinition(entry: DictionaryEntryFx) = ol {
} }
} }
private fun DIV.crossStraitsDefinition(entry: DictionaryEntryFx) = ol { private fun DIV.crossStraitsDefinition(entry: DictionaryEntry) = ol {
entry.crossStraitsDefinitions.forEach { definition -> entry.crossStraitsDefinitions.forEach { definition ->
li { li {
span(classes = "definition") { span(classes = "definition") {
@ -358,7 +347,7 @@ private fun DIV.crossStraitsDefinition(entry: DictionaryEntryFx) = ol {
} }
} }
private fun DIV.moeDefinition(entry: DictionaryEntryFx) = private fun DIV.moeDefinition(entry: DictionaryEntry) =
entry.moedictDefinitions.groupBy { it.type ?: "" }.entries.forEach { (type, definitions) -> entry.moedictDefinitions.groupBy { it.type ?: "" }.entries.forEach { (type, definitions) ->
if (type != "") { if (type != "") {
span(classes = "type") { span(classes = "type") {

6
src/main/kotlin/com/marvinelsen/willow/ui/controllers/SearchResultsController.kt
View File

@ -2,7 +2,7 @@ package com.marvinelsen.willow.ui.controllers
import com.marvinelsen.willow.Model import com.marvinelsen.willow.Model
import com.marvinelsen.willow.config.Config import com.marvinelsen.willow.config.Config
import com.marvinelsen.willow.ui.DictionaryEntryFx import com.marvinelsen.willow.domain.entities.DictionaryEntry
import com.marvinelsen.willow.ui.cells.DictionaryEntryCellFactory import com.marvinelsen.willow.ui.cells.DictionaryEntryCellFactory
import javafx.application.HostServices import javafx.application.HostServices
import javafx.beans.binding.Bindings import javafx.beans.binding.Bindings
@ -29,7 +29,7 @@ class SearchResultsController(
private lateinit var labelNoEntriesFound: Label private lateinit var labelNoEntriesFound: Label
@FXML @FXML
private lateinit var listViewSearchResults: ListView<DictionaryEntryFx> private lateinit var listViewSearchResults: ListView<DictionaryEntry>
@FXML @FXML
@Suppress("UnusedPrivateMember") @Suppress("UnusedPrivateMember")
@ -45,7 +45,7 @@ class SearchResultsController(
.visibleProperty() .visibleProperty()
.bind(Bindings.and(Bindings.isEmpty(model.searchResults), Bindings.not(model.isSearching))) .bind(Bindings.and(Bindings.isEmpty(model.searchResults), Bindings.not(model.isSearching)))
listViewSearchResults.selectionModel.selectedItemProperty().addListener { _, _, newValue: DictionaryEntryFx? -> listViewSearchResults.selectionModel.selectedItemProperty().addListener { _, _, newValue: DictionaryEntry? ->
if (newValue == null) { if (newValue == null) {
return@addListener return@addListener
} }

18
src/main/kotlin/com/marvinelsen/willow/ui/util/ContextMenuUtils.kt
View File

@ -1,7 +1,7 @@
package com.marvinelsen.willow.ui.util package com.marvinelsen.willow.ui.util
import com.marvinelsen.willow.ui.DictionaryEntryFx import com.marvinelsen.willow.domain.entities.DictionaryEntry
import com.marvinelsen.willow.ui.SentenceFx import com.marvinelsen.willow.domain.entities.Sentence
import javafx.application.HostServices import javafx.application.HostServices
import javafx.event.EventHandler import javafx.event.EventHandler
import javafx.scene.control.ContextMenu import javafx.scene.control.ContextMenu
@ -11,24 +11,24 @@ import java.nio.charset.StandardCharsets
import java.util.ResourceBundle import java.util.ResourceBundle
fun createContextMenuForEntry( fun createContextMenuForEntry(
entry: DictionaryEntryFx, entry: DictionaryEntry,
resourceBundle: ResourceBundle, resourceBundle: ResourceBundle,
hostServices: HostServices, hostServices: HostServices,
) = ContextMenu().apply { ) = ContextMenu().apply {
val menuItemCopyHeadword = val menuItemCopyHeadword =
MenuItem(resourceBundle.getString("menubar.edit.copy.headword")).apply { MenuItem(resourceBundle.getString("menubar.edit.copy.headword")).apply {
onAction = EventHandler { ClipboardHelper.copyString(entry.traditionalProperty.value) } onAction = EventHandler { ClipboardHelper.copyString(entry.traditional) }
} }
val menuItemCopyPronunciation = val menuItemCopyPronunciation =
MenuItem(resourceBundle.getString("menubar.edit.copy.pronunciation")).apply { MenuItem(resourceBundle.getString("menubar.edit.copy.pronunciation")).apply {
onAction = EventHandler { ClipboardHelper.copyString(entry.pinyinWithToneMarksProperty.value) } onAction = EventHandler { ClipboardHelper.copyString(entry.pinyinWithToneMarks) }
} }
val menuItemSearchOnWeb = val menuItemSearchOnWeb =
MenuItem(resourceBundle.getString("menubar.edit.search-web")).apply { MenuItem(resourceBundle.getString("menubar.edit.search-web")).apply {
onAction = EventHandler { onAction = EventHandler {
val query = URLEncoder.encode(entry.traditionalProperty.value, StandardCharsets.UTF_8) val query = URLEncoder.encode(entry.traditional, StandardCharsets.UTF_8)
hostServices.showDocument("https://duckduckgo.com/?q=$query") hostServices.showDocument("https://duckduckgo.com/?q=$query")
} }
} }
@ -37,19 +37,19 @@ fun createContextMenuForEntry(
} }
fun createContextMenuForSentence( fun createContextMenuForSentence(
sentence: SentenceFx, sentence: Sentence,
resourceBundle: ResourceBundle, resourceBundle: ResourceBundle,
hostServices: HostServices, hostServices: HostServices,
) = ContextMenu().apply { ) = ContextMenu().apply {
val menuItemCopySentence = val menuItemCopySentence =
MenuItem(resourceBundle.getString("menubar.edit.copy.sentence")).apply { MenuItem(resourceBundle.getString("menubar.edit.copy.sentence")).apply {
onAction = EventHandler { ClipboardHelper.copyString(sentence.traditionalProperty.value) } onAction = EventHandler { ClipboardHelper.copyString(sentence.traditional) }
} }
val menuItemSearchOnWeb = val menuItemSearchOnWeb =
MenuItem(resourceBundle.getString("menubar.edit.search-web")).apply { MenuItem(resourceBundle.getString("menubar.edit.search-web")).apply {
onAction = EventHandler { onAction = EventHandler {
val query = URLEncoder.encode(sentence.traditionalProperty.value, StandardCharsets.UTF_8) val query = URLEncoder.encode(sentence.traditional, StandardCharsets.UTF_8)
hostServices.showDocument("https://duckduckgo.com/?q=$query") hostServices.showDocument("https://duckduckgo.com/?q=$query")
} }
} }