lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply spinner instead of intermediate progress bar

Browse Source
This commit is contained in:
huangyuhui
2018-06-08 12:47:46 +08:00
parent f640922a50
commit d986d7ac03
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,6 +41,8 @@ import org.jackhuang.hmcl.setting.Accounts;
import org.jackhuang.hmcl.setting.Settings; import org.jackhuang.hmcl.setting.Settings;
import org.jackhuang.hmcl.task.Schedulers; import org.jackhuang.hmcl.task.Schedulers;
import org.jackhuang.hmcl.task.Task; import org.jackhuang.hmcl.task.Task;
import org.jackhuang.hmcl.ui.animation.ContainerAnimations;
import org.jackhuang.hmcl.ui.animation.TransitionHandler;
import org.jackhuang.hmcl.ui.construct.AdvancedListBox; import org.jackhuang.hmcl.ui.construct.AdvancedListBox;
import org.jackhuang.hmcl.ui.construct.IconedItem; import org.jackhuang.hmcl.ui.construct.IconedItem;
import org.jackhuang.hmcl.ui.construct.Validator; import org.jackhuang.hmcl.ui.construct.Validator;
@@ -63,18 +65,23 @@ public class AddAccountPane extends StackPane {
@FXML private Label lblPassword; @FXML private Label lblPassword;
@FXML private JFXComboBox<String> cboType; @FXML private JFXComboBox<String> cboType;
@FXML private JFXComboBox<TwoLineListItem> cboServers; @FXML private JFXComboBox<TwoLineListItem> cboServers;
@FXML private JFXProgressBar progressBar;
@FXML private Label lblInjectorServer; @FXML private Label lblInjectorServer;
@FXML private Hyperlink linkManageInjectorServers; @FXML private Hyperlink linkManageInjectorServers;
@FXML private JFXDialogLayout layout; @FXML private JFXDialogLayout layout;
@FXML private JFXButton btnAccept; @FXML private JFXButton btnAccept;
@FXML private StackPane acceptPane;
@FXML private JFXSpinner spinnerAccept;
private final Consumer<Region> finalization; private final Consumer<Region> finalization;
private final TransitionHandler transitionHandler;
public AddAccountPane(Consumer<Region> finalization) { public AddAccountPane(Consumer<Region> finalization) {
this.finalization = finalization; this.finalization = finalization;
FXUtils.loadFXML(this, "/assets/fxml/account-add.fxml"); FXUtils.loadFXML(this, "/assets/fxml/account-add.fxml");
transitionHandler = new TransitionHandler(acceptPane);
acceptPane.getChildren().setAll(btnAccept);
loadServers(); loadServers();
cboType.getItems().setAll(Launcher.i18n("account.methods.offline"), Launcher.i18n("account.methods.yggdrasil"), Launcher.i18n("account.methods.authlib_injector")); cboType.getItems().setAll(Launcher.i18n("account.methods.offline"), Launcher.i18n("account.methods.yggdrasil"), Launcher.i18n("account.methods.authlib_injector"));
@@ -122,13 +129,21 @@ public class AddAccountPane extends StackPane {
})); }));
} }
private void showSpinner() {
transitionHandler.setContent(spinnerAccept, ContainerAnimations.FADE.getAnimationProducer());
}
private void hideSpinner() {
transitionHandler.setContent(btnAccept, ContainerAnimations.FADE.getAnimationProducer());
}
@FXML @FXML
private void onCreationAccept() { private void onCreationAccept() {
int type = cboType.getSelectionModel().getSelectedIndex(); int type = cboType.getSelectionModel().getSelectedIndex();
String username = txtUsername.getText(); String username = txtUsername.getText();
String password = txtPassword.getText(); String password = txtPassword.getText();
String apiRoot = Optional.ofNullable(cboServers.getSelectionModel().getSelectedItem()).map(TwoLineListItem::getSubtitle).orElse(null); String apiRoot = Optional.ofNullable(cboServers.getSelectionModel().getSelectedItem()).map(TwoLineListItem::getSubtitle).orElse(null);
progressBar.setVisible(true); showSpinner();
lblCreationWarning.setText(""); lblCreationWarning.setText("");
Task.ofResult("create_account", () -> { Task.ofResult("create_account", () -> {
AccountFactory<?> factory; AccountFactory<?> factory;
@@ -142,7 +157,7 @@ public class AddAccountPane extends StackPane {
return factory.create(new Selector(), username, password, apiRoot, Settings.INSTANCE.getProxy()); return factory.create(new Selector(), username, password, apiRoot, Settings.INSTANCE.getProxy());
}).finalized(Schedulers.javafx(), variables -> { }).finalized(Schedulers.javafx(), variables -> {
Settings.INSTANCE.addAccount(variables.get("create_account")); Settings.INSTANCE.addAccount(variables.get("create_account"));
progressBar.setVisible(false); hideSpinner();
finalization.accept(this); finalization.accept(this);
}, exception -> { }, exception -> {
if (exception instanceof NoSelectedCharacterException) { if (exception instanceof NoSelectedCharacterException) {
@@ -150,7 +165,7 @@ public class AddAccountPane extends StackPane {
} else { } else {
lblCreationWarning.setText(accountException(exception)); lblCreationWarning.setText(accountException(exception));
} }
progressBar.setVisible(false); hideSpinner();
}).start(); }).start();
} }