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

resize ImportView too

This commit is contained in:
Jannik 2019-06-09 13:38:11 +02:00
parent 5d223ba72b
commit 07f2682a2d
Signed by: Seil0
GPG Key ID: E8459F3723C52C24
5 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
client/src/main/kotlin/org/hso/texturesyncclient/controller/RootController.kt
View File

@ -13,12 +13,12 @@ import org.hso.texturesyncclient.model.Sha256
import org.hso.texturesyncclient.model.Texture
import org.hso.texturesyncclient.model.TextureFormat
import org.hso.texturesyncclient.view.importView.ImportView
import org.hso.texturesyncclient.view.importView.ImportViewController
import org.hso.texturesyncclient.view.mainView.MainView
import org.hso.texturesyncclient.view.mainView.MainViewController
import org.hso.texturesyncclient.view.startupView.StartupView
import org.hso.texturesyncclient.view.startupView.StartupViewController
import tornadofx.Controller
import tornadofx.find
import tornadofx.observable
import java.net.InetAddress
import java.util.Calendar
@ -34,12 +34,10 @@ class RootController : Controller() {
private val mvc: MainViewController by inject()
private val svc: StartupViewController by inject()
private val ivc: ImportViewController by inject()
private lateinit var con: Connection
private lateinit var selectedTexture: Texture
private var lastExportDir: String = System.getProperty("user.home")
/**
@ -167,26 +165,6 @@ 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)
}
}
// These runLater calls should be unnecessary
fun switchMainToImport() {
Platform.runLater {
find(MainView::class).replaceWith(ImportView::class, sizeToScene = true, centerOnScreen = true)
}
}
fun switchImportToMain() {
Platform.runLater {
find(ImportView::class).replaceWith(MainView::class, sizeToScene = true, centerOnScreen = true)
}
}
/**
* save the texture file to a local directory
* @param data the texture as meta element
@ -286,7 +264,28 @@ class RootController : Controller() {
/**
* show all available textures at start
*/
fun showAll() {
private fun showAll() {
queryElements(mvc.getTags())
}
companion object {
fun switchStartupToMain() {
Platform.runLater {
find(StartupView::class).replaceWith(MainView::class, sizeToScene = true, centerOnScreen = true)
}
}
// These runLater calls should be unnecessary
fun switchMainToImport() {
Platform.runLater {
find(MainView::class).replaceWith(ImportView::class, sizeToScene = true, centerOnScreen = true)
}
}
fun switchImportToMain() {
Platform.runLater {
find(ImportView::class).replaceWith(MainView::class, sizeToScene = true, centerOnScreen = true)
}
}
}
}

6
client/src/main/kotlin/org/hso/texturesyncclient/view/importView/ImportView.kt
View File

@ -18,7 +18,7 @@ class ImportView : View("TextureSync") {
val tfName = JFXTextField()
val cvTags = JFXChipView<String>()
val btnImport = JFXButton("Importieren")
val btnBack = JFXButton("Zurück")
private val btnBack = JFXButton("Zurück")
private val ivc: ImportViewController by inject()
@ -27,8 +27,8 @@ class ImportView : View("TextureSync") {
}
override val root = borderpane {
minWidth = 1000.0
minHeight = 500.0
prefWidth = FX.primaryStage.width
prefHeight = FX.primaryStage.height
background = Background(BackgroundFill(Paint.valueOf("#2b2b2b"), CornerRadii.EMPTY, Insets.EMPTY))
center = vbox(50) {

4
client/src/main/kotlin/org/hso/texturesyncclient/view/importView/ImportViewController.kt
View File

@ -34,7 +34,7 @@ class ImportViewController : Controller() {
fun btnImportAction() {
rootc.importTexture(iv.tfFilePath.text, iv.tfName.text, iv.cvTags.chips)
rootc.switchImportToMain()
RootController.switchImportToMain()
iv.tfFilePath.clear()
iv.tfName.clear()
iv.cvTags.chips.clear()
@ -46,7 +46,7 @@ class ImportViewController : Controller() {
}
fun btnBackAction() {
rootc.switchImportToMain()
RootController.switchImportToMain()
iv.tfFilePath.clear()
iv.tfName.clear()
iv.cvTags.chips.clear()

2
client/src/main/kotlin/org/hso/texturesyncclient/view/mainView/MainView.kt
View File

@ -13,7 +13,7 @@ import tornadofx.*
class MainView : View("TextureSync") {
val cvSearch = JFXChipView<String>()
val btnImport = JFXButton("+")
private val btnImport = JFXButton("+")
val folderView = find(FolderView::class)
val detailView = find(DetailView::class)

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

@ -70,7 +70,7 @@ class MainViewController : Controller() {
}
fun btnImportAction() {
rootc.switchMainToImport()
RootController.switchMainToImport()
}
fun removeTextureFromView(data: Texture) {