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

remove deleted Elements from the FolderView, comments

Browse Source
This commit is contained in:
Jannik
2019-06-07 13:48:42 +02:00
parent 8e7ba1cb46
commit ed344cbd49
3 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
client/src/main/kotlin/org/hso/texturesyncclient/controller/Controller.kt
View File

@ -137,7 +137,7 @@ class RootController : Controller() {
return previewList
}
// TODO this could be a companion object
fun switchStartupToMain() {
Platform.runLater {
find(StartupView::class).replaceWith(MainView::class, sizeToScene = true, centerOnScreen = true)
@ -179,12 +179,20 @@ class RootController : Controller() {
}
}
/**
* show the detailed meta information in the DetailView
* @param data the texture as meta element
*/
fun showDetail(data: Texture) {
mvc.setPreview3DTexture(con.getTexturePreview(data.textureHash))
mvc.setMeta(data.name, data.resolution.toString(), "")
mvc.setTags(data.tags.toList().observable())
}
/**
* remove a texture from the FolderView and the server
* @param data the texture as meta element
*/
fun deleteTexture(data: Texture) {
val dialogDelete = JFXOkayCancelAlert(
"Löschen",
@ -192,14 +200,11 @@ class RootController : Controller() {
"-fx-button-type: RAISED; -fx-background-color: #2b7bbb; -fx-text-fill: #000000;"
)
dialogDelete.okayAction = EventHandler {
println("Okay")
con.deleteTexture(data)
//TODO delete texture from ui
mvc.removeTextureFromView(data)
con.deleteTexture(data)
}
dialogDelete.cancelAction = EventHandler {
println("Cancel")
// Do nothing
}
dialogDelete.showAndWait()
}

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

@ -12,8 +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 org.hso.texturesyncclient.view.mainView.MainViewController
import tornadofx.*
class GUIModel constructor(var data: Texture, img: Image) : VBox(){
@ -21,8 +19,8 @@ class GUIModel constructor(var data: Texture, img: Image) : VBox(){
private var image = ImageView()
private var label = Label()
private var contextMenu = ContextMenu()
var exportItem = MenuItem("exportiern")
var deleteItem = MenuItem("löschen")
private var exportItem = MenuItem("exportiern")
private var deleteItem = MenuItem("löschen")
private val gmc = find(GUIModelController::class)

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

@ -77,14 +77,8 @@ class MainViewController : Controller() {
fun removeTextureFromView(data: Texture) {
//TODO delete guimodel from view
//var previewList = folderView.children
//previewList.stream().filter { x:GUIModel -> x.data.id == data.id }.findAny().e
//folderView.children.remove(data)
// stream all children nodes, filter them as GUIModel with data.id == data.id, for any found object if it's still present remove it from the folderView
folderView.children.stream().filter { x -> (x as GUIModel).data.id == data.id }.findAny().ifPresent{ x -> folderView.children.remove(x)}
}