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

Update build files

Browse source
This commit is contained in:
Manfred Karrer 2015-04-16 11:43:39 +02:00
parent b9fe4660a3
commit 33a539ca52
20 changed files with 749 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gui/src/main/java/io/bitsquare/gui/main/MainView.java
View file

@ -259,9 +259,12 @@ public class MainView extends InitializableView<StackPane, MainViewModel> {
bootstrapIcon.setId(newValue);
bootstrapIcon.setVisible(true);
bootstrapIcon.setManaged(true);
bootstrapIndicator.setVisible(false);
bootstrapIndicator.setManaged(false);
});
model.bootstrapProgress.addListener((ov, oldValue, newValue) -> {
if ((double) newValue >= 1) {
bootstrapIndicator.setVisible(false);
bootstrapIndicator.setManaged(false);
}
});
HBox bootstrapBox = new HBox();

6
gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
View file

@ -261,11 +261,15 @@ class MainViewModel implements ViewModel {
case DISCOVERY_MANUAL_PORT_FORWARDING_SUCCEEDED:
case DISCOVERY_AUTO_PORT_FORWARDING_SUCCEEDED:
case RELAY_SUCCEEDED:
bootstrapInfo.set("Bootstrapping to P2P network: " + state.getMessage());
bootstrapProgress.set(-1);
break;
case BOOT_STRAP_SUCCEEDED:
bootstrapInfo.set("Successfully connected to P2P network: " + state.getMessage());
bootstrapProgress.set(1);
break;
default:
bootstrapInfo.set("Connecting to the Bitsquare network: " + state.getMessage());
bootstrapInfo.set("Connecting to P2P network: " + state.getMessage());
bootstrapProgress.set(-1);
break;
}

24
gui/src/main/java/io/bitsquare/gui/main/offer/OfferView.java
View file

@ -53,6 +53,8 @@ public abstract class OfferView extends ActivatableView<TabPane, Void> {
private final ViewLoader viewLoader;
private final Navigation navigation;
private final Offer.Direction direction;
private Tab createOfferTab;
private Tab takeOfferTab;
protected OfferView(ViewLoader viewLoader, Navigation navigation) {
this.viewLoader = viewLoader;
@ -153,14 +155,13 @@ public abstract class OfferView extends ActivatableView<TabPane, Void> {
createOfferView = (CreateOfferView) view;
createOfferView.initWithData(direction, amount, price);
createOfferPane = ((CreateOfferView) view).getRoot();
final Tab tab = new Tab("Create offer");
createOfferTab = new Tab("Create offer");
createOfferView.setCloseHandler(() -> {
if (tabPane.getTabs().size() == 2)
tabPane.getTabs().remove(1);
tabPane.getTabs().remove(createOfferTab);
});
tab.setContent(createOfferPane);
tabPane.getTabs().add(tab);
tabPane.getSelectionModel().select(tab);
createOfferTab.setContent(createOfferPane);
tabPane.getTabs().add(createOfferTab);
tabPane.getSelectionModel().select(createOfferTab);
}
else if (viewClass == TakeOfferView.class && takeOfferView == null && offer != null) {
view = viewLoader.load(viewClass);
@ -169,14 +170,13 @@ public abstract class OfferView extends ActivatableView<TabPane, Void> {
takeOfferView = (TakeOfferView) view;
takeOfferView.initWithData(amount, offer);
takeOfferPane = ((TakeOfferView) view).getRoot();
final Tab tab = new Tab("Take offer");
takeOfferTab = new Tab("Take offer");
takeOfferView.setCloseHandler(() -> {
if (tabPane.getTabs().size() == 2)
tabPane.getTabs().remove(1);
tabPane.getTabs().remove(takeOfferTab);
});
tab.setContent(takeOfferPane);
tabPane.getTabs().add(tab);
tabPane.getSelectionModel().select(tab);
takeOfferTab.setContent(takeOfferPane);
tabPane.getTabs().add(takeOfferTab);
tabPane.getSelectionModel().select(takeOfferTab);
}
}