Voomra/trader
Archived
0
Fork 0
Code Activity

- add localization support

Browse Source 
- add english language
This commit is contained in:
iMoHax
2014-08-27 14:43:27 +04:00
parent c011ea05d5
commit 9d58026568
22 changed files with 502 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/main/resources/view/itemDesc.fxml
View File

@@ -10,11 +10,11 @@
spacing="4" >
<fx:define><Insets fx:id="vbox_margin" left="6" top="3" bottom="3"/></fx:define>
<Label text="Продавцы:" VBox.margin="$vbox_margin"/>
<Label text="%itemDesc.sellers" VBox.margin="$vbox_margin"/>
<ListView fx:id="seller" maxHeight="200.0">
<cellFactory><OfferListCell/></cellFactory>
</ListView>
<Label text="Покупатели:" VBox.margin="$vbox_margin"/>
<Label text="%itemDesc.buyers" VBox.margin="$vbox_margin"/>
<ListView fx:id="buyer" maxHeight="200.0">
<cellFactory><OfferListCell/></cellFactory>
</ListView>

26
client/src/main/resources/view/items.fxml
View File

@@ -12,46 +12,46 @@
fx:controller="ru.trader.controllers.ItemsController">
<TableView fx:id="tblItems" editable="true" VBox.vgrow="ALWAYS" prefWidth="1095.0">
<columns>
<TableColumn editable="true" minWidth="200.0" text="Товар">
<TableColumn editable="true" minWidth="200.0" text="%market.item.name">
<cellValueFactory><PropertyValueFactory property="name"/></cellValueFactory>
</TableColumn>
<TableColumn editable="true" resizable="false" text="Покупка">
<TableColumn editable="true" resizable="false" text="%market.offer.buy">
<columns>
<TableColumn minWidth="120.0" text="Мин.">
<TableColumn minWidth="120.0" text="%market.offer.min">
<cellValueFactory><OfferCellValueImpl property="minSell"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="80.0" text="Ср.">
<TableColumn minWidth="80.0" text="%market.offer.avg">
<cellFactory><DoubleCell/></cellFactory>
<cellValueFactory><PropertyValueFactory property="avgSell"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="120.0" text="Макс.">
<TableColumn minWidth="120.0" text="%market.offer.max">
<cellValueFactory><OfferCellValueImpl property="maxSell"/></cellValueFactory>
</TableColumn>
</columns>
</TableColumn>
<TableColumn editable="true" resizable="false" text="Продажа">
<TableColumn editable="true" resizable="false" text="%market.offer.sell">
<columns>
<TableColumn minWidth="120.0" text="Мин.">
<TableColumn minWidth="120.0" text="%market.offer.min">
<cellValueFactory><OfferCellValueImpl property="minBuy"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="80.0" text="Ср.">
<TableColumn minWidth="80.0" text="%market.offer.avg">
<cellFactory><DoubleCell/></cellFactory>
<cellValueFactory><PropertyValueFactory property="avgBuy"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="120.0" text="Макс.">
<TableColumn minWidth="120.0" text="%market.offer.max">
<cellValueFactory><OfferCellValueImpl property="maxBuy"/></cellValueFactory>
</TableColumn>
</columns>
</TableColumn>
<TableColumn editable="true" resizable="false" text="Прибыль">
<TableColumn editable="true" resizable="false" text="%market.order.profit">
<columns>
<TableColumn fx:id="minProfit" minWidth="80.0" text="Мин.">
<TableColumn fx:id="minProfit" minWidth="80.0" text="%market.offer.min">
<cellFactory><DoubleCell/></cellFactory>
</TableColumn>
<TableColumn fx:id="avgProfit" minWidth="80.0" text="Ср.">
<TableColumn fx:id="avgProfit" minWidth="80.0" text="%market.offer.avg">
<cellFactory><DoubleCell/></cellFactory>
</TableColumn>
<TableColumn fx:id="maxProfit" minWidth="80.0" text="Макс." sortType="DESCENDING">
<TableColumn fx:id="maxProfit" minWidth="80.0" text="%market.offer.max" sortType="DESCENDING">
<cellFactory><DoubleCell/></cellFactory>
</TableColumn>
</columns>

23
client/src/main/resources/view/main.fxml
View File

