AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-17 11:24:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

eros: account card improvements

Browse Source
This commit is contained in:
Bixilon 2021-07-30 12:44:03 +02:00
parent dc54c55aa1
commit 69ffca6d62
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
5 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/de/bixilon/minosoft/gui/eros/main/account/AccountController.kt
View File

@ -139,9 +139,7 @@ class AccountController : EmbeddedJavaFXController<Pane>() {
isDisable = true isDisable = true
DefaultThreadPool += { DefaultThreadPool += {
account.verify() account.verify()
Platform.runLater { Platform.runLater { refreshList() }
refreshList()
}
} }
} }
}, 3, 0) }, 3, 0)
@ -153,9 +151,7 @@ class AccountController : EmbeddedJavaFXController<Pane>() {
account.verify() account.verify()
Minosoft.config.config.account.selected = account Minosoft.config.config.account.selected = account
Minosoft.config.saveToFile() Minosoft.config.saveToFile()
Platform.runLater { Platform.runLater { refreshList() }
refreshList()
}
} }
} }
isDisable = Minosoft.config.config.account.selected === account isDisable = Minosoft.config.config.account.selected === account
@ -176,7 +172,7 @@ class AccountController : EmbeddedJavaFXController<Pane>() {
val LAYOUT = "minosoft:eros/main/account/account.fxml".asResourceLocation() val LAYOUT = "minosoft:eros/main/account/account.fxml".asResourceLocation()
private val ACCOUNT_INFO_PROPERTIES: List<Pair<ResourceLocation, (account: Account) -> Any?>> = listOf( private val ACCOUNT_INFO_PROPERTIES: List<Pair<ResourceLocation, (account: Account) -> Any?>> = listOf(
"minosoft:account.id".asResourceLocation() to { it.id }, "minosoft:main.account.account_info.id".asResourceLocation() to { it.id },
) )
val ACCOUNT_TYPES = listOf( val ACCOUNT_TYPES = listOf(
@ -184,8 +180,8 @@ class AccountController : EmbeddedJavaFXController<Pane>() {
resourceLocation = MojangAccount.RESOURCE_LOCATION, resourceLocation = MojangAccount.RESOURCE_LOCATION,
translationKey = "minosoft:main.account.type.mojang".asResourceLocation(), translationKey = "minosoft:main.account.type.mojang".asResourceLocation(),
additionalDetails = listOf( additionalDetails = listOf(
"minosoft:account.email".asResourceLocation() to { it.email }, "minosoft:main.account.account_info.email".asResourceLocation() to { it.email },
"minosoft:account.uuid".asResourceLocation() to { it.uuid }, "minosoft:main.account.account_info.uuid".asResourceLocation() to { it.uuid },
), ),
icon = FontAwesomeSolid.BUILDING, icon = FontAwesomeSolid.BUILDING,
addHandler = { MojangAddController(it).show() }, addHandler = { MojangAddController(it).show() },

20
src/main/java/de/bixilon/minosoft/gui/eros/main/account/AccountTypeCardController.kt
View File

@ -29,17 +29,25 @@ class AccountTypeCardController : AbstractCard<ErosAccountType<*>>() {
@FXML private lateinit var textFX: TextFlow @FXML private lateinit var textFX: TextFlow
override fun updateItem(item: ErosAccountType<*>?, empty: Boolean) { override fun updateItem(type: ErosAccountType<*>?, empty: Boolean) {
super.updateItem(item, empty) super.updateItem(type, empty)
item ?: return type ?: return
iconFX.isVisible = true iconFX.isVisible = true
iconFX.iconCode = item.icon iconFX.iconCode = type.icon
headerFX.text = Minosoft.LANGUAGE_MANAGER.translate(item) headerFX.text = Minosoft.LANGUAGE_MANAGER.translate(type)
textFX.text = "? accounts" // ToDo: Update on the fly
var count = 0
for (account in Minosoft.config.config.account.entries.values) {
if (account.type != type.resourceLocation) {
continue
}
count++
}
textFX.text = "$count accounts" // ToDo: Update on the fly
} }

2
src/main/java/de/bixilon/minosoft/gui/eros/util/JavaFXAccountUtil.kt
View File

@ -19,5 +19,5 @@ import javafx.scene.image.Image
object JavaFXAccountUtil { object JavaFXAccountUtil {
val Account.avatar: Image? val Account.avatar: Image?
get() = null // ToDo get() = JavaFXUtil.MINOSOFT_LOGO // ToDo
} }

3
src/main/resources/assets/minosoft/eros/main/account/account_card.fxml
View File

@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?> <?import javafx.geometry.Insets?>
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<?import javafx.scene.text.*?> <?import javafx.scene.text.*?>
<HBox xmlns:fx="http://javafx.com/fxml/1" fx:id="root" prefHeight="100.0" prefWidth="400.0" xmlns="http://javafx.com/javafx/16" fx:controller="de.bixilon.minosoft.gui.eros.main.account.AccountCardController"> <HBox xmlns:fx="http://javafx.com/fxml/1" fx:id="root" prefWidth="400.0" xmlns="http://javafx.com/javafx/16" fx:controller="de.bixilon.minosoft.gui.eros.main.account.AccountCardController">
<GridPane HBox.hgrow="ALWAYS"> <GridPane HBox.hgrow="ALWAYS">
<columnConstraints> <columnConstraints>
<ColumnConstraints hgrow="ALWAYS" minWidth="10.0" prefWidth="100.0"/> <ColumnConstraints hgrow="ALWAYS" minWidth="10.0" prefWidth="100.0"/>

4
src/main/resources/assets/minosoft/language/en_us.lang
View File

@ -66,6 +66,10 @@ minosoft:main.account.type.offline=Offline
minosoft:main.account.card.connection_count=%1$s connections minosoft:main.account.card.connection_count=%1$s connections
minosoft:main.account.account_info.id=Id
minosoft:main.account.account_info.email=E-Mail
minosoft:main.account.account_info.uuid=UUID
minosoft:main.account.add.offline.title=Add offline account minosoft:main.account.add.offline.title=Add offline account
minosoft:main.account.add.offline.header=Add offline account minosoft:main.account.add.offline.header=Add offline account
minosoft:main.account.add.offline.description=Please enter the username of the account you want to add. minosoft:main.account.add.offline.description=Please enter the username of the account you want to add.