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

add addAllElements

This commit is contained in:
Jannik 2019-06-03 16:46:57 +02:00
parent c975730a58
commit c36d81aa92
Signed by: Seil0
GPG Key ID: E8459F3723C52C24
3 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/main/kotlin/org/hso/texturesyncclient/app/Main.kt
View File

@ -6,8 +6,8 @@ import org.hso.texturesyncclient.view.mainView.MainView
import org.hso.texturesyncclient.view.startupView.StartupView
import tornadofx.App
class Main: App(MainView::class){
class Main: App(ImportView::class){
val controller = Controller()
//val controller = Controller()
}

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

@ -1,27 +1,31 @@
package org.hso.texturesyncclient.controller
import javafx.scene.image.Image
import org.hso.texturesyncclient.controller.net.Connection
import org.hso.texturesyncclient.model.GUIModel
import org.hso.texturesyncclient.model.Texture
import org.hso.texturesyncclient.view.importView.ImportViewController
import org.hso.texturesyncclient.view.mainView.MainViewController
import org.hso.texturesyncclient.view.startupView.StartupViewController
import tornadofx.Controller
import java.net.InetAddress
class Controller : Controller() {
private val mvc: MainViewController by inject()
//private val mvc: = MainViewController()
//private val mvc: = MainViewController()
private val svc: StartupViewController by inject()
private val ivc: ImportViewController by inject()
private val con = Connection(InetAddress.getByName("127.0.0.1"))
init {
//TODO FIX ME!
/*var test1 = GUIModel() // TODO get image from server with get_texture_preview
test1.setImage(Image("textures/sample_texture_1.jpg"))
test1.setText("Texture 1")
mvc.addElement(test1)
/*var data = Texture()
var img = con.getTexturePreview(data.textureHash)
var test = GUIModel(data, img)
mvc.addElement(test)
data = Texture()
img = con.getTexturePreview(data.textureHash)
test = GUIModel(data, img)
mvc.addElement(test)*/
var test2 = GUIModel()
test2.setImage(Image("textures/sample_texture_2.jpg"))
test2.setText("Texture 2")
mvc.addElement(test2)
*/
}
}

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

@ -4,7 +4,6 @@ import javafx.collections.ObservableList
import javafx.scene.image.Image
import org.hso.texturesyncclient.model.GUIModel
import tornadofx.Controller
import tornadofx.add
class MainViewController : Controller() {
@ -21,7 +20,11 @@ class MainViewController : Controller() {
// FolderView functions
fun addElement(element: GUIModel) {
folderView.add(element)
folderView.children.add(element)
}
fun addAllElements(elementList: List<GUIModel>) {
folderView.children.addAll(elementList)
}