fix #46
This commit is contained in:
parent
32883a2639
commit
f0fe4bb981
|
@ -303,6 +303,7 @@ class RootController : Controller() {
|
||||||
fun switchMainToImport() {
|
fun switchMainToImport() {
|
||||||
Platform.runLater {
|
Platform.runLater {
|
||||||
find(MainView::class).replaceWith(ImportView::class, sizeToScene = true, centerOnScreen = true)
|
find(MainView::class).replaceWith(ImportView::class, sizeToScene = true, centerOnScreen = true)
|
||||||
|
find(ImportView::class).reset()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3,13 +3,13 @@ package org.hso.texturesyncclient.view.importView
|
||||||
import com.jfoenix.controls.JFXButton
|
import com.jfoenix.controls.JFXButton
|
||||||
import com.jfoenix.controls.JFXChipView
|
import com.jfoenix.controls.JFXChipView
|
||||||
import com.jfoenix.controls.JFXTextField
|
import com.jfoenix.controls.JFXTextField
|
||||||
|
import javafx.geometry.Insets
|
||||||
import javafx.geometry.Pos
|
import javafx.geometry.Pos
|
||||||
import javafx.scene.layout.Background
|
import javafx.scene.layout.Background
|
||||||
import javafx.geometry.Insets
|
|
||||||
import javafx.scene.layout.BackgroundFill
|
import javafx.scene.layout.BackgroundFill
|
||||||
import javafx.scene.layout.CornerRadii
|
import javafx.scene.layout.CornerRadii
|
||||||
import javafx.scene.paint.Paint
|
|
||||||
import javafx.scene.layout.Priority
|
import javafx.scene.layout.Priority
|
||||||
|
import javafx.scene.paint.Paint
|
||||||
import org.hso.texturesyncclient.view.mainView.Preview3D
|
import org.hso.texturesyncclient.view.mainView.Preview3D
|
||||||
import tornadofx.*
|
import tornadofx.*
|
||||||
|
|
||||||
|
@ -27,6 +27,10 @@ class ImportView : View("TextureSync") {
|
||||||
private val ivc: ImportViewController by inject()
|
private val ivc: ImportViewController by inject()
|
||||||
|
|
||||||
init {
|
init {
|
||||||
|
reset()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun reset() {
|
||||||
btnImport.isVisible = false
|
btnImport.isVisible = false
|
||||||
preview.root.isVisible = false
|
preview.root.isVisible = false
|
||||||
}
|
}
|
||||||
|
@ -93,11 +97,12 @@ class ImportView : View("TextureSync") {
|
||||||
//TODO change color of Chip´s see: https://github.com/jfoenixadmin/JFoenix/blob/master/jfoenix/src/main/resources/com/jfoenix/assets/css/controls/jfx-chip-view.css#L52
|
//TODO change color of Chip´s see: https://github.com/jfoenixadmin/JFoenix/blob/master/jfoenix/src/main/resources/com/jfoenix/assets/css/controls/jfx-chip-view.css#L52
|
||||||
|
|
||||||
btnImport.style = "-fx-button-type: RAISED; -fx-background-color: #b15b2e; -fx-text-fill: #3c3f41;"
|
btnImport.style = "-fx-button-type: RAISED; -fx-background-color: #b15b2e; -fx-text-fill: #3c3f41;"
|
||||||
btnBack.style = "-fx-button-type: RAISED; -fx-background-color: #3c3f41; -fx-text-fill: #2b7bbb; -fx-padding: 10;"
|
btnBack.style =
|
||||||
|
"-fx-button-type: RAISED; -fx-background-color: #3c3f41; -fx-text-fill: #2b7bbb; -fx-padding: 10;"
|
||||||
}
|
}
|
||||||
|
|
||||||
tfFilePath.textProperty().addListener{ _, _, _ -> ivc.validateImport() }
|
tfFilePath.textProperty().addListener { _, _, _ -> ivc.validateImport() }
|
||||||
tfName.textProperty().addListener{ _, _, _ -> ivc.validateImport() }
|
tfName.textProperty().addListener { _, _, _ -> ivc.validateImport() }
|
||||||
|
|
||||||
cvTags.chips.onChange {
|
cvTags.chips.onChange {
|
||||||
ivc.validateImport()
|
ivc.validateImport()
|
||||||
|
|
Loading…
Reference in New Issue