@@ -9,27 +9,28 @@
>
<top>
<MenuBar>
<Menu text="Файл">
<MenuItem text="Сохранить" onAction="#save"/>
<MenuItem text="Импорт..." onAction="#importWorld"/>
<Menu text="%main.menu.file">
<MenuItem text="%main.menu.file.save" onAction="#save"/>
<MenuItem text="%main.menu.file.import" onAction="#importWorld"/>
<Menu fx:id="langs" text="%main.menu.file.language"/>
</Menu>
<Menu text="Правка">
<MenuItem text="Добавить станцию" onAction="#addVendor"/>
<MenuItem text="Добавить товар" onAction="#addItem"/>
<MenuItem text="Редактировать станцию" onAction="#editVendor"/>
<Menu text="%main.menu.edit">
<MenuItem text="%main.menu.edit.addStation" onAction="#addVendor"/>
<MenuItem text="%main.menu.edit.addItem" onAction="#addItem"/>
<MenuItem text="%main.menu.edit.editStation" onAction="#editVendor"/>
</Menu>
</MenuBar>
</top>
<center>
<TabPane tabClosingPolicy="UNAVAILABLE" BorderPane.alignment="CENTER">
<Tab text="Товары">
<Tab text="%market.items">
<fx:include fx:id="items" source="items.fxml"/>
</Tab>
<Tab text="Станции">
<Tab text="%market.vendors">
<fx:include fx:id="offers" source="offers.fxml"/>
</Tab>
<Tab text="Маршруты">
<fx:include source="routers.fxml"/>
<Tab text="%routes">
<fx:include source="router.fxml"/>
</Tab>
</TabPane>
</center>

4
client/src/main/resources/view/oEditor.fxml
View File

@@ -8,9 +8,9 @@
fx:controller="ru.trader.controllers.OffersEditorController">
<Label fx:id="name"/>
<HBox>
<Label text="Продажа:"/>
<Label text="%oEditor.sell"/>
<NumberField fx:id="sell"/>
<Label text="Покупка:"/>
<Label text="%oEditor.buy"/>
<NumberField fx:id="buy"/>
</HBox>
</VBox>

82
client/src/main/resources/view/offers.fxml
View File

