mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 15:10:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Improve wording, improve layout

Browse source
This commit is contained in:
Manfred Karrer 2016-10-06 00:34:10 +02:00
parent be27a11998
commit bac867873d
14 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/src/main/java/io/bitsquare/common/crypto/Encryption.java
View file

@ -210,7 +210,7 @@ public class Encryption {
// Create a symmetric key
SecretKey secretKey = generateSecretKey();
// Encrypt secretKey with receivers publicKey
// Encrypt secretKey with receiver's publicKey
byte[] encryptedSecretKey = encryptSecretKey(secretKey, encryptionPublicKey);
// Encrypt with sym key payload with appended hmac

2
core/src/main/java/io/bitsquare/btc/pricefeed/PriceFeedService.java
View file

@ -179,7 +179,7 @@ public class PriceFeedService {
}
} else {
String errorMessage = "We don't have a price for currencyCode " + currencyCode;
String errorMessage = "We don't have a price for " + currencyCode;
log.debug(errorMessage);
faultHandler.handleFault(errorMessage, new PriceRequestException(errorMessage));
}

5
gui/src/main/java/io/bitsquare/gui/main/account/content/seedwords/SeedWordsView.java
View file

@ -102,9 +102,10 @@ public class SeedWordsView extends ActivatableView<GridPane, Void> {
restoreButton = addButtonAfterGroup(root, ++gridRow, "Restore wallet");
addTitledGroupBg(root, ++gridRow, 1, "Information", Layout.GROUP_DISTANCE);
addMultilineLabel(root, gridRow, "Please write down you wallet seed words.\n" +
addMultilineLabel(root, gridRow, "Please write down you wallet seed words. " +
"You can recover your wallet with those seed words.\n\n" +
"If you are restoring your wallet you need to use the wallet date of the wallet into which you want to restore.\n" +
"If you are restoring your wallet you need to use the wallet date " +
"of the wallet into which you want to restore. " +
"So in case you restore to a new wallet it is the today's date.",
Layout.FIRST_ROW_AND_GROUP_DISTANCE);

4
gui/src/main/java/io/bitsquare/gui/main/disputes/DisputesView.java
View file

@ -97,10 +97,10 @@ public class DisputesView extends ActivatableViewAndModel<TabPane, Activatable>
.findAny().isPresent();
if (arbitratorsDisputesTab == null && isArbitrator) {
arbitratorsDisputesTab = new Tab("Arbitrators support tickets");
arbitratorsDisputesTab = new Tab("Arbitrator's support tickets");
arbitratorsDisputesTab.setClosable(false);
root.getTabs().add(arbitratorsDisputesTab);
tradersDisputesTab.setText("Traders support tickets");
tradersDisputesTab.setText("Trader's support tickets");
}
}

6
gui/src/main/java/io/bitsquare/gui/main/disputes/trader/TraderDisputeView.java
View file

@ -243,12 +243,12 @@ public class TraderDisputeView extends ActivatableView<VBox, Void> {
disputeGroup.stream().forEach(dispute -> {
stringBuilder
.append("*******************************************************************************************\n")
.append("** Traders ID: ")
.append("** Trader's ID: ")
.append(dispute.getTraderId())
.append("\n*******************************************************************************************\n")
.append("\n");
dispute.getDisputeCommunicationMessagesAsObservableList().stream().forEach(m -> {
String role = m.isSenderIsTrader() ? ">> Traders msg: " : "<< Arbitrators msg: ";
String role = m.isSenderIsTrader() ? ">> Trader's msg: " : "<< Arbitrator's msg: ";
stringBuilder.append(role)
.append(m.getMessage())
.append("\n");
@ -766,7 +766,7 @@ public class TraderDisputeView extends ActivatableView<VBox, Void> {
private void showMailboxIcon() {
statusIcon.setVisible(true);
AwesomeDude.setIcon(statusIcon, AwesomeIcon.ENVELOPE_ALT, "14");
Tooltip.install(statusIcon, new Tooltip("Message saved in receivers mailbox"));
Tooltip.install(statusIcon, new Tooltip("Message saved in receiver's mailbox"));
statusIcon.setTextFill(Paint.valueOf("#0f87c3"));
}

2
gui/src/main/java/io/bitsquare/gui/main/funds/locked/LockedView.java
View file

@ -246,7 +246,7 @@ public class LockedView extends ActivatableView<VBox, Void> {
field.setTooltip(new Tooltip("Open popup for details"));
setGraphic(field);
} else if (item.getAddressEntry().getContext() == AddressEntry.Context.ARBITRATOR) {
setGraphic(new Label("Arbitrators fee"));
setGraphic(new Label("Arbitrator's fee"));
} else {
setGraphic(new Label("No details available"));
}

2
gui/src/main/java/io/bitsquare/gui/main/funds/reserved/ReservedView.java
View file

@ -246,7 +246,7 @@ public class ReservedView extends ActivatableView<VBox, Void> {
field.setTooltip(new Tooltip("Open popup for details"));
setGraphic(field);
} else if (item.getAddressEntry().getContext() == AddressEntry.Context.ARBITRATOR) {
setGraphic(new Label("Arbitrators fee"));
setGraphic(new Label("Arbitrator's fee"));
} else {
setGraphic(new Label("No details available"));
}

12
gui/src/main/java/io/bitsquare/gui/main/market/spread/SpreadView.java
View file

@ -117,9 +117,9 @@ public class SpreadView extends ActivatableViewAndModel<GridPane, SpreadViewMode
private void updateHeaders() {
numberOfOffersColumn.setText("All offers (" + sortedList.stream().mapToInt(item -> item.numberOfOffers).sum() + ")");
numberOfBuyOffersColumn.setText("Buy BTC offers (" + sortedList.stream().mapToInt(item -> item.numberOfBuyOffers).sum() + ")");
numberOfSellOffersColumn.setText("Sell BTC offers (" + sortedList.stream().mapToInt(item -> item.numberOfSellOffers).sum() + ")");
totalAmountColumn.setText("Total amount in BTC (" + formatter.formatCoin(Coin.valueOf(sortedList.stream().mapToLong(item -> item.totalAmount.value).sum())) + ")");
numberOfBuyOffersColumn.setText("Buy BTC (" + sortedList.stream().mapToInt(item -> item.numberOfBuyOffers).sum() + ")");
numberOfSellOffersColumn.setText("Sell BTC (" + sortedList.stream().mapToInt(item -> item.numberOfSellOffers).sum() + ")");
totalAmountColumn.setText("Total BTC (" + formatter.formatCoin(Coin.valueOf(sortedList.stream().mapToLong(item -> item.totalAmount.value).sum())) + ")");
}
@ -130,7 +130,7 @@ public class SpreadView extends ActivatableViewAndModel<GridPane, SpreadViewMode
private TableColumn<SpreadItem, SpreadItem> getCurrencyColumn() {
TableColumn<SpreadItem, SpreadItem> column = new TableColumn<SpreadItem, SpreadItem>("Currency") {
{
setMinWidth(110);
setMinWidth(160); //110
}
};
column.setCellValueFactory((item) -> new ReadOnlyObjectWrapper<>(item.getValue()));
@ -242,7 +242,7 @@ public class SpreadView extends ActivatableViewAndModel<GridPane, SpreadViewMode
private TableColumn<SpreadItem, SpreadItem> getTotalAmountColumn() {
TableColumn<SpreadItem, SpreadItem> column = new TableColumn<SpreadItem, SpreadItem>("Total amount") {
{
setMinWidth(170);
setMinWidth(140); //170
}
};
column.setCellValueFactory((item) -> new ReadOnlyObjectWrapper<>(item.getValue()));
@ -270,7 +270,7 @@ public class SpreadView extends ActivatableViewAndModel<GridPane, SpreadViewMode
private TableColumn<SpreadItem, SpreadItem> getSpreadColumn() {
TableColumn<SpreadItem, SpreadItem> column = new TableColumn<SpreadItem, SpreadItem>("Spread") {
{
setMinWidth(130);
setMinWidth(110); //130
}
};
column.setCellValueFactory((item) -> new ReadOnlyObjectWrapper<>(item.getValue()));

4
gui/src/main/java/io/bitsquare/gui/main/market/trades/TradesChartsView.java
View file

@ -130,7 +130,7 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
volumeAxisYWidth = (double) newValue;
layoutChart();
};
tradeStatisticsByCurrencyListener = c -> nrOfTradeStatisticsLabel.setText("No. of trades: " + model.tradeStatisticsByCurrency.size());
tradeStatisticsByCurrencyListener = c -> nrOfTradeStatisticsLabel.setText("Trades: " + model.tradeStatisticsByCurrency.size());
}
@Override
@ -204,7 +204,7 @@ public class TradesChartsView extends ActivatableViewAndModel<VBox, TradesCharts
priceAxisX.setTickLabelFormatter(getTimeAxisStringConverter());
volumeAxisX.setTickLabelFormatter(getTimeAxisStringConverter());
nrOfTradeStatisticsLabel.setText("No. of trades: " + model.tradeStatisticsByCurrency.size());
nrOfTradeStatisticsLabel.setText("Trades: " + model.tradeStatisticsByCurrency.size());
UserThread.runAfter(this::updateChartData, 100, TimeUnit.MILLISECONDS);
}

4
gui/src/main/java/io/bitsquare/gui/main/overlays/windows/DisputeSummaryWindow.java
View file

@ -243,7 +243,7 @@ public class DisputeSummaryWindow extends Overlay<DisputeSummaryWindow> {
else
role = "BTC Seller/taker";
}
addLabelTextField(gridPane, ++rowIndex, "Traders role:", role);
addLabelTextField(gridPane, ++rowIndex, "Trader's role:", role);
addLabelTextField(gridPane, ++rowIndex, "Trade amount:", formatter.formatCoinWithCode(contract.getTradeAmount()));
addLabelTextField(gridPane, ++rowIndex, "Trade price:", formatter.formatPrice(contract.getTradePrice()));
addLabelTextField(gridPane, ++rowIndex, "Trade volume:", formatter.formatVolumeWithCode(new ExchangeRate(contract.getTradePrice()).coinToFiat(contract.getTradeAmount())));
@ -494,7 +494,7 @@ public class DisputeSummaryWindow extends Overlay<DisputeSummaryWindow> {
"\n" + role + " did screencast or video: " + formatter.booleanToYesNo(disputeResult.screenCastProperty().get()) +
"\nPayout amount for BTC buyer: " + formatter.formatCoinWithCode(disputeResult.getBuyerPayoutAmount()) +
"\nPayout amount for BTC seller: " + formatter.formatCoinWithCode(disputeResult.getSellerPayoutAmount()) +
"\nArbitrators dispute fee: " + formatter.formatCoinWithCode(disputeResult.getArbitratorPayoutAmount()) +
"\nArbitrator's dispute fee: " + formatter.formatCoinWithCode(disputeResult.getArbitratorPayoutAmount()) +
"\n\nSummary notes:\n" + disputeResult.summaryNotesProperty().get();
dispute.setIsClosed(true);

2
gui/src/main/java/io/bitsquare/gui/main/overlays/windows/WalletPasswordWindow.java
View file

@ -215,7 +215,7 @@ public class WalletPasswordWindow extends Overlay<WalletPasswordWindow> {
}
});
} else {
log.error("wallet.getKeyCrypter() is null, than must not happen.");
log.error("wallet.getKeyCrypter() is null, that must not happen.");
}
});

4
gui/src/main/java/io/bitsquare/gui/main/portfolio/openoffer/OpenOffersView.fxml
View file

@ -29,10 +29,10 @@
<TableView fx:id="tableView" VBox.vgrow="ALWAYS">
<columns>
<TableColumn text="Offer ID" fx:id="offerIdColumn" minWidth="120" maxWidth="130"/>
<TableColumn text="Date/Time" fx:id="dateColumn" minWidth="170" maxWidth="190"/>
<TableColumn text="Date/Time" fx:id="dateColumn" minWidth="180" maxWidth="190"/>
<TableColumn text="Market" fx:id="marketColumn" minWidth="100"/>
<TableColumn text="Price" fx:id="priceColumn" minWidth="160"/>
<TableColumn text="Amount in BTC (min - max)" fx:id="amountColumn" minWidth="220"/>
<TableColumn text="BTC (min - max)" fx:id="amountColumn" minWidth="160"/>
<TableColumn text="Amount (min - max)" fx:id="volumeColumn" minWidth="180"/>
<TableColumn text="Trade type" fx:id="directionColumn" minWidth="100"/>
<TableColumn text="" fx:id="removeItemColumn" minWidth="120" maxWidth="120" sortable="false"/>

2
gui/src/main/java/io/bitsquare/gui/main/settings/preferences/PreferencesView.java
View file

@ -344,7 +344,7 @@ public class PreferencesView extends ActivatableViewAndModel<GridPane, Activatab
useAnimationsCheckBox = addLabelCheckBox(root, ++gridRow, "Use animations:", "").second;
// useStickyMarketPriceCheckBox = addLabelCheckBox(root, ++gridRow, "Use sticky market price:", "").second;
sortMarketCurrenciesNumericallyCheckBox = addLabelCheckBox(root, ++gridRow, "Sort market lists with no. of offers/trades:", "").second;
resetDontShowAgainButton = addLabelButton(root, ++gridRow, "Reset all don't show again flags:", "Reset", 0).second;
resetDontShowAgainButton = addLabelButton(root, ++gridRow, "Reset all 'Don't show again' flags:", "Reset", 0).second;
}
///////////////////////////////////////////////////////////////////////////////////////////

2
network/src/main/java/io/bitsquare/p2p/storage/payload/MailboxStoragePayload.java
View file

@ -16,7 +16,7 @@ import java.security.spec.X509EncodedKeySpec;
import java.util.concurrent.TimeUnit;
/**
* Envelope message which support a time to live and sender and receivers pub keys for storage operations.
* Envelope message which support a time to live and sender and receiver's pub keys for storage operations.
* It differs from the ProtectedExpirableMessage in the way that the sender is permitted to do an add operation
* but only the receiver is permitted to remove the data.
* That is the typical requirement for a mailbox like system.