JfMods
/
Inceptum
1
0
Fork 0
Code Issues 2 Packages Projects Releases Activity

fix: instance creation + dialog
ci/woodpecker/push/woodpecker Pipeline failed Details
ci/woodpecker/push/docs Pipeline was successful Details

This commit is contained in:
Johannes Frohnmeyer 2023-06-30 23:39:05 +02:00
parent 8f46e4887f
commit 7cefa88dcb
Signed by: Johannes
GPG Key ID: E76429612C2929F4
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/GtkEnvBackend.kt
View File

@ -2,6 +2,7 @@ package io.gitlab.jfronny.inceptum.gtk
import io.gitlab.jfronny.commons.StringFormatter
import io.gitlab.jfronny.inceptum.common.Utils
import io.gitlab.jfronny.inceptum.gtk.util.I18n
import io.gitlab.jfronny.inceptum.gtk.window.dialog.MicrosoftLoginDialog
import io.gitlab.jfronny.inceptum.gtk.window.dialog.StringInputDialog
import io.gitlab.jfronny.inceptum.launcher.LauncherEnv.EnvBackend
@ -78,6 +79,23 @@ object GtkEnvBackend : EnvBackend {
dialog.message = title
dialog.detail = markup
dialog.modal = true
when {
cancel == null -> {
dialog.setButtons(arrayOf(I18n["ok"]))
dialog.defaultButton = 0
dialog.cancelButton = -1
}
ok == null -> {
dialog.setButtons(arrayOf("Cancel"))
dialog.defaultButton = -1
dialog.cancelButton = 0
}
else -> {
dialog.setButtons(arrayOf("OK", "Cancel"))
dialog.defaultButton = 0
dialog.cancelButton = 1
}
}
dialog.choose(parent, Cancellable()) { _, res, _ ->
val result = dialog.chooseFinish(res)
val cancelIdx = dialog.cancelButton

2
launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/GtkMain.kt
View File

@ -37,7 +37,7 @@ object GtkMain {
AccountManager.loadAccounts()
GtkMenubar.create(this)
val window = MainWindow(this)
window.show()
window.visible = true
GtkEnvBackend.dialogParent = window
window.onCloseRequest {
GtkEnvBackend.dialogParent = null

6
launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/create/NewInstanceWindow.kt
View File

@ -62,8 +62,8 @@ class NewInstanceWindow(app: Application) : KAssistant(app) {
val none = CheckButton.newWithLabel("None")
val fabric = CheckButton.newWithLabel("Fabric")
none.onActivate { useFabric = false }
none.onActivate { useFabric = true }
none.onToggled { useFabric = false }
none.onToggled { useFabric = true }
fabric.setGroup(none)
append(none)
val fabricVersionDropdown = KDropDown(versions, { it.loader.version }, def)
@ -175,6 +175,8 @@ class NewInstanceWindow(app: Application) : KAssistant(app) {
status.setMarkup("The instance was successfully created. You can now launch it using the main menu")
}
}
setComplete(true)
}
}
}