ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-02 19:26:47 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

explorer: Use default fxid injection

Browse Source
This commit is contained in:
Andras Slemmer 2016-09-12 13:55:50 +01:00
parent 01d879772d
commit 50ceb9d155
12 changed files with 134 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
explorer/src/main/kotlin/com/r3corda/explorer/views/CashViewer.kt
View File

@ -59,22 +59,22 @@ class CashViewer : View() {
// Inject UI elements // Inject UI elements
override val root: SplitPane by fxml() override val root: SplitPane by fxml()
val topSplitPane: SplitPane by fxid("TopSplitPane") val topSplitPane: SplitPane by fxid()
// Left pane // Left pane
val leftPane: VBox by fxid("LeftPane") val leftPane: VBox by fxid()
val searchCriteriaTextField: TextField by fxid("SearchCriteriaTextField") val searchCriteriaTextField: TextField by fxid()
val searchCancelImageView: ImageView by fxid("SearchCancelImageView") val searchCancelImageView: ImageView by fxid()
val totalMatchingLabel: Label by fxid("TotalMatchingLabel") val totalMatchingLabel: Label by fxid()
val cashViewerTable: TreeTableView<ViewerNode> by fxid("CashViewerTable") val cashViewerTable: TreeTableView<ViewerNode> by fxid()
val cashViewerTableIssuerCurrency: TreeTableColumn<ViewerNode, String> by fxid("CashViewerTableIssuerCurrency") val cashViewerTableIssuerCurrency: TreeTableColumn<ViewerNode, String> by fxid()
val cashViewerTableLocalCurrency: TreeTableColumn<ViewerNode, Amount<Currency>?> by fxid("CashViewerTableLocalCurrency") val cashViewerTableLocalCurrency: TreeTableColumn<ViewerNode, Amount<Currency>?> by fxid()
val cashViewerTableEquiv: TreeTableColumn<ViewerNode, Amount<Currency>?> by fxid("CashViewerTableEquiv") val cashViewerTableEquiv: TreeTableColumn<ViewerNode, Amount<Currency>?> by fxid()
// Right pane // Right pane
val rightPane: VBox by fxid("RightPane") val rightPane: VBox by fxid()
val totalPositionsLabel: Label by fxid("TotalPositionsLabel") val totalPositionsLabel: Label by fxid()
val equivSumLabel: Label by fxid("EquivSumLabel") val equivSumLabel: Label by fxid()
val cashStatesList: ListView<StateRow> by fxid("CashStatesList") val cashStatesList: ListView<StateRow> by fxid()
// Inject observables // Inject observables
val cashStates by observableList(ContractStateModel::cashStates) val cashStates by observableList(ContractStateModel::cashStates)
@ -186,12 +186,12 @@ class CashViewer : View() {
) : UIComponent() { ) : UIComponent() {
override val root: HBox by fxml("CashStateViewer.fxml") override val root: HBox by fxml("CashStateViewer.fxml")
val equivLabel: Label by fxid("EquivLabel") val equivLabel: Label by fxid()
val stateIdValueLabel: Label by fxid("StateIdValueLabel") val stateIdValueLabel: Label by fxid()
val issuerValueLabel: Label by fxid("IssuerValueLabel") val issuerValueLabel: Label by fxid()
val originatedValueLabel: Label by fxid("OriginatedValueLabel") val originatedValueLabel: Label by fxid()
val amountValueLabel: Label by fxid("AmountValueLabel") val amountValueLabel: Label by fxid()
val equivValueLabel: Label by fxid("EquivValueLabel") val equivValueLabel: Label by fxid()
val equivAmount: ObservableValue<Amount<Currency>> = EasyBind.map(reportingExchange) { val equivAmount: ObservableValue<Amount<Currency>> = EasyBind.map(reportingExchange) {
it.second(stateRow.stateAndRef.state.data.amount.withoutIssuer()) it.second(stateRow.stateAndRef.state.data.amount.withoutIssuer())

10
explorer/src/main/kotlin/com/r3corda/explorer/views/Header.kt
View File

@ -15,11 +15,11 @@ import tornadofx.View
class Header : View() { class Header : View() {
override val root: VBox by fxml() override val root: VBox by fxml()
private val sectionIcon: ImageView by fxid("SectionIcon") private val sectionIcon: ImageView by fxid()
private val sectionIconContainer: VBox by fxid("SectionIconContainer") private val sectionIconContainer: VBox by fxid()
private val sectionLabel: Label by fxid("SectionLabel") private val sectionLabel: Label by fxid()
private val debugNextButton: Button by fxid("DebugNextButton") private val debugNextButton: Button by fxid()
private val debugGoStopButton: Button by fxid("DebugGoStopButton") private val debugGoStopButton: Button by fxid()
private val selectedView: ObservableValue<SelectedView> by observableValue(TopLevelModel::selectedView) private val selectedView: ObservableValue<SelectedView> by observableValue(TopLevelModel::selectedView)

8
explorer/src/main/kotlin/com/r3corda/explorer/views/Home.kt
View File

@ -26,11 +26,11 @@ import java.util.*
class Home : View() { class Home : View() {
override val root: TilePane by fxml() override val root: TilePane by fxml()
private val ourCashPane: TitledPane by fxid("OurCashPane") private val ourCashPane: TitledPane by fxid()
private val ourCashLabel: Label by fxid("OurCashLabel") private val ourCashLabel: Label by fxid()
private val ourTransactionsPane: TitledPane by fxid("OurTransactionsPane") private val ourTransactionsPane: TitledPane by fxid()
private val ourTransactionsLabel: Label by fxid("OurTransactionsLabel") private val ourTransactionsLabel: Label by fxid()
private val selectedView: WritableValue<SelectedView> by writableValue(TopLevelModel::selectedView) private val selectedView: WritableValue<SelectedView> by writableValue(TopLevelModel::selectedView)
private val cashStates: ObservableList<StateAndRef<Cash.State>> by observableList(ContractStateModel::cashStates) private val cashStates: ObservableList<StateAndRef<Cash.State>> by observableList(ContractStateModel::cashStates)

6
explorer/src/main/kotlin/com/r3corda/explorer/views/TopLevel.kt
View File

@ -14,7 +14,7 @@ import tornadofx.View
class TopLevel : View() { class TopLevel : View() {
override val root: VBox by fxml() 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 header: Header by inject()
private val home: Home by inject() private val home: Home by inject()
@ -35,8 +35,8 @@ class TopLevel : View() {
val selectedView: ObjectProperty<SelectedView> by objectProperty(TopLevelModel::selectedView) val selectedView: ObjectProperty<SelectedView> by objectProperty(TopLevelModel::selectedView)
init { init {
VBox.setVgrow(selection, Priority.ALWAYS) VBox.setVgrow(selectionBorderPane, Priority.ALWAYS)
selection.centerProperty().bind(EasyBind.map(selectedView) { getView(it) }) selectionBorderPane.centerProperty().bind(EasyBind.map(selectedView) { getView(it) })
primaryStage.addEventHandler(KeyEvent.KEY_RELEASED) { keyEvent -> primaryStage.addEventHandler(KeyEvent.KEY_RELEASED) { keyEvent ->
if (keyEvent.code == KeyCode.ESCAPE) { if (keyEvent.code == KeyCode.ESCAPE) {

66
explorer/src/main/kotlin/com/r3corda/explorer/views/TransactionViewer.kt
View File

@ -41,48 +41,48 @@ import java.util.*
class TransactionViewer: View() { class TransactionViewer: View() {
override val root: VBox by fxml() override val root: VBox by fxml()
val topSplitPane: SplitPane by fxid("TopSplitPane") val topSplitPane: SplitPane by fxid()
// Top half (transactions table) // Top half (transactions table)
private val transactionViewTable: TableView<ViewerNode> by fxid("TransactionViewTable") private val transactionViewTable: TableView<ViewerNode> by fxid()
private val transactionViewFiberId: TableColumn<ViewerNode, String> by fxid("TransactionViewFiberId") private val transactionViewFiberId: TableColumn<ViewerNode, String> by fxid()
private val transactionViewClientUuid: TableColumn<ViewerNode, String> by fxid("TransactionViewClientUuid") private val transactionViewClientUuid: TableColumn<ViewerNode, String> by fxid()
private val transactionViewTransactionStatus: TableColumn<ViewerNode, TransactionCreateStatus?> by fxid("TransactionViewTransactionStatus") private val transactionViewTransactionStatus: TableColumn<ViewerNode, TransactionCreateStatus?> by fxid()
private val transactionViewProtocolStatus: TableColumn<ViewerNode, String> by fxid("TransactionViewProtocolStatus") private val transactionViewProtocolStatus: TableColumn<ViewerNode, String> by fxid()
private val transactionViewStateMachineStatus: TableColumn<ViewerNode, StateMachineStatus?> by fxid("TransactionViewStateMachineStatus") private val transactionViewStateMachineStatus: TableColumn<ViewerNode, StateMachineStatus?> by fxid()
private val transactionViewCommandTypes: TableColumn<ViewerNode, String> by fxid("TransactionViewCommandTypes") private val transactionViewCommandTypes: TableColumn<ViewerNode, String> by fxid()
private val transactionViewTotalValueEquiv: TableColumn<ViewerNode, AmountDiff<Currency>> by fxid("TransactionViewTotalValueEquiv") private val transactionViewTotalValueEquiv: TableColumn<ViewerNode, AmountDiff<Currency>> by fxid()
// Bottom half (details) // 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 contractStatesInputsCountLabel: Label by fxid()
private val contractStatesInputStatesTable: TableView<StateNode> by fxid("ContractStatesInputStatesTable") private val contractStatesInputStatesTable: TableView<StateNode> by fxid()
private val contractStatesInputStatesId: TableColumn<StateNode, String> by fxid("ContractStatesInputStatesId") private val contractStatesInputStatesId: TableColumn<StateNode, String> by fxid()
private val contractStatesInputStatesType: TableColumn<StateNode, Class<out ContractState>> by fxid("ContractStatesInputStatesType") private val contractStatesInputStatesType: TableColumn<StateNode, Class<out ContractState>> by fxid()
private val contractStatesInputStatesOwner: TableColumn<StateNode, String> by fxid("ContractStatesInputStatesOwner") private val contractStatesInputStatesOwner: TableColumn<StateNode, String> by fxid()
private val contractStatesInputStatesLocalCurrency: TableColumn<StateNode, Currency?> by fxid("ContractStatesInputStatesLocalCurrency") private val contractStatesInputStatesLocalCurrency: TableColumn<StateNode, Currency?> by fxid()
private val contractStatesInputStatesAmount: TableColumn<StateNode, Long> by fxid("ContractStatesInputStatesAmount") private val contractStatesInputStatesAmount: TableColumn<StateNode, Long> by fxid()
private val contractStatesInputStatesEquiv: TableColumn<StateNode, Amount<Currency>> by fxid("ContractStatesInputStatesEquiv") private val contractStatesInputStatesEquiv: TableColumn<StateNode, Amount<Currency>> by fxid()
private val contractStatesOutputsCountLabel: Label by fxid("ContractStatesOutputsCountLabel") private val contractStatesOutputsCountLabel: Label by fxid()
private val contractStatesOutputStatesTable: TableView<StateNode> by fxid("ContractStatesOutputStatesTable") private val contractStatesOutputStatesTable: TableView<StateNode> by fxid()
private val contractStatesOutputStatesId: TableColumn<StateNode, String> by fxid("ContractStatesOutputStatesId") private val contractStatesOutputStatesId: TableColumn<StateNode, String> by fxid()
private val contractStatesOutputStatesType: TableColumn<StateNode, Class<out ContractState>> by fxid("ContractStatesOutputStatesType") private val contractStatesOutputStatesType: TableColumn<StateNode, Class<out ContractState>> by fxid()
private val contractStatesOutputStatesOwner: TableColumn<StateNode, String> by fxid("ContractStatesOutputStatesOwner") private val contractStatesOutputStatesOwner: TableColumn<StateNode, String> by fxid()
private val contractStatesOutputStatesLocalCurrency: TableColumn<StateNode, Currency?> by fxid("ContractStatesOutputStatesLocalCurrency") private val contractStatesOutputStatesLocalCurrency: TableColumn<StateNode, Currency?> by fxid()
private val contractStatesOutputStatesAmount: TableColumn<StateNode, Long> by fxid("ContractStatesOutputStatesAmount") private val contractStatesOutputStatesAmount: TableColumn<StateNode, Long> by fxid()
private val contractStatesOutputStatesEquiv: TableColumn<StateNode, Amount<Currency>> by fxid("ContractStatesOutputStatesEquiv") private val contractStatesOutputStatesEquiv: TableColumn<StateNode, Amount<Currency>> by fxid()
private val signaturesTitledPane: TitledPane by fxid("SignaturesTitledPane") private val signaturesTitledPane: TitledPane by fxid()
private val signaturesList: ListView<PublicKey> by fxid("SignaturesList") private val signaturesList: ListView<PublicKey> by fxid()
private val lowLevelEventsTitledPane: TitledPane by fxid("LowLevelEventsTitledPane") private val lowLevelEventsTitledPane: TitledPane by fxid()
private val lowLevelEventsTable: TableView<ServiceToClientEvent> by fxid("LowLevelEventsTable") private val lowLevelEventsTable: TableView<ServiceToClientEvent> by fxid()
private val lowLevelEventsTimestamp: TableColumn<ServiceToClientEvent, Instant> by fxid("LowLevelEventsTimestamp") private val lowLevelEventsTimestamp: TableColumn<ServiceToClientEvent, Instant> by fxid()
private val lowLevelEventsEvent: TableColumn<ServiceToClientEvent, ServiceToClientEvent> by fxid("LowLevelEventsEvent") private val lowLevelEventsEvent: TableColumn<ServiceToClientEvent, ServiceToClientEvent> by fxid()
private val matchingTransactionsLabel: Label by fxid("MatchingTransactionsLabel") private val matchingTransactionsLabel: Label by fxid()
private val gatheredTransactionDataList: ObservableList<out GatheredTransactionData> private val gatheredTransactionDataList: ObservableList<out GatheredTransactionData>
by observableListReadOnly(GatheredTransactionDataModel::gatheredTransactionDataList) by observableListReadOnly(GatheredTransactionDataModel::gatheredTransactionDataList)

8
explorer/src/main/resources/com/r3corda/explorer/css/wallet.css
View File

@ -1,19 +1,19 @@
#TopLevel.root { #topLevel.root {
-fx-background-image:url('../images/r3bg.png'); -fx-background-image:url('../images/r3bg.png');
-fx-background-size: cover; -fx-background-size: cover;
-fx-background-repeat:no-repeat; -fx-background-repeat:no-repeat;
-fx-base:white; -fx-base:white;
} }
#CashViewer { #cashViewer {
-fx-background-color: transparent; -fx-background-color: transparent;
} }
#CashViewerTable { #cashViewerTable {
-fx-background-color: transparent; -fx-background-color: transparent;
} }
#CashViewerTable .tree-table-row-cell { #cashViewerTable .tree-table-row-cell {
-fx-background-color: transparent; -fx-background-color: transparent;
} }

12
explorer/src/main/resources/com/r3corda/explorer/views/CashStateViewer.fxml
View File

@ -12,16 +12,16 @@
<Label text="Issuer" /> <Label text="Issuer" />
<Label text="Originated" wrapText="true" /> <Label text="Originated" wrapText="true" />
<Label text="Amount" wrapText="true" /> <Label text="Amount" wrapText="true" />
<Label fx:id="EquivLabel" text="USD" wrapText="true" /> <Label fx:id="equivLabel" text="USD" wrapText="true" />
</children> </children>
</VBox> </VBox>
<VBox HBox.hgrow="ALWAYS"> <VBox HBox.hgrow="ALWAYS">
<children> <children>
<Label fx:id="StateIdValueLabel" text="39043-329090-390091" /> <Label fx:id="stateIdValueLabel" text="39043-329090-390091" />
<Label fx:id="IssuerValueLabel" styleClass="counterparty" text="C-03820 HSBC GROUP PLC" /> <Label fx:id="issuerValueLabel" styleClass="counterparty" text="C-03820 HSBC GROUP PLC" />
<Label fx:id="OriginatedValueLabel" text="2018-04-27 11:34 UTC" /> <Label fx:id="originatedValueLabel" text="2018-04-27 11:34 UTC" />
<Label fx:id="AmountValueLabel" text="GBP 0.00" wrapText="true" /> <Label fx:id="amountValueLabel" text="GBP 0.00" wrapText="true" />
<Label fx:id="EquivValueLabel" text="0.00" wrapText="true" /> <Label fx:id="equivValueLabel" text="0.00" wrapText="true" />
</children> </children>
</VBox> </VBox>
</children> </children>

26
explorer/src/main/resources/com/r3corda/explorer/views/CashViewer.fxml
View File

@ -14,16 +14,16 @@
<?import javafx.scene.layout.StackPane?> <?import javafx.scene.layout.StackPane?>
<?import javafx.scene.layout.VBox?> <?import javafx.scene.layout.VBox?>
<SplitPane fx:id="TopSplitPane" dividerPositions="0.5" xmlns="http://javafx.com/javafx/8.0.76-ea" xmlns:fx="http://javafx.com/fxml/1"> <SplitPane fx:id="topSplitPane" dividerPositions="0.5" xmlns="http://javafx.com/javafx/8.0.76-ea" xmlns:fx="http://javafx.com/fxml/1">
<items> <items>
<VBox fx:id="LeftPane" spacing="5.0" styleClass="root"> <VBox fx:id="leftPane" spacing="5.0" styleClass="root">
<children> <children>
<StackPane alignment="CENTER_RIGHT"> <StackPane alignment="CENTER_RIGHT">
<VBox.margin> <VBox.margin>
<Insets /> <Insets />
</VBox.margin> </VBox.margin>
<children> <children>
<TextField id="search" fx:id="SearchCriteriaTextField" promptText="Search by issuer/currency" styleClass="search"> <TextField id="search" fx:id="searchCriteriaTextField" promptText="Search by issuer/currency" styleClass="search">
<opaqueInsets> <opaqueInsets>
<Insets /> <Insets />
</opaqueInsets> </opaqueInsets>
@ -34,7 +34,7 @@
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</padding> </padding>
</TextField> </TextField>
<ImageView fx:id="SearchCancelImageView" fitHeight="16.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true" styleClass="search-clear"> <ImageView fx:id="searchCancelImageView" fitHeight="16.0" fitWidth="16.0" pickOnBounds="true" preserveRatio="true" styleClass="search-clear">
<image> <image>
<Image url="@../../images/clear_inactive.png" /> <Image url="@../../images/clear_inactive.png" />
</image> </image>
@ -44,21 +44,21 @@
</ImageView> </ImageView>
</children> </children>
</StackPane> </StackPane>
<Label fx:id="TotalMatchingLabel" alignment="BOTTOM_LEFT" text="Total 15 matching issuer(s)" wrapText="true"> <Label fx:id="totalMatchingLabel" alignment="BOTTOM_LEFT" text="Total 15 matching issuer(s)" wrapText="true">
<VBox.margin> <VBox.margin>
<Insets bottom="5.0" right="10.0" top="5.0" /> <Insets bottom="5.0" right="10.0" top="5.0" />
</VBox.margin> </VBox.margin>
</Label> </Label>
<TreeTableView fx:id="CashViewerTable" showRoot="false" VBox.vgrow="ALWAYS"> <TreeTableView fx:id="cashViewerTable" showRoot="false" VBox.vgrow="ALWAYS">
<columns> <columns>
<TreeTableColumn fx:id="CashViewerTableIssuerCurrency" maxWidth="1.7976931348623157E308" minWidth="-1.0" prefWidth="100.0" styleClass="first-column" text="Issuer/Currency" /> <TreeTableColumn fx:id="cashViewerTableIssuerCurrency" maxWidth="1.7976931348623157E308" minWidth="-1.0" prefWidth="100.0" styleClass="first-column" text="Issuer/Currency" />
<TreeTableColumn fx:id="CashViewerTableLocalCurrency" maxWidth="1.7976931348623157E308" minWidth="-1.0" prefWidth="132.0" text="Local currency"> <TreeTableColumn fx:id="cashViewerTableLocalCurrency" maxWidth="1.7976931348623157E308" minWidth="-1.0" prefWidth="132.0" text="Local currency">
<styleClass> <styleClass>
<String fx:value="monetary-value" /> <String fx:value="monetary-value" />
<String fx:value="second-column" /> <String fx:value="second-column" />
</styleClass> </styleClass>
</TreeTableColumn> </TreeTableColumn>
<TreeTableColumn fx:id="CashViewerTableEquiv" maxWidth="1.7976931348623157E308" minWidth="-1.0" prefWidth="72.0" styleClass="monetary-value" text="Equiv" /> <TreeTableColumn fx:id="cashViewerTableEquiv" maxWidth="1.7976931348623157E308" minWidth="-1.0" prefWidth="72.0" styleClass="monetary-value" text="Equiv" />
</columns> </columns>
</TreeTableView> </TreeTableView>
</children> </children>
@ -66,12 +66,12 @@
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
</padding> </padding>
</VBox> </VBox>
<VBox fx:id="RightPane" spacing="5.0"> <VBox fx:id="rightPane" spacing="5.0">
<children> <children>
<Button mnemonicParsing="false" text="&gt;&gt;" /> <Button mnemonicParsing="false" text="&gt;&gt;" />
<Label fx:id="TotalPositionsLabel" styleClass="subline" text="Total 18 position(s)" /> <Label fx:id="totalPositionsLabel" styleClass="subline" text="Total 18 position(s)" />
<Label fx:id="EquivSumLabel" styleClass="headline" text="USD 394.6k" /> <Label fx:id="equivSumLabel" styleClass="headline" text="USD 394.6k" />
<ListView fx:id="CashStatesList" VBox.vgrow="ALWAYS" /> <ListView fx:id="cashStatesList" VBox.vgrow="ALWAYS" />
</children> </children>
<opaqueInsets> <opaqueInsets>
<Insets /> <Insets />

12
explorer/src/main/resources/com/r3corda/explorer/views/Header.fxml
View File

@ -20,16 +20,16 @@
<children> <children>
<HBox alignment="CENTER_LEFT" spacing="5.0" HBox.hgrow="ALWAYS"> <HBox alignment="CENTER_LEFT" spacing="5.0" HBox.hgrow="ALWAYS">
<children> <children>
<VBox fx:id="SectionIconContainer" alignment="CENTER"> <VBox fx:id="sectionIconContainer" alignment="CENTER">
<children> <children>
<ImageView fx:id="SectionIcon" fitHeight="30.0" fitWidth="30.0" pickOnBounds="true" preserveRatio="true"> <ImageView fx:id="sectionIcon" fitHeight="30.0" fitWidth="30.0" pickOnBounds="true" preserveRatio="true">
<image> <image>
<Image url="@../../images/home.png" /> <Image url="@../../images/home.png" />
</image> </image>
</ImageView> </ImageView>
</children> </children>
</VBox> </VBox>
<Label id="headline" fx:id="SectionLabel" text="Home" /> <Label id="headline" fx:id="sectionLabel" text="Home" />
</children> </children>
<padding> <padding>
<Insets bottom="5.0" left="5.0" right="5.0" top="5.0" /> <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
@ -37,8 +37,8 @@
</HBox> </HBox>
<HBox alignment="TOP_RIGHT" spacing="5.0"> <HBox alignment="TOP_RIGHT" spacing="5.0">
<children> <children>
<Button fx:id="DebugNextButton" mnemonicParsing="false" text="Next" /> <Button fx:id="debugNextButton" mnemonicParsing="false" text="Next" />
<Button fx:id="DebugGoStopButton" mnemonicParsing="false" text="!!!" /> <Button fx:id="debugGoStopButton" mnemonicParsing="false" text="!!!" />
<SplitMenuButton mnemonicParsing="false" text="DRUTTER"> <SplitMenuButton mnemonicParsing="false" text="DRUTTER">
<items> <items>
<MenuItem mnemonicParsing="false" text="Sign out" /> <MenuItem mnemonicParsing="false" text="Sign out" />
@ -52,7 +52,7 @@
</ImageView> </ImageView>
</graphic> </graphic>
</SplitMenuButton> </SplitMenuButton>
<Button fx:id="SettingsButton" mnemonicParsing="false" text="Settings"> <Button fx:id="settingsButton" mnemonicParsing="false" text="Settings">
<graphic> <graphic>
<ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true"> <ImageView fitHeight="20.0" fitWidth="20.0" pickOnBounds="true" preserveRatio="true">
<image> <image>

12
explorer/src/main/resources/com/r3corda/explorer/views/Home.fxml
View File

@ -6,24 +6,24 @@
<TilePane prefHeight="425.0" prefWidth="425.0" tileAlignment="TOP_LEFT" xmlns="http://javafx.com/javafx/8.0.76-ea" xmlns:fx="http://javafx.com/fxml/1"> <TilePane prefHeight="425.0" prefWidth="425.0" tileAlignment="TOP_LEFT" xmlns="http://javafx.com/javafx/8.0.76-ea" xmlns:fx="http://javafx.com/fxml/1">
<children> <children>
<TitledPane id="tile_cash" fx:id="OurCashPane" alignment="CENTER" collapsible="false" prefHeight="160.0" prefWidth="160.0" styleClass="tile" text="Our cash"> <TitledPane id="tile_cash" fx:id="ourCashPane" alignment="CENTER" collapsible="false" prefHeight="160.0" prefWidth="160.0" styleClass="tile" text="Our cash">
<content> <content>
<Label fx:id="OurCashLabel" text="USD 186.7m" textAlignment="CENTER" wrapText="true" /> <Label fx:id="ourCashLabel" text="USD 186.7m" textAlignment="CENTER" wrapText="true" />
</content> </content>
</TitledPane> </TitledPane>
<TitledPane id="tile_debtors" fx:id="OurDebtorsPane" alignment="CENTER" collapsible="false" layoutX="232.0" layoutY="10.0" prefHeight="160.0" prefWidth="160.0" styleClass="tile" text="Our debtors"> <TitledPane id="tile_debtors" fx:id="ourDebtorsPane" alignment="CENTER" collapsible="false" layoutX="232.0" layoutY="10.0" prefHeight="160.0" prefWidth="160.0" styleClass="tile" text="Our debtors">
<content> <content>
<Label text="USD 71.3m" textAlignment="CENTER" wrapText="true" /> <Label text="USD 71.3m" textAlignment="CENTER" wrapText="true" />
</content> </content>
</TitledPane> </TitledPane>
<TitledPane id="tile_creditors" fx:id="OurCreditorsPane" alignment="CENTER" collapsible="false" layoutX="312.0" layoutY="10.0" prefHeight="160.0" prefWidth="160.0" styleClass="tile" text="Our creditors"> <TitledPane id="tile_creditors" fx:id="ourCreditorsPane" alignment="CENTER" collapsible="false" layoutX="312.0" layoutY="10.0" prefHeight="160.0" prefWidth="160.0" styleClass="tile" text="Our creditors">
<content> <content>
<Label text="USD (29.4m)" textAlignment="CENTER" wrapText="true" /> <Label text="USD (29.4m)" textAlignment="CENTER" wrapText="true" />
</content> </content>
</TitledPane> </TitledPane>
<TitledPane id="tile_tx" fx:id="OurTransactionsPane" alignment="CENTER" collapsible="false" layoutX="392.0" layoutY="10.0" prefHeight="160.0" prefWidth="160.0" styleClass="tile" text="Our transactions"> <TitledPane id="tile_tx" fx:id="ourTransactionsPane" alignment="CENTER" collapsible="false" layoutX="392.0" layoutY="10.0" prefHeight="160.0" prefWidth="160.0" styleClass="tile" text="Our transactions">
<content> <content>
<Label fx:id="OurTransactionsLabel" text="In flight: 1,315" textAlignment="CENTER" wrapText="true" /> <Label fx:id="ourTransactionsLabel" text="In flight: 1,315" textAlignment="CENTER" wrapText="true" />
</content> </content>
</TitledPane> </TitledPane>
</children> </children>

4
explorer/src/main/resources/com/r3corda/explorer/views/TopLevel.fxml
View File

@ -3,8 +3,8 @@
<?import javafx.scene.layout.BorderPane?> <?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.VBox?> <?import javafx.scene.layout.VBox?>
<VBox fx:id="TopLevel" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" xmlns="http://javafx.com/javafx/8.0.76-ea" xmlns:fx="http://javafx.com/fxml/1"> <VBox fx:id="topLevel" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" xmlns="http://javafx.com/javafx/8.0.76-ea" xmlns:fx="http://javafx.com/fxml/1">
<children> <children>
<BorderPane fx:id="SelectionBorderPane" /> <BorderPane fx:id="selectionBorderPane" />
</children> </children>
</VBox> </VBox>

66
explorer/src/main/resources/com/r3corda/explorer/views/TransactionViewer.fxml
View File

@ -40,23 +40,23 @@
</ImageView> </ImageView>
</children> </children>
</StackPane> </StackPane>
<SplitPane fx:id="TopSplitPane" dividerPositions="0.3, 0.6, 0.7" orientation="VERTICAL" prefHeight="562.0" prefWidth="1087.0" VBox.vgrow="ALWAYS"> <SplitPane fx:id="topSplitPane" dividerPositions="0.3, 0.6, 0.7" orientation="VERTICAL" prefHeight="562.0" prefWidth="1087.0" VBox.vgrow="ALWAYS">
<items> <items>
<TableView fx:id="TransactionViewTable" prefHeight="200.0" prefWidth="200.0"> <TableView fx:id="transactionViewTable" prefHeight="200.0" prefWidth="200.0">
<columns> <columns>
<TableColumn fx:id="TransactionViewFiberId" prefWidth="187.0" text="Fiber ID" /> <TableColumn fx:id="transactionViewFiberId" prefWidth="187.0" text="Fiber ID" />
<TableColumn fx:id="TransactionViewClientUuid" prefWidth="75.0" text="Client UUID" /> <TableColumn fx:id="transactionViewClientUuid" prefWidth="75.0" text="Client UUID" />
<TableColumn fx:id="TransactionViewTransactionStatus" prefWidth="75.0" text="Transaction status" /> <TableColumn fx:id="transactionViewTransactionStatus" prefWidth="75.0" text="Transaction status" />
<TableColumn fx:id="TransactionViewProtocolStatus" prefWidth="75.0" text="Protocol status" /> <TableColumn fx:id="transactionViewProtocolStatus" prefWidth="75.0" text="Protocol status" />
<TableColumn fx:id="TransactionViewStateMachineStatus" prefWidth="75.0" text="SM Status" /> <TableColumn fx:id="transactionViewStateMachineStatus" prefWidth="75.0" text="SM Status" />
<TableColumn fx:id="TransactionViewCommandTypes" prefWidth="75.0" text="Command type(s)" /> <TableColumn fx:id="transactionViewCommandTypes" prefWidth="75.0" text="Command type(s)" />
<TableColumn fx:id="TransactionViewTotalValueEquiv" prefWidth="75.0" styleClass="monetary-value" text="Total value (USD equiv)" /> <TableColumn fx:id="transactionViewTotalValueEquiv" prefWidth="75.0" styleClass="monetary-value" text="Total value (USD equiv)" />
</columns> </columns>
<columnResizePolicy> <columnResizePolicy>
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY" /> <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
</columnResizePolicy> </columnResizePolicy>
</TableView> </TableView>
<TitledPane fx:id="ContractStatesTitledPane" animated="false" text="Contract states"> <TitledPane fx:id="contractStatesTitledPane" animated="false" text="Contract states">
<content> <content>
<SplitPane dividerPositions="0.5" prefHeight="160.0" prefWidth="200.0"> <SplitPane dividerPositions="0.5" prefHeight="160.0" prefWidth="200.0">
<items> <items>
@ -65,22 +65,22 @@
<HBox spacing="5.0"> <HBox spacing="5.0">
<children> <children>
<Label text="Inputs:" /> <Label text="Inputs:" />
<Label fx:id="ContractStatesInputsCountLabel" text="Label" /> <Label fx:id="contractStatesInputsCountLabel" text="Label" />
</children> </children>
</HBox> </HBox>
<TableView fx:id="ContractStatesInputStatesTable" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS"> <TableView fx:id="contractStatesInputStatesTable" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
<columns> <columns>
<TableColumn fx:id="ContractStatesInputStatesId" prefWidth="75.0" text="ID" /> <TableColumn fx:id="contractStatesInputStatesId" prefWidth="75.0" text="ID" />
<TableColumn fx:id="ContractStatesInputStatesType" prefWidth="75.0" text="Type" /> <TableColumn fx:id="contractStatesInputStatesType" prefWidth="75.0" text="Type" />
<TableColumn fx:id="ContractStatesInputStatesOwner" prefWidth="75.0" text="Owner" /> <TableColumn fx:id="contractStatesInputStatesOwner" prefWidth="75.0" text="Owner" />
<TableColumn fx:id="ContractStatesInputStatesLocalCurrency" prefWidth="75.0" styleClass="first-column" text="Local Ccy" /> <TableColumn fx:id="contractStatesInputStatesLocalCurrency" prefWidth="75.0" styleClass="first-column" text="Local Ccy" />
<TableColumn fx:id="ContractStatesInputStatesAmount" prefWidth="75.0" text="Amount"> <TableColumn fx:id="contractStatesInputStatesAmount" prefWidth="75.0" text="Amount">
<styleClass> <styleClass>
<String fx:value="second-column" /> <String fx:value="second-column" />
<String fx:value="monetary-value" /> <String fx:value="monetary-value" />
</styleClass> </styleClass>
</TableColumn> </TableColumn>
<TableColumn fx:id="ContractStatesInputStatesEquiv" prefWidth="75.0" text="USD Equiv" /> <TableColumn fx:id="contractStatesInputStatesEquiv" prefWidth="75.0" text="USD Equiv" />
</columns> </columns>
<columnResizePolicy> <columnResizePolicy>
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY" /> <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
@ -93,22 +93,22 @@
<HBox spacing="5.0"> <HBox spacing="5.0">
<children> <children>
<Label text="Outputs:" /> <Label text="Outputs:" />
<Label fx:id="ContractStatesOutputsCountLabel" text="Label" /> <Label fx:id="contractStatesOutputsCountLabel" text="Label" />
</children> </children>
</HBox> </HBox>
<TableView fx:id="ContractStatesOutputStatesTable" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS"> <TableView fx:id="contractStatesOutputStatesTable" prefHeight="200.0" prefWidth="200.0" VBox.vgrow="ALWAYS">
<columns> <columns>
<TableColumn fx:id="ContractStatesOutputStatesId" prefWidth="75.0" text="ID" /> <TableColumn fx:id="contractStatesOutputStatesId" prefWidth="75.0" text="ID" />
<TableColumn fx:id="ContractStatesOutputStatesType" prefWidth="75.0" text="Type" /> <TableColumn fx:id="contractStatesOutputStatesType" prefWidth="75.0" text="Type" />
<TableColumn fx:id="ContractStatesOutputStatesOwner" prefWidth="75.0" text="Owner" /> <TableColumn fx:id="contractStatesOutputStatesOwner" prefWidth="75.0" text="Owner" />
<TableColumn fx:id="ContractStatesOutputStatesLocalCurrency" prefWidth="75.0" styleClass="first-column" text="Local Ccy" /> <TableColumn fx:id="contractStatesOutputStatesLocalCurrency" prefWidth="75.0" styleClass="first-column" text="Local Ccy" />
<TableColumn fx:id="ContractStatesOutputStatesAmount" prefWidth="75.0" text="Amount"> <TableColumn fx:id="contractStatesOutputStatesAmount" prefWidth="75.0" text="Amount">
<styleClass> <styleClass>
<String fx:value="second-column" /> <String fx:value="second-column" />
<String fx:value="monetary-value" /> <String fx:value="monetary-value" />
</styleClass> </styleClass>
</TableColumn> </TableColumn>
<TableColumn fx:id="ContractStatesOutputStatesEquiv" prefWidth="75.0" text="USD Equiv" /> <TableColumn fx:id="contractStatesOutputStatesEquiv" prefWidth="75.0" text="USD Equiv" />
</columns> </columns>
<columnResizePolicy> <columnResizePolicy>
<TableView fx:constant="CONSTRAINED_RESIZE_POLICY" /> <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
@ -120,17 +120,17 @@
</SplitPane> </SplitPane>
</content> </content>
</TitledPane> </TitledPane>
<TitledPane fx:id="SignaturesTitledPane" animated="false" text="Required signatures"> <TitledPane fx:id="signaturesTitledPane" animated="false" text="Required signatures">
<content> <content>
<ListView fx:id="SignaturesList" /> <ListView fx:id="signaturesList" />
</content> </content>
</TitledPane> </TitledPane>
<TitledPane fx:id="LowLevelEventsTitledPane" animated="false" text="Low level events"> <TitledPane fx:id="lowLevelEventsTitledPane" animated="false" text="Low level events">
<content> <content>
<TableView fx:id="LowLevelEventsTable"> <TableView fx:id="lowLevelEventsTable">
<columns> <columns>
<TableColumn fx:id="LowLevelEventsTimestamp" prefWidth="102.0" text="Timestamp" /> <TableColumn fx:id="lowLevelEventsTimestamp" prefWidth="102.0" text="Timestamp" />
<TableColumn fx:id="LowLevelEventsEvent" prefWidth="138.0" text="Event" /> <TableColumn fx:id="lowLevelEventsEvent" prefWidth="138.0" text="Event" />
</columns> </columns>
</TableView> </TableView>
</content> </content>
@ -139,7 +139,7 @@
</SplitPane> </SplitPane>
<HBox> <HBox>
<children> <children>
<Label fx:id="MatchingTransactionsLabel" text="matching transaction(s)" /> <Label fx:id="matchingTransactionsLabel" text="matching transaction(s)" />
</children> </children>
</HBox> </HBox>
</children> </children>