From 20547e53db2b89ecd2024bdb42d1f801db3ff568 Mon Sep 17 00:00:00 2001 From: chimp1984 Date: Tue, 26 Nov 2019 12:21:37 -0500 Subject: [PATCH 1/8] Remove short cut for legacy arbitrator registration --- .../java/bisq/desktop/main/account/AccountView.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/account/AccountView.java b/desktop/src/main/java/bisq/desktop/main/account/AccountView.java index a7990a1adcb..b49610fb2b6 100644 --- a/desktop/src/main/java/bisq/desktop/main/account/AccountView.java +++ b/desktop/src/main/java/bisq/desktop/main/account/AccountView.java @@ -119,18 +119,7 @@ public void initialize() { }; keyEventEventHandler = event -> { - if (Utilities.isAltOrCtrlPressed(KeyCode.R, event) && arbitratorRegistrationTab == null) { - if (mediatorRegistrationTab != null) { - root.getTabs().remove(mediatorRegistrationTab); - } - if (refundAgentRegistrationTab != null) { - root.getTabs().remove(refundAgentRegistrationTab); - } - arbitratorRegistrationTab = new Tab(Res.get("account.tab.arbitratorRegistration").toUpperCase()); - arbitratorRegistrationTab.setClosable(true); - root.getTabs().add(arbitratorRegistrationTab); - navigation.navigateTo(MainView.class, AccountView.class, ArbitratorRegistrationView.class); - } else if (Utilities.isAltOrCtrlPressed(KeyCode.D, event) && mediatorRegistrationTab == null) { + if (Utilities.isAltOrCtrlPressed(KeyCode.D, event) && mediatorRegistrationTab == null) { if (arbitratorRegistrationTab != null) { root.getTabs().remove(arbitratorRegistrationTab); } From 004ad2b9d0120732c71cc1c3c601cdb81851029a Mon Sep 17 00:00:00 2001 From: chimp1984 Date: Tue, 26 Nov 2019 12:22:07 -0500 Subject: [PATCH 2/8] Change shortcut for reRepublishAllGovernanceData --- desktop/src/main/java/bisq/desktop/app/BisqApp.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop/src/main/java/bisq/desktop/app/BisqApp.java b/desktop/src/main/java/bisq/desktop/app/BisqApp.java index 206ce5e5174..36795827280 100644 --- a/desktop/src/main/java/bisq/desktop/app/BisqApp.java +++ b/desktop/src/main/java/bisq/desktop/app/BisqApp.java @@ -275,7 +275,7 @@ private void addSceneKeyEventHandler(Scene scene, Injector injector) { injector.getInstance(SendAlertMessageWindow.class).show(); } else if (Utilities.isAltOrCtrlPressed(KeyCode.F, keyEvent)) { injector.getInstance(FilterWindow.class).show(); - } else if (Utilities.isAltOrCtrlPressed(KeyCode.UP, keyEvent)) { + } else if (Utilities.isAltOrCtrlPressed(KeyCode.H, keyEvent)) { log.warn("We re-published all proposalPayloads and blindVotePayloads to the P2P network."); injector.getInstance(MissingDataRequestService.class).reRepublishAllGovernanceData(); } else if (Utilities.isAltOrCtrlPressed(KeyCode.T, keyEvent)) { From 6dece567b600766e4efde1b1e5cf80c35aaf94b5 Mon Sep 17 00:00:00 2001 From: chimp1984 Date: Tue, 26 Nov 2019 12:22:52 -0500 Subject: [PATCH 3/8] Use isAltOrCtrlPressed for removeFailedTrade --- .../main/portfolio/pendingtrades/PendingTradesView.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesView.java b/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesView.java index b783d291d6e..af5ae880ec4 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesView.java +++ b/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesView.java @@ -47,9 +47,8 @@ import bisq.common.UserThread; import bisq.common.util.Utilities; -import javax.inject.Named; - import javax.inject.Inject; +import javax.inject.Named; import de.jensd.fx.glyphs.materialdesignicons.MaterialDesignIcon; @@ -210,7 +209,7 @@ public void initialize() { .closeButtonText(Res.get("shared.cancel")) .onClose(popup::hide) .show(); - } else if (Utilities.isAltPressed(KeyCode.Y, keyEvent)) { + } else if (Utilities.isAltOrCtrlPressed(KeyCode.Y, keyEvent)) { new Popup().warning(Res.get("portfolio.pending.removeFailedTrade")) .onAction(model.dataModel::onMoveToFailedTrades) .show(); From 6a551b43effebd9189f0b749ec84bb133faff3cb Mon Sep 17 00:00:00 2001 From: chimp1984 Date: Tue, 26 Nov 2019 12:23:37 -0500 Subject: [PATCH 4/8] Remove showStatisticsPopup This was useful for legacy arbitrators as they received the trade fee --- .../funds/transactions/TransactionsView.java | 110 +----------------- 1 file changed, 2 insertions(+), 108 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionsView.java b/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionsView.java index cf4144faf0d..78c2f495d76 100644 --- a/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionsView.java +++ b/desktop/src/main/java/bisq/desktop/main/funds/transactions/TransactionsView.java @@ -41,8 +41,6 @@ import bisq.network.p2p.P2PService; -import bisq.common.util.Tuple2; -import bisq.common.util.Tuple4; import bisq.common.util.Utilities; import org.bitcoinj.core.Coin; @@ -83,16 +81,8 @@ import javafx.util.Callback; -import java.text.DateFormat; - -import java.util.ArrayList; import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.stream.Collectors; import javax.annotation.Nullable; @@ -218,6 +208,7 @@ public void onKeysAdded(List keys) { }; keyEventEventHandler = event -> { + // Not intended to be public to users as the feature is not well tested if (Utilities.isAltOrCtrlPressed(KeyCode.R, event)) { if (revertTxColumn.isVisible()) { confidenceColumn.getStyleClass().remove("last-column"); @@ -225,8 +216,7 @@ public void onKeysAdded(List keys) { confidenceColumn.getStyleClass().add("last-column"); } revertTxColumn.setVisible(!revertTxColumn.isVisible()); - } else if (Utilities.isAltOrCtrlPressed(KeyCode.A, event)) - showStatisticsPopup(); + } }; exportButton.updateText(Res.get("shared.exportCSV")); @@ -556,101 +546,5 @@ private void revertTransaction(String txId, @Nullable Tradable tradable) { } } } - - // This method is not intended for the public so we don't translate here - private void showStatisticsPopup() { - Map> map = new HashMap<>(); - Map> dataByDayMap = new HashMap<>(); - displayedTransactions.forEach(item -> { - Coin amountAsCoin = item.getAmountAsCoin(); - List amounts; - long key = amountAsCoin.getValue(); - if (!map.containsKey(key)) { - amounts = new ArrayList<>(); - map.put(key, amounts); - } else { - amounts = map.get(key); - } - amounts.add(amountAsCoin); - - DateFormat dateFormatter = DateFormat.getDateInstance(DateFormat.DEFAULT, Locale.US); - String day = dateFormatter.format(item.getDate()); - - // TODO fee is dynamic now - Coin txFee = Coin.valueOf(20_000); - Coin createOfferFee = Coin.valueOf(50_000); - Coin takeOfferFee = Coin.valueOf(100_000); - - if (!dataByDayMap.containsKey(day)) { - int numOffers = 0; - int numTrades = 0; - if (amountAsCoin.compareTo(createOfferFee.subtract(txFee)) == 0) - numOffers++; - else if (amountAsCoin.compareTo(takeOfferFee.subtract(txFee)) == 0) - numTrades++; - - dataByDayMap.put(day, new Tuple4<>(item.getDate(), 1, numOffers, numTrades)); - } else { - Tuple4 tuple = dataByDayMap.get(day); - int prev = tuple.second; - int numOffers = tuple.third; - int numTrades = tuple.fourth; - if (amountAsCoin.compareTo(createOfferFee.subtract(txFee)) == 0) - numOffers++; - else if (amountAsCoin.compareTo(takeOfferFee.subtract(txFee)) == 0) - numTrades++; - - dataByDayMap.put(day, new Tuple4<>(tuple.first, ++prev, numOffers, numTrades)); - } - }); - - StringBuilder stringBuilder = new StringBuilder(); - map.forEach((key, value) -> { - // This is not intended for the public so we don't translate here - stringBuilder.append("No. of transactions for amount "). - append(formatter.formatCoinWithCode(Coin.valueOf(key))). - append(": "). - append(value.size()). - append("\n"); - }); - - List>> sortedDataByDayList = dataByDayMap.entrySet().stream(). - map(e -> { - Tuple4 data = e.getValue(); - return new Tuple4<>(e.getKey(), data.first, data.second, new Tuple2<>(data.third, data.fourth)); - }).sorted((o1, o2) -> o2.second.compareTo(o1.second)) - .collect(Collectors.toList()); - StringBuilder transactionsByDayStringBuilder = new StringBuilder(); - StringBuilder offersStringBuilder = new StringBuilder(); - StringBuilder tradesStringBuilder = new StringBuilder(); - StringBuilder allStringBuilder = new StringBuilder(); - // This is not intended for the public so we don't translate here - allStringBuilder.append(Res.get("shared.date")).append(";").append("Offers").append(";").append("Trades").append("\n"); - sortedDataByDayList.forEach(tuple4 -> { - offersStringBuilder.append(tuple4.fourth.first).append(","); - tradesStringBuilder.append(tuple4.fourth.second).append(","); - allStringBuilder.append(tuple4.first).append(";").append(tuple4.fourth.first).append(";").append(tuple4.fourth.second).append("\n"); - transactionsByDayStringBuilder.append("\n"). - append(tuple4.first). - append(": "). - append(tuple4.third). - append(" (Offers: "). - append(tuple4.fourth.first). - append(" / Trades: "). - append(tuple4.fourth.second). - append(")"); - }); - // This is not intended for the public so we don't translate here - String message = stringBuilder.toString() + "\nNo. of transactions by day:" + transactionsByDayStringBuilder.toString(); - new Popup().headLine("Statistical info") - .information(message) - .actionButtonText("Copy") - .onAction(() -> Utilities.copyToClipboard(message + - "\n\nCSV (Offers):\n" + offersStringBuilder.toString() + - "\n\nCSV (Trades):\n" + tradesStringBuilder.toString() + - "\n\nCSV (all):\n" + allStringBuilder.toString())) - .show(); - } - } From f40d49e2a26248b614f8559e00bad28628ed7d8a Mon Sep 17 00:00:00 2001 From: chimp1984 Date: Tue, 26 Nov 2019 12:24:50 -0500 Subject: [PATCH 5/8] Cleanup - Remove setColumnSpan for titledGroupBg - Fix row length --- .../main/settings/about/AboutView.java | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/settings/about/AboutView.java b/desktop/src/main/java/bisq/desktop/main/settings/about/AboutView.java index 2414ac261e5..3e54bc145da 100644 --- a/desktop/src/main/java/bisq/desktop/main/settings/about/AboutView.java +++ b/desktop/src/main/java/bisq/desktop/main/settings/about/AboutView.java @@ -20,7 +20,6 @@ import bisq.desktop.common.view.ActivatableView; import bisq.desktop.common.view.FxmlView; import bisq.desktop.components.HyperlinkWithIcon; -import bisq.desktop.components.TitledGroupBg; import bisq.desktop.util.Layout; import bisq.core.locale.Res; @@ -51,8 +50,8 @@ public AboutView() { @Override public void initialize() { - TitledGroupBg titledGroupBg = addTitledGroupBg(root, gridRow, 4, Res.get("setting.about.aboutBisq")); - GridPane.setColumnSpan(titledGroupBg, 2); + addTitledGroupBg(root, gridRow, 4, Res.get("setting.about.aboutBisq")); + Label label = addLabel(root, gridRow, Res.get("setting.about.about"), Layout.TWICE_FIRST_ROW_DISTANCE); label.setWrapText(true); GridPane.setColumnSpan(label, 2); @@ -64,8 +63,8 @@ public void initialize() { hyperlinkWithIcon = addHyperlinkWithIcon(root, ++gridRow, Res.get("setting.about.agpl"), "https://bisq.network/source/bisq/blob/master/LICENSE"); GridPane.setColumnSpan(hyperlinkWithIcon, 2); - titledGroupBg = addTitledGroupBg(root, ++gridRow, 3, Res.get("setting.about.support"), Layout.GROUP_DISTANCE); - GridPane.setColumnSpan(titledGroupBg, 2); + addTitledGroupBg(root, ++gridRow, 2, Res.get("setting.about.support"), Layout.GROUP_DISTANCE); + label = addLabel(root, gridRow, Res.get("setting.about.def"), Layout.TWICE_FIRST_ROW_AND_GROUP_DISTANCE); label.setWrapText(true); GridPane.setColumnSpan(label, 2); @@ -73,22 +72,20 @@ public void initialize() { hyperlinkWithIcon = addHyperlinkWithIcon(root, ++gridRow, Res.get("setting.about.contribute"), "https://bisq.network/contribute"); GridPane.setColumnSpan(hyperlinkWithIcon, 2); - final boolean isBtc = Res.getBaseCurrencyCode().equals("BTC"); - titledGroupBg = addTitledGroupBg(root, ++gridRow, isBtc ? 3 : 2, Res.get("setting.about.providers"), Layout.GROUP_DISTANCE); - GridPane.setColumnSpan(titledGroupBg, 2); + boolean isBtc = Res.getBaseCurrencyCode().equals("BTC"); + addTitledGroupBg(root, ++gridRow, isBtc ? 3 : 2, Res.get("setting.about.providers"), Layout.GROUP_DISTANCE); + label = addLabel(root, gridRow, Res.get(isBtc ? "setting.about.apisWithFee" : "setting.about.apis"), Layout.TWICE_FIRST_ROW_AND_GROUP_DISTANCE); label.setWrapText(true); - GridPane.setColumnSpan(label, 2); GridPane.setHalignment(label, HPos.LEFT); addCompactTopLabelTextField(root, ++gridRow, Res.get("setting.about.pricesProvided"), Res.get("setting.about.pricesProviders", "BitcoinAverage (https://bitcoinaverage.com)", "Poloniex (https://poloniex.com)", "Coinmarketcap (https://coinmarketcap.com)")); if (isBtc) - addCompactTopLabelTextField(root, ++gridRow, Res.get("setting.about.feeEstimation.label"), "21 (https://bitcoinfees.earn.com)"); + addCompactTopLabelTextField(root, ++gridRow, Res.get("setting.about.feeEstimation.label"), "Earn.com (https://bitcoinfees.earn.com)"); - titledGroupBg = addTitledGroupBg(root, ++gridRow, 2, Res.get("setting.about.versionDetails"), Layout.GROUP_DISTANCE); - GridPane.setColumnSpan(titledGroupBg, 2); + addTitledGroupBg(root, ++gridRow, 2, Res.get("setting.about.versionDetails"), Layout.GROUP_DISTANCE); addCompactTopLabelTextField(root, gridRow, Res.get("setting.about.version"), Version.VERSION, Layout.TWICE_FIRST_ROW_AND_GROUP_DISTANCE); addCompactTopLabelTextField(root, ++gridRow, Res.get("setting.about.subsystems.label"), From 91b76d42310359686f9c7e772bd5d07397db2159 Mon Sep 17 00:00:00 2001 From: chimp1984 Date: Tue, 26 Nov 2019 12:51:57 -0500 Subject: [PATCH 6/8] Add list of shortcuts --- .../resources/i18n/displayStrings.properties | 55 +++++++++++++ .../main/settings/about/AboutView.java | 80 +++++++++++++++++++ 2 files changed, 135 insertions(+) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index 5aeb86668f7..b9c902d2a44 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -1141,6 +1141,61 @@ setting.about.version=Application version setting.about.subsystems.label=Versions of subsystems setting.about.subsystems.val=Network version: {0}; P2P message version: {1}; Local DB version: {2}; Trade protocol version: {3} +setting.about.shortcuts=Short cuts +setting.about.shortcuts.ctrlOrAltOrCmd=''Ctrl + {0}'' or ''alt + {0}'' or ''cmd + {0}'' + +setting.about.shortcuts.menuNav=Navigate main menu +setting.about.shortcuts.menuNav.value=To navigate the main menu press: 'Ctrl' or 'alt' or 'cmd' with a numeric key between '1-9' + +setting.about.shortcuts.close=Close Bisq +setting.about.shortcuts.close.value=''Ctrl + {0}'' or ''cmd + {0}'' or ''Ctrl + {1}'' or ''cmd + {1}'' + +setting.about.shortcuts.closePopup=Close popup or dialog window +setting.about.shortcuts.closePopup.value='ESCAPE' key + +setting.about.shortcuts.chatSendMsg=Send trader chat message +setting.about.shortcuts.chatSendMsg.value=''Ctrl + ENTER'' or ''alt + ENTER'' or ''cmd + ENTER'' + +setting.about.shortcuts.openDispute=Open dispute +setting.about.shortcuts.openDispute.value=Select pending trade and click: {0} + +setting.about.shortcuts.walletDetails=Open wallet details window + +setting.about.shortcuts.openEmergencyBtcWalletTool=Open emergency wallet tool for BTC wallet + +setting.about.shortcuts.openEmergencyBsqWalletTool=Open emergency wallet tool for BSQ wallet + +setting.about.shortcuts.showTorLogs=Toggle log level for Tor messages between DEBUG and WARN + +setting.about.shortcuts.showDisputeStatistics=Show summary of all disputes +setting.about.shortcuts.showDisputeStatistics.value=Navigate to disputes view and click: {0} + +setting.about.shortcuts.manualPayoutTxWindow=Open window for manual payout from 2of2 Multisig deposit tx + +setting.about.shortcuts.reRepublishAllGovernanceData=Republish DAO governance data (proposals, votes) + +setting.about.shortcuts.removeStuckTrade=Open popup to move stuck trade to failed trades tab (only use if you are sure) +setting.about.shortcuts.removeStuckTrade.value=Select pending trade and click: {0} + +setting.about.shortcuts.registerArbitrator=Register arbitrator (mediator/arbitrator only) +setting.about.shortcuts.registerArbitrator.value=Navigate to account and click: {0} + +setting.about.shortcuts.registerMediator=Register mediator (mediator/arbitrator only) +setting.about.shortcuts.registerMediator.value=Navigate to account and click: {0} + +setting.about.shortcuts.reOpenDispute=Re-open already closed dispute (mediator/arbitrator only) +setting.about.shortcuts.reOpenDispute.value=Select closed dispute and click: {0} + +setting.about.shortcuts.openSignPaymentAccountsWindow=Open window for account age signing (legacy arbitrators only) +setting.about.shortcuts.openSignPaymentAccountsWindow.value=Navigate to legacy arbitrator view and click: {0} + +setting.about.shortcuts.sendAlertMsg=Send alert or update message (privileged activity) + +setting.about.shortcuts.sendFilter=Set Filter (privileged activity) + +setting.about.shortcuts.sendPrivateNotification=Send private notification to peer (privileged activity) +setting.about.shortcuts.sendPrivateNotification.value=Open peer info at avatar or dispute and click: {0} + #################################################################### # Account diff --git a/desktop/src/main/java/bisq/desktop/main/settings/about/AboutView.java b/desktop/src/main/java/bisq/desktop/main/settings/about/AboutView.java index 3e54bc145da..04298a27627 100644 --- a/desktop/src/main/java/bisq/desktop/main/settings/about/AboutView.java +++ b/desktop/src/main/java/bisq/desktop/main/settings/about/AboutView.java @@ -94,6 +94,86 @@ public void initialize() { Version.getP2PMessageVersion(), Version.LOCAL_DB_VERSION, Version.TRADE_PROTOCOL_VERSION)); + + addTitledGroupBg(root, ++gridRow, 20, Res.get("setting.about.shortcuts"), Layout.GROUP_DISTANCE); + + // basics + addCompactTopLabelTextField(root, gridRow, Res.get("setting.about.shortcuts.menuNav"), + Res.get("setting.about.shortcuts.menuNav.value"), + Layout.TWICE_FIRST_ROW_AND_GROUP_DISTANCE); + + addCompactTopLabelTextField(root, ++gridRow, Res.get("setting.about.shortcuts.close"), + Res.get("setting.about.shortcuts.close.value", "q", "w")); + + addCompactTopLabelTextField(root, ++gridRow, Res.get("setting.about.shortcuts.closePopup"), + Res.get("setting.about.shortcuts.closePopup.value")); + + addCompactTopLabelTextField(root, ++gridRow, Res.get("setting.about.shortcuts.chatSendMsg"), + Res.get("setting.about.shortcuts.chatSendMsg.value")); + + addCompactTopLabelTextField(root, ++gridRow, Res.get("setting.about.shortcuts.openDispute"), + Res.get("setting.about.shortcuts.openDispute.value", + Res.get("setting.about.shortcuts.ctrlOrAltOrCmd", "o"))); + + addCompactTopLabelTextField(root, ++gridRow, Res.get("setting.about.shortcuts.walletDetails"), + Res.get("setting.about.shortcuts.ctrlOrAltOrCmd", "j")); + + addCompactTopLabelTextField(root, ++gridRow, Res.get("setting.about.shortcuts.openEmergencyBtcWalletTool"), + Res.get("setting.about.shortcuts.ctrlOrAltOrCmd", "e")); + + addCompactTopLabelTextField(root, ++gridRow, Res.get("setting.about.shortcuts.openEmergencyBsqWalletTool"), + Res.get("setting.about.shortcuts.ctrlOrAltOrCmd", "b")); + + addCompactTopLabelTextField(root, ++gridRow, Res.get("setting.about.shortcuts.showDisputeStatistics"), + Res.get("setting.about.shortcuts.showDisputeStatistics.value", + Res.get("setting.about.shortcuts.ctrlOrAltOrCmd", "l"))); + + addCompactTopLabelTextField(root, ++gridRow, Res.get("setting.about.shortcuts.showTorLogs"), + Res.get("setting.about.shortcuts.ctrlOrAltOrCmd", "t")); + + // special + addCompactTopLabelTextField(root, ++gridRow, Res.get("setting.about.shortcuts.removeStuckTrade"), + Res.get("setting.about.shortcuts.removeStuckTrade.value", + Res.get("setting.about.shortcuts.ctrlOrAltOrCmd", "y"))); + + addCompactTopLabelTextField(root, ++gridRow, Res.get("setting.about.shortcuts.manualPayoutTxWindow"), + Res.get("setting.about.shortcuts.ctrlOrAltOrCmd", "g")); + + addCompactTopLabelTextField(root, ++gridRow, Res.get("setting.about.shortcuts.reRepublishAllGovernanceData"), + Res.get("setting.about.shortcuts.ctrlOrAltOrCmd", "h")); + + // for arbitrators + addCompactTopLabelTextField(root, ++gridRow, Res.get("setting.about.shortcuts.registerArbitrator"), + Res.get("setting.about.shortcuts.registerArbitrator.value", + Res.get("setting.about.shortcuts.ctrlOrAltOrCmd", "n"))); + + addCompactTopLabelTextField(root, ++gridRow, Res.get("setting.about.shortcuts.registerMediator"), + Res.get("setting.about.shortcuts.registerMediator.value", + Res.get("setting.about.shortcuts.ctrlOrAltOrCmd", "d"))); + + addCompactTopLabelTextField(root, ++gridRow, Res.get("setting.about.shortcuts.reOpenDispute"), + Res.get("setting.about.shortcuts.reOpenDispute.value", + Res.get("setting.about.shortcuts.ctrlOrAltOrCmd", "u"))); + + addCompactTopLabelTextField(root, ++gridRow, Res.get("setting.about.shortcuts.openSignPaymentAccountsWindow"), + Res.get("setting.about.shortcuts.openSignPaymentAccountsWindow.value", + Res.get("setting.about.shortcuts.ctrlOrAltOrCmd", "s"))); + + // only for maintainers + addCompactTopLabelTextField(root, ++gridRow, Res.get("setting.about.shortcuts.sendAlertMsg"), + Res.get("setting.about.shortcuts.ctrlOrAltOrCmd", "m")); + + addCompactTopLabelTextField(root, ++gridRow, Res.get("setting.about.shortcuts.sendFilter"), + Res.get("setting.about.shortcuts.ctrlOrAltOrCmd", "f")); + + addCompactTopLabelTextField(root, ++gridRow, Res.get("setting.about.shortcuts.sendPrivateNotification"), + Res.get("setting.about.shortcuts.sendPrivateNotification.value", + Res.get("setting.about.shortcuts.ctrlOrAltOrCmd", "r"))); + + // Not added: + // allTradesWithReferralId, allOffersWithReferralId -> ReferralId is not used yet + // revert tx -> not tested well, high risk + // debug window -> not maintained, only for devs working on trade protocol relevant } @Override From a67b960df963f205862040bfa9a0ed8a8d46d484 Mon Sep 17 00:00:00 2001 From: chimp1984 Date: Tue, 26 Nov 2019 15:47:21 -0500 Subject: [PATCH 7/8] Update comment --- .../dao/governance/voteresult/MissingDataRequestService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/bisq/core/dao/governance/voteresult/MissingDataRequestService.java b/core/src/main/java/bisq/core/dao/governance/voteresult/MissingDataRequestService.java index 8042ac5c735..6d5a5da5173 100644 --- a/core/src/main/java/bisq/core/dao/governance/voteresult/MissingDataRequestService.java +++ b/core/src/main/java/bisq/core/dao/governance/voteresult/MissingDataRequestService.java @@ -78,7 +78,7 @@ public void sendRepublishRequest() { republishGovernanceDataHandler.sendRepublishRequest(); } - // Can be triggered with shortcut ctrl+UP or alt+UP + // Can be triggered with shortcut ctrl+h, cmd+h or alt+h public void reRepublishAllGovernanceData() { // We only want to do it once in case we would get flooded with requests. if (!reRepublishAllGovernanceDataDone) { From 734b1f08f7cf8bf648e05a5e676c0d2ba74f61e4 Mon Sep 17 00:00:00 2001 From: chimp1984 Date: Fri, 6 Dec 2019 23:35:05 -0500 Subject: [PATCH 8/8] Change "click" to "press" --- .../main/resources/i18n/displayStrings.properties | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index b9c902d2a44..2bee91b8ea2 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -1168,33 +1168,33 @@ setting.about.shortcuts.openEmergencyBsqWalletTool=Open emergency wallet tool fo setting.about.shortcuts.showTorLogs=Toggle log level for Tor messages between DEBUG and WARN setting.about.shortcuts.showDisputeStatistics=Show summary of all disputes -setting.about.shortcuts.showDisputeStatistics.value=Navigate to disputes view and click: {0} +setting.about.shortcuts.showDisputeStatistics.value=Navigate to disputes view and press: {0} setting.about.shortcuts.manualPayoutTxWindow=Open window for manual payout from 2of2 Multisig deposit tx setting.about.shortcuts.reRepublishAllGovernanceData=Republish DAO governance data (proposals, votes) setting.about.shortcuts.removeStuckTrade=Open popup to move stuck trade to failed trades tab (only use if you are sure) -setting.about.shortcuts.removeStuckTrade.value=Select pending trade and click: {0} +setting.about.shortcuts.removeStuckTrade.value=Select pending trade and press: {0} setting.about.shortcuts.registerArbitrator=Register arbitrator (mediator/arbitrator only) -setting.about.shortcuts.registerArbitrator.value=Navigate to account and click: {0} +setting.about.shortcuts.registerArbitrator.value=Navigate to account and press: {0} setting.about.shortcuts.registerMediator=Register mediator (mediator/arbitrator only) -setting.about.shortcuts.registerMediator.value=Navigate to account and click: {0} +setting.about.shortcuts.registerMediator.value=Navigate to account and press: {0} setting.about.shortcuts.reOpenDispute=Re-open already closed dispute (mediator/arbitrator only) -setting.about.shortcuts.reOpenDispute.value=Select closed dispute and click: {0} +setting.about.shortcuts.reOpenDispute.value=Select closed dispute and press: {0} setting.about.shortcuts.openSignPaymentAccountsWindow=Open window for account age signing (legacy arbitrators only) -setting.about.shortcuts.openSignPaymentAccountsWindow.value=Navigate to legacy arbitrator view and click: {0} +setting.about.shortcuts.openSignPaymentAccountsWindow.value=Navigate to legacy arbitrator view and press: {0} setting.about.shortcuts.sendAlertMsg=Send alert or update message (privileged activity) setting.about.shortcuts.sendFilter=Set Filter (privileged activity) setting.about.shortcuts.sendPrivateNotification=Send private notification to peer (privileged activity) -setting.about.shortcuts.sendPrivateNotification.value=Open peer info at avatar or dispute and click: {0} +setting.about.shortcuts.sendPrivateNotification.value=Open peer info at avatar or dispute and press: {0} ####################################################################