@@ -11,39 +11,47 @@
<?import ru.trader.view.support.cells.DoubleCell?>
<HBox xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="ru.trader.controllers.OffersController">
<TitledPane text="Станции" minWidth="250" prefHeight="510" collapsible="false">
<TitledPane text="%market.vendors" minWidth="250" prefHeight="510" collapsible="false">
<ListView fx:id="vendors" />
</TitledPane>
<Accordion HBox.hgrow="ALWAYS">
<panes>
<TitledPane fx:id="sells" animated="false" text="Продаваемые товары">
<TitledPane fx:id="sells" animated="false" text="%offers.pane.sell">
<TableView fx:id="tblSell" editable="true">
<columns>
<TableColumn minWidth="230.0" text="Товар">
<TableColumn minWidth="230.0" text="%market.item.name">
<cellValueFactory><PropertyValueFactory property="name"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="110.0" text="Цена" onEditCommit="#editPrice">
<TableColumn minWidth="110.0" text="%market.offer.price" onEditCommit="#editPrice">
<cellFactory><PriceCellImpl/></cellFactory>
<cellValueFactory><PropertyValueFactory property="price"/></cellValueFactory>
</TableColumn>
<TableColumn fx:id="sortSell" minWidth="80.0" text="Прибыль" sortType="DESCENDING">
<TableColumn fx:id="sortSell" minWidth="90.0" text="%market.order.profit" sortType="DESCENDING">
<cellFactory><DoubleCell/></cellFactory>
<cellValueFactory><PropertyValueFactory property="profit"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="80.0" text="AVG SELL">
<cellFactory><DoubleCell/></cellFactory>
<cellValueFactory><PropertyValueFactory property="avgSell"/></cellValueFactory>
<TableColumn text="%market.offer.avg">
<columns>
<TableColumn minWidth="80.0" text="%market.offer.sell">
<cellFactory><DoubleCell/></cellFactory>
<cellValueFactory><PropertyValueFactory property="avgSell"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="80.0" text="%market.offer.buy">
<cellFactory><DoubleCell/></cellFactory>
<cellValueFactory><PropertyValueFactory property="avgBuy"/></cellValueFactory>
</TableColumn>
</columns>
</TableColumn>
<TableColumn minWidth="80.0" text="AVG BUY">
<cellFactory><DoubleCell/></cellFactory>
<cellValueFactory><PropertyValueFactory property="avgBuy"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="120.0" text="BEST SELL">
<cellValueFactory><OfferCellValueImpl property="bestSell"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="120.0" text="BEST BUY">
<cellValueFactory><OfferCellValueImpl property="bestBuy"/></cellValueFactory>
<TableColumn text="%market.offer.best">
<columns>
<TableColumn minWidth="120.0" text="%market.offer.sell">
<cellValueFactory><OfferCellValueImpl property="bestSell"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="120.0" text="%market.offer.buy">
<cellValueFactory><OfferCellValueImpl property="bestBuy"/></cellValueFactory>
</TableColumn>
</columns>
</TableColumn>
</columns>
<columnResizePolicy>
@@ -54,33 +62,41 @@
</sortOrder>
</TableView>
</TitledPane>
<TitledPane animated="false" text="Покупаемые товары">
<TitledPane animated="false" text="%offers.pane.buy">
<TableView fx:id="tblBuy" editable="true">
<columns>
<TableColumn minWidth="230.0" text="Товар">
<TableColumn minWidth="230.0" text="%market.item.name">
<cellValueFactory><PropertyValueFactory property="name"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="110.0" text="Цена" editable="true" onEditCommit="#editPrice">
<TableColumn minWidth="110.0" text="%market.offer.price" editable="true" onEditCommit="#editPrice">
<cellFactory><PriceCellImpl/></cellFactory>
<cellValueFactory><PropertyValueFactory property="price"/></cellValueFactory>
</TableColumn>
<TableColumn fx:id="sortBuy" minWidth="80.0" text="Прибыль" sortType="DESCENDING">
<TableColumn fx:id="sortBuy" minWidth="90.0" text="%market.order.profit" sortType="DESCENDING">
<cellFactory><DoubleCell/></cellFactory>
<cellValueFactory><PropertyValueFactory property="profit"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="80.0" text="AVG SELL">
<cellFactory><DoubleCell/></cellFactory>
<cellValueFactory><PropertyValueFactory property="avgSell"/></cellValueFactory>
<TableColumn text="%market.offer.avg">
<columns>
<TableColumn minWidth="80.0" text="%market.offer.sell">
<cellFactory><DoubleCell/></cellFactory>
<cellValueFactory><PropertyValueFactory property="avgSell"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="80.0" text="%market.offer.buy">
<cellFactory><DoubleCell/></cellFactory>
<cellValueFactory><PropertyValueFactory property="avgBuy"/></cellValueFactory>
</TableColumn>
</columns>
</TableColumn>
<TableColumn minWidth="80.0" text="AVG BUY">
<cellFactory><DoubleCell/></cellFactory>
<cellValueFactory><PropertyValueFactory property="avgBuy"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="120.0" text="BEST SELL">
<cellValueFactory><OfferCellValueImpl property="bestSell"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="120.0" text="BEST BUY">
<cellValueFactory><OfferCellValueImpl property="bestBuy"/></cellValueFactory>
<TableColumn text="%market.offer.best">
<columns>
<TableColumn minWidth="120.0" text="%market.offer.sell">
<cellValueFactory><OfferCellValueImpl property="bestSell"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="120.0" text="%market.offer.buy">
<cellValueFactory><OfferCellValueImpl property="bestBuy"/></cellValueFactory>
</TableColumn>
</columns>
</TableColumn>
</columns>
<columnResizePolicy>

22
client/src/main/resources/view/orders.fxml
View File

