Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjustments with redesign #1819

Merged
merged 3 commits into from
Oct 26, 2018
Merged

Adjustments with redesign #1819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2953b98
Fix tab navigation issue
ManfredKarrer Oct 26, 2018
80cb50a
Remove colons, remove progressbar style in dao phases
ManfredKarrer Oct 26, 2018
4f52f22
Small UI improvements
ManfredKarrer Oct 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 51 additions & 49 deletions core/src/main/resources/i18n/displayStrings.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,8 @@ shared.tradingFeeInBsqInfo=equivalent to {0} used as mining fee
shared.openURL=Open {0}
shared.fiat=Fiat
shared.crypto=Crypto
shared.all=All
shared.edit=Edit


####################################################################
Expand All @@ -210,8 +212,8 @@ mainView.menu.account=Account
mainView.menu.dao=DAO

mainView.marketPrice.provider=Price by
mainView.marketPrice.label=Market Price
mainView.marketPriceWithProvider.label=Market Price by {0}
mainView.marketPrice.label=Market price
mainView.marketPriceWithProvider.label=Market price by {0}
mainView.marketPrice.tooltip.provider=The displayed price is provided by {0}
mainView.marketPrice.bisqInternalPrice=Price of latest Bisq trade
mainView.marketPrice.tooltip.bisqInternalPrice=There is no market price from external price feed providers available.\n\
Expand Down Expand Up @@ -842,14 +844,14 @@ setting.preferences.useCustomValue=Use custom value
setting.preferences.txFeeMin=Transaction fee must be at least {0} satoshis/byte
setting.preferences.txFeeTooLarge=Your input is above any reasonable value (>5000 satoshis/byte). Transaction fee is usually in the range of 50-400 satoshis/byte.
setting.preferences.ignorePeers=Ignore peers with onion address (comma sep.)
setting.preferences.refererId=Referral ID:
setting.preferences.refererId=Referral ID
setting.preferences.refererId.prompt=Optional referral ID
setting.preferences.currenciesInList=Currencies in market price feed list
setting.preferences.prefCurrency=Preferred currency:
setting.preferences.prefCurrency=Preferred currency
setting.preferences.displayFiat=Display national currencies
setting.preferences.noFiat=There are no national currencies selected
setting.preferences.cannotRemovePrefCurrency=You cannot remove your selected preferred display currency
setting.preferences.displayAltcoins=Display altcoins:
setting.preferences.displayAltcoins=Display altcoins
setting.preferences.noAltcoins=There are no altcoins selected
setting.preferences.addFiat=Add national currency
setting.preferences.addAltcoin=Add altcoin
Expand All @@ -863,7 +865,7 @@ settings.preferences.languageChange=To apply the language change to all screens
settings.preferences.arbitrationLanguageWarning=In case of a dispute, please note that arbitration is handled in {0}.
settings.preferences.selectCurrencyNetwork=Select network
setting.preferences.daoOptions=DAO options
setting.preferences.dao.resync.label=Rebuild DAO state from genesis tx:
setting.preferences.dao.resync.label=Rebuild DAO state from genesis tx
setting.preferences.dao.resync.button=Resync
setting.preferences.dao.resync.popup=After an application restart the BSQ consensus state will be rebuilt from the genesis transaction.
setting.preferences.dao.isDaoFullNode=Run Bisq as DAO full node
Expand Down Expand Up @@ -963,7 +965,7 @@ account.menu.seedWords=Wallet seed
account.menu.backup=Backup
account.menu.notifications=Notifications

account.arbitratorRegistration.pubKey=Public key:
account.arbitratorRegistration.pubKey=Public key

account.arbitratorRegistration.register=Register arbitrator
account.arbitratorRegistration.revoke=Revoke registration
Expand Down Expand Up @@ -1175,12 +1177,12 @@ dao.proposal.menuItem.vote=Vote on proposals
dao.proposal.menuItem.result=Vote results
dao.cycle.headline=Voting cycle
dao.cycle.overview.headline=Voting cycle overview
dao.cycle.currentPhase=Current phase:
dao.cycle.currentBlockHeight=Current block height:
dao.cycle.proposal=Proposal phase:
dao.cycle.blindVote=Blind vote phase:
dao.cycle.voteReveal=Vote reveal phase:
dao.cycle.voteResult=Vote result:
dao.cycle.currentPhase=Current phase
dao.cycle.currentBlockHeight=Current block height
dao.cycle.proposal=Proposal phase
dao.cycle.blindVote=Blind vote phase
dao.cycle.voteReveal=Vote reveal phase
dao.cycle.voteResult=Vote result
dao.cycle.phaseDuration={0} blocks (≈{1}); Block {2} - {3} (≈{4} - ≈{5})

