From b1984ac8dd35b002196a47d414ca26cf28c8fddf Mon Sep 17 00:00:00 2001 From: localhorst Date: Fri, 7 Jun 2019 21:39:26 +0200 Subject: [PATCH] delete dialog btn text changed, ui fixes import view --- .../org/hso/texturesyncclient/alerts/JFXOkayCancelAlert.kt | 4 ++-- .../org/hso/texturesyncclient/controller/RootController.kt | 2 +- .../org/hso/texturesyncclient/view/importView/ImportView.kt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client/src/main/kotlin/org/hso/texturesyncclient/alerts/JFXOkayCancelAlert.kt b/client/src/main/kotlin/org/hso/texturesyncclient/alerts/JFXOkayCancelAlert.kt index 8bbc64a..af56396 100644 --- a/client/src/main/kotlin/org/hso/texturesyncclient/alerts/JFXOkayCancelAlert.kt +++ b/client/src/main/kotlin/org/hso/texturesyncclient/alerts/JFXOkayCancelAlert.kt @@ -20,8 +20,8 @@ class JFXOkayCancelAlert(heading: String, body: String, private var btnStyle: St var okayAction: EventHandler? = null var cancelAction: EventHandler? = null - private var okayText = "Okay" - private var cancelText = "Cancel" + private var okayText = "Löschen" + private var cancelText = "Abbrechen" private var headingText = Text(heading) private var bodyText = Text(body) 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 c340e36..93bdcab 100644 --- a/client/src/main/kotlin/org/hso/texturesyncclient/controller/RootController.kt +++ b/client/src/main/kotlin/org/hso/texturesyncclient/controller/RootController.kt @@ -199,7 +199,7 @@ class RootController : Controller() { fun deleteTexture(data: Texture) { val dialogDelete = JFXOkayCancelAlert( "Löschen", - "Wirklich löschen?", + "Textur wirklich löschen?", "-fx-button-type: RAISED; -fx-background-color: #2b7bbb; -fx-text-fill: #000000;" ) dialogDelete.okayAction = EventHandler { diff --git a/client/src/main/kotlin/org/hso/texturesyncclient/view/importView/ImportView.kt b/client/src/main/kotlin/org/hso/texturesyncclient/view/importView/ImportView.kt index c41ea4b..29f2ae5 100644 --- a/client/src/main/kotlin/org/hso/texturesyncclient/view/importView/ImportView.kt +++ b/client/src/main/kotlin/org/hso/texturesyncclient/view/importView/ImportView.kt @@ -85,8 +85,8 @@ class ImportView : View() { cvTags.style = "-fx-background-color: #3c3f41; -fx-text-inner-color: #b15b2e;" //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: #3c3f41; -fx-text-fill: #2b7bbb;" - btnBack.style = "-fx-button-type: RAISED; -fx-background-color: #3c3f41; -fx-text-fill: #2b7bbb; -fx-padding: 10 10 10 10;" + 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;" } tfFilePath.textProperty().addListener{ _, _, _ -> ivc.validateImport() }