@@ -14,30 +14,30 @@
prefWidth="1010">
<TableView fx:id="tblOrders" editable="true">
<columns>
<TableColumn minWidth="160.0" text="Товар">
<TableColumn minWidth="160.0" text="%market.item.name">
<cellValueFactory><PropertyValueFactory property="name"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="60.0" text="Цена">
<TableColumn minWidth="60.0" text="%market.offer.price">
<cellFactory><DoubleCell/></cellFactory>
<cellValueFactory><PropertyValueFactory property="price"/></cellValueFactory>
</TableColumn>
<TableColumn fx:id="count" minWidth="60.0" prefWidth="60.0" text="Кол-во">
<TableColumn fx:id="count" minWidth="60.0" prefWidth="60.0" text="%market.order.count">
<cellValueFactory><PropertyValueFactory property="count"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="160.0" text="Покупатель">
<TableColumn minWidth="160.0" text="%market.order.buyer">
<cellValueFactory><OfferCellValueImpl property="buyOffer"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="80.0" text="Прибыль">
<TableColumn minWidth="80.0" text="%market.order.profit">
<cellFactory><DoubleCell/></cellFactory>
<cellValueFactory><PropertyValueFactory property="profit"/></cellValueFactory>
</TableColumn>
<TableColumn resizable="false" text="Максимум">
<TableColumn resizable="false" text="%market.offer.max.full">
<columns>
<TableColumn fx:id="maxCount" minWidth="60.0" prefWidth="60.0" text="Кол-во">
<TableColumn fx:id="maxCount" minWidth="60.0" prefWidth="60.0" text="%market.order.count">
<cellValueFactory><PropertyValueFactory property="max"/></cellValueFactory>
</TableColumn>
<TableColumn fx:id="bestProfit" minWidth="80.0" text="Прибыль" sortType="DESCENDING">
<TableColumn fx:id="bestProfit" minWidth="80.0" text="%market.order.profit" sortType="DESCENDING">
<cellFactory><DoubleCell/></cellFactory>
<cellValueFactory><PropertyValueFactory property="bestProfit"/></cellValueFactory>
</TableColumn>
@@ -53,14 +53,14 @@
</TableView>
<TableView fx:id="tblBuyers" minWidth="335">
<columns>
<TableColumn minWidth="160.0" text="Покупатель">
<TableColumn minWidth="160.0" text="%market.order.buyer">
<cellFactory><OfferTableCell/></cellFactory>
<cellValueFactory><PropertyValueFactory property="price"/></cellValueFactory>
</TableColumn>
<TableColumn fx:id="curDistance" minWidth="80.0" text="Дистанция">
<TableColumn fx:id="curDistance" minWidth="80.0" text="%market.order.distance">
<cellFactory><DoubleCell format="\%.2f LY"/></cellFactory>
</TableColumn>
<TableColumn fx:id="curProfit" minWidth="80.0" text="Прибыль" sortType="DESCENDING">
<TableColumn fx:id="curProfit" minWidth="80.0" text="%market.order.profit" sortType="DESCENDING">
<cellFactory><DoubleCell/></cellFactory>
</TableColumn>
</columns>

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

@@ -15,26 +15,26 @@
prefWidth="1050">
<TableView fx:id="tblPaths" editable="true">
<columns>
<TableColumn minWidth="600.0" text="Путь">
<TableColumn minWidth="600.0" text="%routes.path">
<cellFactory><PathRouteCell /></cellFactory>
</TableColumn>
<TableColumn minWidth="70.0" text="Прыжков">
<TableColumn minWidth="70.0" text="%routes.jumps">
<cellValueFactory><PropertyValueFactory property="jumps"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="70.0" text="Заправок">
<TableColumn minWidth="70.0" text="%routes.refills">
<cellValueFactory><PropertyValueFactory property="refuels"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="70.0" text="Посадок">
<TableColumn minWidth="70.0" text="%routes.lands">
<cellValueFactory><PropertyValueFactory property="lands"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="80.0" text="Дистанция">
<TableColumn minWidth="80.0" text="%market.order.distance">
<cellFactory><DoubleCell format="\%.2f LY"/></cellFactory>
<cellValueFactory><PropertyValueFactory property="distance"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="70.0" text="Прибыль">
<TableColumn minWidth="70.0" text="%market.order.profit">
<cellValueFactory><PropertyValueFactory property="totalProfit"/></cellValueFactory>
</TableColumn>
<TableColumn fx:id="avgProfit" minWidth="70.0" text="Ср." sortType="DESCENDING">
<TableColumn fx:id="avgProfit" minWidth="70.0" text="%market.offer.avg" sortType="DESCENDING">
<cellFactory><DoubleCell format="\%.0f"/></cellFactory>
<cellValueFactory><PropertyValueFactory property="avgProfit"/></cellValueFactory>
</TableColumn>

54
client/src/main/resources/view/routers.fxml → client/src/main/resources/view/router.fxml
View File

