mirror of
https://github.com/haveno-dex/haveno.git
synced 2025-06-10 08:03:24 -04:00
Merge branch 'seedpeer' of https://github.com/bitsquare/bitsquare into seedpeer
This commit is contained in:
commit
08f1a73bf5
3 changed files with 4 additions and 4 deletions
|
@ -25,7 +25,7 @@
|
||||||
xmlns:fx="http://javafx.com/fxml">
|
xmlns:fx="http://javafx.com/fxml">
|
||||||
|
|
||||||
<Tab fx:id="offersTab" text="Open offers" closable="false"/>
|
<Tab fx:id="offersTab" text="Open offers" closable="false"/>
|
||||||
<Tab fx:id="pendingTradesTab" text="Pending trades" closable="false"/>
|
<Tab fx:id="pendingTradesTab" text="Open trades" closable="false"/>
|
||||||
<Tab fx:id="closedTradesTab" text="History" closable="false"/>
|
<Tab fx:id="closedTradesTab" text="History" closable="false"/>
|
||||||
|
|
||||||
</TabPane>
|
</TabPane>
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
<Insets bottom="-10.0" left="25.0" top="30.0" right="25"/>
|
<Insets bottom="-10.0" left="25.0" top="30.0" right="25"/>
|
||||||
</padding>
|
</padding>
|
||||||
|
|
||||||
<TitledSeparator text="Pending trades" GridPane.rowIndex="0" GridPane.columnIndex="0"
|
<TitledSeparator text="Open trades" GridPane.rowIndex="0" GridPane.columnIndex="0"
|
||||||
GridPane.columnSpan="2"/>
|
GridPane.columnSpan="2"/>
|
||||||
|
|
||||||
<TableView fx:id="table" GridPane.rowIndex="0" GridPane.columnIndex="0" GridPane.columnSpan="2"
|
<TableView fx:id="table" GridPane.rowIndex="0" GridPane.columnIndex="0" GridPane.columnSpan="2"
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
<Insets bottom="20.0" left="25.0" top="30.0" right="25"/>
|
<Insets bottom="20.0" left="25.0" top="30.0" right="25"/>
|
||||||
</padding>
|
</padding>
|
||||||
|
|
||||||
<TitledSeparator text="Pending trades" GridPane.rowIndex="0" GridPane.columnIndex="0"
|
<TitledSeparator text="Open trades" GridPane.rowIndex="0" GridPane.columnIndex="0"
|
||||||
GridPane.columnSpan="2"/>
|
GridPane.columnSpan="2"/>
|
||||||
|
|
||||||
<TableView fx:id="orderBookTable" GridPane.rowIndex="0" GridPane.columnIndex="0" GridPane.columnSpan="2"
|
<TableView fx:id="orderBookTable" GridPane.rowIndex="0" GridPane.columnIndex="0" GridPane.columnSpan="2"
|
||||||
|
@ -57,7 +57,7 @@
|
||||||
</GridPane.margin>
|
</GridPane.margin>
|
||||||
</ProcessStepBar>
|
</ProcessStepBar>
|
||||||
|
|
||||||
<TitledGroupBg fx:id="priceAmountPane" text="Pending trade"
|
<TitledGroupBg fx:id="priceAmountPane" text="Open trade"
|
||||||
GridPane.rowSpan="2" GridPane.columnSpan="2" GridPane.rowIndex="2">
|
GridPane.rowSpan="2" GridPane.columnSpan="2" GridPane.rowIndex="2">
|
||||||
<GridPane.margin>
|
<GridPane.margin>
|
||||||
<Insets top="40.0" bottom="-10" left="-10" right="-10"/>
|
<Insets top="40.0" bottom="-10" left="-10" right="-10"/>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue