From d015df43cb042db2ee58e978f282bcbb5641725b Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Wed, 9 Mar 2016 13:40:32 +0100 Subject: [PATCH] make offerbook table in market view not selectable and show only top 3 offers, remove show effects option --- .../java/io/bitsquare/user/Preferences.java | 18 --------------- .../gui/main/account/AccountView.java | 2 +- .../altcoinaccounts/AltCoinAccountsView.java | 2 +- .../ArbitratorSelectionView.java | 2 +- .../fiataccounts/FiatAccountsView.java | 2 +- .../gui/main/disputes/DisputesView.java | 22 ------------------- .../markets/charts/MarketsChartsView.java | 12 ++++++---- .../charts/MarketsChartsViewModel.java | 2 ++ .../pendingtrades/PendingTradesView.java | 1 - .../gui/main/settings/SettingsView.fxml | 2 +- .../settings/preferences/PreferencesView.java | 15 ++++--------- 11 files changed, 19 insertions(+), 61 deletions(-) diff --git a/core/src/main/java/io/bitsquare/user/Preferences.java b/core/src/main/java/io/bitsquare/user/Preferences.java index 59aba19bfc..d87b35da60 100644 --- a/core/src/main/java/io/bitsquare/user/Preferences.java +++ b/core/src/main/java/io/bitsquare/user/Preferences.java @@ -108,7 +108,6 @@ public final class Preferences implements Persistable { // Observable wrappers transient private final StringProperty btcDenominationProperty = new SimpleStringProperty(btcDenomination); transient private final BooleanProperty useAnimationsProperty = new SimpleBooleanProperty(useAnimations); - transient private final BooleanProperty useEffectsProperty = new SimpleBooleanProperty(useEffects); transient private final ObservableList fiatCurrenciesAsObservable = FXCollections.observableArrayList(); transient private final ObservableList cryptoCurrenciesAsObservable = FXCollections.observableArrayList(); transient private final ObservableList tradeCurrenciesAsObservable = FXCollections.observableArrayList(); @@ -128,7 +127,6 @@ public final class Preferences implements Persistable { if (persisted != null) { setBtcDenomination(persisted.btcDenomination); setUseAnimations(persisted.useAnimations); - setUseEffects(persisted.useEffects); setFiatCurrencies(persisted.fiatCurrencies); fiatCurrencies = new ArrayList<>(fiatCurrenciesAsObservable); @@ -189,10 +187,6 @@ public final class Preferences implements Persistable { useAnimations = useAnimationsProperty.get(); storage.queueUpForSave(2000); }); - useEffectsProperty.addListener((ov) -> { - useEffects = useEffectsProperty.get(); - storage.queueUpForSave(2000); - }); fiatCurrenciesAsObservable.addListener((Observable ov) -> { fiatCurrencies.clear(); fiatCurrencies.addAll(fiatCurrenciesAsObservable); @@ -241,10 +235,6 @@ public final class Preferences implements Persistable { this.useAnimationsProperty.set(useAnimationsProperty); } - public void setUseEffects(boolean useEffectsProperty) { - this.useEffectsProperty.set(useEffectsProperty); - } - public void setBitcoinNetwork(BitcoinNetwork bitcoinNetwork) { if (this.bitcoinNetwork != bitcoinNetwork) bitsquareEnvironment.saveBitcoinNetwork(bitcoinNetwork); @@ -358,10 +348,6 @@ public final class Preferences implements Persistable { return btcDenominationProperty.get(); } - public boolean getUseEffects() { - return useEffectsProperty.get(); - } - public boolean getUseAnimations() { return useAnimationsProperty.get(); } @@ -374,10 +360,6 @@ public final class Preferences implements Persistable { return useAnimationsProperty; } - public BooleanProperty useEffectsPropertyProperty() { - return useEffectsProperty; - } - public BitcoinNetwork getBitcoinNetwork() { return bitcoinNetwork; } diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/AccountView.java b/gui/src/main/java/io/bitsquare/gui/main/account/AccountView.java index c91e883f15..255e602e3b 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/account/AccountView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/AccountView.java @@ -130,7 +130,7 @@ public class AccountView extends ActivatableView { if (view instanceof AccountSettingsView) { selectedTab = accountSettingsTab; accountSettingsView = (AccountSettingsView) view; - selectedTab.setText("Account settings"); + selectedTab.setText("Account"); if (arbitratorRegistrationTab != null) { arbitratorRegistrationTab.setDisable(false); if (arbitratorRegistrationView != null) diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/altcoinaccounts/AltCoinAccountsView.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/altcoinaccounts/AltCoinAccountsView.java index 248643e415..9f82973192 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/account/content/altcoinaccounts/AltCoinAccountsView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/altcoinaccounts/AltCoinAccountsView.java @@ -154,7 +154,7 @@ public class AltCoinAccountsView extends ActivatableViewAndModel tuple = addLabelListView(root, gridRow, "Your accounts:", Layout.FIRST_ROW_DISTANCE); + Tuple2 tuple = addLabelListView(root, gridRow, "Your cryptocurrency accounts:", Layout.FIRST_ROW_DISTANCE); GridPane.setValignment(tuple.first, VPos.TOP); paymentAccountsListView = tuple.second; paymentAccountsListView.setPrefHeight(2 * Layout.LIST_ROW_HEIGHT + 14); diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/arbitratorselection/ArbitratorSelectionView.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/arbitratorselection/ArbitratorSelectionView.java index 2baa64f259..0fef3bbc80 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/account/content/arbitratorselection/ArbitratorSelectionView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/arbitratorselection/ArbitratorSelectionView.java @@ -206,7 +206,7 @@ public class ArbitratorSelectionView extends ActivatableViewAndModel nameColumn = new TableColumn("Public key"); + TableColumn nameColumn = new TableColumn("Onion address"); nameColumn.setCellValueFactory(param -> new ReadOnlyObjectWrapper(param.getValue().getAddressString())); nameColumn.setMinWidth(90); diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/content/fiataccounts/FiatAccountsView.java b/gui/src/main/java/io/bitsquare/gui/main/account/content/fiataccounts/FiatAccountsView.java index bf55700b19..deabcf804f 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/account/content/fiataccounts/FiatAccountsView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/content/fiataccounts/FiatAccountsView.java @@ -156,7 +156,7 @@ public class FiatAccountsView extends ActivatableViewAndModel tuple = addLabelListView(root, gridRow, "Your accounts:", Layout.FIRST_ROW_DISTANCE); + Tuple2 tuple = addLabelListView(root, gridRow, "Your national currency accounts:", Layout.FIRST_ROW_DISTANCE); GridPane.setValignment(tuple.first, VPos.TOP); paymentAccountsListView = tuple.second; paymentAccountsListView.setPrefHeight(2 * Layout.LIST_ROW_HEIGHT + 14); diff --git a/gui/src/main/java/io/bitsquare/gui/main/disputes/DisputesView.java b/gui/src/main/java/io/bitsquare/gui/main/disputes/DisputesView.java index 6440b20ba5..2b94b57d70 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/disputes/DisputesView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/disputes/DisputesView.java @@ -143,28 +143,6 @@ public class DisputesView extends ActivatableViewAndModel }) .dontShowAgainId(key, preferences) .show(); - /* - .backgroundInfo("Bitsquare is not a company and not operating any kind of customer support.\n\n" + - "If there are disputes in the trade process (e.g. one trader does not follow the trade protocol) " + - "the application will display a \"Open dispute\" button after the trade period is over " + - "for contacting the arbitrator.\n" + - "In cases of software bugs or network problems, which are detected by the application there will " + - "be displayed a \"Open support ticket\" button to contact the arbitrator who will forward the issue " + - "to the developers.\n\n" + - "In cases where a user got stuck by a bug without getting displayed that \"Open support ticket\" button, " + - "you can open here a support ticket manually.\n\n" + - "Please use that only if you are sure that the software is not working like expected. " + - "If you have problems how to use Bitsquare of questions please review the FAQ at the " + - "Bitsquare.io web page or contact the Bitsquare over " + - "any of the communication channels offered " + - "at the Bitsquare.io web page.") - .closeButtonText("Open Bitsquare.io web page") - .onClose(() -> Utilities.openWebPage("https://bitsquare.io")) - .actionButtonText("I understand") - .onAction(() -> { - }) - .dontShowAgainId(key, preferences) - .show();*/ } @Override diff --git a/gui/src/main/java/io/bitsquare/gui/main/markets/charts/MarketsChartsView.java b/gui/src/main/java/io/bitsquare/gui/main/markets/charts/MarketsChartsView.java index 9a6f981898..c4262506f1 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/markets/charts/MarketsChartsView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/markets/charts/MarketsChartsView.java @@ -155,13 +155,16 @@ public class MarketsChartsView extends ActivatableViewAndModel, VBox, Button> getOfferTable(Offer.Direction direction) { TableView tableView = new TableView<>(); - tableView.setMinHeight(100); + tableView.setMinHeight(99); + tableView.setMaxHeight(99); tableView.setMinWidth(390); + tableView.setMouseTransparent(true); // price TableColumn priceColumn = new TableColumn<>(); priceColumn.textProperty().bind(priceColumnLabel); priceColumn.setMinWidth(120); + priceColumn.setSortable(false); priceColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue())); priceColumn.setCellFactory( new Callback, TableCell>() { @@ -185,6 +188,7 @@ public class MarketsChartsView extends ActivatableViewAndModel amountColumn = new TableColumn<>("Amount (BTC)"); amountColumn.setText("Amount (BTC)"); amountColumn.setMinWidth(120); + amountColumn.setSortable(false); amountColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue())); amountColumn.setCellFactory( new Callback, TableCell>() { @@ -207,6 +211,7 @@ public class MarketsChartsView extends ActivatableViewAndModel volumeColumn = new TableColumn<>("Amount (BTC)"); volumeColumn.setMinWidth(120); + volumeColumn.setSortable(false); volumeColumn.textProperty().bind(volumeColumnLabel); volumeColumn.setCellValueFactory((offer) -> new ReadOnlyObjectWrapper<>(offer.getValue())); volumeColumn.setCellFactory( @@ -231,9 +236,8 @@ public class MarketsChartsView extends ActivatableViewAndModel titleLabel.prefWidthProperty().bind(tableView.widthProperty())); @@ -251,7 +255,7 @@ public class MarketsChartsView extends ActivatableViewAndModel popup.hide()) .show(); } - //new OpenSupportTicketWindow().onOpenTicket(model.dataModel::onOpenSupportTicket).show(); }; } diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml b/gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml index 26ef765445..ff671ea972 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml +++ b/gui/src/main/java/io/bitsquare/gui/main/settings/SettingsView.fxml @@ -25,6 +25,6 @@ AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0" xmlns:fx="http://javafx.com/fxml"> - + diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/preferences/PreferencesView.java b/gui/src/main/java/io/bitsquare/gui/main/settings/preferences/PreferencesView.java index 1bdc20b74e..67e8316f8e 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/settings/preferences/PreferencesView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/settings/preferences/PreferencesView.java @@ -57,7 +57,7 @@ public class PreferencesView extends ActivatableViewAndModel userLanguageComboBox; private ComboBox preferredTradeCurrencyComboBox; - private CheckBox useAnimationsCheckBox, useEffectsCheckBox, autoSelectArbitratorsCheckBox; + private CheckBox useAnimationsCheckBox, autoSelectArbitratorsCheckBox; private int gridRow = 0; //private InputTextField transactionFeeInputTextField; private ChangeListener transactionFeeFocusedListener; @@ -130,7 +130,7 @@ public class PreferencesView extends ActivatableViewAndModel preferences.setUseAnimations(useAnimationsCheckBox.isSelected())); - useEffectsCheckBox.setSelected(preferences.getUseEffects()); - useEffectsCheckBox.setOnAction(e -> preferences.setUseEffects(useEffectsCheckBox.isSelected())); - resetDontShowAgainButton.setOnAction(e -> preferences.resetDontShowAgainForType()); autoSelectArbitratorsCheckBox.setSelected(preferences.getAutoSelectArbitrators()); @@ -423,10 +419,7 @@ public class PreferencesView extends ActivatableViewAndModel