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

rename paymentaccountview

Browse Source
This commit is contained in:
Manfred Karrer 2016-03-01 01:31:54 +01:00
parent 4f7becf018
commit 59ad7653b5
12 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gui/src/main/java/io/bitsquare/gui/main/account/AccountView.java
View File

@ -21,7 +21,7 @@ import io.bitsquare.gui.Navigation;
import io.bitsquare.gui.common.view.*;
import io.bitsquare.gui.main.MainView;
import io.bitsquare.gui.main.account.arbitratorregistration.ArbitratorRegistrationView;
import io.bitsquare.gui.main.account.content.paymentsaccount.PaymentAccountView;
import io.bitsquare.gui.main.account.content.fiataccounts.FiatAccountsView;
import io.bitsquare.gui.main.account.settings.AccountSettingsView;
import javafx.beans.value.ChangeListener;
import javafx.event.EventHandler;
@ -67,7 +67,7 @@ public class AccountView extends ActivatableView<TabPane, AccountViewModel> {
navigationListener = viewPath -> {
if (viewPath.size() == 3 && viewPath.indexOf(AccountView.class) == 1) {
if (arbitratorRegistrationTab == null && viewPath.get(2).equals(ArbitratorRegistrationView.class))
navigation.navigateTo(MainView.class, AccountView.class, AccountSettingsView.class, PaymentAccountView.class);
navigation.navigateTo(MainView.class, AccountView.class, AccountSettingsView.class, FiatAccountsView.class);
else
loadView(viewPath.tip());
}
@ -86,7 +86,7 @@ public class AccountView extends ActivatableView<TabPane, AccountViewModel> {
if (newValue == accountSettingsTab) {
Class<? extends View> selectedViewClass = accountSettingsView.getSelectedViewClass();
if (selectedViewClass == null)
navigation.navigateTo(MainView.class, AccountView.class, AccountSettingsView.class, PaymentAccountView.class);
navigation.navigateTo(MainView.class, AccountView.class, AccountSettingsView.class, FiatAccountsView.class);
else
navigation.navigateTo(MainView.class, AccountView.class, AccountSettingsView.class, selectedViewClass);
} else if (arbitratorRegistrationTab != null) {

6
gui/src/main/java/io/bitsquare/gui/main/account/content/altcoinsaccount/AltCoinsAccountDataModel.java → gui/src/main/java/io/bitsquare/gui/main/account/content/altcoinaccounts/AltCoinAccountsDataModel.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.main.account.content.altcoinsaccount;
package io.bitsquare.gui.main.account.content.altcoinaccounts;
import com.google.inject.Inject;
import io.bitsquare.gui.common.model.ActivatableDataModel;
@ -28,14 +28,14 @@ import javafx.collections.SetChangeListener;
import java.util.stream.Collectors;
class AltCoinsAccountDataModel extends ActivatableDataModel {
class AltCoinAccountsDataModel extends ActivatableDataModel {
private final User user;
final ObservableList<PaymentAccount> paymentAccounts = FXCollections.observableArrayList();
private final SetChangeListener<PaymentAccount> setChangeListener;
@Inject
public AltCoinsAccountDataModel(User user) {
public AltCoinAccountsDataModel(User user) {
this.user = user;
setChangeListener = change -> fillAndSortPaymentAccounts();
}

2
gui/src/main/java/io/bitsquare/gui/main/account/content/altcoinsaccount/AltCoinsAccountView.fxml → gui/src/main/java/io/bitsquare/gui/main/account/content/altcoinaccounts/AltCoinAccountsView.fxml
View File

@ -19,7 +19,7 @@
<?import javafx.scene.layout.*?>
<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.altcoinsaccount.AltCoinsAccountView"
<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.altcoinaccounts.AltCoinAccountsView"
hgap="5.0" vgap="5.0"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="-10.0"

16
gui/src/main/java/io/bitsquare/gui/main/account/content/altcoinsaccount/AltCoinsAccountView.java → gui/src/main/java/io/bitsquare/gui/main/account/content/altcoinaccounts/AltCoinAccountsView.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.main.account.content.altcoinsaccount;
package io.bitsquare.gui.main.account.content.altcoinaccounts;
import io.bitsquare.common.util.Tuple2;
import io.bitsquare.gui.common.view.ActivatableViewAndModel;
@ -47,7 +47,7 @@ import javax.inject.Inject;
import static io.bitsquare.gui.util.FormBuilder.*;
@FxmlView
public class AltCoinsAccountView extends ActivatableViewAndModel<GridPane, AltCoinsAccountViewModel> {
public class AltCoinAccountsView extends ActivatableViewAndModel<GridPane, AltCoinAccountsViewModel> {
private ListView<PaymentAccount> paymentAccountsListView;
@ -68,7 +68,7 @@ public class AltCoinsAccountView extends ActivatableViewAndModel<GridPane, AltCo
private ChangeListener<PaymentAccount> paymentAccountChangeListener;
@Inject
public AltCoinsAccountView(AltCoinsAccountViewModel model,
public AltCoinAccountsView(AltCoinAccountsViewModel model,
IBANValidator ibanValidator,
BICValidator bicValidator,
InputValidator inputValidator,
@ -96,7 +96,7 @@ public class AltCoinsAccountView extends ActivatableViewAndModel<GridPane, AltCo
if (newValue != null)
onSelectAccount(newValue);
};
Label placeholder = new Label("There are no altcoin accounts set up yet");
Label placeholder = new Label("There are no accounts set up yet");
placeholder.setWrapText(true);
paymentAccountsListView.setPlaceholder(placeholder);
}
@ -135,7 +135,7 @@ public class AltCoinsAccountView extends ActivatableViewAndModel<GridPane, AltCo
}
private void onDeleteAccount(PaymentAccount paymentAccount) {
new Popup().warning("Do you really want to delete the selected altcoin account?")
new Popup().warning("Do you really want to delete the selected account?")
.onAction(() -> {
model.onDeleteAccount(paymentAccount);
removeSelectAccountForm();
@ -149,9 +149,9 @@ public class AltCoinsAccountView extends ActivatableViewAndModel<GridPane, AltCo
///////////////////////////////////////////////////////////////////////////////////////////
private void buildForm() {
addTitledGroupBg(root, gridRow, 1, "Manage altcoin accounts");
addTitledGroupBg(root, gridRow, 2, "Manage accounts");
Tuple2<Label, ListView> tuple = addLabelListView(root, gridRow, "Your altcoin accounts:", Layout.FIRST_ROW_DISTANCE);
Tuple2<Label, ListView> tuple = addLabelListView(root, gridRow, "Your accounts:", Layout.FIRST_ROW_DISTANCE);
GridPane.setValignment(tuple.first, VPos.TOP);
paymentAccountsListView = tuple.second;
paymentAccountsListView.setPrefHeight(2 * Layout.LIST_ROW_HEIGHT + 14);
@ -185,7 +185,7 @@ public class AltCoinsAccountView extends ActivatableViewAndModel<GridPane, AltCo
}
});
addAccountButton = addButtonAfterGroup(root, ++gridRow, "Add new account");
addAccountButton = addButton(root, ++gridRow, "Add new account");
addAccountButton.setOnAction(event -> addNewAccount());
}

6
gui/src/main/java/io/bitsquare/gui/main/account/content/altcoinsaccount/AltCoinsAccountViewModel.java → gui/src/main/java/io/bitsquare/gui/main/account/content/altcoinaccounts/AltCoinAccountsViewModel.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.main.account.content.altcoinsaccount;
package io.bitsquare.gui.main.account.content.altcoinaccounts;
import com.google.inject.Inject;
import io.bitsquare.gui.common.model.ActivatableWithDataModel;
@ -23,11 +23,11 @@ import io.bitsquare.gui.common.model.ViewModel;
import io.bitsquare.payment.PaymentAccount;
import javafx.collections.ObservableList;
class AltCoinsAccountViewModel extends ActivatableWithDataModel<AltCoinsAccountDataModel> implements ViewModel {
class AltCoinAccountsViewModel extends ActivatableWithDataModel<AltCoinAccountsDataModel> implements ViewModel {
@Inject
public AltCoinsAccountViewModel(AltCoinsAccountDataModel dataModel) {
public AltCoinAccountsViewModel(AltCoinAccountsDataModel dataModel) {
super(dataModel);
}

6
gui/src/main/java/io/bitsquare/gui/main/account/content/paymentsaccount/PaymentAccountDataModel.java → gui/src/main/java/io/bitsquare/gui/main/account/content/fiataccounts/FiatAccountsDataModel.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.main.account.content.paymentsaccount;
package io.bitsquare.gui.main.account.content.fiataccounts;
import com.google.inject.Inject;
import io.bitsquare.gui.common.model.ActivatableDataModel;
@ -29,14 +29,14 @@ import javafx.collections.SetChangeListener;
import java.util.List;
import java.util.stream.Collectors;
class PaymentAccountDataModel extends ActivatableDataModel {
class FiatAccountsDataModel extends ActivatableDataModel {
private final User user;
final ObservableList<PaymentAccount> paymentAccounts = FXCollections.observableArrayList();
private final SetChangeListener<PaymentAccount> setChangeListener;
@Inject
public PaymentAccountDataModel(User user) {
public FiatAccountsDataModel(User user) {
this.user = user;
setChangeListener = change -> fillAndSortPaymentAccounts();
}

2
gui/src/main/java/io/bitsquare/gui/main/account/content/paymentsaccount/PaymentAccountView.fxml → gui/src/main/java/io/bitsquare/gui/main/account/content/fiataccounts/FiatAccountsView.fxml
View File

@ -19,7 +19,7 @@
<?import javafx.scene.layout.*?>
<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.paymentsaccount.PaymentAccountView"
<GridPane fx:id="root" fx:controller="io.bitsquare.gui.main.account.content.fiataccounts.FiatAccountsView"
hgap="5.0" vgap="5.0"
AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0"
AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="-10.0"

32
gui/src/main/java/io/bitsquare/gui/main/account/content/paymentsaccount/PaymentAccountView.java → gui/src/main/java/io/bitsquare/gui/main/account/content/fiataccounts/FiatAccountsView.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.main.account.content.paymentsaccount;
package io.bitsquare.gui.main.account.content.fiataccounts;
import io.bitsquare.common.util.Tuple2;
import io.bitsquare.gui.common.view.ActivatableViewAndModel;
@ -48,7 +48,7 @@ import java.util.stream.Collectors;
import static io.bitsquare.gui.util.FormBuilder.*;
@FxmlView
public class PaymentAccountView extends ActivatableViewAndModel<GridPane, PaymentAccountViewModel> {
public class FiatAccountsView extends ActivatableViewAndModel<GridPane, FiatAccountsViewModel> {
private ListView<PaymentAccount> paymentAccountsListView;
private ComboBox<PaymentMethod> paymentMethodsComboBox;
@ -70,15 +70,15 @@ public class PaymentAccountView extends ActivatableViewAndModel<GridPane, Paymen
private ChangeListener<PaymentAccount> paymentAccountChangeListener;
@Inject
public PaymentAccountView(PaymentAccountViewModel model,
IBANValidator ibanValidator,
BICValidator bicValidator,
InputValidator inputValidator,
OKPayValidator okPayValidator,
AliPayValidator aliPayValidator,
PerfectMoneyValidator perfectMoneyValidator,
SwishValidator swishValidator,
AltCoinAddressValidator altCoinAddressValidator) {
public FiatAccountsView(FiatAccountsViewModel model,
IBANValidator ibanValidator,
BICValidator bicValidator,
InputValidator inputValidator,
OKPayValidator okPayValidator,
AliPayValidator aliPayValidator,
PerfectMoneyValidator perfectMoneyValidator,
SwishValidator swishValidator,
AltCoinAddressValidator altCoinAddressValidator) {
super(model);
this.ibanValidator = ibanValidator;
@ -98,7 +98,7 @@ public class PaymentAccountView extends ActivatableViewAndModel<GridPane, Paymen
if (newValue != null)
onSelectAccount(newValue);
};
Label placeholder = new Label("There are no payment accounts set up yet");
Label placeholder = new Label("There are no accounts set up yet");
placeholder.setWrapText(true);
paymentAccountsListView.setPlaceholder(placeholder);
}
@ -137,7 +137,7 @@ public class PaymentAccountView extends ActivatableViewAndModel<GridPane, Paymen
}
private void onDeleteAccount(PaymentAccount paymentAccount) {
new Popup().warning("Do you really want to delete the selected payment account?")
new Popup().warning("Do you really want to delete the selected account?")
.onAction(() -> {
model.onDeleteAccount(paymentAccount);
removeSelectAccountForm();
@ -151,9 +151,9 @@ public class PaymentAccountView extends ActivatableViewAndModel<GridPane, Paymen
///////////////////////////////////////////////////////////////////////////////////////////
private void buildForm() {
addTitledGroupBg(root, gridRow, 1, "Manage payment accounts");
addTitledGroupBg(root, gridRow, 2, "Manage accounts");
Tuple2<Label, ListView> tuple = addLabelListView(root, gridRow, "Your payment accounts:", Layout.FIRST_ROW_DISTANCE);
Tuple2<Label, ListView> tuple = addLabelListView(root, gridRow, "Your accounts:", Layout.FIRST_ROW_DISTANCE);
GridPane.setValignment(tuple.first, VPos.TOP);
paymentAccountsListView = tuple.second;
paymentAccountsListView.setPrefHeight(2 * Layout.LIST_ROW_HEIGHT + 14);
@ -187,7 +187,7 @@ public class PaymentAccountView extends ActivatableViewAndModel<GridPane, Paymen
}
});
addAccountButton = addButtonAfterGroup(root, ++gridRow, "Add new account");
addAccountButton = addButton(root, ++gridRow, "Add new account");
addAccountButton.setOnAction(event -> addNewAccount());
}

6
gui/src/main/java/io/bitsquare/gui/main/account/content/paymentsaccount/PaymentAccountViewModel.java → gui/src/main/java/io/bitsquare/gui/main/account/content/fiataccounts/FiatAccountsViewModel.java
View File

@ -15,7 +15,7 @@
* along with Bitsquare. If not, see <http://www.gnu.org/licenses/>.
*/
package io.bitsquare.gui.main.account.content.paymentsaccount;
package io.bitsquare.gui.main.account.content.fiataccounts;
import com.google.inject.Inject;
import io.bitsquare.gui.common.model.ActivatableWithDataModel;
@ -23,11 +23,11 @@ import io.bitsquare.gui.common.model.ViewModel;
import io.bitsquare.payment.PaymentAccount;
import javafx.collections.ObservableList;
class PaymentAccountViewModel extends ActivatableWithDataModel<PaymentAccountDataModel> implements ViewModel {
class FiatAccountsViewModel extends ActivatableWithDataModel<FiatAccountsDataModel> implements ViewModel {
@Inject
public PaymentAccountViewModel(PaymentAccountDataModel dataModel) {
public FiatAccountsViewModel(FiatAccountsDataModel dataModel) {
super(dataModel);
}

6
gui/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.fxml
View File

@ -23,9 +23,9 @@
prefHeight="660.0" prefWidth="1000.0"
xmlns:fx="http://javafx.com/fxml">
<VBox fx:id="leftVBox" spacing="5" prefWidth="200" AnchorPane.bottomAnchor="20" AnchorPane.leftAnchor="15"
<VBox fx:id="leftVBox" spacing="5" prefWidth="220" AnchorPane.bottomAnchor="20" AnchorPane.leftAnchor="15"
AnchorPane.topAnchor="20"/>
<AnchorPane fx:id="content" AnchorPane.bottomAnchor="10" AnchorPane.rightAnchor="25" AnchorPane.leftAnchor="250"
AnchorPane.topAnchor="30" prefWidth="720"/>
<AnchorPane fx:id="content" AnchorPane.bottomAnchor="10" AnchorPane.rightAnchor="25" AnchorPane.leftAnchor="270"
AnchorPane.topAnchor="30"/>
</AnchorPane>

16
gui/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java
View File

@ -23,11 +23,11 @@ import io.bitsquare.gui.Navigation;
import io.bitsquare.gui.common.view.*;
import io.bitsquare.gui.main.MainView;
import io.bitsquare.gui.main.account.AccountView;
import io.bitsquare.gui.main.account.content.altcoinsaccount.AltCoinsAccountView;
import io.bitsquare.gui.main.account.content.altcoinaccounts.AltCoinAccountsView;
import io.bitsquare.gui.main.account.content.arbitratorselection.ArbitratorSelectionView;
import io.bitsquare.gui.main.account.content.backup.BackupView;
import io.bitsquare.gui.main.account.content.fiataccounts.FiatAccountsView;
import io.bitsquare.gui.main.account.content.password.PasswordView;
import io.bitsquare.gui.main.account.content.paymentsaccount.PaymentAccountView;
import io.bitsquare.gui.main.account.content.seedwords.SeedWordsView;
import io.bitsquare.gui.util.Colors;
import javafx.beans.value.ChangeListener;
@ -75,8 +75,8 @@ public class AccountSettingsView extends ActivatableViewAndModel {
};
ToggleGroup toggleGroup = new ToggleGroup();
paymentAccount = new MenuItem(navigation, toggleGroup, "Payment account(s)", PaymentAccountView.class, AwesomeIcon.MONEY);
altCoinsAccountView = new MenuItem(navigation, toggleGroup, "Altcoin account(s)", AltCoinsAccountView.class, AwesomeIcon.LINK);
paymentAccount = new MenuItem(navigation, toggleGroup, "National currency accounts", FiatAccountsView.class, AwesomeIcon.MONEY);
altCoinsAccountView = new MenuItem(navigation, toggleGroup, "Cryptocurrency accounts", AltCoinAccountsView.class, AwesomeIcon.LINK);
arbitratorSelection = new MenuItem(navigation, toggleGroup, "Arbitrator selection", ArbitratorSelectionView.class, AwesomeIcon.USER_MD);
password = new MenuItem(navigation, toggleGroup, "Wallet password", PasswordView.class, AwesomeIcon.UNLOCK_ALT);
seedWords = new MenuItem(navigation, toggleGroup, "Wallet seed", SeedWordsView.class, AwesomeIcon.KEY);
@ -98,7 +98,7 @@ public class AccountSettingsView extends ActivatableViewAndModel {
ViewPath viewPath = navigation.getCurrentPath();
if (viewPath.size() == 3 && viewPath.indexOf(AccountSettingsView.class) == 2 ||
viewPath.size() == 2 && viewPath.indexOf(AccountView.class) == 1) {
navigation.navigateTo(MainView.class, AccountView.class, AccountSettingsView.class, PaymentAccountView.class);
navigation.navigateTo(MainView.class, AccountView.class, AccountSettingsView.class, FiatAccountsView.class);
} else if (viewPath.size() == 4 && viewPath.indexOf(AccountSettingsView.class) == 2) {
selectedViewClass = viewPath.get(3);
loadView(selectedViewClass);
@ -121,8 +121,8 @@ public class AccountSettingsView extends ActivatableViewAndModel {
View view = viewLoader.load(viewClass);
content.getChildren().setAll(view.getRoot());
if (view instanceof PaymentAccountView) paymentAccount.setSelected(true);
else if (view instanceof AltCoinsAccountView) altCoinsAccountView.setSelected(true);
if (view instanceof FiatAccountsView) paymentAccount.setSelected(true);
else if (view instanceof AltCoinAccountsView) altCoinsAccountView.setSelected(true);
else if (view instanceof ArbitratorSelectionView) arbitratorSelection.setSelected(true);
else if (view instanceof PasswordView) password.setSelected(true);
else if (view instanceof SeedWordsView) seedWords.setSelected(true);
@ -150,7 +150,7 @@ class MenuItem extends ToggleButton {
setText(title);
setId("account-settings-item-background-active");
setPrefHeight(40);
setPrefWidth(200);
setPrefWidth(220);
setAlignment(Pos.CENTER_LEFT);
Label icon = new Label();

8
gui/src/main/java/io/bitsquare/gui/main/offer/offerbook/OfferBookView.java
View File

@ -25,7 +25,7 @@ import io.bitsquare.gui.components.TitledGroupBg;
import io.bitsquare.gui.main.MainView;
import io.bitsquare.gui.main.account.AccountView;
import io.bitsquare.gui.main.account.content.arbitratorselection.ArbitratorSelectionView;
import io.bitsquare.gui.main.account.content.paymentsaccount.PaymentAccountView;
import io.bitsquare.gui.main.account.content.fiataccounts.FiatAccountsView;
import io.bitsquare.gui.main.account.settings.AccountSettingsView;
import io.bitsquare.gui.main.funds.FundsView;
import io.bitsquare.gui.main.funds.withdrawal.WithdrawalView;
@ -251,12 +251,12 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
private void onCreateOffer() {
if (!model.hasPaymentAccount()) {
showWarning("You don't have setup a payment account yet.",
"You need to setup your payment account before you can trade.\nDo you want to do this now?", PaymentAccountView.class);
"You need to setup your payment account before you can trade.\nDo you want to do this now?", FiatAccountsView.class);
} else if (!model.hasPaymentAccountForCurrency()) {
showWarning("You don't have a payment account for the currency:\n" +
model.getSelectedTradeCurrency().getCodeAndName(),
"You need to setup a payment account for the selected currency to be able to trade in that currency.\n" +
"Do you want to do this now?", PaymentAccountView.class);
"Do you want to do this now?", FiatAccountsView.class);
} else if (!model.hasAcceptedArbitrators()) {
showWarning("You don't have an arbitrator selected.",
"You need to setup at least one arbitrator to be able to trade.\n" +
@ -275,7 +275,7 @@ public class OfferBookView extends ActivatableViewAndModel<GridPane, OfferBookVi
} else if (!isPaymentAccountValidForOffer) {
showWarning("You don't have a payment account with the payment method required for that offer.",
"You need to setup a payment account with that payment method if you want to take that offer.\n" +
"Do you want to do this now?", PaymentAccountView.class);
"Do you want to do this now?", FiatAccountsView.class);
} else if (!hasSameProtocolVersion) {
new Popup().information("That offer requires a different protocol version as the one used in your " +
"version of the software." +