localhorst/TextureSync
3
1
Fork 0
Code Issues 2 Pull Requests Releases 3 Wiki Activity

clear DetailVIew on delete, rename submitButton to btnSubmit, clean up

Browse Source
This commit is contained in:
Jannik 2019-06-13 21:43:43 +02:00
parent dfad679e6e
commit 5fff4023f9
Signed by: Seil0
GPG Key ID: E8459F3723C52C24
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/main/kotlin/org/hso/texturesyncclient/controller/RootController.kt
View File

@ -3,6 +3,7 @@ package org.hso.texturesyncclient.controller
import javafx.application.Platform import javafx.application.Platform
import javafx.collections.ObservableList import javafx.collections.ObservableList
import javafx.event.EventHandler import javafx.event.EventHandler
import javafx.scene.image.Image
import javafx.stage.DirectoryChooser import javafx.stage.DirectoryChooser
import org.hso.texturesyncclient.alerts.JFXInfoAlert import org.hso.texturesyncclient.alerts.JFXInfoAlert
import org.hso.texturesyncclient.alerts.JFXOkayCancelAlert import org.hso.texturesyncclient.alerts.JFXOkayCancelAlert
@ -233,6 +234,9 @@ class RootController : Controller() {
dialogDelete.okayAction = EventHandler { dialogDelete.okayAction = EventHandler {
con.deleteTexture(selectedTextureModel.data) con.deleteTexture(selectedTextureModel.data)
mvc.removeTextureFromView(selectedTextureModel.data) mvc.removeTextureFromView(selectedTextureModel.data)
// reset the DetailView
mvc.setVisibleMetaTags(false)
mvc.setPreview3DTexture(Image("icons/TextureSync_Icon_256x256.jpeg"))
} }
dialogDelete.cancelAction = EventHandler { dialogDelete.cancelAction = EventHandler {
// Do nothing // Do nothing

1
client/src/main/kotlin/org/hso/texturesyncclient/model/GUIModel.kt
View File

@ -12,7 +12,6 @@ import javafx.scene.layout.BackgroundFill
import javafx.scene.layout.CornerRadii import javafx.scene.layout.CornerRadii
import javafx.scene.layout.VBox import javafx.scene.layout.VBox
import javafx.scene.paint.Paint import javafx.scene.paint.Paint
import org.hso.texturesyncclient.controller.RootController
import tornadofx.addClass import tornadofx.addClass
import tornadofx.find import tornadofx.find
import tornadofx.paddingTop import tornadofx.paddingTop

6
client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/DetailView.kt
View File

@ -22,7 +22,7 @@ class DetailView : View() {
val formatInfo = label().addClass("metadata") val formatInfo = label().addClass("metadata")
val dateInfo = 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 { val metadataPanel = gridpane {
row { row {
@ -65,7 +65,7 @@ class DetailView : View() {
} }
field { field {
add(submitButton) add(btnSubmit)
} }
} }
@ -74,7 +74,7 @@ class DetailView : View() {
init { init {
// set a default texture // set a default texture
preview.setTexture(Image("icons/TextureSync_Icon_256x256.jpeg")) preview.setTexture(Image("icons/TextureSync_Icon_256x256.jpeg"))
submitButton.useMaxWidth = true btnSubmit.useMaxWidth = true
} }
} }

8
client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/MainView.kt
View File

@ -74,16 +74,16 @@ class MainView : View("TextureSync") {
// TODO: on chipview update on name update // TODO: on chipview update on name update
detailView.cvTags.chips.onChange { detailView.cvTags.chips.onChange {
detailView.submitButton.isVisible = true detailView.btnSubmit.isVisible = true
} }
detailView.nameInfo.textProperty().onChange { detailView.nameInfo.textProperty().onChange {
detailView.submitButton.isVisible = true detailView.btnSubmit.isVisible = true
} }
detailView.submitButton.setOnAction { detailView.btnSubmit.setOnAction {
mvc.updateTags() mvc.updateTags()
detailView.submitButton.isVisible = false detailView.btnSubmit.isVisible = false
} }
//keyboard actions //keyboard actions

4
client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/MainViewController.kt
View File

@ -90,11 +90,11 @@ class MainViewController : Controller() {
fun setVisibleMetaTags(bool: Boolean) { fun setVisibleMetaTags(bool: Boolean) {
if (bool) { if (bool) {
mv.detailView.metadataPanel.isVisible = true mv.detailView.metadataPanel.isVisible = true
mv.detailView.submitButton.isVisible = false mv.detailView.btnSubmit.isVisible = false
cvTags.isVisible = true cvTags.isVisible = true
} else { } else {
mv.detailView.metadataPanel.isVisible = false mv.detailView.metadataPanel.isVisible = false
mv.detailView.submitButton.isVisible = false mv.detailView.btnSubmit.isVisible = false
cvTags.isVisible = false cvTags.isVisible = false
} }
} }