Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-21 21:19:36 -04:00
Code Issues Projects Releases Packages Wiki Activity

Use irc instead of fiat classes

Browse source
This commit is contained in:
Manfred Karrer 2014-11-25 02:17:25 +01:00 • committed by Chris Beams
parent 63b7e254d7
commit ed83cdbe49
No known key found for this signature in database
GPG key ID: 3D214F8F5BC5ED73
2 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java
View file

@ -22,7 +22,7 @@ import io.bitsquare.gui.Navigation;
import io.bitsquare.gui.main.MainView; import io.bitsquare.gui.main.MainView;
import io.bitsquare.gui.main.account.AccountView; import io.bitsquare.gui.main.account.AccountView;
import io.bitsquare.gui.main.account.content.changepassword.ChangePasswordView; import io.bitsquare.gui.main.account.content.changepassword.ChangePasswordView;
import io.bitsquare.gui.main.account.content.fiat.FiatAccountView; import io.bitsquare.gui.main.account.content.irc.IrcAccountView;
import io.bitsquare.gui.main.account.content.registration.RegistrationView; import io.bitsquare.gui.main.account.content.registration.RegistrationView;
import io.bitsquare.gui.main.account.content.restrictions.RestrictionsView; import io.bitsquare.gui.main.account.content.restrictions.RestrictionsView;
import io.bitsquare.gui.main.account.content.seedwords.SeedWordsView; import io.bitsquare.gui.main.account.content.seedwords.SeedWordsView;
@ -52,7 +52,7 @@ public class AccountSettingsView extends ActivatableViewAndModel {
private final ViewLoader viewLoader; private final ViewLoader viewLoader;
private final Navigation navigation; private final Navigation navigation;
private MenuItem seedWords, password, restrictions, fiatAccount, registration; private MenuItem seedWords, password, restrictions, ircAccount, registration;
private Navigation.Listener listener; private Navigation.Listener listener;
@FXML private VBox leftVBox; @FXML private VBox leftVBox;
@ -78,7 +78,7 @@ public class AccountSettingsView extends ActivatableViewAndModel {
seedWords = new MenuItem(navigation, toggleGroup, "Wallet seed", SeedWordsView.class); seedWords = new MenuItem(navigation, toggleGroup, "Wallet seed", SeedWordsView.class);
password = new MenuItem(navigation, toggleGroup, "Wallet password", ChangePasswordView.class); password = new MenuItem(navigation, toggleGroup, "Wallet password", ChangePasswordView.class);
restrictions = new MenuItem(navigation, toggleGroup, "Arbitrator selection", RestrictionsView.class); restrictions = new MenuItem(navigation, toggleGroup, "Arbitrator selection", RestrictionsView.class);
fiatAccount = new MenuItem(navigation, toggleGroup, "Payments account(s)", FiatAccountView.class); ircAccount = new MenuItem(navigation, toggleGroup, "Payments account(s)", IrcAccountView.class);
registration = new MenuItem(navigation, toggleGroup, "Renew your account", RegistrationView.class); registration = new MenuItem(navigation, toggleGroup, "Renew your account", RegistrationView.class);
seedWords.setDisable(true); seedWords.setDisable(true);
@ -86,7 +86,7 @@ public class AccountSettingsView extends ActivatableViewAndModel {
restrictions.setDisable(true); restrictions.setDisable(true);
registration.setDisable(true); registration.setDisable(true);
leftVBox.getChildren().addAll(seedWords, password, restrictions, fiatAccount, registration); leftVBox.getChildren().addAll(seedWords, password, restrictions, ircAccount, registration);
} }
@Override @Override
@ -94,7 +94,7 @@ public class AccountSettingsView extends ActivatableViewAndModel {
navigation.addListener(listener); navigation.addListener(listener);
ViewPath viewPath = navigation.getCurrentPath(); ViewPath viewPath = navigation.getCurrentPath();
if (viewPath.size() == 3 && viewPath.indexOf(AccountSettingsView.class) == 2) { if (viewPath.size() == 3 && viewPath.indexOf(AccountSettingsView.class) == 2) {
navigation.navigateTo(MainView.class, AccountView.class, AccountSettingsView.class, FiatAccountView.class); navigation.navigateTo(MainView.class, AccountView.class, AccountSettingsView.class, IrcAccountView.class);
} }
else if (viewPath.size() == 4 && viewPath.indexOf(AccountSettingsView.class) == 2) { else if (viewPath.size() == 4 && viewPath.indexOf(AccountSettingsView.class) == 2) {
loadView(viewPath.get(3)); loadView(viewPath.get(3));
@ -118,7 +118,7 @@ public class AccountSettingsView extends ActivatableViewAndModel {
if (viewClass == SeedWordsView.class) seedWords.setSelected(true); if (viewClass == SeedWordsView.class) seedWords.setSelected(true);
else if (viewClass == ChangePasswordView.class) password.setSelected(true); else if (viewClass == ChangePasswordView.class) password.setSelected(true);
else if (viewClass == RestrictionsView.class) restrictions.setSelected(true); else if (viewClass == RestrictionsView.class) restrictions.setSelected(true);
else if (viewClass == FiatAccountView.class) fiatAccount.setSelected(true); else if (viewClass == IrcAccountView.class) ircAccount.setSelected(true);
else if (viewClass == RegistrationView.class) registration.setSelected(true); else if (viewClass == RegistrationView.class) registration.setSelected(true);
else throw new BitsquareException("Selecting main menu button for " + viewClass + " is not supported"); else throw new BitsquareException("Selecting main menu button for " + viewClass + " is not supported");
} }

19
src/main/java/io/bitsquare/gui/main/account/setup/AccountSetupWizard.java
View file

@ -19,7 +19,6 @@ package io.bitsquare.gui.main.account.setup;
import io.bitsquare.gui.Navigation; import io.bitsquare.gui.Navigation;
import io.bitsquare.gui.main.MainView; import io.bitsquare.gui.main.MainView;
import io.bitsquare.gui.main.account.content.fiat.FiatAccountView;
import io.bitsquare.gui.main.account.content.irc.IrcAccountView; import io.bitsquare.gui.main.account.content.irc.IrcAccountView;
import io.bitsquare.gui.main.account.content.password.PasswordView; import io.bitsquare.gui.main.account.content.password.PasswordView;
import io.bitsquare.gui.main.account.content.registration.RegistrationView; import io.bitsquare.gui.main.account.content.registration.RegistrationView;
@ -47,7 +46,7 @@ public class AccountSetupWizard extends ActivatableView implements Wizard {
@FXML VBox leftVBox; @FXML VBox leftVBox;
@FXML AnchorPane content; @FXML AnchorPane content;
private WizardItem seedWords, password, fiatAccount, restrictions, registration; private WizardItem seedWords, password, ircAccount, restrictions, registration;
private Navigation.Listener listener; private Navigation.Listener listener;
private final ViewLoader viewLoader; private final ViewLoader viewLoader;
@ -79,17 +78,17 @@ public class AccountSetupWizard extends ActivatableView implements Wizard {
password.onCompleted(); password.onCompleted();
restrictions.show(); restrictions.show();
} }
else if (viewClass == FiatAccountView.class) { else if (viewClass == IrcAccountView.class) {
seedWords.onCompleted(); seedWords.onCompleted();
password.onCompleted(); password.onCompleted();
restrictions.onCompleted(); restrictions.onCompleted();
fiatAccount.show(); ircAccount.show();
} }
else if (viewClass == RegistrationView.class) { else if (viewClass == RegistrationView.class) {
seedWords.onCompleted(); seedWords.onCompleted();
password.onCompleted(); password.onCompleted();
restrictions.onCompleted(); restrictions.onCompleted();
fiatAccount.onCompleted(); ircAccount.onCompleted();
registration.show(); registration.show();
} }
}; };
@ -100,12 +99,12 @@ public class AccountSetupWizard extends ActivatableView implements Wizard {
"Setup password", "Protect your wallet with a password"); "Setup password", "Protect your wallet with a password");
restrictions = new WizardItem(RestrictionsView.class, restrictions = new WizardItem(RestrictionsView.class,
"Select arbitrators", "Select which arbitrators you want to use for trading"); "Select arbitrators", "Select which arbitrators you want to use for trading");
fiatAccount = new WizardItem(FiatAccountView.class, ircAccount = new WizardItem(IrcAccountView.class,
" Setup Payments account(s)", "You need to setup at least one payment account"); " Setup Payments account(s)", "You need to setup at least one payment account");
registration = new WizardItem(RegistrationView.class, registration = new WizardItem(RegistrationView.class,
"Register your account", "The registration in the Blockchain requires a payment of 0.0002 BTC"); "Register your account", "The registration in the Blockchain requires a payment of 0.0002 BTC");
leftVBox.getChildren().addAll(seedWords, password, restrictions, fiatAccount, registration); leftVBox.getChildren().addAll(seedWords, password, restrictions, ircAccount, registration);
seedWords.setDisable(true); seedWords.setDisable(true);
password.setDisable(true); password.setDisable(true);
@ -116,7 +115,7 @@ public class AccountSetupWizard extends ActivatableView implements Wizard {
@Override @Override
public void activate() { public void activate() {
navigation.addListener(listener); navigation.addListener(listener);
fiatAccount.show(); ircAccount.show();
} }
@Override @Override
@ -136,10 +135,10 @@ public class AccountSetupWizard extends ActivatableView implements Wizard {
} }
else if (currentStep instanceof RestrictionsView) { else if (currentStep instanceof RestrictionsView) {
restrictions.onCompleted(); restrictions.onCompleted();
fiatAccount.show(); ircAccount.show();
} }
else if (currentStep instanceof IrcAccountView) { else if (currentStep instanceof IrcAccountView) {
fiatAccount.onCompleted(); ircAccount.onCompleted();
registration.show(); registration.show();
} }
else if (currentStep instanceof RegistrationView) { else if (currentStep instanceof RegistrationView) {