Rename AccountSetup{View => Wizard}

This commit is contained in:
Chris Beams 2014-11-23 04:46:27 +01:00
parent 693e95391a
commit 55036b04c6
No known key found for this signature in database
GPG Key ID: 3D214F8F5BC5ED73
3 changed files with 9 additions and 9 deletions

View File

@ -191,7 +191,7 @@ public class Navigation {
NETWORK_SETTINGS("/io/bitsquare/gui/main/settings/network/NetworkSettingsView.fxml"),
// account
ACCOUNT_SETUP("/io/bitsquare/gui/main/account/setup/AccountSetupView.fxml"),
ACCOUNT_SETUP("/io/bitsquare/gui/main/account/setup/AccountSetupWizard.fxml"),
ACCOUNT_SETTINGS("/io/bitsquare/gui/main/account/settings/AccountSettingsView.fxml"),
ARBITRATOR_SETTINGS("/io/bitsquare/gui/main/account/arbitrator/ArbitratorSettingsView.fxml"),

View File

@ -19,7 +19,7 @@
<?import javafx.scene.layout.*?>
<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.setup.AccountSetupView"
<AnchorPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.setup.AccountSetupWizard"
xmlns:fx="http://javafx.com/fxml">
<VBox fx:id="leftVBox" spacing="5" prefWidth="300" AnchorPane.bottomAnchor="20" AnchorPane.leftAnchor="15"

View File

@ -42,9 +42,9 @@ import org.slf4j.LoggerFactory;
/**
* This UI is not cached as it is normally only needed once.
*/
public class AccountSetupView extends ActivatableView implements Wizard {
public class AccountSetupWizard extends ActivatableView implements Wizard {
private static final Logger log = LoggerFactory.getLogger(AccountSetupView.class);
private static final Logger log = LoggerFactory.getLogger(AccountSetupWizard.class);
private WizardItem seedWords, password, fiatAccount, restrictions, registration;
private Navigation.Listener listener;
@ -61,7 +61,7 @@ public class AccountSetupView extends ActivatableView implements Wizard {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
private AccountSetupView(ViewLoader viewLoader, Navigation navigation) {
private AccountSetupWizard(ViewLoader viewLoader, Navigation navigation) {
this.viewLoader = viewLoader;
this.navigation = navigation;
}
@ -196,12 +196,12 @@ class WizardItem extends HBox {
private final ImageView imageView;
private final Label titleLabel;
private final Label subTitleLabel;
private final AccountSetupView host;
private final AccountSetupWizard parent;
private final Navigation.Item navigationItem;
WizardItem(AccountSetupView host, String title, String subTitle,
WizardItem(AccountSetupWizard parent, String title, String subTitle,
Navigation.Item navigationItem) {
this.host = host;
this.parent = parent;
this.navigationItem = navigationItem;
setId("wizard-item-background-deactivated");
@ -239,7 +239,7 @@ class WizardItem extends HBox {
}
void show() {
host.loadView(navigationItem);
parent.loadView(navigationItem);
/* navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.ACCOUNT, Navigation
.Item.ACCOUNT_SETUP,
navigationItem);*/