clear DetailVIew on delete, rename submitButton to btnSubmit, clean up
This commit is contained in:
parent
dfad679e6e
commit
5fff4023f9
|
@ -3,6 +3,7 @@ package org.hso.texturesyncclient.controller
|
|||
import javafx.application.Platform
|
||||
import javafx.collections.ObservableList
|
||||
import javafx.event.EventHandler
|
||||
import javafx.scene.image.Image
|
||||
import javafx.stage.DirectoryChooser
|
||||
import org.hso.texturesyncclient.alerts.JFXInfoAlert
|
||||
import org.hso.texturesyncclient.alerts.JFXOkayCancelAlert
|
||||
|
@ -233,6 +234,9 @@ class RootController : Controller() {
|
|||
dialogDelete.okayAction = EventHandler {
|
||||
con.deleteTexture(selectedTextureModel.data)
|
||||
mvc.removeTextureFromView(selectedTextureModel.data)
|
||||
// reset the DetailView
|
||||
mvc.setVisibleMetaTags(false)
|
||||
mvc.setPreview3DTexture(Image("icons/TextureSync_Icon_256x256.jpeg"))
|
||||
}
|
||||
dialogDelete.cancelAction = EventHandler {
|
||||
// Do nothing
|
||||
|
|
|
@ -12,7 +12,6 @@ import javafx.scene.layout.BackgroundFill
|
|||
import javafx.scene.layout.CornerRadii
|
||||
import javafx.scene.layout.VBox
|
||||
import javafx.scene.paint.Paint
|
||||
import org.hso.texturesyncclient.controller.RootController
|
||||
import tornadofx.addClass
|
||||
import tornadofx.find
|
||||
import tornadofx.paddingTop
|
||||
|
|
|
@ -22,7 +22,7 @@ class DetailView : View() {
|
|||
val formatInfo = label().addClass("metadata")
|
||||
val dateInfo = label().addClass("metadata")
|
||||
|
||||
val submitButton = JFXButton("Ändern").addClass("btn-blue")
|
||||
val btnSubmit = JFXButton("Ändern").addClass("btn-blue")
|
||||
|
||||
val metadataPanel = gridpane {
|
||||
row {
|
||||
|
@ -65,7 +65,7 @@ class DetailView : View() {
|
|||
}
|
||||
|
||||
field {
|
||||
add(submitButton)
|
||||
add(btnSubmit)
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -74,7 +74,7 @@ class DetailView : View() {
|
|||
init {
|
||||
// set a default texture
|
||||
preview.setTexture(Image("icons/TextureSync_Icon_256x256.jpeg"))
|
||||
submitButton.useMaxWidth = true
|
||||
btnSubmit.useMaxWidth = true
|
||||
|
||||
}
|
||||
}
|
|
@ -74,16 +74,16 @@ class MainView : View("TextureSync") {
|
|||
// TODO: on chipview update on name update
|
||||
|
||||
detailView.cvTags.chips.onChange {
|
||||
detailView.submitButton.isVisible = true
|
||||
detailView.btnSubmit.isVisible = true
|
||||
}
|
||||
|
||||
detailView.nameInfo.textProperty().onChange {
|
||||
detailView.submitButton.isVisible = true
|
||||
detailView.btnSubmit.isVisible = true
|
||||
}
|
||||
|
||||
detailView.submitButton.setOnAction {
|
||||
detailView.btnSubmit.setOnAction {
|
||||
mvc.updateTags()
|
||||
detailView.submitButton.isVisible = false
|
||||
detailView.btnSubmit.isVisible = false
|
||||
}
|
||||
|
||||
//keyboard actions
|
||||
|
|
|
@ -90,11 +90,11 @@ class MainViewController : Controller() {
|
|||
fun setVisibleMetaTags(bool: Boolean) {
|
||||
if (bool) {
|
||||
mv.detailView.metadataPanel.isVisible = true
|
||||
mv.detailView.submitButton.isVisible = false
|
||||
mv.detailView.btnSubmit.isVisible = false
|
||||
cvTags.isVisible = true
|
||||
} else {
|
||||
mv.detailView.metadataPanel.isVisible = false
|
||||
mv.detailView.submitButton.isVisible = false
|
||||
mv.detailView.btnSubmit.isVisible = false
|
||||
cvTags.isVisible = false
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue