Add under construction messages, deactivate not implemented features, update logo

This commit is contained in:
Manfred Karrer 2014-09-29 12:04:33 +02:00
parent 94f4b2aeb0
commit d03d1cf760
13 changed files with 69 additions and 31 deletions

View file

@ -59,7 +59,7 @@ public class Popups {
// Information // Information
public static void openInfo(String message) { public static void openInfo(String message) {
openInfo(message, null, null); openInfo(message, null);
} }
// Supports blurring the content background // Supports blurring the content background

View file

@ -26,9 +26,9 @@
xmlns:fx="http://javafx.com/fxml"> xmlns:fx="http://javafx.com/fxml">
<VBox spacing="20"> <VBox spacing="20">
<padding> <padding>
<Insets left="10" top="10" right="10"/> <Insets left="20" top="20" right="20"/>
</padding> </padding>
<Label text="TODO: Just very basic prototype yet..."/> <Label text="Arbitration system is not implemented yet. At the moment there are just very basic UI screens for the registration and editing."/>
<Button text="Register yourself as an arbitrator" onAction="#onArbitratorRegistration"/> <Button text="Register yourself as an arbitrator" onAction="#onArbitratorRegistration"/>
<Button text="Edit my arbitrator details" onAction="#onArbitratorEdit"/> <Button text="Edit my arbitrator details" onAction="#onArbitratorEdit"/>
</VBox> </VBox>

View file

@ -19,6 +19,7 @@ package io.bitsquare.gui.main.funds.transactions;
import io.bitsquare.btc.WalletFacade; import io.bitsquare.btc.WalletFacade;
import io.bitsquare.gui.CachedViewCB; import io.bitsquare.gui.CachedViewCB;
import io.bitsquare.gui.components.Popups;
import io.bitsquare.gui.util.BSFormatter; import io.bitsquare.gui.util.BSFormatter;
import com.google.bitcoin.core.Transaction; import com.google.bitcoin.core.Transaction;
@ -115,6 +116,13 @@ public class TransactionsViewCB extends CachedViewCB {
// Private methods // Private methods
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
private void openTxDetails(TransactionsListItem item) {
// TODO Open popup with details view
log.debug("openTxDetails " + item);
Popups.openWarningPopup("Under construction",
"This will open a details popup but that is not implemented yet.");
}
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
// Cell factories // Cell factories
@ -139,8 +147,7 @@ public class TransactionsViewCB extends CachedViewCB {
if (item != null && !empty) { if (item != null && !empty) {
hyperlink = new Hyperlink(item.getAddressString()); hyperlink = new Hyperlink(item.getAddressString());
hyperlink.setId("id-link"); hyperlink.setId("id-link");
hyperlink.setOnAction(event -> log.info("Show trade details " + item hyperlink.setOnAction(event -> openTxDetails(item));
.getAddressString()));
setGraphic(hyperlink); setGraphic(hyperlink);
} }
else { else {

View file

@ -27,9 +27,9 @@
<Tab text="Overview" closable="false"> <Tab text="Overview" closable="false">
<VBox spacing="20"> <VBox spacing="20">
<padding> <padding>
<Insets left="10" top="10" right="10"/> <Insets left="20" top="20" right="20"/>
</padding> </padding>
<Label text="TODO: Overview"/> <Label text="Overview not implemented yet. It will contain latest activities, market and price information and notifications."/>
</VBox> </VBox>
</Tab> </Tab>
</TabPane> </TabPane>

View file

@ -28,9 +28,9 @@
<Tab text="Message" closable="false"> <Tab text="Message" closable="false">
<VBox spacing="20"> <VBox spacing="20">
<padding> <padding>
<Insets left="10" top="10" right="10"/> <Insets left="20" top="20" right="20"/>
</padding> </padding>
<Label text="TODO: Communication tools with arbitrators, Mailbox for trade messages if client was offline"/> <Label text="Messages not implemented yet. It will contain communication tools with arbitrators, mailbox for trade messages if client was offline and notifications."/>
</VBox> </VBox>
</Tab> </Tab>
</TabPane> </TabPane>

View file

@ -18,6 +18,7 @@
package io.bitsquare.gui.main.orders.closed; package io.bitsquare.gui.main.orders.closed;
import io.bitsquare.gui.CachedViewCB; import io.bitsquare.gui.CachedViewCB;
import io.bitsquare.gui.components.Popups;
import java.net.URL; import java.net.URL;
@ -97,6 +98,8 @@ public class ClosedTradesViewCB extends CachedViewCB<ClosedTradesPM> {
private void openOfferDetails(ClosedTradesListItem item) { private void openOfferDetails(ClosedTradesListItem item) {
// TODO Open popup with details view // TODO Open popup with details view
log.debug("Trade details " + item); log.debug("Trade details " + item);
Popups.openWarningPopup("Under construction", "This will open a details " +
"popup but that is not implemented yet.");
} }

View file

@ -18,6 +18,7 @@
package io.bitsquare.gui.main.orders.offer; package io.bitsquare.gui.main.orders.offer;
import io.bitsquare.gui.CachedViewCB; import io.bitsquare.gui.CachedViewCB;
import io.bitsquare.gui.components.Popups;
import java.net.URL; import java.net.URL;
@ -103,6 +104,8 @@ public class OffersViewCB extends CachedViewCB<OffersPM> {
private void openOfferDetails(OfferListItem item) { private void openOfferDetails(OfferListItem item) {
// TODO Open popup with details view // TODO Open popup with details view
log.debug("openOfferDetails " + item); log.debug("openOfferDetails " + item);
Popups.openWarningPopup("Under construction",
"This will open a details popup but that is not implemented yet.");
} }

View file

@ -20,6 +20,7 @@ package io.bitsquare.gui.main.orders.pending;
import io.bitsquare.gui.CachedViewCB; import io.bitsquare.gui.CachedViewCB;
import io.bitsquare.gui.Navigation; import io.bitsquare.gui.Navigation;
import io.bitsquare.gui.components.InfoDisplay; import io.bitsquare.gui.components.InfoDisplay;
import io.bitsquare.gui.components.Popups;
import io.bitsquare.gui.components.TextFieldWithCopyIcon; import io.bitsquare.gui.components.TextFieldWithCopyIcon;
import io.bitsquare.gui.components.TitledGroupBg; import io.bitsquare.gui.components.TitledGroupBg;
import io.bitsquare.gui.components.TxIdTextField; import io.bitsquare.gui.components.TxIdTextField;
@ -206,6 +207,12 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
Help.openWindow(HelpId.PENDING_TRADE_SUMMARY); Help.openWindow(HelpId.PENDING_TRADE_SUMMARY);
} }
private void openOfferDetails(PendingTradesListItem item) {
// TODO Open popup with details view
log.debug("Trade details " + item);
Popups.openWarningPopup("Under construction", "This will open a " +
"details popup but that is not implemented yet.");
}
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
// Private methods // Private methods
@ -408,11 +415,6 @@ public class PendingTradesViewCB extends CachedViewCB<PendingTradesPM> {
log.error(fault.toString()); log.error(fault.toString());
} }
private void openOfferDetails(PendingTradesListItem item) {
// TODO Open popup with details view
log.debug("Trade details " + item);
}
private void setPaymentsControlsVisible(boolean visible) { private void setPaymentsControlsVisible(boolean visible) {
paymentsGroupBg.setVisible(visible); paymentsGroupBg.setVisible(visible);
paymentMethodLabel.setVisible(visible); paymentMethodLabel.setVisible(visible);

View file

@ -28,9 +28,9 @@
<Tab text="Preferences" closable="false"> <Tab text="Preferences" closable="false">
<VBox spacing="20"> <VBox spacing="20">
<padding> <padding>
<Insets left="10" top="10" right="10"/> <Insets left="20" top="20" right="20"/>
</padding> </padding>
<Label text="TODO: Application preferences"/> <Label text="Preferences not implemented yet."/>
</VBox> </VBox>
</Tab> </Tab>

View file

@ -93,17 +93,20 @@
<Label fx:id="extendedCheckBoxLabel" text="Show only matching offers:" GridPane.columnIndex="0" <Label fx:id="extendedCheckBoxLabel" text="Show only matching offers:" GridPane.columnIndex="0"
GridPane.rowIndex="2" visible="false" managed="false"/> GridPane.rowIndex="2" visible="false" managed="false"/>
<CheckBox fx:id="extendedCheckBox" visible="false" managed="false" GridPane.columnIndex="1" <CheckBox fx:id="showOnlyMatchingCheckBox" onAction="#onShowOnlyMatching" visible="false" managed="false"
GridPane.columnIndex="1"
GridPane.rowIndex="2"/> GridPane.rowIndex="2"/>
<Label fx:id="extendedButton1Label" text="Payments account countries:" GridPane.columnIndex="0" <Label fx:id="extendedButton1Label" text="Payments account countries:" GridPane.columnIndex="0"
GridPane.rowIndex="3" visible="false" managed="false"/> GridPane.rowIndex="3" visible="false" managed="false"/>
<Button fx:id="extendedButton1" text="Open countries filter" GridPane.columnIndex="1" <Button fx:id="openCountryFilterButton" text="Open countries filter"
onAction="#onOpenCountryFilter" GridPane.columnIndex="1"
GridPane.rowIndex="3" visible="false" managed="false"/> GridPane.rowIndex="3" visible="false" managed="false"/>
<Label fx:id="extendedButton2Label" text="Payments account methods:" GridPane.columnIndex="0" <Label fx:id="extendedButton2Label" text="Payments account methods:" GridPane.columnIndex="0"
GridPane.rowIndex="4" visible="false" managed="false"/> GridPane.rowIndex="4" visible="false" managed="false"/>
<Button fx:id="extendedButton2" text="Open payment methods filter" GridPane.columnIndex="1" <Button fx:id="openPaymentMethodsFilterButton" text="Open payment methods filter"
onAction="#onOpenPaymentMethodsFilter" GridPane.columnIndex="1"
GridPane.rowIndex="4" visible="false" managed="false"> GridPane.rowIndex="4" visible="false" managed="false">
<GridPane.margin> <GridPane.margin>
<Insets bottom="-5"/> <Insets bottom="-5"/>

View file

@ -76,12 +76,12 @@ public class OrderBookViewCB extends CachedViewCB<OrderBookPM> {
private ImageView expand; private ImageView expand;
private ImageView collapse; private ImageView collapse;
@FXML CheckBox extendedCheckBox; @FXML CheckBox showOnlyMatchingCheckBox;
@FXML Label amountBtcLabel, priceDescriptionLabel, priceFiatLabel, volumeDescriptionLabel, @FXML Label amountBtcLabel, priceDescriptionLabel, priceFiatLabel, volumeDescriptionLabel,
volumeFiatLabel, extendedButton1Label, extendedButton2Label, extendedCheckBoxLabel; volumeFiatLabel, extendedButton1Label, extendedButton2Label, extendedCheckBoxLabel;
@FXML InputTextField volumeTextField, amountTextField, priceTextField; @FXML InputTextField volumeTextField, amountTextField, priceTextField;
@FXML TableView<OrderBookListItem> table; @FXML TableView<OrderBookListItem> table;
@FXML Button createOfferButton, showAdvancedSettingsButton, extendedButton1, extendedButton2; @FXML Button createOfferButton, showAdvancedSettingsButton, openCountryFilterButton, openPaymentMethodsFilterButton;
@FXML TableColumn<OrderBookListItem, OrderBookListItem> priceColumn, amountColumn, volumeColumn, @FXML TableColumn<OrderBookListItem, OrderBookListItem> priceColumn, amountColumn, volumeColumn,
directionColumn, countryColumn, bankAccountTypeColumn; directionColumn, countryColumn, bankAccountTypeColumn;
@ -187,10 +187,16 @@ public class OrderBookViewCB extends CachedViewCB<OrderBookPM> {
@FXML @FXML
void createOffer() { void createOffer() {
if (presentationModel.isRegistered()) { if (presentationModel.isRegistered()) {
if (presentationModel.getDirection() == Direction.BUY) {
createOfferButton.setDisable(true); createOfferButton.setDisable(true);
((TradeNavigator) parent).createOffer(presentationModel.getAmountAsCoin(), ((TradeNavigator) parent).createOffer(presentationModel.getAmountAsCoin(),
presentationModel.getPriceAsCoin()); presentationModel.getPriceAsCoin());
} }
else {
Popups.openWarningPopup("Under construction", "At the moment only the creation of buy offers is " +
"implemented.");
}
}
else { else {
openSetupScreen(); openSetupScreen();
} }
@ -211,6 +217,21 @@ public class OrderBookViewCB extends CachedViewCB<OrderBookPM> {
} }
} }
@FXML
void onShowOnlyMatching() {
Popups.openWarningPopup("Under construction", "This feature is not implemented yet.");
}
@FXML
void onOpenCountryFilter() {
Popups.openWarningPopup("Under construction", "This feature is not implemented yet.");
}
@FXML
void onOpenPaymentMethodsFilter() {
Popups.openWarningPopup("Under construction", "This feature is not implemented yet.");
}
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////
// Private methods // Private methods
@ -285,14 +306,14 @@ public class OrderBookViewCB extends CachedViewCB<OrderBookPM> {
extendedCheckBoxLabel.setVisible(visible); extendedCheckBoxLabel.setVisible(visible);
extendedCheckBoxLabel.setManaged(visible); extendedCheckBoxLabel.setManaged(visible);
extendedButton1.setVisible(visible); openCountryFilterButton.setVisible(visible);
extendedButton1.setManaged(visible); openCountryFilterButton.setManaged(visible);
extendedButton2.setVisible(visible); openPaymentMethodsFilterButton.setVisible(visible);
extendedButton2.setManaged(visible); openPaymentMethodsFilterButton.setManaged(visible);
extendedCheckBox.setVisible(visible); showOnlyMatchingCheckBox.setVisible(visible);
extendedCheckBox.setManaged(visible); showOnlyMatchingCheckBox.setManaged(visible);
} }
@ -536,6 +557,5 @@ public class OrderBookViewCB extends CachedViewCB<OrderBookPM> {
} }
}); });
} }
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 41 KiB

Before After
Before After