dao.cycle.info.headline=Information
Expand Down Expand Up @@ -1310,10 +1312,10 @@ dao.bonding.menuItem.bondedRoles=Bonded roles
dao.bonding.menuItem.lockupBSQ=Lockup BSQ
dao.bonding.menuItem.unlockBSQ=Unlock BSQ
dao.bonding.lock.lockBSQ=Lockup BSQ
dao.bonding.lock.amount=Amount of BSQ to lockup:
dao.bonding.lock.time=Unlock time in blocks:
dao.bonding.lock.type=Type of bond:
dao.bonding.lock.bondedRoles=Bonded roles:
dao.bonding.lock.amount=Amount of BSQ to lockup
dao.bonding.lock.time=Unlock time in blocks
dao.bonding.lock.type=Type of bond
dao.bonding.lock.bondedRoles=Bonded roles
dao.bonding.lock.setAmount=Set BSQ amount to lockup (min. amount is {0})
dao.bonding.lock.setTime=Number of blocks when locked funds become spendable after the unlock transaction ({0} - {1})
dao.bonding.lock.lockupButton=Lockup
Expand All @@ -1324,8 +1326,8 @@ dao.bonding.unlock.unlock=Unlock
dao.bonding.unlock.sendTx.headline=Confirm unlock transaction
dao.bonding.unlock.sendTx.details=Unlock amount: {0}\nLockup time: {1} block(s)\n\nAre you sure you want to proceed?
dao.bonding.dashboard.bondsHeadline=Bonded BSQ
dao.bonding.dashboard.lockupAmount=Lockup funds:
dao.bonding.dashboard.unlockingAmount=Unlocking funds (wait until lock time is over):
dao.bonding.dashboard.lockupAmount=Lockup funds
dao.bonding.dashboard.unlockingAmount=Unlocking funds (wait until lock time is over)

