MainView materialfx

src/main/kotlin/solve/SolveApp.kt

@@ -1,7 +1,9 @@
 package solve
 
 import de.codecentric.centerdevice.javafxsvg.SvgImageLoaderFactory
+import javafx.scene.image.Image
 import javafx.stage.Stage
+import solve.constants.IconsApp
 import solve.main.MainView
 import solve.scene.view.landmarks.AnimationProvider
 import solve.scene.view.landmarks.JavaFXAnimationProvider
@@ -18,10 +20,13 @@ class SolveApp : App(MainView::class, ApplicationStylesheet::class) {
         registerServices()
 
         with(stage) {
+            stage.icons.add(Image(IconsApp))
             width = 1000.0
             height = 600.0
+            title = "SOLVE"
             isMaximized = true
         }
+
         super.start(stage)
     }
 
@@ -31,7 +36,6 @@ class SolveApp : App(MainView::class, ApplicationStylesheet::class) {
 
     private fun initializeDependencies() {
         SvgImageLoaderFactory.install(SVGImageLoaderDimensionProvider())
-
         initializeStyle()
     }
 

src/main/kotlin/solve/catalogue/CatalogueUtils.kt

@@ -1,18 +1,23 @@
 package solve.catalogue
 
-import javafx.scene.control.Labeled
-import javafx.scene.control.ListView
+import io.github.palexdev.materialfx.controls.MFXCheckListView
+import io.github.palexdev.materialfx.selection.base.IMultipleSelectionModel
+import javafx.beans.property.ObjectProperty
+import javafx.beans.property.SimpleObjectProperty
 import solve.project.model.ProjectFrame
 import solve.project.model.ProjectLayer
-import tornadofx.tooltip
 
-val ProjectFrame.layers: List<ProjectLayer>
-    get() = landmarkFiles.map { it.projectLayer }.distinct()
+fun <T> MFXCheckListView<T>.selectionModelProperty(): ObjectProperty<IMultipleSelectionModel<T>> {
+    return SimpleObjectProperty(selectionModel)
+}
 
-fun <T> synchronizeListViewsSelections(firstListView: ListView<T>, secondListView: ListView<T>) {
-    secondListView.selectionModel = firstListView.selectionModel
+fun <T> MFXCheckListView<T>.setSelectionModel(value: IMultipleSelectionModel<T>) {
+    selectionModelProperty().set(value)
 }
 
-fun Labeled.addNameTooltip() {
-    tooltip(text)
+val ProjectFrame.layers: List<ProjectLayer>
+    get() = landmarkFiles.map { it.projectLayer }.distinct()
+
+fun <T> synchronizeListViewsSelections(firstListView: MFXCheckListView<T>, secondListView: MFXCheckListView<T>) {
+    secondListView.setSelectionModel(firstListView.selectionModel)
 }

src/main/kotlin/solve/catalogue/controller/CatalogueController.kt

@@ -25,9 +25,9 @@ class CatalogueController : Controller() {
         SceneFacade.visualize(layers, frames, true)
     }
 
-    fun selectAllFields() = view.selectAllFields()
+    fun checkAllFields() = view.checkAllFields()
 
-    fun deselectAllFields() = view.deselectAllFields()
+    fun uncheckAllFields() = view.uncheckAllFields()
 
     fun changeViewFormat(format: ViewFormat) = view.changeViewFormat(format)
 

src/main/kotlin/solve/catalogue/view/CatalogueSettingsView.kt

@@ -1,14 +1,17 @@
 package solve.catalogue.view
 
 import javafx.beans.property.SimpleObjectProperty
+import javafx.geometry.Insets
 import javafx.geometry.Pos
 import javafx.scene.control.CheckBox
-import javafx.scene.control.RadioButton
+import javafx.scene.control.ToggleButton
 import javafx.scene.control.ToggleGroup
-import javafx.scene.layout.Priority
-import solve.catalogue.addNameTooltip
+import org.controlsfx.control.SegmentedButton
 import solve.catalogue.controller.CatalogueController
 import solve.catalogue.model.ViewFormat
+import solve.styles.CatalogueViewStylesheet
+import solve.styles.Style
+import solve.utils.materialfx.mfxCheckbox
 import tornadofx.*
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
@@ -31,9 +34,6 @@ class CatalogueSettingsView : View() {
     private val catalogueView: CatalogueView by inject()
 
     private val viewFormatToggleGroup = ToggleGroup()
-    private lateinit var fileNameViewRadioButton: RadioButton
-    private lateinit var imagePreviewRadioButton: RadioButton
-
     private lateinit var selectionCheckBox: CheckBox
     private var checkBoxSelectionState: SelectionState by checkBoxSelectionStateDelegate()
 
@@ -45,29 +45,37 @@ class CatalogueSettingsView : View() {
     }
     private var isDisplayingInfoLabel = false
 
-    override val root = vbox {
-        hbox(5) {
-            selectionCheckBox = checkbox("Select all", isSelectionCheckBoxCheckedProperty) {
-                addNameTooltip()
-                action {
-                    if (isSelected) {
-                        controller.selectAllFields()
-                    } else {
-                        controller.deselectAllFields()
+    private var fileNameViewRadioButton = ToggleButton("FILES").apply {
+        style = "-fx-font-family: ${Style.FontCondensed}; -fx-font-weight: ${Style.FontWeightBold};"
+    }
+    private var imagePreviewRadioButton = ToggleButton("IMAGES").apply {
+        style = "-fx-font-family: ${Style.FontCondensed}; -fx-font-weight: ${Style.FontWeightBold};"
+    }
+
+    var segmentedButton = SegmentedButton(fileNameViewRadioButton, imagePreviewRadioButton)
+
+    override val root =
+        vbox {
+            hbox(130) {
+                addStylesheet(CatalogueViewStylesheet::class)
+                maxWidth = 500.0
+                padding = Insets(0.0, 0.0, 0.0, 0.0)
+                selectionCheckBox = mfxCheckbox {
+                    paddingLeft = 7.0
+                    action {
+                        if (isSelected) {
+                            controller.checkAllFields()
+                        } else {
+                            controller.uncheckAllFields()
+                        }
                     }
                 }
+                segmentedButton.toggleGroup = viewFormatToggleGroup
+
+                add(segmentedButton)
+                paddingBottom = 4
             }
-            pane().hgrow = Priority.ALWAYS
-            fileNameViewRadioButton = radiobutton("File view", viewFormatToggleGroup) {
-                addNameTooltip()
-            }
-            imagePreviewRadioButton = radiobutton("Image preview", viewFormatToggleGroup) {
-                addNameTooltip()
-            }
-            paddingBottom = 4
-        }
-        add(infoNode)
-    }.also { initialize() }
+        }.also { initialize() }
 
     init {
         viewFormatProperty.onChange { newFormat ->
@@ -78,7 +86,7 @@ class CatalogueSettingsView : View() {
 
     fun resetSettings() {
         checkBoxSelectionState = CatalogueController.initialSelectionState
-        viewFormatToggleGroup.selectToggle(getViewFormatRadioButton(CatalogueController.initialViewFormat))
+        viewFormatToggleGroup.selectToggle(getViewFormatToggleButton(CatalogueController.initialViewFormat))
     }
 
     fun displayInfoLabel(withText: String) {
@@ -105,24 +113,24 @@ class CatalogueSettingsView : View() {
 
     private fun initialize() {
         initializeViewFormatRadioButtons()
-        viewFormatToggleGroup.selectToggle(getViewFormatRadioButton(CatalogueController.initialViewFormat))
+        viewFormatToggleGroup.selectToggle(getViewFormatToggleButton(CatalogueController.initialViewFormat))
     }
 
-    private fun getRadioButtonViewFormat(radioButton: RadioButton) = when (radioButton) {
+    private fun getRadioButtonViewFormat(toggleButton: ToggleButton) = when (toggleButton) {
         fileNameViewRadioButton -> ViewFormat.FileName
         imagePreviewRadioButton -> ViewFormat.ImagePreview
-        else -> throw IllegalArgumentException("Unexpected view format radio button!")
+        else -> throw IllegalArgumentException("Unexpected view format toggle button!")
     }
 
-    private fun getViewFormatRadioButton(viewFormat: ViewFormat) = when (viewFormat) {
+    private fun getViewFormatToggleButton(viewFormat: ViewFormat) = when (viewFormat) {
         ViewFormat.FileName -> fileNameViewRadioButton
         ViewFormat.ImagePreview -> imagePreviewRadioButton
     }
 
     private fun initializeViewFormatRadioButtons() {
         viewFormatToggleGroup.selectedToggleProperty().onChange {
             it ?: return@onChange
-            viewFormat = getRadioButtonViewFormat(it as RadioButton)
+            viewFormat = getRadioButtonViewFormat(it as ToggleButton)
         }
     }
 
@@ -137,10 +145,12 @@ class CatalogueSettingsView : View() {
                         selectionCheckBox.isIndeterminate = false
                         isSelectionCheckBoxChecked = true
                     }
+
                     SelectionState.None -> {
                         selectionCheckBox.isIndeterminate = false
                         isSelectionCheckBoxChecked = false
                     }
+
                     SelectionState.Part -> {
                         selectionCheckBox.isIndeterminate = true
                         isSelectionCheckBoxChecked = false