@@ -10,68 +10,68 @@
<?import javafx.geometry.Insets?>
<HBox xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="ru.trader.controllers.RoutersController">
fx:controller="ru.trader.controllers.RouterController">
<fx:define><Insets fx:id="fields_group_margin" left="2" right="10"/></fx:define>
<fx:define><Insets fx:id="separator_margin" top="10" bottom="10"/></fx:define>
<VBox minWidth="250">
<TitledPane text="Параметры корабля" minHeight="160" collapsible="false">
<TitledPane text="%router.pane.ship" minHeight="160" collapsible="false">
<GridPane vgap="4">
<columnConstraints>
<ColumnConstraints minWidth="140" />
<ColumnConstraints minWidth="90" maxWidth="90"/>
</columnConstraints>
<Label text="Баланс:"/>
<Label text="%router.pane.ship.balance"/>
<NumberField fx:id="balance" GridPane.columnIndex="1" />
<Label text="Трюм:" GridPane.rowIndex="1" />
<Label text="%router.pane.ship.cargo" GridPane.rowIndex="1" />
<NumberField fx:id="cargo" GridPane.columnIndex="1" GridPane.rowIndex="1" />
<Label text="Запас топлива(LY):" GridPane.rowIndex="2" />
<Label text="%router.pane.ship.fueltank" GridPane.rowIndex="2" />
<NumberField fx:id="tank" GridPane.columnIndex="1" GridPane.rowIndex="2" />
<Label text="Дистанция прыжка(LY):" GridPane.rowIndex="3" />
<Label text="%router.pane.ship.distance" GridPane.rowIndex="3" />
<NumberField fx:id="distance" GridPane.columnIndex="1" GridPane.rowIndex="3" />
</GridPane>
</TitledPane>
<TitledPane text="Параметры маршрута" minHeight="250" collapsible="false">
<TitledPane text="%router.pane.route" minHeight="250" collapsible="false">
<GridPane vgap="4">
<columnConstraints>
<ColumnConstraints minWidth="70"/>
<ColumnConstraints minWidth="160" maxWidth="160"/>
</columnConstraints>
<Label text="От:" />
<Label text="%router.pane.route.from" />
<ComboBox fx:id="source" prefWidth="160" GridPane.columnIndex="1" />
<Label text="До:" GridPane.rowIndex="1"/>
<Label text="%router.pane.route.to" GridPane.rowIndex="1"/>
<ComboBox fx:id="target" prefWidth="160" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
<Label text="Прыжков:" GridPane.rowIndex="2" />
<Label text="%router.pane.route.jumps" GridPane.rowIndex="2" />
<NumberField fx:id="jumps" GridPane.columnIndex="1" GridPane.rowIndex="2" />
<Separator GridPane.columnSpan="2" GridPane.rowIndex="3" GridPane.margin="$separator_margin"/>
<VBox GridPane.columnSpan="2" GridPane.rowIndex="4" spacing="5">
<HBox alignment="CENTER" spacing="5">
<Button fx:id="editBtn" text="Изменить" onAction="#editOrders"/>
<Button fx:id="removeBtn" text="Удалить" onAction="#removeSelected"/>
<Button text="Очистить" onAction="#removeAll" />
<Button fx:id="editBtn" text="%route.button.edit" onAction="#editOrders"/>
<Button fx:id="removeBtn" text="%route.button.remove" onAction="#removeSelected"/>
<Button text="%route.button.clear" onAction="#removeAll" />
</HBox>
<HBox alignment="CENTER" spacing="5">
<Button prefWidth="80" text="Заказы" onAction="#showOrders" />
<Button text="TOP 100" onAction="#showTopOrders" />
<Button prefWidth="80" text="%market.offers" onAction="#showOrders" />
<Button text="%route.button.top" onAction="#showTopOrders" />
</HBox>
<HBox alignment="CENTER" spacing="5">
<Button prefWidth="80" text="Маршруты" onAction="#showRoutes" />
<Button text="TOP 100" onAction="#showTopRoutes" />
<Button prefWidth="80" text="%routes" onAction="#showRoutes" />
<Button text="%route.button.top" onAction="#showTopRoutes" />
</HBox>
</VBox>
</GridPane>
</TitledPane>
<Pane VBox.vgrow="ALWAYS"/>
<TitledPane text="Итого" minHeight="100" collapsible="false">
<TitledPane text="%router.pane.total" minHeight="100" collapsible="false">
<GridPane vgap="4">
<columnConstraints>
<ColumnConstraints minWidth="70"/>
<ColumnConstraints minWidth="160"/>
</columnConstraints>
<Label text="Баланс:"/>
<Label text="%router.pane.ship.balance"/>
<NumberField fx:id="totalBalance" prefWidth="100" GridPane.columnIndex="1" editable="false"/>
<Label text="Прибыль:" GridPane.rowIndex="1"/>
<Label text="%router.pane.total.profit" GridPane.rowIndex="1"/>
<NumberField fx:id="totalProfit" prefWidth="100" GridPane.columnIndex="1" GridPane.rowIndex="1" editable="false"/>
</GridPane>
</TitledPane>
@@ -79,27 +79,27 @@
<VBox HBox.hgrow="ALWAYS">
<TableView fx:id="tblOrders" VBox.vgrow="ALWAYS">
<columns>
<TableColumn minWidth="210.0" text="Продавец">
<TableColumn minWidth="210.0" text="%market.order.seller">
<cellValueFactory><PropertyValueFactory property="vendor"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="180.0" text="Товар">
<TableColumn minWidth="180.0" text="%market.item.name">
<cellValueFactory><PropertyValueFactory property="name"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="80.0" text="Цена">
<TableColumn minWidth="80.0" text="%market.offer.price">
<cellFactory><DoubleCell/></cellFactory>
<cellValueFactory><PropertyValueFactory property="price"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="80.0" text="Кол-во">
<TableColumn minWidth="80.0" text="%market.order.count">
<cellValueFactory><PropertyValueFactory property="count"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="120.0" text="Покупатель">
<TableColumn minWidth="120.0" text="%market.order.buyer">
<cellValueFactory><OfferCellValueImpl property="buyOffer"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="80.0" text="Дистанция">
<TableColumn minWidth="80.0" text="%market.order.distance">
<cellFactory><DoubleCell format="\%.2f LY"/></cellFactory>
<cellValueFactory><PropertyValueFactory property="distance"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="80.0" text="Прибыль">
<TableColumn minWidth="80.0" text="%market.order.profit">
<cellFactory><DoubleCell/></cellFactory>
<cellValueFactory><PropertyValueFactory property="profit"/></cellValueFactory>
</TableColumn>

