build.gradle.kts

@@ -28,8 +28,6 @@ dependencies {
     implementation(libs.kotlinx.serialization.json)
     implementation(libs.kotlinx.html.jvm)
 
-    implementation(libs.segment)
-
     testImplementation(libs.kotest.core)
     testImplementation(libs.kotest.assertions)
 }

gradle/libs.versions.toml

@@ -14,8 +14,6 @@ sqlite-jdbc = "3.46.0.1"
 kotlinx-serialization-json = "1.7.1"
 kotlinx-html-jvm = "0.11.0"
 
-segment = "0.3.1"
-
 [libraries]
 chinese-transliteration = { module = "com.marvinelsen:chinese-transliteration", version.ref = "chinese-transliteration" }
 cedict-parser = { module = "com.marvinelsen:cedict-parser", version.ref = "cedict-parser" }
@@ -30,8 +28,6 @@ sqlite-jdbc = { module = "org.xerial:sqlite-jdbc", version.ref = "sqlite-jdbc" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization-json" }
 kotlinx-html-jvm = { module = "org.jetbrains.kotlinx:kotlinx-html-jvm", version.ref = "kotlinx-html-jvm" }
 
-segment = { module = "com.github.houbb:segment", version.ref = "segment" }
-
 # Detekt
 # See: https://detekt.dev
 detekt-formatting = { module = "io.gitlab.arturbosch.detekt:detekt-formatting", version.ref = "detekt" }

src/main/kotlin/com/marvinelsen/willow/Config.kt

@@ -0,0 +1,32 @@
+package com.marvinelsen.willow
+
+import javafx.beans.property.IntegerProperty
+import javafx.beans.property.SimpleIntegerProperty
+import java.util.prefs.Preferences
+
+class Config {
+    companion object {
+        private const val DETAIL_HEADWORD_FONT_SIZE_KEY = "detailHeadwordFontSize"
+
+        private const val DEFAULT_DETAIL_HEADWORD_FONT_SIZE = 16
+    }
+
+    private val preferences = Preferences.userNodeForPackage(this::class.java)
+
+    val detailHeadwordFontSize: IntegerProperty = SimpleIntegerProperty(DEFAULT_DETAIL_HEADWORD_FONT_SIZE)
+
+    fun save() {
+        preferences.putInt(DETAIL_HEADWORD_FONT_SIZE_KEY, detailHeadwordFontSize.value)
+    }
+
+    fun load() {
+        detailHeadwordFontSize.value = preferences.getInt(
+            DETAIL_HEADWORD_FONT_SIZE_KEY,
+            DEFAULT_DETAIL_HEADWORD_FONT_SIZE
+        )
+    }
+
+    fun reset() {
+        detailHeadwordFontSize.value = DEFAULT_DETAIL_HEADWORD_FONT_SIZE
+    }
+}

src/main/kotlin/com/marvinelsen/willow/WillowApplication.kt

@@ -1,12 +1,11 @@
 package com.marvinelsen.willow
 
-import com.marvinelsen.willow.config.Config
 import com.marvinelsen.willow.domain.SqliteDictionary
 import com.marvinelsen.willow.ui.controllers.DetailsController
+import com.marvinelsen.willow.ui.controllers.ListController
 import com.marvinelsen.willow.ui.controllers.MainController
 import com.marvinelsen.willow.ui.controllers.MenuController
 import com.marvinelsen.willow.ui.controllers.SearchController
-import com.marvinelsen.willow.ui.controllers.SearchResultsController
 import com.marvinelsen.willow.ui.util.FindWordsService
 import com.marvinelsen.willow.ui.util.SearchService
 import javafx.application.Application
@@ -17,6 +16,7 @@ import javafx.scene.text.Font
 import javafx.stage.Stage
 import javafx.util.Callback
 import java.sql.DriverManager
+import java.util.Locale
 import java.util.ResourceBundle
 
 class WillowApplication : Application() {
@@ -48,14 +48,14 @@ class WillowApplication : Application() {
         config.load()
 
         val fxmlLoader = FXMLLoader()
-        fxmlLoader.resources = ResourceBundle.getBundle("i18n/willow", config.locale.value)
+        fxmlLoader.resources = ResourceBundle.getBundle("i18n/willow", Locale.getDefault())
         fxmlLoader.controllerFactory = Callback { type ->
             when (type) {
                 MainController::class.java -> MainController(model)
                 MenuController::class.java -> MenuController(model, config)
                 DetailsController::class.java -> DetailsController(model, config)
                 SearchController::class.java -> SearchController(model)
-                SearchResultsController::class.java -> SearchResultsController(model, config)
+                ListController::class.java -> ListController(model)
                 else -> error("Trying to instantiate unknown controller type $type")
             }
         }

src/main/kotlin/com/marvinelsen/willow/config/Config.kt

@@ -1,146 +0,0 @@
-package com.marvinelsen.willow.config
-
-import javafx.beans.property.BooleanProperty
-import javafx.beans.property.IntegerProperty
-import javafx.beans.property.ObjectProperty
-import javafx.beans.property.SimpleBooleanProperty
-import javafx.beans.property.SimpleIntegerProperty
-import javafx.beans.property.SimpleObjectProperty
-import java.util.Locale
-import java.util.prefs.Preferences
-
-class Config {
-    companion object {
-        private const val LOCALE_KEY = "locale"
-        private const val THEME_KEY = "theme"
-        private const val SCRIPT_KEY = "script"
-        private const val DETAIL_HEADWORD_FONT_SIZE_KEY = "detailHeadwordFontSize"
-        private const val DETAIL_PRONUNCIATION_FONT_SIZE_KEY = "detailPronunciationFontSize"
-
-        private const val DEFAULT_DETAIL_HEADWORD_FONT_SIZE = 40
-        private const val DEFAULT_DETAIL_PRONUNCIATION_FONT_SIZE = 16
-        private val DEFAULT_THEME = Theme.SYSTEM
-        private val DEFAULT_SCRIPT = Script.SIMPLIFIED
-        private val DEFAULT_LOCALE = Locale.ENGLISH
-    }
-
-    private val preferences = Preferences.userNodeForPackage(this::class.java)
-    val searchResults = SearchResultsConfig(preferences)
-
-    val locale: ObjectProperty<Locale> = SimpleObjectProperty(DEFAULT_LOCALE)
-    val theme: ObjectProperty<Theme> = SimpleObjectProperty(DEFAULT_THEME)
-    val script: ObjectProperty<Script> = SimpleObjectProperty(DEFAULT_SCRIPT)
-    val detailHeadwordFontSize: IntegerProperty = SimpleIntegerProperty(DEFAULT_DETAIL_HEADWORD_FONT_SIZE)
-    val detailPronunciationFontSize: IntegerProperty = SimpleIntegerProperty(DEFAULT_DETAIL_PRONUNCIATION_FONT_SIZE)
-
-    fun save() {
-        preferences.put(LOCALE_KEY, locale.value.toLanguageTag())
-        preferences.put(THEME_KEY, theme.value.name)
-        preferences.put(SCRIPT_KEY, script.value.name)
-        preferences.putInt(DETAIL_HEADWORD_FONT_SIZE_KEY, detailHeadwordFontSize.value)
-        preferences.putInt(DETAIL_PRONUNCIATION_FONT_SIZE_KEY, detailPronunciationFontSize.value)
-
-        searchResults.save()
-
-        preferences.flush()
-    }
-
-    fun load() {
-        preferences.sync()
-
-        detailHeadwordFontSize.value = preferences.getInt(
-            DETAIL_HEADWORD_FONT_SIZE_KEY,
-            DEFAULT_DETAIL_HEADWORD_FONT_SIZE
-        )
-
-        detailPronunciationFontSize.value = preferences.getInt(
-            DETAIL_PRONUNCIATION_FONT_SIZE_KEY,
-            DEFAULT_DETAIL_PRONUNCIATION_FONT_SIZE
-        )
-
-        theme.value = Theme.valueOf(
-            preferences.get(
-                THEME_KEY,
-                DEFAULT_THEME.name
-            )
-        )
-
-        script.value = Script.valueOf(
-            preferences.get(
-                SCRIPT_KEY,
-                DEFAULT_SCRIPT.name
-            )
-        )
-
-        locale.value = Locale.forLanguageTag(preferences.get(LOCALE_KEY, DEFAULT_LOCALE.toLanguageTag()))
-
-        searchResults.load()
-    }
-
-    fun reset() {
-        detailHeadwordFontSize.value = DEFAULT_DETAIL_HEADWORD_FONT_SIZE
-    }
-}
-
-class SearchResultsConfig(private val preferences: Preferences) {
-    companion object {
-        private const val PRONUNCIATION_KEY = "searchResultsPronunciation"
-        private const val HEADWORD_FONT_SIZE_KEY = "searchResultsHeadwordFontSize"
-        private const val PRONUNCIATION_FONT_SIZE_KEY = "searchResultsPronunciationFontSize"
-        private const val DEFINITION_FONT_SIZE_KEY = "searchResultsDefinitionFontSize"
-        private const val SHOULD_SHOW_PRONUNCIATION_KEY = "searchResultsShouldShowPronunciation"
-        private const val SHOULD_SHOW_DEFINITION_KEY = "searchResultsShouldShowDefinition"
-
-        private val DEFAULT_PRONUNCIATION = Pronunciation.PINYIN_WITH_TONE_MARKS
-        private const val DEFAULT_HEADWORD_FONT_SIZE = 20
-        private const val DEFAULT_PRONUNCIATION_FONT_SIZE = 14
-        private const val DEFAULT_DEFINITION_FONT_SIZE = 14
-        private const val DEFAULT_SHOULD_SHOW_PRONUNCIATION = true
-        private const val DEFAULT_SHOULD_SHOW_DEFINITION = true
-    }
-
-    val pronunciation: ObjectProperty<Pronunciation> = SimpleObjectProperty(DEFAULT_PRONUNCIATION)
-    val headwordFontSize: IntegerProperty = SimpleIntegerProperty(DEFAULT_HEADWORD_FONT_SIZE)
-    val pronunciationFontSize: IntegerProperty = SimpleIntegerProperty(DEFAULT_PRONUNCIATION_FONT_SIZE)
-    val definitionFontSize: IntegerProperty = SimpleIntegerProperty(DEFAULT_DEFINITION_FONT_SIZE)
-    val shouldShowPronunciation: BooleanProperty = SimpleBooleanProperty(DEFAULT_SHOULD_SHOW_PRONUNCIATION)
-    val shouldShowDefinition: BooleanProperty = SimpleBooleanProperty(DEFAULT_SHOULD_SHOW_DEFINITION)
-
-    fun save() {
-        preferences.put(PRONUNCIATION_KEY, pronunciation.value.name)
-        preferences.putInt(HEADWORD_FONT_SIZE_KEY, headwordFontSize.value)
-        preferences.putInt(PRONUNCIATION_FONT_SIZE_KEY, pronunciationFontSize.value)
-        preferences.putInt(DEFINITION_FONT_SIZE_KEY, definitionFontSize.value)
-        preferences.putBoolean(SHOULD_SHOW_PRONUNCIATION_KEY, shouldShowPronunciation.value)
-        preferences.putBoolean(SHOULD_SHOW_DEFINITION_KEY, shouldShowDefinition.value)
-    }
-
-    fun load() {
-        headwordFontSize.value = preferences.getInt(
-            HEADWORD_FONT_SIZE_KEY,
-            DEFAULT_HEADWORD_FONT_SIZE
-        )
-        pronunciationFontSize.value = preferences.getInt(
-            PRONUNCIATION_FONT_SIZE_KEY,
-            DEFAULT_PRONUNCIATION_FONT_SIZE
-        )
-        definitionFontSize.value = preferences.getInt(
-            DEFINITION_FONT_SIZE_KEY,
-            DEFAULT_DEFINITION_FONT_SIZE
-        )
-        shouldShowPronunciation.value = preferences.getBoolean(
-            SHOULD_SHOW_PRONUNCIATION_KEY,
-            DEFAULT_SHOULD_SHOW_PRONUNCIATION
-        )
-        shouldShowDefinition.value = preferences.getBoolean(
-            SHOULD_SHOW_DEFINITION_KEY,
-            DEFAULT_SHOULD_SHOW_DEFINITION
-        )
-        pronunciation.value = Pronunciation.valueOf(
-            preferences.get(
-                PRONUNCIATION_KEY,
-                DEFAULT_PRONUNCIATION.name
-            )
-        )
-    }
-}

src/main/kotlin/com/marvinelsen/willow/config/Pronunciation.kt

@@ -1,7 +0,0 @@
-package com.marvinelsen.willow.config
-
-enum class Pronunciation {
-    PINYIN_WITH_TONE_MARKS,
-    PINYIN_WITH_TONE_NUMBERS,
-    ZHUYIN
-}

src/main/kotlin/com/marvinelsen/willow/config/Script.kt

@@ -1,5 +0,0 @@
-package com.marvinelsen.willow.config
-
-enum class Script {
-    SIMPLIFIED, TRADITIONAL
-}

src/main/kotlin/com/marvinelsen/willow/config/Theme.kt

@@ -1,5 +0,0 @@
-package com.marvinelsen.willow.config
-
-enum class Theme {
-    SYSTEM, LIGHT, DARK
-}

src/main/kotlin/com/marvinelsen/willow/domain/Dictionary.kt

@@ -5,5 +5,4 @@ interface Dictionary {
     fun findWordsContaining(entry: DictionaryEntry): List<DictionaryEntry>
     fun findSentencesContaining(entry: DictionaryEntry): List<DictionaryEntry>
     fun findCharacters(entry: DictionaryEntry): List<DictionaryEntry>
-    fun searchSegments(phrase: String): List<DictionaryEntry>
 }

src/main/kotlin/com/marvinelsen/willow/domain/SearchMode.kt

@@ -1,5 +1,5 @@
 package com.marvinelsen.willow.domain
 
 enum class SearchMode {
-    PINYIN, SIMPLIFIED, TRADITIONAL, ENGLISH, SEGMENTS
+    PINYIN, SIMPLIFIED, TRADITIONAL, ENGLISH
 }

src/main/kotlin/com/marvinelsen/willow/domain/SqliteDictionary.kt

@@ -1,13 +1,5 @@
 package com.marvinelsen.willow.domain
 
-import com.github.houbb.segment.bs.SegmentBs
-import com.github.houbb.segment.data.phrase.core.data.SegmentPhraseDatas
-import com.github.houbb.segment.data.pos.core.data.SegmentPosDatas
-import com.github.houbb.segment.support.format.impl.SegmentFormats
-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.result.impl.SegmentResultHandlers
-import com.github.houbb.segment.support.tagging.pos.tag.impl.SegmentPosTaggings
 import kotlinx.serialization.json.Json
 import java.sql.Connection
 import java.sql.PreparedStatement
@@ -16,14 +8,6 @@ import java.sql.ResultSet
 class SqliteDictionary(private val connection: Connection) : Dictionary {
     private val whitespaceRegex = """\s+""".toRegex()
 
-    private val segmentBs = SegmentBs.newInstance()
-        .segment(Segments.defaults())
-        .segmentData(SegmentPhraseDatas.define())
-        .segmentMode(SegmentModes.dict())
-        .segmentFormat(SegmentFormats.chineseSimple())
-        .posTagging(SegmentPosTaggings.simple())
-        .posData(SegmentPosDatas.define())
-
     private val searchSimplifiedPreparedStatement: PreparedStatement by lazy {
         connection.prepareStatement(
             """
@@ -58,14 +42,6 @@ class SqliteDictionary(private val connection: Connection) : Dictionary {
         )
     }
 
-    private val searchSegments = """
-            WITH cte(id, segment) AS (VALUES ?)
-            SELECT cedict.traditional, simplified, pinyin_with_tone_marks, pinyin_with_tone_numbers, zhuyin, definitions  
-            FROM cedict INNER JOIN cte
-            ON cte.segment = cedict.traditional OR cte.segment = cedict.simplified
-            ORDER BY cte.id
-    """.trimIndent()
-
     private val findWordsContaining: PreparedStatement by lazy {
         connection.prepareStatement(
             """
@@ -87,7 +63,6 @@ class SqliteDictionary(private val connection: Connection) : Dictionary {
         SearchMode.PINYIN -> searchPinyin(query)
         SearchMode.SIMPLIFIED -> searchSimplified(query)
         SearchMode.TRADITIONAL -> searchTraditional(query)
-        SearchMode.SEGMENTS -> searchSegments(query)
         SearchMode.ENGLISH -> TODO()
     }
 
@@ -116,20 +91,6 @@ class SqliteDictionary(private val connection: Connection) : Dictionary {
         return resultSet.toListOfDictionaryEntries()
     }
 
-    override fun searchSegments(phrase: String): List<DictionaryEntry> {
-        val segments = segmentBs.segment(phrase, SegmentResultHandlers.word())
-
-        val segmentsListString = segments
-            .mapIndexed { index, s -> "($index, '$s')" }
-            .joinToString(",")
-
-        val query = searchSegments.replace("?", segmentsListString)
-
-        val resultSet: ResultSet = connection.createStatement().executeQuery(query)
-
-        return resultSet.toListOfDictionaryEntries()
-    }
-
     private fun searchSimplified(query: String): List<DictionaryEntry> {
         searchSimplifiedPreparedStatement.setString(1, "$query*")
 

src/main/kotlin/com/marvinelsen/willow/ui/Configuration.kt

@@ -0,0 +1,15 @@
+package com.marvinelsen.willow.ui
+
+data class Configuration(
+    val preferredScript: Script = Script.SIMPLIFIED,
+)
+
+enum class Script {
+    SIMPLIFIED, TRADITIONAL
+}
+
+enum class Pronunciation {
+    PINYIN_WITH_TONE_MARKS,
+    PINYIN_WITH_TONE_NUMBERS,
+    ZHUYIN
+}

src/main/kotlin/com/marvinelsen/willow/ui/cells/EntryCellFactory.kt

@@ -1,11 +1,7 @@
 package com.marvinelsen.willow.ui.cells
 
-import com.marvinelsen.willow.config.Config
-import com.marvinelsen.willow.config.Pronunciation
-import com.marvinelsen.willow.config.Script
 import com.marvinelsen.willow.ui.DictionaryEntryFx
 import com.marvinelsen.willow.ui.util.createContextMenuForEntry
-import javafx.beans.binding.Bindings
 import javafx.geometry.VPos
 import javafx.scene.control.Label
 import javafx.scene.control.ListCell
@@ -15,10 +11,10 @@ import javafx.scene.layout.VBox
 import javafx.util.Callback
 import java.util.ResourceBundle
 
-class DictionaryEntryCellFactory(private val resources: ResourceBundle, private val config: Config) :
+class DictionaryEntryCellFactory(private val resources: ResourceBundle) :
     Callback<ListView<DictionaryEntryFx?>, ListCell<DictionaryEntryFx?>> {
     override fun call(listView: ListView<DictionaryEntryFx?>): ListCell<DictionaryEntryFx?> {
-        val entryCell = EntryCell(resources, config)
+        val entryCell = EntryCell(resources)
         entryCell.prefWidthProperty().bind(listView.widthProperty().subtract(CELL_PADDING))
         return entryCell
     }
@@ -28,43 +24,17 @@ class DictionaryEntryCellFactory(private val resources: ResourceBundle, private
     }
 }
 
-internal class EntryCell(private val resources: ResourceBundle, private val config: Config) :
+internal class EntryCell(private val resources: ResourceBundle) : ListCell<DictionaryEntryFx?>() {
-    ListCell<DictionaryEntryFx?>() {
     private val labelHeadword = Label().apply {
-        styleClass.add("headword")
+        styleClass.add("list-view-entry")
-        styleProperty().bind(
-            Bindings.concat(
-                "-fx-font-size: ",
-                config.searchResults.headwordFontSize.asString(),
-                "px;"
-            )
-        )
     }
 
     private val labelDefinition = Label().apply {
-        styleClass.add("definition")
+        styleClass.add("list-view-definition")
-        styleProperty().bind(
-            Bindings.concat(
-                "-fx-font-size: ",
-                config.searchResults.definitionFontSize.asString(),
-                "px;"
-            )
-        )
-        visibleProperty().bind(config.searchResults.shouldShowDefinition)
-        managedProperty().bind(config.searchResults.shouldShowDefinition)
     }
 
     private val labelPronunciation = Label().apply {
-        styleClass.add("pronunciation")
+        styleClass.add("list-view-pronunciation")
-        styleProperty().bind(
-            Bindings.concat(
-                "-fx-font-size: ",
-                config.searchResults.pronunciationFontSize.asString(),
-                "px;"
-            )
-        )
-        visibleProperty().bind(config.searchResults.shouldShowPronunciation)
-        managedProperty().bind(config.searchResults.shouldShowPronunciation)
     }
 
     private val flowPane = FlowPane(labelHeadword, labelPronunciation).apply {
@@ -72,9 +42,7 @@ internal class EntryCell(private val resources: ResourceBundle, private val conf
         rowValignment = VPos.BASELINE
     }
 
-    private val root = VBox(flowPane, labelDefinition).apply {
+    private val root = VBox(flowPane, labelDefinition)
-        styleClass.add("search-result")
-    }
 
     init {
         text = null
@@ -86,29 +54,8 @@ internal class EntryCell(private val resources: ResourceBundle, private val conf
             graphic = null
             contextMenu = null
         } else {
-            labelHeadword.textProperty().bind(
+            labelHeadword.text = entry.traditionalProperty.value
-                Bindings.createStringBinding(
+            labelPronunciation.text = entry.pinyinWithToneMarksProperty.value
-                    {
-                        when (config.script.value!!) {
-                            Script.SIMPLIFIED -> entry.simplifiedProperty.value
-                            Script.TRADITIONAL -> entry.traditionalProperty.value
-                        }
-                    },
-                    config.script
-                )
-            )
-            labelPronunciation.textProperty().bind(
-                Bindings.createStringBinding(
-                    {
-                        when (config.searchResults.pronunciation.value!!) {
-                            Pronunciation.PINYIN_WITH_TONE_MARKS -> entry.pinyinWithToneMarksProperty.value
-                            Pronunciation.PINYIN_WITH_TONE_NUMBERS -> entry.pinyinWithToneNumbersProperty.value
-                            Pronunciation.ZHUYIN -> entry.zhuyinProperty.value
-                        }
-                    },
-                    config.searchResults.pronunciation
-                )
-            )
 
             val definition = entry.definitions.joinToString(separator = " / ") { it.joinToString(separator = "; ") }
             labelDefinition.text = definition

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

@@ -1,8 +1,7 @@
 package com.marvinelsen.willow.ui.controllers
 
+import com.marvinelsen.willow.Config
 import com.marvinelsen.willow.Model
-import com.marvinelsen.willow.config.Config
-import com.marvinelsen.willow.config.Script
 import com.marvinelsen.willow.ui.DictionaryEntryFx
 import com.marvinelsen.willow.ui.cells.DictionaryEntryCellFactory
 import javafx.beans.binding.Bindings
@@ -46,14 +45,46 @@ class DetailsController(private val model: Model, private val config: Config) {
     @FXML
     @Suppress("UnusedPrivateMember")
     private fun initialize() {
-        initializeLabelHeadword()
+        val headwordObjectBinding =
-        initializeTabPaneDetails()
+            Bindings.createStringBinding({ model.selectedEntry.value?.traditionalProperty?.value }, model.selectedEntry)
-        initializeListViewWords()
-        initializeWebViewDefinition()
 
-        model.selectedEntry.addListener { _, _, newEntry ->
+        labelHeadword.textProperty().bind(headwordObjectBinding)
-            if (newEntry == null) return@addListener
+        labelHeadword
+            .styleProperty()
+            .bind(
+                Bindings.concat(
+                    "-fx-font-size: ",
+                    config.detailHeadwordFontSize.asString(),
+                    "px;"
+                )
+            )
 
+        tabPaneDetails.disableProperty().bind(Bindings.isNull(model.selectedEntry))
+
+        listViewWords.cellFactory = DictionaryEntryCellFactory(resources)
+        listViewWords.items = model.wordsContaining
+        tabPaneDetails.selectionModel.selectedItemProperty().addListener { _, _, selectedTab ->
+            if (model.selectedEntry.value == null) return@addListener
+
+            when (selectedTab.id) {
+                "tabWords" -> {
+                    model.findWords()
+                }
+
+                else -> {}
+            }
+        }
+
+        webViewDefinition.apply {
+            isContextMenuEnabled = false
+            engine.userStyleSheetLocation =
+                this::class.java.getResource("/css/definitions.css")!!.toExternalForm()
+        }
+
+        model.selectedEntry.addListener { _, _, newValue ->
+            if (newValue == null) {
+                return@addListener
+            }
             when (tabPaneDetails.selectionModel.selectedItem.id) {
                 "tabWords" -> {
                     model.findWords()
@@ -61,71 +92,22 @@ class DetailsController(private val model: Model, private val config: Config) {
 
                 else -> {}
             }
-            webViewDefinition.engine.loadContent(newEntry.createCedictDefinitionHtml())
+            webViewDefinition.engine.loadContent(
-        }
+                createHTML().html {
-    }
+                    body {
-
+                        h1 {
-    private fun initializeWebViewDefinition() {
+                            +"CC-CEDICT"
-        webViewDefinition.apply {
+                        }
-            engine.userStyleSheetLocation = this::class.java.getResource("/css/definitions.css")!!.toExternalForm()
+                        ol {
-        }
+                            for (definition in newValue.definitions) {
-    }
+                                li {
-
+                                    +definition.joinToString(separator = "; ")
-    private fun initializeListViewWords() {
+                                }
-        listViewWords.apply {
+                            }
-            cellFactory = DictionaryEntryCellFactory(resources, config)
-            items = model.wordsContaining
-        }
-    }
-
-    private fun initializeTabPaneDetails() {
-        tabPaneDetails.apply {
-            disableProperty().bind(Bindings.isNull(model.selectedEntry))
-
-            selectionModel.selectedItemProperty().addListener { _, _, selectedTab ->
-                if (model.selectedEntry.value == null) return@addListener
-
-                when (selectedTab.id) {
-                    "tabWords" -> {
-                        model.findWords()
-                    }
-
-                    else -> {}
-                }
-            }
-        }
-    }
-
-    private fun initializeLabelHeadword() {
-        labelHeadword.apply {
-            textProperty().bind(
-                Bindings.createStringBinding(
-                    {
-                        when (config.script.value!!) {
-                            Script.SIMPLIFIED -> model.selectedEntry.value?.simplifiedProperty?.value
-                            Script.TRADITIONAL -> model.selectedEntry.value?.traditionalProperty?.value
                         }
-                    },
-                    config.script,
-                    model.selectedEntry
-                )
-            )
-            styleProperty().bind(Bindings.concat("-fx-font-size: ", config.detailHeadwordFontSize.asString(), "px;"))
-        }
-    }
-
-    private fun DictionaryEntryFx.createCedictDefinitionHtml() = createHTML().html {
-        body {
-            h1 {
-                +"CC-CEDICT"
-            }
-            ol {
-                for (definition in this@createCedictDefinitionHtml.definitions) {
-                    li {
-                        +definition.joinToString(separator = "; ")
                     }
                 }
-            }
+            )
         }
     }
 }

src/main/kotlin/com/marvinelsen/willow/ui/controllers/ListController.kt

@@ -1,7 +1,6 @@
 package com.marvinelsen.willow.ui.controllers
 
 import com.marvinelsen.willow.Model
-import com.marvinelsen.willow.config.Config
 import com.marvinelsen.willow.ui.DictionaryEntryFx
 import com.marvinelsen.willow.ui.cells.DictionaryEntryCellFactory
 import javafx.beans.binding.Bindings
@@ -11,7 +10,7 @@ import javafx.scene.control.ListView
 import javafx.scene.control.ProgressIndicator
 import java.util.ResourceBundle
 
-class SearchResultsController(private val model: Model, private val config: Config) {
+class ListController(private val model: Model) {
     @FXML
     private lateinit var resources: ResourceBundle
 
@@ -28,7 +27,7 @@ class SearchResultsController(private val model: Model, private val config: Conf
     @FXML
     @Suppress("UnusedPrivateMember")
     private fun initialize() {
-        listViewSearchResults.cellFactory = DictionaryEntryCellFactory(resources, config)
+        listViewSearchResults.cellFactory = DictionaryEntryCellFactory(resources)
         listViewSearchResults.items = model.searchResults
         listViewSearchResults
             .disableProperty()

src/main/kotlin/com/marvinelsen/willow/ui/controllers/MenuController.kt

@@ -1,7 +1,7 @@
 package com.marvinelsen.willow.ui.controllers
 
+import com.marvinelsen.willow.Config
 import com.marvinelsen.willow.Model
-import com.marvinelsen.willow.config.Config
 import com.marvinelsen.willow.ui.dialogs.PreferencesDialog
 import javafx.application.Platform
 import javafx.beans.binding.Bindings

src/main/kotlin/com/marvinelsen/willow/ui/converters/LocaleStringConverter.kt

@@ -1,9 +0,0 @@
-package com.marvinelsen.willow.ui.converters
-
-import javafx.util.StringConverter
-import java.util.Locale
-
-class LocaleStringConverter : StringConverter<Locale>() {
-    override fun toString(locale: Locale): String = locale.displayName
-    override fun fromString(string: String) = null
-}

src/main/kotlin/com/marvinelsen/willow/ui/converters/PronunciationStringConverter.kt

@@ -1,6 +1,6 @@
 package com.marvinelsen.willow.ui.converters
 
-import com.marvinelsen.willow.config.Pronunciation
+import com.marvinelsen.willow.ui.Pronunciation
 import javafx.util.StringConverter
 
 class PronunciationStringConverter : StringConverter<Pronunciation>() {

src/main/kotlin/com/marvinelsen/willow/ui/converters/ScriptStringConverter.kt

@@ -1,13 +0,0 @@
-package com.marvinelsen.willow.ui.converters
-
-import com.marvinelsen.willow.config.Script
-import javafx.util.StringConverter
-
-class ScriptStringConverter : StringConverter<Script>() {
-    override fun toString(script: Script): String = when (script) {
-        Script.SIMPLIFIED -> "Simplified"
-        Script.TRADITIONAL -> "Traditional"
-    }
-
-    override fun fromString(string: String) = null
-}

src/main/kotlin/com/marvinelsen/willow/ui/converters/ThemeStringConverter.kt

@@ -1,14 +0,0 @@
-package com.marvinelsen.willow.ui.converters
-
-import com.marvinelsen.willow.config.Theme
-import javafx.util.StringConverter
-
-class ThemeStringConverter : StringConverter<Theme>() {
-    override fun toString(theme: Theme): String = when (theme) {
-        Theme.SYSTEM -> "System"
-        Theme.LIGHT -> "Light"
-        Theme.DARK -> "Dark"
-    }
-
-    override fun fromString(string: String) = null
-}

src/main/kotlin/com/marvinelsen/willow/ui/dialogs/PreferencesDialog.kt

@@ -1,12 +1,9 @@
 package com.marvinelsen.willow.ui.dialogs
 
+import com.marvinelsen.willow.Config
 import com.marvinelsen.willow.WillowApplication
-import com.marvinelsen.willow.config.Config
+import com.marvinelsen.willow.ui.Pronunciation
-import com.marvinelsen.willow.config.Pronunciation
-import com.marvinelsen.willow.config.Script
-import com.marvinelsen.willow.config.Theme
 import com.marvinelsen.willow.ui.formatters.FontSizeTextFormatter
-import javafx.fxml.FXML
 import javafx.fxml.FXMLLoader
 import javafx.scene.control.ButtonType
 import javafx.scene.control.CheckBox
@@ -18,8 +15,8 @@ import javafx.stage.Modality
 import javafx.stage.Stage
 import javafx.stage.Window
 import javafx.util.Callback
-import java.util.Locale
 
+@Suppress("MemberVisibilityCanBePrivate")
 class PreferencesDialog(owner: Window?, config: Config) : Dialog<PreferencesDialog.Result>() {
     companion object {
         private const val DIALOG_MIN_HEIGHT = 400.0
@@ -30,48 +27,22 @@ class PreferencesDialog(owner: Window?, config: Config) : Dialog<PreferencesDial
         CHANGES, NO_CHANGES
     }
 
-    @FXML
+    lateinit var comboBoxEntryPronunciation: ComboBox<Pronunciation>
-    private lateinit var comboBoxLocale: ComboBox<Locale>
+    lateinit var comboBoxListPronunciation: ComboBox<Pronunciation>
 
-    @FXML
+    lateinit var checkBoxListShowPronunciation: CheckBox
-    private lateinit var comboBoxTheme: ComboBox<Theme>
+    lateinit var checkBoxListShowDefinition: CheckBox
 
-    @FXML
+    lateinit var spinnerEntryHeadwordFontSize: Spinner<Int>
-    private lateinit var comboBoxScript: ComboBox<Script>
+    lateinit var spinnerEntryPronunciationFontSize: Spinner<Int>
-
+    lateinit var spinnerListHeadwordFontSize: Spinner<Int>
-    @FXML
+    lateinit var spinnerListPronunciationFontSize: Spinner<Int>
-    private lateinit var comboBoxPronunciationSearchResults: ComboBox<Pronunciation>
+    lateinit var spinnerListDefinitionFontSize: Spinner<Int>
-
-    @FXML
-    private lateinit var checkBoxShowPronunciationSearchResults: CheckBox
-
-    @FXML
-    private lateinit var checkBoxShowDefinitionSearchResults: CheckBox
-
-    @FXML
-    private lateinit var spinnerHeadwordFontSizeDetails: Spinner<Int>
-
-    @FXML
-    private lateinit var spinnerPronunciationFontSizeDetails: Spinner<Int>
-
-    @FXML
-    private lateinit var spinnerHeadwordFontSizeSearchResults: Spinner<Int>
-
-    @FXML
-    private lateinit var spinnerPronunciationFontSizeSearchResults: Spinner<Int>
-
-    @FXML
-    private lateinit var spinnerDefinitionFontSizeSearchResults: Spinner<Int>
 
     private val entryHeadwordFontSizeObjectProperty = config.detailHeadwordFontSize.asObject()
-    private val entryPronunciationFontSizeObjectProperty = config.detailPronunciationFontSize.asObject()
-
-    private val searchResultHeadwordFontSizeObjectProperty = config.searchResults.headwordFontSize.asObject()
-    private val searchResultPronunciationFontSizeObjectProperty = config.searchResults.pronunciationFontSize.asObject()
-    private val searchResultDefinitionFontSizeObjectProperty = config.searchResults.definitionFontSize.asObject()
 
     init {
-        val loader = FXMLLoader(WillowApplication::class.java.getResource("/fxml/dialogs/preferences.fxml"))
+        val loader = FXMLLoader(WillowApplication::class.java.getResource("/fxml/preferences-dialog.fxml"))
         loader.setController(this)
         val root: DialogPane = loader.load()
 
@@ -87,52 +58,11 @@ class PreferencesDialog(owner: Window?, config: Config) : Dialog<PreferencesDial
             minHeight = DIALOG_MIN_HEIGHT
         }
 
-        comboBoxLocale.items.addAll(
+        with(spinnerEntryHeadwordFontSize) {
-            setOf(
-                Locale.ENGLISH,
-                Locale.GERMAN,
-                Locale.CHINA,
-                Locale.TAIWAN
-            )
-        )
-
-        comboBoxTheme.valueProperty().bindBidirectional(config.theme)
-        comboBoxScript.valueProperty().bindBidirectional(config.script)
-        comboBoxLocale.valueProperty().bindBidirectional(config.locale)
-        comboBoxPronunciationSearchResults.valueProperty().bindBidirectional(config.searchResults.pronunciation)
-
-        checkBoxShowDefinitionSearchResults
-            .selectedProperty()
-            .bindBidirectional(config.searchResults.shouldShowDefinition)
-        checkBoxShowPronunciationSearchResults
-            .selectedProperty()
-            .bindBidirectional(config.searchResults.shouldShowPronunciation)
-
-        with(spinnerHeadwordFontSizeDetails) {
             editor.textFormatter = FontSizeTextFormatter()
             valueFactory.valueProperty().bindBidirectional(entryHeadwordFontSizeObjectProperty)
         }
 
-        with(spinnerPronunciationFontSizeDetails) {
-            editor.textFormatter = FontSizeTextFormatter()
-            valueFactory.valueProperty().bindBidirectional(entryPronunciationFontSizeObjectProperty)
-        }
-
-        with(spinnerHeadwordFontSizeSearchResults) {
-            editor.textFormatter = FontSizeTextFormatter()
-            valueFactory.valueProperty().bindBidirectional(searchResultHeadwordFontSizeObjectProperty)
-        }
-
-        with(spinnerPronunciationFontSizeSearchResults) {
-            editor.textFormatter = FontSizeTextFormatter()
-            valueFactory.valueProperty().bindBidirectional(searchResultPronunciationFontSizeObjectProperty)
-        }
-
-        with(spinnerDefinitionFontSizeSearchResults) {
-            editor.textFormatter = FontSizeTextFormatter()
-            valueFactory.valueProperty().bindBidirectional(searchResultDefinitionFontSizeObjectProperty)
-        }
-
         resultConverter = Callback(::convertToResult)
     }
 

src/main/resources/css/dark.css

@@ -1,20 +0,0 @@
-/*
-JavaFX CSS Reference Guide
-https://openjfx.io/javadoc/23/javafx.graphics/javafx/scene/doc-files/cssref.html
-*/
-
-.root {
-    willow-background: #2D2D30;
-    willow-foreground: #ffffff;
-
-    -fx-background-color: willow-background;
-    background-color: willow-background;
-}
-
-.label {
-    -fx-text-fill: willow-foreground;
-}
-
-.radio-button {
-    -fx-text-fill: willow-foreground;
-}

src/main/resources/css/main.css

@@ -2,6 +2,41 @@
     -fx-font-family: "Inter Variable";
 }
 
-.details-pronunciation {
+.chinese {
+    -fx-font-family: "Noto Sans CJK TC";
+}
+
+.list-view {
+    -fx-selection-bar: #B8EEFF;
+    /*-fx-selection-bar-non-focused: green;*/
+}
+
+.list-view-entry {
+    -fx-font-family: "Noto Sans TC";
+    -fx-font-size: 20;
+    -fx-font-weight: bold;
+}
+
+.list-view-definition {
+    -fx-font-size: 14;
+}
+
+.list-view-pronunciation {
+    -fx-font-size: 14;
+}
+
+.list-view-sentence-cell {
+    -fx-font-size: 16;
+}
+
+.moe-definition {
+    -fx-font-size: 16;
+}
+
+.pronunciation {
     -fx-font: 16 "Noto Sans TC";
-}
+}
+
+.preferences-dialog .content {
+    -fx-padding: 0;
+}

src/main/resources/css/preferences.css

@@ -1,3 +0,0 @@
-.preferences-dialog .content {
-    -fx-padding: 0;
-}

src/main/resources/css/search-results.css

@@ -1,17 +0,0 @@
-.list-view:focused .list-cell:filled:focused:selected .search-result {
-    /*-fx-text-fill: red;*/
-}
-
-.headword {
-    -fx-font-family: "Noto Sans TC";
-    -fx-font-weight: bold;
-    /*-fx-text-fill: inherit;*/
-}
-
-.pronunciation {
-    /*-fx-text-fill: inherit;*/
-}
-
-.definition {
-    /*-fx-text-fill: inherit;*/
-}

src/main/resources/fxml/list.fxml

@@ -6,8 +6,8 @@
 <?import javafx.scene.control.ProgressIndicator?>
 <?import javafx.scene.layout.StackPane?>
 <StackPane xmlns="http://javafx.com/javafx/23" xmlns:fx="http://javafx.com/fxml/1"
-           fx:controller="com.marvinelsen.willow.ui.controllers.SearchResultsController"
+           fx:controller="com.marvinelsen.willow.ui.controllers.ListController"
-           stylesheets="/css/search-results.css">
+           stylesheets="/css/main.css">
     <ListView fx:id="listViewSearchResults" disable="true"/>
     <Label fx:id="labelNoEntriesFound" text="%list.no_entries_found" textAlignment="CENTER"
            visible="false" wrapText="true">

src/main/resources/fxml/main.fxml

@@ -16,7 +16,7 @@
             </BorderPane.margin>
             <fx:include source="/fxml/search.fxml"/>
             <SplitPane dividerPositions="0.33" VBox.vgrow="ALWAYS">
-                <fx:include source="/fxml/search-results.fxml"/>
+                <fx:include source="/fxml/list.fxml"/>
                 <fx:include source="/fxml/details.fxml"/>
             </SplitPane>
         </VBox>

src/main/resources/fxml/preferences-dialog.fxml

@@ -1,73 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import com.marvinelsen.willow.config.*?>
+<?import com.marvinelsen.willow.ui.converters.PronunciationStringConverter?>
-<?import com.marvinelsen.willow.ui.converters.*?>
+<?import com.marvinelsen.willow.ui.*?>
 <?import javafx.collections.FXCollections?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <DialogPane styleClass="preferences-dialog" xmlns="http://javafx.com/javafx/23" xmlns:fx="http://javafx.com/fxml/1"
-            stylesheets="/css/preferences.css">
+            stylesheets="/css/main.css">
     <fx:define>
         <FXCollections fx:factory="observableArrayList" fx:id="phoneticAlphabets">
             <Pronunciation fx:value="PINYIN_WITH_TONE_MARKS"/>
             <Pronunciation fx:value="PINYIN_WITH_TONE_NUMBERS"/>
             <Pronunciation fx:value="ZHUYIN"/>
         </FXCollections>
-        <FXCollections fx:factory="observableArrayList" fx:id="themes">
-            <Theme fx:value="SYSTEM"/>
-            <Theme fx:value="LIGHT"/>
-            <Theme fx:value="DARK"/>
-        </FXCollections>
-        <FXCollections fx:factory="observableArrayList" fx:id="scripts">
-            <Script fx:value="SIMPLIFIED"/>
-            <Script fx:value="TRADITIONAL"/>
-        </FXCollections>
     </fx:define>
     <content>
         <TabPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity"
                  tabClosingPolicy="UNAVAILABLE">
-            <Tab closable="false" text="General">
+            <Tab closable="false" text="Entry">
-                <GridPane alignment="TOP_CENTER" hgap="8.0" vgap="8.0">
-                    <columnConstraints>
-                        <ColumnConstraints halignment="RIGHT" hgrow="ALWAYS"/>
-                        <ColumnConstraints halignment="LEFT" hgrow="ALWAYS"/>
-                    </columnConstraints>
-                    <rowConstraints>
-                        <RowConstraints minHeight="10.0" prefHeight="30.0" valignment="BASELINE" vgrow="NEVER"/>
-                        <RowConstraints minHeight="10.0" prefHeight="30.0" valignment="BASELINE" vgrow="NEVER"/>
-                    </rowConstraints>
-                    <padding>
-                        <Insets bottom="12.0" left="12.0" right="12.0" top="12.0"/>
-                    </padding>
-                    <Label text="Script:" GridPane.rowIndex="3"/>
-                    <ComboBox fx:id="comboBoxScript" items="$scripts" GridPane.columnIndex="1" GridPane.rowIndex="3">
-                        <value>
-                            <Script fx:value="SIMPLIFIED"/>
-                        </value>
-                        <converter>
-                            <ScriptStringConverter/>
-                        </converter>
-                    </ComboBox>
-                    <Separator prefWidth="200.0" GridPane.columnSpan="2147483647" GridPane.rowIndex="2"/>
-                    <Label text="Language:" GridPane.rowIndex="0"/>
-                    <ComboBox fx:id="comboBoxLocale" GridPane.rowIndex="0" GridPane.columnIndex="1">
-                        <converter>
-                            <LocaleStringConverter/>
-                        </converter>
-                    </ComboBox>
-                    <Label text="Theme:" GridPane.rowIndex="1"/>
-                    <ComboBox fx:id="comboBoxTheme" items="$themes" GridPane.rowIndex="1" GridPane.columnIndex="1">
-                        <value>
-                            <Theme fx:value="SYSTEM"/>
-                        </value>
-                        <converter>
-                            <ThemeStringConverter/>
-                        </converter>
-                    </ComboBox>
-                </GridPane>
-            </Tab>
-            <Tab closable="false" text="Details View">
                 <GridPane alignment="TOP_CENTER" hgap="8.0" vgap="8.0">
                     <columnConstraints>
                         <ColumnConstraints halignment="RIGHT" hgrow="ALWAYS"/>
@@ -83,7 +34,7 @@
                         <Insets bottom="12.0" left="12.0" right="12.0" top="12.0"/>
                     </padding>
                     <Label text="Pronunciation:"/>
-                    <ComboBox fx:id="comboBoxPronunciationDetails" items="$phoneticAlphabets" GridPane.columnIndex="1">
+                    <ComboBox fx:id="comboBoxEntryPronunciation" GridPane.columnIndex="1">
                         <value>
                             <Pronunciation fx:value="PINYIN_WITH_TONE_MARKS"/>
                         </value>
@@ -93,13 +44,13 @@
                     </ComboBox>
                     <Label text="Headword font size:" GridPane.rowIndex="2"/>
                     <Label text="Pronunciation font size:" GridPane.rowIndex="3"/>
-                    <Spinner fx:id="spinnerPronunciationFontSizeDetails" editable="true" GridPane.columnIndex="1"
+                    <Spinner fx:id="spinnerEntryPronunciationFontSize" editable="true" GridPane.columnIndex="1"
                              GridPane.rowIndex="3">
                         <valueFactory>
                             <SpinnerValueFactory.IntegerSpinnerValueFactory amountToStepBy="1" max="300" min="1"/>
                         </valueFactory>
                     </Spinner>
-                    <Spinner fx:id="spinnerHeadwordFontSizeDetails" editable="true" GridPane.columnIndex="1"
+                    <Spinner fx:id="spinnerEntryHeadwordFontSize" editable="true" GridPane.columnIndex="1"
                              GridPane.rowIndex="2">
                         <valueFactory>
                             <SpinnerValueFactory.IntegerSpinnerValueFactory amountToStepBy="1" max="300" min="1"/>
@@ -108,7 +59,7 @@
                     <Separator prefWidth="200.0" GridPane.columnSpan="2147483647" GridPane.rowIndex="1"/>
                 </GridPane>
             </Tab>
-            <Tab closable="false" text="Search Results">
+            <Tab closable="false" text="List">
                 <GridPane alignment="TOP_CENTER" hgap="8.0" vgap="8.0">
                     <columnConstraints>
                         <ColumnConstraints halignment="RIGHT" hgrow="ALWAYS"/>
@@ -128,8 +79,7 @@
                         <Insets bottom="12.0" left="12.0" right="12.0" top="12.0"/>
                     </padding>
                     <Label text="Pronunciation:"/>
-                    <ComboBox fx:id="comboBoxPronunciationSearchResults" items="$phoneticAlphabets"
+                    <ComboBox fx:id="comboBoxListPronunciation" GridPane.columnIndex="1">
-                              GridPane.columnIndex="1">
                         <value>
                             <Pronunciation fx:value="PINYIN_WITH_TONE_MARKS"/>
                         </value>
@@ -139,19 +89,19 @@
                     </ComboBox>
                     <Label text="Headword font size:" GridPane.rowIndex="5"/>
                     <Label text="Pronunciation font size:" GridPane.rowIndex="6"/>
-                    <Spinner fx:id="spinnerPronunciationFontSizeSearchResults" editable="true" GridPane.columnIndex="1"
+                    <Spinner fx:id="spinnerListPronunciationFontSize" editable="true" GridPane.columnIndex="1"
                              GridPane.rowIndex="6">
                         <valueFactory>
                             <SpinnerValueFactory.IntegerSpinnerValueFactory amountToStepBy="1" max="300" min="1"/>
                         </valueFactory>
                     </Spinner>
-                    <Spinner fx:id="spinnerHeadwordFontSizeSearchResults" editable="true" GridPane.columnIndex="1"
+                    <Spinner fx:id="spinnerListHeadwordFontSize" editable="true" GridPane.columnIndex="1"
                              GridPane.rowIndex="5">
                         <valueFactory>
                             <SpinnerValueFactory.IntegerSpinnerValueFactory amountToStepBy="1" max="300" min="1"/>
                         </valueFactory>
                     </Spinner>
-                    <Spinner fx:id="spinnerDefinitionFontSizeSearchResults" editable="true" GridPane.columnIndex="1"
+                    <Spinner fx:id="spinnerListDefinitionFontSize" editable="true" GridPane.columnIndex="1"
                              GridPane.rowIndex="7">
                         <valueFactory>
                             <SpinnerValueFactory.IntegerSpinnerValueFactory amountToStepBy="1" max="300" min="1"/>
@@ -160,9 +110,9 @@
                     <Separator prefWidth="200.0" GridPane.columnSpan="2147483647" GridPane.rowIndex="4"/>
                     <Label text="Definition font size:" GridPane.rowIndex="7"/>
                     <Label text="Display:" GridPane.rowIndex="2"/>
-                    <CheckBox fx:id="checkBoxShowPronunciationSearchResults" mnemonicParsing="false" selected="true"
+                    <CheckBox fx:id="checkBoxListShowPronunciation" mnemonicParsing="false" selected="true"
                               text="Show pronunciation" GridPane.columnIndex="1" GridPane.rowIndex="2"/>
-                    <CheckBox fx:id="checkBoxShowDefinitionSearchResults" mnemonicParsing="false" selected="true"
+                    <CheckBox fx:id="checkBoxListShowDefinition" mnemonicParsing="false" selected="true"
                               text="Show definition" GridPane.columnIndex="1" GridPane.rowIndex="3"/>
                     <Separator prefWidth="200.0" GridPane.columnSpan="2147483647" GridPane.rowIndex="1"/>
                 </GridPane>
@@ -171,4 +121,4 @@
     </content>
     <ButtonType fx:id="buttonTypeApply" fx:constant="APPLY"/>
     <ButtonType fx:constant="CANCEL"/>
-</DialogPane>
+</DialogPane>

src/main/resources/fxml/search.fxml

@@ -30,12 +30,6 @@
                 <SearchMode fx:value="PINYIN"/>
             </userData>
         </RadioButton>
-        <RadioButton mnemonicParsing="false" text="%search.mode.phrase"
-                     toggleGroup="$searchModeToggleGroup">
-            <userData>
-                <SearchMode fx:value="SEGMENTS"/>
-            </userData>
-        </RadioButton>
         <RadioButton mnemonicParsing="false" text="%search.mode.english"
                      toggleGroup="$searchModeToggleGroup"
                      disable="true">

src/main/resources/i18n/willow.properties

@@ -17,4 +17,3 @@ menubar.edit.copy.pronunciation=Copy Pronunciation
 menubar.help=_Help
 menubar.help.about=_About…
 list.no_entries_found=No matching entries found
-search.mode.phrase=Phrase

src/main/resources/i18n/willow_de.properties

@@ -17,4 +17,3 @@ menubar.edit.copy.pronunciation=Kopiere Aussprache
 menubar.help=_Hilfe
 menubar.help.about=_Über…
 list.no_entries_found=No matching entries found
-search.mode.phrase=Phrase

src/main/resources/i18n/willow_en.properties

@@ -17,4 +17,3 @@ menubar.edit.copy.pronunciation=Copy Pronunciation
 menubar.help=_Help
 menubar.help.about=_About…
 list.no_entries_found=No matching entries found
-search.mode.phrase=Phrase

src/main/resources/i18n/willow_zh_CN.properties

@@ -17,4 +17,3 @@ menubar.edit.copy.pronunciation=複製 Aussprache
 menubar.help=_說明
 menubar.help.about=_關於 Willow…
 list.no_entries_found=No matching entries found
-search.mode.phrase=Phrase

src/main/resources/i18n/willow_zh_TW.properties

@@ -17,4 +17,3 @@ menubar.edit.copy.pronunciation=複製 Aussprache
 menubar.help=_說明
 menubar.help.about=_關於 Willow…
 list.no_entries_found=No matching entries found
-search.mode.phrase=Phrase