diff --git a/explorer/src/main/kotlin/com/r3corda/explorer/views/CashViewer.kt b/explorer/src/main/kotlin/com/r3corda/explorer/views/CashViewer.kt index f6d2f8aa07..b0bd979f46 100644 --- a/explorer/src/main/kotlin/com/r3corda/explorer/views/CashViewer.kt +++ b/explorer/src/main/kotlin/com/r3corda/explorer/views/CashViewer.kt @@ -59,22 +59,22 @@ class CashViewer : View() { // Inject UI elements override val root: SplitPane by fxml() - val topSplitPane: SplitPane by fxid("TopSplitPane") + val topSplitPane: SplitPane by fxid() // Left pane - val leftPane: VBox by fxid("LeftPane") - val searchCriteriaTextField: TextField by fxid("SearchCriteriaTextField") - val searchCancelImageView: ImageView by fxid("SearchCancelImageView") - val totalMatchingLabel: Label by fxid("TotalMatchingLabel") - val cashViewerTable: TreeTableView by fxid("CashViewerTable") - val cashViewerTableIssuerCurrency: TreeTableColumn by fxid("CashViewerTableIssuerCurrency") - val cashViewerTableLocalCurrency: TreeTableColumn?> by fxid("CashViewerTableLocalCurrency") - val cashViewerTableEquiv: TreeTableColumn?> by fxid("CashViewerTableEquiv") + val leftPane: VBox by fxid() + val searchCriteriaTextField: TextField by fxid() + val searchCancelImageView: ImageView by fxid() + val totalMatchingLabel: Label by fxid() + val cashViewerTable: TreeTableView by fxid() + val cashViewerTableIssuerCurrency: TreeTableColumn by fxid() + val cashViewerTableLocalCurrency: TreeTableColumn?> by fxid() + val cashViewerTableEquiv: TreeTableColumn?> by fxid() // Right pane - val rightPane: VBox by fxid("RightPane") - val totalPositionsLabel: Label by fxid("TotalPositionsLabel") - val equivSumLabel: Label by fxid("EquivSumLabel") - val cashStatesList: ListView by fxid("CashStatesList") + val rightPane: VBox by fxid() + val totalPositionsLabel: Label by fxid() + val equivSumLabel: Label by fxid() + val cashStatesList: ListView by fxid() // Inject observables val cashStates by observableList(ContractStateModel::cashStates) @@ -186,12 +186,12 @@ class CashViewer : View() { ) : UIComponent() { override val root: HBox by fxml("CashStateViewer.fxml") - val equivLabel: Label by fxid("EquivLabel") - val stateIdValueLabel: Label by fxid("StateIdValueLabel") - val issuerValueLabel: Label by fxid("IssuerValueLabel") - val originatedValueLabel: Label by fxid("OriginatedValueLabel") - val amountValueLabel: Label by fxid("AmountValueLabel") - val equivValueLabel: Label by fxid("EquivValueLabel") + val equivLabel: Label by fxid() + val stateIdValueLabel: Label by fxid() + val issuerValueLabel: Label by fxid() + val originatedValueLabel: Label by fxid() + val amountValueLabel: Label by fxid() + val equivValueLabel: Label by fxid() val equivAmount: ObservableValue> = EasyBind.map(reportingExchange) { it.second(stateRow.stateAndRef.state.data.amount.withoutIssuer()) diff --git a/explorer/src/main/kotlin/com/r3corda/explorer/views/Header.kt b/explorer/src/main/kotlin/com/r3corda/explorer/views/Header.kt index 752d8ece37..927f5f1259 100644 --- a/explorer/src/main/kotlin/com/r3corda/explorer/views/Header.kt +++ b/explorer/src/main/kotlin/com/r3corda/explorer/views/Header.kt @@ -15,11 +15,11 @@ import tornadofx.View class Header : View() { override val root: VBox by fxml() - private val sectionIcon: ImageView by fxid("SectionIcon") - private val sectionIconContainer: VBox by fxid("SectionIconContainer") - private val sectionLabel: Label by fxid("SectionLabel") - private val debugNextButton: Button by fxid("DebugNextButton") - private val debugGoStopButton: Button by fxid("DebugGoStopButton") + private val sectionIcon: ImageView by fxid() + private val sectionIconContainer: VBox by fxid() + private val sectionLabel: Label by fxid() + private val debugNextButton: Button by fxid() + private val debugGoStopButton: Button by fxid() private val selectedView: ObservableValue by observableValue(TopLevelModel::selectedView) diff --git a/explorer/src/main/kotlin/com/r3corda/explorer/views/Home.kt b/explorer/src/main/kotlin/com/r3corda/explorer/views/Home.kt index cd04db15dc..bc8cc4b324 100644 --- a/explorer/src/main/kotlin/com/r3corda/explorer/views/Home.kt +++ b/explorer/src/main/kotlin/com/r3corda/explorer/views/Home.kt @@ -26,11 +26,11 @@ import java.util.* class Home : View() { override val root: TilePane by fxml() - private val ourCashPane: TitledPane by fxid("OurCashPane") - private val ourCashLabel: Label by fxid("OurCashLabel") + private val ourCashPane: TitledPane by fxid() + private val ourCashLabel: Label by fxid() - private val ourTransactionsPane: TitledPane by fxid("OurTransactionsPane") - private val ourTransactionsLabel: Label by fxid("OurTransactionsLabel") + private val ourTransactionsPane: TitledPane by fxid() + private val ourTransactionsLabel: Label by fxid() private val selectedView: WritableValue by writableValue(TopLevelModel::selectedView) private val cashStates: ObservableList> by observableList(ContractStateModel::cashStates) diff --git a/explorer/src/main/kotlin/com/r3corda/explorer/views/TopLevel.kt b/explorer/src/main/kotlin/com/r3corda/explorer/views/TopLevel.kt index e1ceb38de0..0509ca5dbe 100644 --- a/explorer/src/main/kotlin/com/r3corda/explorer/views/TopLevel.kt +++ b/explorer/src/main/kotlin/com/r3corda/explorer/views/TopLevel.kt @@ -14,7 +14,7 @@ import tornadofx.View class TopLevel : View() { override val root: VBox by fxml() - val selection: BorderPane by fxid("SelectionBorderPane") + val selectionBorderPane: BorderPane by fxid() private val header: Header by inject() private val home: Home by inject() @@ -35,8 +35,8 @@ class TopLevel : View() { val selectedView: ObjectProperty by objectProperty(TopLevelModel::selectedView) init { - VBox.setVgrow(selection, Priority.ALWAYS) - selection.centerProperty().bind(EasyBind.map(selectedView) { getView(it) }) + VBox.setVgrow(selectionBorderPane, Priority.ALWAYS) + selectionBorderPane.centerProperty().bind(EasyBind.map(selectedView) { getView(it) }) primaryStage.addEventHandler(KeyEvent.KEY_RELEASED) { keyEvent -> if (keyEvent.code == KeyCode.ESCAPE) { diff --git a/explorer/src/main/kotlin/com/r3corda/explorer/views/TransactionViewer.kt b/explorer/src/main/kotlin/com/r3corda/explorer/views/TransactionViewer.kt index 2a6bace419..c249f4e2d3 100644 --- a/explorer/src/main/kotlin/com/r3corda/explorer/views/TransactionViewer.kt +++ b/explorer/src/main/kotlin/com/r3corda/explorer/views/TransactionViewer.kt @@ -41,48 +41,48 @@ import java.util.* class TransactionViewer: View() { override val root: VBox by fxml() - val topSplitPane: SplitPane by fxid("TopSplitPane") + val topSplitPane: SplitPane by fxid() // Top half (transactions table) - private val transactionViewTable: TableView by fxid("TransactionViewTable") - private val transactionViewFiberId: TableColumn by fxid("TransactionViewFiberId") - private val transactionViewClientUuid: TableColumn by fxid("TransactionViewClientUuid") - private val transactionViewTransactionStatus: TableColumn by fxid("TransactionViewTransactionStatus") - private val transactionViewProtocolStatus: TableColumn by fxid("TransactionViewProtocolStatus") - private val transactionViewStateMachineStatus: TableColumn by fxid("TransactionViewStateMachineStatus") - private val transactionViewCommandTypes: TableColumn by fxid("TransactionViewCommandTypes") - private val transactionViewTotalValueEquiv: TableColumn> by fxid("TransactionViewTotalValueEquiv") + private val transactionViewTable: TableView by fxid() + private val transactionViewFiberId: TableColumn by fxid() + private val transactionViewClientUuid: TableColumn by fxid() + private val transactionViewTransactionStatus: TableColumn by fxid() + private val transactionViewProtocolStatus: TableColumn by fxid() + private val transactionViewStateMachineStatus: TableColumn by fxid() + private val transactionViewCommandTypes: TableColumn by fxid() + private val transactionViewTotalValueEquiv: TableColumn> by fxid() // Bottom half (details) - private val contractStatesTitledPane: TitledPane by fxid("ContractStatesTitledPane") + private val contractStatesTitledPane: TitledPane by fxid() - private val contractStatesInputsCountLabel: Label by fxid("ContractStatesInputsCountLabel") - private val contractStatesInputStatesTable: TableView by fxid("ContractStatesInputStatesTable") - private val contractStatesInputStatesId: TableColumn by fxid("ContractStatesInputStatesId") - private val contractStatesInputStatesType: TableColumn> by fxid("ContractStatesInputStatesType") - private val contractStatesInputStatesOwner: TableColumn by fxid("ContractStatesInputStatesOwner") - private val contractStatesInputStatesLocalCurrency: TableColumn by fxid("ContractStatesInputStatesLocalCurrency") - private val contractStatesInputStatesAmount: TableColumn by fxid("ContractStatesInputStatesAmount") - private val contractStatesInputStatesEquiv: TableColumn> by fxid("ContractStatesInputStatesEquiv") + private val contractStatesInputsCountLabel: Label by fxid() + private val contractStatesInputStatesTable: TableView by fxid() + private val contractStatesInputStatesId: TableColumn by fxid() + private val contractStatesInputStatesType: TableColumn> by fxid() + private val contractStatesInputStatesOwner: TableColumn by fxid() + private val contractStatesInputStatesLocalCurrency: TableColumn by fxid() + private val contractStatesInputStatesAmount: TableColumn by fxid() + private val contractStatesInputStatesEquiv: TableColumn> by fxid() - private val contractStatesOutputsCountLabel: Label by fxid("ContractStatesOutputsCountLabel") - private val contractStatesOutputStatesTable: TableView by fxid("ContractStatesOutputStatesTable") - private val contractStatesOutputStatesId: TableColumn by fxid("ContractStatesOutputStatesId") - private val contractStatesOutputStatesType: TableColumn> by fxid("ContractStatesOutputStatesType") - private val contractStatesOutputStatesOwner: TableColumn by fxid("ContractStatesOutputStatesOwner") - private val contractStatesOutputStatesLocalCurrency: TableColumn by fxid("ContractStatesOutputStatesLocalCurrency") - private val contractStatesOutputStatesAmount: TableColumn by fxid("ContractStatesOutputStatesAmount") - private val contractStatesOutputStatesEquiv: TableColumn> by fxid("ContractStatesOutputStatesEquiv") + private val contractStatesOutputsCountLabel: Label by fxid() + private val contractStatesOutputStatesTable: TableView by fxid() + private val contractStatesOutputStatesId: TableColumn by fxid() + private val contractStatesOutputStatesType: TableColumn> by fxid() + private val contractStatesOutputStatesOwner: TableColumn by fxid() + private val contractStatesOutputStatesLocalCurrency: TableColumn by fxid() + private val contractStatesOutputStatesAmount: TableColumn by fxid() + private val contractStatesOutputStatesEquiv: TableColumn> by fxid() - private val signaturesTitledPane: TitledPane by fxid("SignaturesTitledPane") - private val signaturesList: ListView by fxid("SignaturesList") + private val signaturesTitledPane: TitledPane by fxid() + private val signaturesList: ListView by fxid() - private val lowLevelEventsTitledPane: TitledPane by fxid("LowLevelEventsTitledPane") - private val lowLevelEventsTable: TableView by fxid("LowLevelEventsTable") - private val lowLevelEventsTimestamp: TableColumn by fxid("LowLevelEventsTimestamp") - private val lowLevelEventsEvent: TableColumn by fxid("LowLevelEventsEvent") + private val lowLevelEventsTitledPane: TitledPane by fxid() + private val lowLevelEventsTable: TableView by fxid() + private val lowLevelEventsTimestamp: TableColumn by fxid() + private val lowLevelEventsEvent: TableColumn by fxid() - private val matchingTransactionsLabel: Label by fxid("MatchingTransactionsLabel") + private val matchingTransactionsLabel: Label by fxid() private val gatheredTransactionDataList: ObservableList by observableListReadOnly(GatheredTransactionDataModel::gatheredTransactionDataList) diff --git a/explorer/src/main/resources/com/r3corda/explorer/css/wallet.css b/explorer/src/main/resources/com/r3corda/explorer/css/wallet.css index 6835c8ce47..1b2f76c43b 100644 --- a/explorer/src/main/resources/com/r3corda/explorer/css/wallet.css +++ b/explorer/src/main/resources/com/r3corda/explorer/css/wallet.css @@ -1,19 +1,19 @@ -#TopLevel.root { +#topLevel.root { -fx-background-image:url('../images/r3bg.png'); -fx-background-size: cover; -fx-background-repeat:no-repeat; -fx-base:white; } -#CashViewer { +#cashViewer { -fx-background-color: transparent; } -#CashViewerTable { +#cashViewerTable { -fx-background-color: transparent; } -#CashViewerTable .tree-table-row-cell { +#cashViewerTable .tree-table-row-cell { -fx-background-color: transparent; } diff --git a/explorer/src/main/resources/com/r3corda/explorer/views/CashStateViewer.fxml b/explorer/src/main/resources/com/r3corda/explorer/views/CashStateViewer.fxml index aa120e430e..de9415f8a1 100644 --- a/explorer/src/main/resources/com/r3corda/explorer/views/CashStateViewer.fxml +++ b/explorer/src/main/resources/com/r3corda/explorer/views/CashStateViewer.fxml @@ -12,16 +12,16 @@