14
client/src/main/resources/view/topOrders.fxml
View File

@@ -11,26 +11,26 @@
<?import ru.trader.view.support.cells.OfferTableCell?>
<HBox xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="ru.trader.controllers.TopOrdersController" styleClass="dialog"
prefWidth="715">
prefWidth="725">
<TableView fx:id="tblOrders" editable="true">
<columns>
<TableColumn minWidth="160.0" text="Товар">
<TableColumn minWidth="160.0" text="%market.item.name">
<cellValueFactory><PropertyValueFactory property="name"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="160.0" text="Продавец">
<TableColumn minWidth="160.0" text="%market.order.seller">
<cellValueFactory><OfferCellValueImpl property="offer"/></cellValueFactory>
</TableColumn>
<TableColumn fx:id="count" minWidth="60.0" text="Кол-во">
<TableColumn fx:id="count" minWidth="60.0" text="%market.order.count">
<cellValueFactory><PropertyValueFactory property="count"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="160.0" text="Покупатель">
<TableColumn minWidth="160.0" text="%market.order.buyer">
<cellValueFactory><OfferCellValueImpl property="buyOffer"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="80.0" text="Дистанция">
<TableColumn minWidth="80.0" text="%market.order.distance">
<cellFactory><DoubleCell format="\%.2f LY"/></cellFactory>
<cellValueFactory><PropertyValueFactory property="distance"/></cellValueFactory>
</TableColumn>
<TableColumn fx:id="profit" minWidth="80.0" text="Прибыль" sortType="DESCENDING">
<TableColumn fx:id="profit" minWidth="80.0" text="%market.order.profit" sortType="DESCENDING">
<cellFactory><DoubleCell/></cellFactory>
<cellValueFactory><PropertyValueFactory property="profit"/></cellValueFactory>
</TableColumn>

6
client/src/main/resources/view/vEditor.fxml
View File

@@ -29,13 +29,13 @@
</VBox>
<TableView fx:id="items" prefWidth="375.0" editable="true" GridPane.columnIndex="1" GridPane.rowIndex="2">
<columns>
<TableColumn minWidth="200.0" text="Товар" editable="false">
<TableColumn minWidth="200.0" text="%market.item.name" editable="false">
<cellValueFactory><PropertyValueFactory property="name"/></cellValueFactory>
</TableColumn>
<TableColumn fx:id="buy" minWidth="80.0" text="Продажа">
<TableColumn fx:id="buy" minWidth="80.0" text="%market.offer.sell">
<cellValueFactory><PropertyValueFactory property="bprice"/></cellValueFactory>
</TableColumn>
<TableColumn fx:id="sell" minWidth="80.0" text="Покупка">
<TableColumn fx:id="sell" minWidth="80.0" text="%market.offer.buy">
<cellValueFactory><PropertyValueFactory property="sprice"/></cellValueFactory>
</TableColumn>
</columns>