# suppress inspection "UnusedProperty"
dao.bond.lockupType.BONDED_ROLE=Bonded role
Expand Down Expand Up @@ -1444,15 +1446,15 @@ dao.proposal.create.createNew=Make new proposal
dao.proposal.create.create.button=Make proposal
dao.proposal=proposal
dao.proposal.display.type=Proposal type
dao.proposal.display.name=Name/nickname:
dao.proposal.display.link=Link to detail info:
dao.proposal.display.name=Name/nickname
dao.proposal.display.link=Link to detail info
dao.proposal.display.link.prompt=Link to Github issue (https://github.com/bisq-network/compensation/issues)
dao.proposal.display.requestedBsq=Requested amount in BSQ:
dao.proposal.display.bsqAddress=BSQ address:
dao.proposal.display.txId=Proposal transaction ID:
dao.proposal.display.proposalFee=Proposal fee:
dao.proposal.display.myVote=My vote:
dao.proposal.display.voteResult=Vote result summary:
dao.proposal.display.requestedBsq=Requested amount in BSQ
dao.proposal.display.bsqAddress=BSQ address
dao.proposal.display.txId=Proposal transaction ID
dao.proposal.display.proposalFee=Proposal fee
dao.proposal.display.myVote=My vote
dao.proposal.display.voteResult=Vote result summary
dao.proposal.display.bondedRoleComboBox.label=Bonded role type
dao.proposal.display.requiredBondForRole.label=Required bond for role
dao.proposal.display.tickerSymbol.label=Ticker Symbol
Expand All @@ -1472,7 +1474,7 @@ dao.proposal.voteResult.failed=Rejected
dao.proposal.voteResult.summary=Result: {0}; Threshold: {1} (required > {2}); Quorum: {3} (required > {4})

dao.proposal.display.paramComboBox.label=Parameter
dao.proposal.display.paramValue=Parameter value:
dao.proposal.display.paramValue=Parameter value

dao.proposal.display.confiscateBondComboBox.label=Choose bond
dao.proposal.display.assetComboBox.label=Asset to remove
Expand All @@ -1491,36 +1493,36 @@ dao.wallet.dashboard.distribution=Distribution of all BSQ
dao.wallet.dashboard.locked=Global state of locked BSQ
dao.wallet.dashboard.market=Market data
dao.wallet.dashboard.txDetails=BSQ transactions details
dao.wallet.dashboard.genesisBlockHeight=Genesis block height:
dao.wallet.dashboard.genesisTxId=Genesis transaction ID:
dao.wallet.dashboard.genesisIssueAmount=BSQ issued at genesis transaction:
dao.wallet.dashboard.compRequestIssueAmount=BSQ issued for compensation requests:
dao.wallet.dashboard.reimbursementAmount=BSQ issued for reimbursement requests:
dao.wallet.dashboard.availableAmount=Total available BSQ:
dao.wallet.dashboard.burntAmount=Burned BSQ (fees):
dao.wallet.dashboard.totalLockedUpAmount=Locked up in bonds:
dao.wallet.dashboard.totalUnlockingAmount=Unlocking BSQ from bonds:
dao.wallet.dashboard.totalUnlockedAmount=Unlocked BSQ from bonds:
dao.wallet.dashboard.allTx=No. of all BSQ transactions:
dao.wallet.dashboard.utxo=No. of all unspent transaction outputs:
dao.wallet.dashboard.compensationIssuanceTx=No. of all compensation request issuance transactions:
dao.wallet.dashboard.reimbursementIssuanceTx=No. of all reimbursement request issuance transactions:
dao.wallet.dashboard.burntTx=No. of all fee payments transactions:
dao.wallet.dashboard.price=Latest BSQ/BTC trade price (in Bisq):
dao.wallet.dashboard.marketCap=Market capitalisation (based on trade price):
dao.wallet.dashboard.genesisBlockHeight=Genesis block height
dao.wallet.dashboard.genesisTxId=Genesis transaction ID
dao.wallet.dashboard.genesisIssueAmount=BSQ issued at genesis transaction
dao.wallet.dashboard.compRequestIssueAmount=BSQ issued for compensation requests
dao.wallet.dashboard.reimbursementAmount=BSQ issued for reimbursement requests
dao.wallet.dashboard.availableAmount=Total available BSQ
dao.wallet.dashboard.burntAmount=Burned BSQ (fees)
dao.wallet.dashboard.totalLockedUpAmount=Locked up in bonds
dao.wallet.dashboard.totalUnlockingAmount=Unlocking BSQ from bonds
dao.wallet.dashboard.totalUnlockedAmount=Unlocked BSQ from bonds
dao.wallet.dashboard.allTx=No. of all BSQ transactions
dao.wallet.dashboard.utxo=No. of all unspent transaction outputs
dao.wallet.dashboard.compensationIssuanceTx=No. of all compensation request issuance transactions
dao.wallet.dashboard.reimbursementIssuanceTx=No. of all reimbursement request issuance transactions
dao.wallet.dashboard.burntTx=No. of all fee payments transactions
dao.wallet.dashboard.price=Latest BSQ/BTC trade price (in Bisq)
dao.wallet.dashboard.marketCap=Market capitalisation (based on trade price)

dao.wallet.receive.fundBSQWallet=Fund Bisq BSQ wallet
dao.wallet.receive.fundYourWallet=Fund your BSQ wallet
dao.wallet.receive.bsqAddress=BSQ address

dao.wallet.send.sendFunds=Send funds
dao.wallet.send.sendBtcFunds=Send non-BSQ funds (BTC)
dao.wallet.send.amount=Amount in BSQ:
dao.wallet.send.btcAmount=Amount in BTC (non-BSQ funds):
dao.wallet.send.amount=Amount in BSQ
dao.wallet.send.btcAmount=Amount in BTC (non-BSQ funds)
dao.wallet.send.setAmount=Set amount to withdraw (min. amount is {0})
dao.wallet.send.setBtcAmount=Set amount in BTC to withdraw (min. amount is {0})
dao.wallet.send.receiverAddress=Receiver's BSQ address:
dao.wallet.send.receiverBtcAddress=Receiver's BTC address:
dao.wallet.send.receiverAddress=Receiver's BSQ address
dao.wallet.send.receiverBtcAddress=Receiver's BTC address
dao.wallet.send.setDestinationAddress=Fill in your destination address
dao.wallet.send.send=Send BSQ funds
dao.wallet.send.sendBtc=Send BTC funds
Expand Down
1 change: 0 additions & 1 deletion desktop/src/main/java/bisq/desktop/components/SeparatedPhaseBars.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ public SeparatedPhaseBars(List<SeparatedPhaseBarsItem> items) {
ProgressBar progressBar = new ProgressBar();
progressBar.setMinHeight(9);
progressBar.setMaxHeight(9);
progressBar.setStyle("-fx-accent: -bs-green;");
progressBar.progressProperty().bind(item.progressProperty);
progressBar.setOpacity(item.isShowBlocks() ? 1 : 0.25);
progressBars.getChildren().add(progressBar);
Expand Down
6 changes: 3 additions & 3 deletions desktop/src/main/java/bisq/desktop/main/account/AccountView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,7 @@ public void initialize() {
};

tabChangeListener = (ov, oldValue, newValue) -> {
if (arbitratorRegistrationTab != null) {
navigation.navigateTo(MainView.class, AccountView.class, ArbitratorRegistrationView.class);
} else if (newValue == fiatAccountsTab) {
if (newValue == fiatAccountsTab) {
navigation.navigateTo(MainView.class, AccountView.class, FiatAccountsView.class);
} else if (newValue == altcoinAccountsTab) {
navigation.navigateTo(MainView.class, AccountView.class, AltCoinAccountsView.class);
Expand All @@ -120,6 +118,8 @@ public void initialize() {
navigation.navigateTo(MainView.class, AccountView.class, SeedWordsView.class);
} else if (newValue == backupTab) {
navigation.navigateTo(MainView.class, AccountView.class, BackupView.class);
} else if (newValue == arbitratorRegistrationTab) {
navigation.navigateTo(MainView.class, AccountView.class, ArbitratorRegistrationView.class);
} else {
navigation.navigateTo(MainView.class, AccountView.class, FiatAccountsView.class);
}
Expand Down
2 changes: 1 addition & 1 deletion desktop/src/main/java/bisq/desktop/main/market/trades/TradesChartsViewModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public enum TickUnit {
final ObjectProperty<TradeCurrency> selectedTradeCurrencyProperty = new SimpleObjectProperty<>();
final BooleanProperty showAllTradeCurrenciesProperty = new SimpleBooleanProperty(false);
private final CurrencyList currencyListItems;
private final CurrencyListItem showAllCurrencyListItem = new CurrencyListItem(new CryptoCurrency(GUIUtil.SHOW_ALL_FLAG, GUIUtil.SHOW_ALL_FLAG), -1);
private final CurrencyListItem showAllCurrencyListItem = new CurrencyListItem(new CryptoCurrency(GUIUtil.SHOW_ALL_FLAG, ""), -1);
final ObservableList<TradeStatistics2> tradeStatisticsByCurrency = FXCollections.observableArrayList();
final ObservableList<XYChart.Data<Number, Number>> priceItems = FXCollections.observableArrayList();
final ObservableList<XYChart.Data<Number, Number>> volumeItems = FXCollections.observableArrayList();
Expand Down
4 changes: 2 additions & 2 deletions desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,9 +491,9 @@ private void setMarketPriceFeedCurrency() {
private void fillAllTradeCurrencies() {
allTradeCurrencies.clear();
// Used for ignoring filter (show all)
allTradeCurrencies.add(new CryptoCurrency(GUIUtil.SHOW_ALL_FLAG, GUIUtil.SHOW_ALL_FLAG));
allTradeCurrencies.add(new CryptoCurrency(GUIUtil.SHOW_ALL_FLAG, ""));
allTradeCurrencies.addAll(preferences.getTradeCurrenciesAsObservable());
allTradeCurrencies.add(new CryptoCurrency(GUIUtil.EDIT_FLAG, GUIUtil.EDIT_FLAG));
allTradeCurrencies.add(new CryptoCurrency(GUIUtil.EDIT_FLAG, ""));
}

///////////////////////////////////////////////////////////////////////////////////////////
Expand Down
30 changes: 14 additions & 16 deletions desktop/src/main/java/bisq/desktop/util/GUIUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@

@Slf4j
public class GUIUtil {
public final static String SHOW_ALL_FLAG = "SHOW_ALL_FLAG";
public final static String EDIT_FLAG = "EDIT_FLAG";
public final static String SHOW_ALL_FLAG = "list.currency.showAll"; // Used for accessing the i18n resource
public final static String EDIT_FLAG = "list.currency.editList"; // Used for accessing the i18n resource

public final static int FIAT_DECIMALS_WITH_ZEROS = 0;
public final static int FIAT_PRICE_DECIMALS_WITH_ZEROS = 3;
Expand Down Expand Up @@ -295,10 +295,10 @@ protected void updateItem(CurrencyListItem item, boolean empty) {

switch (code) {
case GUIUtil.SHOW_ALL_FLAG:
currency.setText("▶ " + Res.get("list.currency.showAll"));
currency.setText(Res.get("list.currency.showAll"));
break;
case GUIUtil.EDIT_FLAG:
currency.setText(Res.get("▼ " + "list.currency.editList"));
currency.setText(Res.get("list.currency.editList"));
break;
default:
if (preferences.isSortMarketCurrenciesNumerically()) {
Expand Down Expand Up @@ -347,11 +347,11 @@ protected void updateItem(CurrencyListItem item, boolean empty) {

switch (code) {
case GUIUtil.SHOW_ALL_FLAG:
currencyType.setText("▶");
currencyType.setText(Res.get("shared.all"));
currency.setText(Res.get("list.currency.showAll"));
break;
case GUIUtil.EDIT_FLAG:
currencyType.setText("▼");
currencyType.setText(Res.get("shared.edit"));
currency.setText(Res.get("list.currency.editList"));
break;
default:
Expand Down Expand Up @@ -392,10 +392,10 @@ protected void updateItem(TradeCurrency item, boolean empty) {

switch (code) {
case GUIUtil.SHOW_ALL_FLAG:
currency.setText("▶ " + Res.get("list.currency.showAll"));
currency.setText(Res.get("list.currency.showAll"));
break;
case GUIUtil.EDIT_FLAG:
currency.setText(Res.get("▼ " + "list.currency.editList"));
currency.setText(Res.get("list.currency.editList"));
break;
default:
if (offerCountOptional.isPresent()) {
Expand Down Expand Up @@ -447,18 +447,16 @@ protected void updateItem(TradeCurrency item, boolean empty) {

switch (code) {
case GUIUtil.SHOW_ALL_FLAG:
currencyType.setText("▶");
currencyType.setText(Res.get("shared.all"));
currency.setText(Res.get("list.currency.showAll"));
break;
case GUIUtil.EDIT_FLAG:
currencyType.setText("▼");
currencyType.setText(Res.get("shared.edit"));
currency.setText(Res.get("list.currency.editList"));
break;
default:
if (offerCountOptional.isPresent()) {
offers.setText(offers.getText() + " (" + offerCountOptional.get() + " " +
(offerCountOptional.get() == 1 ? postFixSingle : postFixMulti) + ")");
}
offerCountOptional.ifPresent(numOffer -> offers.setText(offers.getText() + " (" + numOffer + " " +
(numOffer == 1 ? postFixSingle : postFixMulti) + ")"));
}

setGraphic(box);
Expand All @@ -483,7 +481,7 @@ protected void updateItem(PaymentMethod item, boolean empty) {
this.getStyleClass().add("currency-label-selected");

if (id.equals(GUIUtil.SHOW_ALL_FLAG)) {
setText("▶ " + Res.get("list.currency.showAll"));
setText(Res.get("list.currency.showAll"));
} else {
setText(Res.get(id));
}
Expand Down Expand Up @@ -516,7 +514,7 @@ protected void updateItem(PaymentMethod item, boolean empty) {
box.getChildren().addAll(paymentType, paymentMethod);

if (id.equals(GUIUtil.SHOW_ALL_FLAG)) {
paymentType.setText("▶");
paymentType.setText(Res.get("shared.all"));
paymentMethod.setText(Res.get("list.currency.showAll"));
}

Expand Down