From 65ad9aa7098f04483a64241187a232f0f7cdd28a Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Wed, 30 Dec 2015 12:24:08 +0100 Subject: [PATCH] Improve UIs (setting, main) --- .../java/io/bitsquare/app/BitsquareApp.java | 2 +- .../main/java/io/bitsquare/gui/bitsquare.css | 5 ----- .../java/io/bitsquare/gui/main/MainView.java | 9 +++------ .../io/bitsquare/gui/main/MainViewModel.java | 3 ++- .../account/settings/AccountSettingsView.java | 19 +++++++++---------- .../gui/main/settings/SettingsView.fxml | 2 +- .../settings/application/PreferencesView.java | 13 +++++++------ .../settings/network/NetworkSettingsView.java | 2 ++ .../io/bitsquare/gui/util/FormBuilder.java | 8 +++++++- 9 files changed, 32 insertions(+), 31 deletions(-) diff --git a/gui/src/main/java/io/bitsquare/app/BitsquareApp.java b/gui/src/main/java/io/bitsquare/app/BitsquareApp.java index 9232e30832..5a7a889770 100644 --- a/gui/src/main/java/io/bitsquare/app/BitsquareApp.java +++ b/gui/src/main/java/io/bitsquare/app/BitsquareApp.java @@ -73,7 +73,7 @@ import static io.bitsquare.app.BitsquareEnvironment.APP_NAME_KEY; public class BitsquareApp extends Application { private static final Logger log = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(BitsquareApp.class); - public static final boolean DEV_MODE = false; + public static final boolean DEV_MODE = true; public static final boolean IS_RELEASE_VERSION = !DEV_MODE && true; private static Environment env; diff --git a/gui/src/main/java/io/bitsquare/gui/bitsquare.css b/gui/src/main/java/io/bitsquare/gui/bitsquare.css index cf0c420d8d..01034ec8a7 100644 --- a/gui/src/main/java/io/bitsquare/gui/bitsquare.css +++ b/gui/src/main/java/io/bitsquare/gui/bitsquare.css @@ -74,11 +74,6 @@ bg color of non edit textFields: fafafa -fx-background: #bbb; } -#footer-bitcoin-network-label { - -fx-text-fill: -fx-accent; - -fx-font-size: 12; -} - #headline-label { -fx-font-weight: bold; -fx-font-size: 18; diff --git a/gui/src/main/java/io/bitsquare/gui/main/MainView.java b/gui/src/main/java/io/bitsquare/gui/main/MainView.java index c43d3b7e3d..42b80b3c54 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/MainView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/MainView.java @@ -350,17 +350,16 @@ public class MainView extends InitializableView { blockchainSyncIndicator.progressProperty().bind(model.blockchainSyncProgress); Label bitcoinNetworkLabel = new Label(); - bitcoinNetworkLabel.setId("footer-bitcoin-network-label"); - bitcoinNetworkLabel.setText(model.bitcoinNetworkAsString); + bitcoinNetworkLabel.setText("/ Bitcoin network: " + model.bitcoinNetworkAsString); model.walletServiceErrorMsg.addListener((ov, oldValue, newValue) -> { if (newValue != null) { bitcoinNetworkLabel.setId("splash-error-state-msg"); - bitcoinNetworkLabel.setText("Not connected"); + bitcoinNetworkLabel.setText("/ Bitcoin network: Not connected"); openBTCConnectionErrorPopup(newValue); } else { bitcoinNetworkLabel.setId("footer-bitcoin-network-label"); - bitcoinNetworkLabel.setText(model.bitcoinNetworkAsString); + bitcoinNetworkLabel.setText("/ Bitcoin network: " + model.bitcoinNetworkAsString); } }); @@ -368,8 +367,6 @@ public class MainView extends InitializableView { if ((double) newValue >= 1) { blockchainSyncIndicator.setVisible(false); blockchainSyncIndicator.setManaged(false); - blockchainSyncLabel.setVisible(false); - blockchainSyncLabel.setManaged(false); } }); diff --git a/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java index 8d888177e4..c162ba9fc3 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java @@ -252,7 +252,7 @@ class MainViewModel implements ViewModel { log.debug("Bitcoin peers " + newValue); numBTCPeers = (int) newValue; numBTCPeersAsString.set(String.valueOf(newValue) + " peers"); - if (blockchainSyncProgress.get() >= 1 && numBTCPeers > 1) + if (blockchainSyncProgress.get() >= 1 && numBTCPeers > 0) blockchainSyncInfoFooter.set("Bitcoin network: Peers: " + numBTCPeers); /* if ((int) newValue < 1) { @@ -591,6 +591,7 @@ class MainViewModel implements ViewModel { blockchainSyncInfo.set("Blockchain synchronization complete." + nrOfPeers); blockchainSyncIconId.set("image-connection-synced"); + blockchainSyncInfoFooter.set("Bitcoin network: Peers: " + numBTCPeers); } else if (value > 0.0) { // We stop as soon the download started the timeout stopBlockchainSyncTimeout(); diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java b/gui/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java index eeac9cf4d0..ec9ec5df29 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/settings/AccountSettingsView.java @@ -51,8 +51,10 @@ public class AccountSettingsView extends ActivatableViewAndModel { private MenuItem password, seedWords, backup, paymentAccount, arbitratorSelection; private Navigation.Listener listener; - @FXML private VBox leftVBox; - @FXML private AnchorPane content; + @FXML + private VBox leftVBox; + @FXML + private AnchorPane content; @Inject private AccountSettingsView(CachingViewLoader viewLoader, Navigation navigation) { @@ -77,7 +79,7 @@ public class AccountSettingsView extends ActivatableViewAndModel { arbitratorSelection = new MenuItem(navigation, toggleGroup, "Arbitrator selection", ArbitratorSelectionView.class, AwesomeIcon.USER_MD); // registration = new MenuItem(navigation, toggleGroup, "Renew your account", RegistrationView.class, AwesomeIcon.BRIEFCASE); - leftVBox.getChildren().addAll(password, seedWords, backup, paymentAccount, arbitratorSelection); + leftVBox.getChildren().addAll(arbitratorSelection, paymentAccount, password, seedWords, backup); } @Override @@ -85,9 +87,8 @@ public class AccountSettingsView extends ActivatableViewAndModel { navigation.addListener(listener); ViewPath viewPath = navigation.getCurrentPath(); if (viewPath.size() == 3 && viewPath.indexOf(AccountSettingsView.class) == 2) { - navigation.navigateTo(MainView.class, AccountView.class, AccountSettingsView.class, PasswordView.class); - } - else if (viewPath.size() == 4 && viewPath.indexOf(AccountSettingsView.class) == 2) { + navigation.navigateTo(MainView.class, AccountView.class, AccountSettingsView.class, ArbitratorSelectionView.class); + } else if (viewPath.size() == 4 && viewPath.indexOf(AccountSettingsView.class) == 2) { loadView(viewPath.get(3)); } } @@ -148,8 +149,7 @@ class MenuItem extends ToggleButton { if (newValue) { setId("account-settings-item-background-selected"); icon.setTextFill(Colors.BLUE); - } - else { + } else { setId("account-settings-item-background-active"); icon.setTextFill(Paint.valueOf("#333")); } @@ -159,8 +159,7 @@ class MenuItem extends ToggleButton { if (newValue) { setId("account-settings-item-background-disabled"); icon.setTextFill(Paint.valueOf("#ccc")); - } - else { + } else { setId("account-settings-item-background-active"); icon.setTextFill(Paint.valueOf("#333")); } 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..a4949b9c25 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/application/PreferencesView.java b/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java index 37f1a58c36..98a665a44c 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/settings/application/PreferencesView.java @@ -52,13 +52,14 @@ public class PreferencesView extends ActivatableViewAndModel model.onSelectLanguageCode(languageComboBox.getSelectionModel().getSelectedItem())); - + blockExplorerComboBox.setItems(model.blockExplorers); blockExplorerComboBox.getSelectionModel().select(model.getBlockExplorer()); blockExplorerComboBox.setConverter(new StringConverter() { diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java b/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java index 1213d289ec..ba0bfca7b2 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java @@ -176,6 +176,8 @@ public class NetworkSettingsView extends ActivatableViewAndModel BitsquareApp.shutDownHandler.run(), 1); }) + .actionButtonText("Shut down") + .closeButtonText("Cancel") .onClose(() -> netWorkComboBox.getSelectionModel().select(preferences.getBitcoinNetwork())) .show(); } diff --git a/gui/src/main/java/io/bitsquare/gui/util/FormBuilder.java b/gui/src/main/java/io/bitsquare/gui/util/FormBuilder.java index e03c7c70da..2da394fdb4 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/FormBuilder.java +++ b/gui/src/main/java/io/bitsquare/gui/util/FormBuilder.java @@ -358,11 +358,17 @@ public class FormBuilder { /////////////////////////////////////////////////////////////////////////////////////////// public static Tuple2 addLabelCheckBox(GridPane gridPane, int rowIndex, String title, String checkBoxTitle) { - Label label = addLabel(gridPane, rowIndex, title, -3); + return addLabelCheckBox(gridPane, rowIndex, title, checkBoxTitle, 0); + } + public static Tuple2 addLabelCheckBox(GridPane gridPane, int rowIndex, String title, String checkBoxTitle, double top) { + Label label = addLabel(gridPane, rowIndex, title, -3); + GridPane.setMargin(label, new Insets(top, 0, 0, 0)); + CheckBox checkBox = new CheckBox(checkBoxTitle); GridPane.setRowIndex(checkBox, rowIndex); GridPane.setColumnIndex(checkBox, 1); + GridPane.setMargin(checkBox, new Insets(top, 0, 0, 0)); gridPane.getChildren().add(checkBox); return new Tuple2<>(label, checkBox);