From 77539c570aa0ce7c7911fcf469fc4ffb6033979c Mon Sep 17 00:00:00 2001 From: user411 Date: Fri, 13 Aug 2021 06:14:11 -0600 Subject: [PATCH] Adjust DLCTableView column widths and "counter party" to "counterparty" (#3539) --- .../org/bitcoins/gui/dlc/DLCTableView.scala | 16 ++++++++-------- .../gui/dlc/dialog/AcceptOfferDialog.scala | 4 ++-- .../gui/dlc/dialog/BroadcastDLCDialog.scala | 2 +- .../bitcoins/gui/dlc/dialog/SignDLCDialog.scala | 2 +- .../dlc/wallet/internal/DLCDataManagement.scala | 2 +- docs/wallet/dlc.md | 2 +- .../versioned_docs/version-0.5.0/wallet/dlc.md | 2 +- .../versioned_docs/version-1.7.0/wallet/dlc.md | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/gui/src/main/scala/org/bitcoins/gui/dlc/DLCTableView.scala b/app/gui/src/main/scala/org/bitcoins/gui/dlc/DLCTableView.scala index 0d2c49d569..cc774dc18c 100644 --- a/app/gui/src/main/scala/org/bitcoins/gui/dlc/DLCTableView.scala +++ b/app/gui/src/main/scala/org/bitcoins/gui/dlc/DLCTableView.scala @@ -22,7 +22,7 @@ class DLCTableView(model: DLCPaneModel) { val tableView: TableView[DLCStatus] = { val eventIdCol = new TableColumn[DLCStatus, String] { text = "Event Id" - prefWidth = 160 + prefWidth = 230 cellValueFactory = { status => val eventIdStr = status.value.oracleInfo.singleOracleInfos.head.announcement.eventTLV.eventId @@ -32,7 +32,7 @@ class DLCTableView(model: DLCPaneModel) { val contractIdCol = new TableColumn[DLCStatus, String] { text = "Contract Id" - prefWidth = 100 + prefWidth = 90 cellValueFactory = { status => val contractIdStr = status.value match { case _: Offered => "" @@ -45,7 +45,7 @@ class DLCTableView(model: DLCPaneModel) { val statusCol = new TableColumn[DLCStatus, String] { text = "Status" - prefWidth = 125 + prefWidth = 105 cellValueFactory = { status => new StringProperty(status, "Status", status.value.statusString) } @@ -65,12 +65,12 @@ class DLCTableView(model: DLCPaneModel) { } val otherCollateralCol = new TableColumn[DLCStatus, String] { - text = "Counter Party Collateral" - prefWidth = 200 + text = "Counterparty Collateral" + prefWidth = 150 cellValueFactory = { status => val amt = GUIUtil.numberFormatter.format( status.value.remoteCollateral.satoshis.toLong) - new StringProperty(status, "Counter Party Collateral", s"$amt sats") + new StringProperty(status, "Counterparty Collateral", s"$amt sats") } } @@ -86,7 +86,7 @@ class DLCTableView(model: DLCPaneModel) { val pnlCol = new TableColumn[DLCStatus, String] { text = "Realized PNL" - prefWidth = 100 + prefWidth = 110 cellValueFactory = { status => status.value match { case closed: ClosedDLCStatus => @@ -100,7 +100,7 @@ class DLCTableView(model: DLCPaneModel) { val rorCol = new TableColumn[DLCStatus, String] { text = "Rate of Return" - prefWidth = 125 + prefWidth = 105 cellValueFactory = { status => status.value match { case closed: ClosedDLCStatus => diff --git a/app/gui/src/main/scala/org/bitcoins/gui/dlc/dialog/AcceptOfferDialog.scala b/app/gui/src/main/scala/org/bitcoins/gui/dlc/dialog/AcceptOfferDialog.scala index 0eeb4e1950..b99dddf423 100644 --- a/app/gui/src/main/scala/org/bitcoins/gui/dlc/dialog/AcceptOfferDialog.scala +++ b/app/gui/src/main/scala/org/bitcoins/gui/dlc/dialog/AcceptOfferDialog.scala @@ -87,7 +87,7 @@ class AcceptOfferDialog extends CliCommandProducer[AcceptDLCCliCommand] { add( new Label("DLC Offer") { - tooltip = Tooltip("Offer message given from your counter party.") + tooltip = Tooltip("Offer message given from your counterparty.") tooltip.value.setShowDelay(new javafx.util.Duration(100)) }, 0, @@ -161,7 +161,7 @@ class AcceptOfferDialog extends CliCommandProducer[AcceptDLCCliCommand] { nextRow) nextRow += 1 - gridPane.add(new Label("Counter Party Collateral"), 0, nextRow) + gridPane.add(new Label("Counterparty Collateral"), 0, nextRow) gridPane.add(new TextField() { text = offer.totalCollateralSatoshis.toString editable = false diff --git a/app/gui/src/main/scala/org/bitcoins/gui/dlc/dialog/BroadcastDLCDialog.scala b/app/gui/src/main/scala/org/bitcoins/gui/dlc/dialog/BroadcastDLCDialog.scala index 93eecd817c..6e6b63b38d 100644 --- a/app/gui/src/main/scala/org/bitcoins/gui/dlc/dialog/BroadcastDLCDialog.scala +++ b/app/gui/src/main/scala/org/bitcoins/gui/dlc/dialog/BroadcastDLCDialog.scala @@ -173,7 +173,7 @@ object BroadcastDLCDialog nextRow) nextRow += 1 - gridPane.add(new Label("Counter Party Collateral"), 0, nextRow) + gridPane.add(new Label("Counterparty Collateral"), 0, nextRow) gridPane.add(new TextField() { text = status.remoteCollateral.satoshis.toString editable = false diff --git a/app/gui/src/main/scala/org/bitcoins/gui/dlc/dialog/SignDLCDialog.scala b/app/gui/src/main/scala/org/bitcoins/gui/dlc/dialog/SignDLCDialog.scala index cf750d258f..65d5b3e600 100644 --- a/app/gui/src/main/scala/org/bitcoins/gui/dlc/dialog/SignDLCDialog.scala +++ b/app/gui/src/main/scala/org/bitcoins/gui/dlc/dialog/SignDLCDialog.scala @@ -188,7 +188,7 @@ object SignDLCDialog nextRow) nextRow += 1 - gridPane.add(new Label("Counter Party Collateral"), 0, nextRow) + gridPane.add(new Label("Counterparty Collateral"), 0, nextRow) gridPane.add(new TextField() { text = status.remoteCollateral.satoshis.toString editable = false diff --git a/dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/internal/DLCDataManagement.scala b/dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/internal/DLCDataManagement.scala index 88e8c3cb3e..c340731f3a 100644 --- a/dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/internal/DLCDataManagement.scala +++ b/dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/internal/DLCDataManagement.scala @@ -567,7 +567,7 @@ private[bitcoins] trait DLCDataManagement { self: DLCWallet => fundingInputs, contractInfo) .flatMap { executor => - // Filter for only counter party's outcome sigs + // Filter for only counterparty's outcome sigs val outcomeSigs = if (dlcDb.isInitiator) { outcomeSigsDbs diff --git a/docs/wallet/dlc.md b/docs/wallet/dlc.md index 4682e3f367..349d127a57 100644 --- a/docs/wallet/dlc.md +++ b/docs/wallet/dlc.md @@ -48,7 +48,7 @@ But do note that this demonstrates the old non-adaptor version of DLCs so that t If using a numeric contract and/or multiple oracles, messages can get very large and sometimes even too large to for the application. To solve this there is an `Export to file` button located under the text box for the messages your wallet will construct. -This can be used to export a DLC message to a file and then the file can be sent to your counter party. +This can be used to export a DLC message to a file and then the file can be sent to your counterparty. If you receive a file from a counter-party, there is an `Import file` button on every dialog you input a DLC message. This can be used to import the file of the DLC message from your counter-party. diff --git a/website/versioned_docs/version-0.5.0/wallet/dlc.md b/website/versioned_docs/version-0.5.0/wallet/dlc.md index f967eccdc5..470f0c062d 100644 --- a/website/versioned_docs/version-0.5.0/wallet/dlc.md +++ b/website/versioned_docs/version-0.5.0/wallet/dlc.md @@ -51,7 +51,7 @@ But do note that this demonstrates the old non-adaptor version of DLCs so that t If using a numeric contract and/or multiple oracles, messages can get very large and sometimes even too large to for the application. To solve this there is an `Export to file` button located under the text box for the messages your wallet will construct. -This can be used to export a DLC message to a file and then the file can be sent to your counter party. +This can be used to export a DLC message to a file and then the file can be sent to your counterparty. If you receive a file from a counter-party, there is an `Import file` button on every dialog you input a DLC message. This can be used to import the file of the DLC message from your counter-party. diff --git a/website/versioned_docs/version-1.7.0/wallet/dlc.md b/website/versioned_docs/version-1.7.0/wallet/dlc.md index 2c3a041b31..388a2b8fc7 100644 --- a/website/versioned_docs/version-1.7.0/wallet/dlc.md +++ b/website/versioned_docs/version-1.7.0/wallet/dlc.md @@ -49,7 +49,7 @@ But do note that this demonstrates the old non-adaptor version of DLCs so that t If using a numeric contract and/or multiple oracles, messages can get very large and sometimes even too large to for the application. To solve this there is an `Export to file` button located under the text box for the messages your wallet will construct. -This can be used to export a DLC message to a file and then the file can be sent to your counter party. +This can be used to export a DLC message to a file and then the file can be sent to your counterparty. If you receive a file from a counter-party, there is an `Import file` button on every dialog you input a DLC message. This can be used to import the file of the DLC message from your counter-party.