Voomra/trader
Archived
0
Fork 0
Code Activity

show time and distance in helper

Browse Source
This commit is contained in:
Mo
2015-10-24 16:15:42 +03:00
parent 74962519cc
commit 97ec8ce1cf
8 changed files with 75 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
client/src/main/resources/view/helper.fxml
View File

@@ -6,18 +6,22 @@
<?import org.controlsfx.glyphfont.Glyph?>
<VBox xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="ru.trader.controllers.HelperController"
spacing="4" minWidth="200" fx:id="helper">
spacing="4" minWidth="220" maxWidth="220" fx:id="helper">
<HBox>
<VBox>
<VBox HBox.hgrow="ALWAYS">
<HBox>
<Button onAction="#copy" minWidth="30">
<graphic><Glyph text="FontAwesome|COPY" /></graphic>
</Button>
<Label fx:id="system" text="Breksta" prefWidth="130" maxWidth="130" styleClass="text-big" />
<Label fx:id="time" text="0:44:15" styleClass="text-small"/>
<Label fx:id="system" text="Breksta" styleClass="text-big" />
</HBox>
<Label fx:id="station" text="Pieres Market" styleClass="text-medium" />
</VBox>
<VBox minWidth="60" alignment="TOP_RIGHT">
<Label fx:id="time" text="00:44:15" styleClass="text-small"/>
<Label fx:id="distance" text="10 LY" styleClass="text-small"/>
<Label fx:id="stationDistance" text="123456 ls" styleClass="text-small"/>
</VBox>
</HBox>
<HBox fx:id="refuelGroup"><Label text="Заправить:" /><Label fx:id="refuel" /></HBox>
<HBox>

19
client/src/main/resources/view/paths.fxml
View File

@@ -1,16 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.cell.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.control.*?>
<?import ru.trader.view.support.cells.DoubleCell?>
<?import ru.trader.view.support.cells.OfferCellValueImpl?>
<?import ru.trader.view.support.cells.OfferTableCell?>
<?import ru.trader.view.support.cells.PathRouteCell?>
<?import javafx.scene.layout.HBox?>
<?import ru.trader.view.support.cells.DistanceCell?>
<?import ru.trader.view.support.cells.DoubleCell?>
<?import ru.trader.view.support.cells.PathRouteCell?>
<?import ru.trader.view.support.cells.TimeCell?>
<HBox xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="ru.trader.controllers.PathsController" styleClass="dialog"
prefWidth="1050">
@@ -35,7 +32,11 @@
<TableColumn minWidth="70.0" text="%market.order.profit">
<cellValueFactory><PropertyValueFactory property="profit"/></cellValueFactory>
</TableColumn>
<TableColumn fx:id="profitByTime" minWidth="70.0" text="%market.offer.avg" sortType="DESCENDING">
<TableColumn minWidth="70.0" text="%market.route.time" sortType="DESCENDING">
<cellFactory><TimeCell /></cellFactory>
<cellValueFactory><PropertyValueFactory property="time"/></cellValueFactory>
</TableColumn>
<TableColumn fx:id="profitByTime" minWidth="70.0" text="%market.route.profitByTime" sortType="DESCENDING">
<cellFactory><DoubleCell format="\%.0f"/></cellFactory>
<cellValueFactory><PropertyValueFactory property="profitByTime"/></cellValueFactory>
</TableColumn>