add addAllElements
This commit is contained in:
parent
c975730a58
commit
c36d81aa92
|
@ -6,8 +6,8 @@ import org.hso.texturesyncclient.view.mainView.MainView
|
||||||
import org.hso.texturesyncclient.view.startupView.StartupView
|
import org.hso.texturesyncclient.view.startupView.StartupView
|
||||||
import tornadofx.App
|
import tornadofx.App
|
||||||
|
|
||||||
class Main: App(MainView::class){
|
class Main: App(ImportView::class){
|
||||||
|
|
||||||
val controller = Controller()
|
//val controller = Controller()
|
||||||
|
|
||||||
}
|
}
|
|
@ -1,27 +1,31 @@
|
||||||
package org.hso.texturesyncclient.controller
|
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.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.mainView.MainViewController
|
||||||
|
import org.hso.texturesyncclient.view.startupView.StartupViewController
|
||||||
import tornadofx.Controller
|
import tornadofx.Controller
|
||||||
|
import java.net.InetAddress
|
||||||
|
|
||||||
class Controller : Controller() {
|
class Controller : Controller() {
|
||||||
|
|
||||||
private val mvc: MainViewController by inject()
|
private val mvc: MainViewController by inject()
|
||||||
//private val mvc: = MainViewController()
|
private val svc: StartupViewController by inject()
|
||||||
//private val mvc: = MainViewController()
|
private val ivc: ImportViewController by inject()
|
||||||
|
|
||||||
|
private val con = Connection(InetAddress.getByName("127.0.0.1"))
|
||||||
init {
|
init {
|
||||||
//TODO FIX ME!
|
/*var data = Texture()
|
||||||
/*var test1 = GUIModel() // TODO get image from server with get_texture_preview
|
var img = con.getTexturePreview(data.textureHash)
|
||||||
test1.setImage(Image("textures/sample_texture_1.jpg"))
|
var test = GUIModel(data, img)
|
||||||
test1.setText("Texture 1")
|
mvc.addElement(test)
|
||||||
mvc.addElement(test1)
|
|
||||||
|
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)
|
|
||||||
*/
|
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -4,7 +4,6 @@ import javafx.collections.ObservableList
|
||||||
import javafx.scene.image.Image
|
import javafx.scene.image.Image
|
||||||
import org.hso.texturesyncclient.model.GUIModel
|
import org.hso.texturesyncclient.model.GUIModel
|
||||||
import tornadofx.Controller
|
import tornadofx.Controller
|
||||||
import tornadofx.add
|
|
||||||
|
|
||||||
class MainViewController : Controller() {
|
class MainViewController : Controller() {
|
||||||
|
|
||||||
|
@ -21,7 +20,11 @@ class MainViewController : Controller() {
|
||||||
|
|
||||||
// FolderView functions
|
// FolderView functions
|
||||||
fun addElement(element: GUIModel) {
|
fun addElement(element: GUIModel) {
|
||||||
folderView.add(element)
|
folderView.children.add(element)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun addAllElements(elementList: List<GUIModel>) {
|
||||||
|
folderView.children.addAll(elementList)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue