AstralTransRocketries/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-09-10 20:37:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remember the last used login type

Browse Source
This commit is contained in:
yushijinhun 2018-10-27 19:30:56 +08:00
parent a1d9b52b9d
commit 594a2741d7
No known key found for this signature in database
GPG Key ID: 5BC167F73EA558E4
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
HMCL/src/main/java/org/jackhuang/hmcl/setting/Config.java
View File

@ -157,6 +157,12 @@ public final class Config implements Cloneable, Observable {
@SerializedName("uiVersion") @SerializedName("uiVersion")
private IntegerProperty uiVersion = new SimpleIntegerProperty(0); private IntegerProperty uiVersion = new SimpleIntegerProperty(0);
/**
* The preferred login type to use when the user wants to add an account.
*/
@SerializedName("preferredLoginType")
private StringProperty preferredLoginType = new SimpleStringProperty();
private transient ObservableHelper helper = new ObservableHelper(this); private transient ObservableHelper helper = new ObservableHelper(this);
public Config() { public Config() {
@ -475,4 +481,16 @@ public final class Config implements Cloneable, Observable {
public void setUiVersion(int uiVersion) { public void setUiVersion(int uiVersion) {
this.uiVersion.set(uiVersion); this.uiVersion.set(uiVersion);
} }
public String getPreferredLoginType() {
return preferredLoginType.get();
}
public void setPreferredLoginType(String preferredLoginType) {
this.preferredLoginType.set(preferredLoginType);
}
public StringProperty preferredLoginTypeProperty() {
return preferredLoginType;
}
} }

10
HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AddAccountPane.java
View File

@ -81,7 +81,12 @@ public class AddAccountPane extends StackPane {
cboType.getItems().setAll(Accounts.FACTORY_OFFLINE, Accounts.FACTORY_YGGDRASIL, Accounts.FACTORY_AUTHLIB_INJECTOR); cboType.getItems().setAll(Accounts.FACTORY_OFFLINE, Accounts.FACTORY_YGGDRASIL, Accounts.FACTORY_AUTHLIB_INJECTOR);
cboType.setConverter(stringConverter(Accounts::getAccountTypeName)); cboType.setConverter(stringConverter(Accounts::getAccountTypeName));
cboType.getSelectionModel().select(0); // try selecting the preferred login type
cboType.getSelectionModel().select(
cboType.getItems().stream()
.filter(type -> Accounts.getAccountTypeName(type).equals(config().getPreferredLoginType()))
.findFirst()
.orElse(Accounts.FACTORY_OFFLINE));
btnAddServer.visibleProperty().bind(cboServers.visibleProperty()); btnAddServer.visibleProperty().bind(cboServers.visibleProperty());
btnManageServer.visibleProperty().bind(cboServers.visibleProperty()); btnManageServer.visibleProperty().bind(cboServers.visibleProperty());
@ -91,6 +96,9 @@ public class AddAccountPane extends StackPane {
ReadOnlyObjectProperty<AccountFactory<?>> loginType = cboType.getSelectionModel().selectedItemProperty(); ReadOnlyObjectProperty<AccountFactory<?>> loginType = cboType.getSelectionModel().selectedItemProperty();
// remember the last used login type
loginType.addListener((observable, oldValue, newValue) -> config().setPreferredLoginType(Accounts.getAccountTypeName(newValue)));
txtPassword.visibleProperty().bind(loginType.isNotEqualTo(Accounts.FACTORY_OFFLINE)); txtPassword.visibleProperty().bind(loginType.isNotEqualTo(Accounts.FACTORY_OFFLINE));
lblPassword.visibleProperty().bind(txtPassword.visibleProperty()); lblPassword.visibleProperty().bind(txtPassword.visibleProperty());