From 5fff4023f9cb0aa7f08e0335dfe60fe9770af79f Mon Sep 17 00:00:00 2001
From: Seil0 <seil0@mosad.xyz>
Date: Thu, 13 Jun 2019 21:43:43 +0200
Subject: [PATCH] clear DetailVIew on delete, rename submitButton to btnSubmit,
 clean up

---
 .../hso/texturesyncclient/controller/RootController.kt    | 4 ++++
 .../kotlin/org/hso/texturesyncclient/model/GUIModel.kt    | 1 -
 .../org/hso/texturesyncclient/view/mainView/DetailView.kt | 6 +++---
 .../org/hso/texturesyncclient/view/mainView/MainView.kt   | 8 ++++----
 .../texturesyncclient/view/mainView/MainViewController.kt | 4 ++--
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/client/src/main/kotlin/org/hso/texturesyncclient/controller/RootController.kt b/client/src/main/kotlin/org/hso/texturesyncclient/controller/RootController.kt
index c122b53..09dfda0 100644
--- a/client/src/main/kotlin/org/hso/texturesyncclient/controller/RootController.kt
+++ b/client/src/main/kotlin/org/hso/texturesyncclient/controller/RootController.kt
@@ -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
diff --git a/client/src/main/kotlin/org/hso/texturesyncclient/model/GUIModel.kt b/client/src/main/kotlin/org/hso/texturesyncclient/model/GUIModel.kt
index 0f59082..1721a1c 100644
--- a/client/src/main/kotlin/org/hso/texturesyncclient/model/GUIModel.kt
+++ b/client/src/main/kotlin/org/hso/texturesyncclient/model/GUIModel.kt
@@ -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
diff --git a/client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/DetailView.kt b/client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/DetailView.kt
index 568823b..d62170d 100644
--- a/client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/DetailView.kt
+++ b/client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/DetailView.kt
@@ -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
 
     }
 }
\ No newline at end of file
diff --git a/client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/MainView.kt b/client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/MainView.kt
index 054c1c8..e360b61 100644
--- a/client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/MainView.kt
+++ b/client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/MainView.kt
@@ -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
diff --git a/client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/MainViewController.kt b/client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/MainViewController.kt
index a91afc3..fc2ae83 100644
--- a/client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/MainViewController.kt
+++ b/client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/MainViewController.kt
@@ -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
         }
     }