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

fixed StartupViewController is created twice

Browse Source 
closes #27
This commit is contained in:
Jannik 2019-06-10 15:30:00 +02:00
parent b1052fa894
commit 7e3ce9ce56
Signed by: Seil0
GPG Key ID: E8459F3723C52C24
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,7 @@ package org.hso.texturesyncclient.app
import javafx.scene.image.Image import javafx.scene.image.Image
import javafx.stage.Stage import javafx.stage.Stage
import org.hso.texturesyncclient.controller.SettingsController
import org.hso.texturesyncclient.view.startupView.StartupView import org.hso.texturesyncclient.view.startupView.StartupView
import org.hso.texturesyncclient.view.startupView.StartupViewController import org.hso.texturesyncclient.view.startupView.StartupViewController
import tornadofx.App import tornadofx.App
@ -9,7 +10,7 @@ import tornadofx.App
class Main: App(StartupView::class){ class Main: App(StartupView::class){
//start first controller //start first controller
private val svc = StartupViewController() private val svc: StartupViewController by inject()
override fun start(stage: Stage) { override fun start(stage: Stage) {
@ -23,6 +24,9 @@ class Main: App(StartupView::class){
super.start(stage) super.start(stage)
stage.scene.stylesheets.add("/css/Styles.css") // this call must be after the super call stage.scene.stylesheets.add("/css/Styles.css") // this call must be after the super call
SettingsController.init()
svc.initConnection()
} }
} }

4
client/src/main/kotlin/org/hso/texturesyncclient/view/startupView/StartupViewController.kt
View File

@ -1,7 +1,6 @@
package org.hso.texturesyncclient.view.startupView package org.hso.texturesyncclient.view.startupView
import org.hso.texturesyncclient.controller.RootController import org.hso.texturesyncclient.controller.RootController
import org.hso.texturesyncclient.controller.SettingsController
import tornadofx.Controller import tornadofx.Controller
@ -10,9 +9,8 @@ class StartupViewController : Controller() {
private val sv = find(StartupView::class) private val sv = find(StartupView::class)
private val rootc = find(RootController::class) private val rootc = find(RootController::class)
init { fun initConnection() {
println("init StartupViewController") println("init StartupViewController")
SettingsController.init()
startConnectionUI() startConnectionUI()
runAsync { runAsync {
rootc.initConnection(" ") rootc.initConnection(" ")