Voomra/trader
Archived
0
Fork 0
Code Activity

- update controlFX to 8.20.6

Browse Source 
- support JDK 8u25
- refactoring models
This commit is contained in:
iMoHax
2014-11-08 18:43:17 +03:00
parent 92387f51df
commit eb8a8df171
48 changed files with 1356 additions and 1250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
client/src/main/resources/lang/locale_en_US.properties
View File

@@ -1,14 +1,17 @@
# Market
market.vendors=Stations
market.systems=Systems
market.stations=Stations
market.items=Commods
market.offers=Offers
market.item.name=Commodity
market.vendor.name=Station
market.station.name=Station
# Offer
market.offer.buy=Buy
market.offer.sell=Sell
market.offer.price=Price
market.offer.supply=Supply
market.offer.demand=Demand
market.offer.min=Min
market.offer.avg=Avg
market.offer.max=Max
@@ -42,9 +45,13 @@ main.menu.file=File
main.menu.file.save=Save
main.menu.file.import=Import...
main.menu.edit=Edit
main.menu.edit.addSystem=Add System
main.menu.edit.editSystem=Edit System
main.menu.edit.removeSystem=Delete System
main.menu.edit.addStation=Add Station
main.menu.edit.addItem=Add Commodity
main.menu.edit.editStation=Edit Station
main.menu.edit.removeStation=Delete Station
main.menu.edit.addItem=Add Commodity
main.menu.settings=Settings
main.menu.settings.language=Language
main.menu.settings.language.item=English

13
client/src/main/resources/lang/locale_ru_RU.properties
View File

@@ -1,14 +1,17 @@
# Market
market.vendors=\u0421\u0442\u0430\u043D\u0446\u0438\u0438
market.systems=\u0421\u0438\u0441\u0442\u0435\u043C\u044B
market.stations=\u0421\u0442\u0430\u043D\u0446\u0438\u0438
market.items=\u0422\u043E\u0432\u0430\u0440\u044B
market.offers=\u0417\u0430\u043A\u0430\u0437\u044B
market.item.name=\u0422\u043E\u0432\u0430\u0440
market.vendor.name=\u0421\u0442\u0430\u043D\u0446\u0438\u044F
market.station.name=\u0421\u0442\u0430\u043D\u0446\u0438\u044F
# Offer
market.offer.buy=\u041F\u043E\u043A\u0443\u043F\u043A\u0430
market.offer.sell=\u041F\u0440\u043E\u0434\u0430\u0436\u0430
market.offer.price=\u0426\u0435\u043D\u0430
market.offer.supply=\u0417\u0430\u043F\u0430\u0441
market.offer.demand=\u0421\u043F\u0440\u043E\u0441
market.offer.min=\u041C\u0438\u043D.
market.offer.avg=\u0421\u0440.
market.offer.max=\u041C\u0430\u043A\u0441.
@@ -43,9 +46,13 @@ main.menu.file=\u0424\u0430\u0439\u043B
main.menu.file.save=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C
main.menu.file.import=\u0418\u043C\u043F\u043E\u0440\u0442...
main.menu.edit=\u041F\u0440\u0430\u0432\u043A\u0430
main.menu.edit.addSystem=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0441\u0438\u0441\u0442\u0435\u043C\u0443
main.menu.edit.editSystem=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0441\u0438\u0441\u0442\u0435\u043C\u0443
main.menu.edit.removeSystem=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0441\u0438\u0441\u0442\u0435\u043C\u0443
main.menu.edit.addStation=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0441\u0442\u0430\u043D\u0446\u0438\u044E
main.menu.edit.addItem=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0442\u043E\u0432\u0430\u0440
main.menu.edit.editStation=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0441\u0442\u0430\u043D\u0446\u0438\u044E
main.menu.edit.removeStation=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0441\u0442\u0430\u043D\u0446\u0438\u044E
main.menu.edit.addItem=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0442\u043E\u0432\u0430\u0440
main.menu.settings=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438
main.menu.settings.language=\u042F\u0437\u044B\u043A
main.menu.settings.language.item=\u0420\u0443\u0441\u0441\u043A\u0438\u0439

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

@@ -14,8 +14,12 @@
<MenuItem text="%main.menu.file.import" onAction="#importWorld"/>
</Menu>
<Menu text="%main.menu.edit">
<MenuItem text="%main.menu.edit.addStation" onAction="#addVendor"/>
<MenuItem text="%main.menu.edit.editStation" onAction="#editVendor"/>
<MenuItem text="%main.menu.edit.addSystem" onAction="#addSystem"/>
<MenuItem text="%main.menu.edit.editSystem" onAction="#editSystem"/>
<MenuItem text="%main.menu.edit.removeSystem" onAction="#removeSystem"/>
<MenuItem text="%main.menu.edit.addStation" onAction="#addStation"/>
<MenuItem text="%main.menu.edit.editStation" onAction="#editStation"/>
<MenuItem text="%main.menu.edit.removeStation" onAction="#removeStation"/>
</Menu>
<Menu text="%main.menu.settings">
<MenuItem text="%main.menu.settings.parameters" onAction="#editSettings"/>
@@ -28,7 +32,7 @@
<Tab text="%market.items">
<fx:include fx:id="items" source="items.fxml"/>
</Tab>
<Tab text="%market.vendors">
<Tab text="%market.systems">
<fx:include fx:id="offers" source="offers.fxml"/>
</Tab>
<Tab text="%routes">

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

@@ -9,24 +9,38 @@
<?import ru.trader.view.support.cells.OfferCellValueImpl?>
<?import ru.trader.view.support.cells.DoubleCell?>
<HBox xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
<?import org.controlsfx.glyphfont.Glyph?>
<?import org.controlsfx.control.SegmentedButton?>
<GridPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="ru.trader.controllers.OffersController">
<TitledPane text="%market.vendors" minWidth="250" prefHeight="510" collapsible="false">
<ListView fx:id="vendors">
<fx:define><Insets fx:id="stationsMargin" left="5" right="5" /></fx:define>
<fx:define><Insets fx:id="stationsPadding" left="12" right="10" /></fx:define>
<columnConstraints>
<ColumnConstraints minWidth="250" maxWidth="250"/>
<ColumnConstraints fillWidth="true"/>
</columnConstraints>
<TitledPane GridPane.rowSpan="2" text="%market.systems" minWidth="250" prefHeight="510" collapsible="false">
<ListView fx:id="systems">
<contextMenu>
<ContextMenu>
<items>
<MenuItem text="%main.menu.edit.addStation" onAction="#addVendor" />
<MenuItem text="%main.menu.edit.editStation" onAction="#editVendor" />
<MenuItem text="%main.menu.edit.addStation" onAction="#addStation" />
<MenuItem text="%main.menu.edit.editStation" onAction="#editStation" />
</items>
</ContextMenu>
</contextMenu>
</ListView>
</TitledPane>
<Accordion HBox.hgrow="ALWAYS">
<panes>
<TitledPane fx:id="sells" animated="false" text="%offers.pane.sell">
<TitledPane GridPane.columnIndex="1" text="%market.stations" maxHeight="60" collapsible="false">
<SegmentedButton fx:id="stationsBar" />
</TitledPane>
<Accordion GridPane.rowIndex="1" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.vgrow="ALWAYS">
<panes>
<TitledPane fx:id="paneSells" animated="false" text="%offers.pane.sell">
<TableView fx:id="tblSell" editable="true">
<columns>
<TableColumn minWidth="230.0" text="%market.item.name">
@@ -36,6 +50,9 @@
<cellFactory><PriceCellImpl/></cellFactory>
<cellValueFactory><PropertyValueFactory property="price"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="80.0" text="%market.offer.supply">
<cellValueFactory><PropertyValueFactory property="count"/></cellValueFactory>
</TableColumn>
<TableColumn fx:id="sortSell" minWidth="90.0" text="%market.order.profit" sortType="DESCENDING">
<cellFactory><DoubleCell/></cellFactory>
<cellValueFactory><PropertyValueFactory property="profit"/></cellValueFactory>
@@ -70,8 +87,8 @@
<fx:reference source="sortSell"/>
</sortOrder>
</TableView>
</TitledPane>
<TitledPane animated="false" text="%offers.pane.buy">
</TitledPane>
<TitledPane animated="false" text="%offers.pane.buy">
<TableView fx:id="tblBuy" editable="true">
<columns>
<TableColumn minWidth="230.0" text="%market.item.name">
@@ -81,6 +98,9 @@
<cellFactory><PriceCellImpl/></cellFactory>
<cellValueFactory><PropertyValueFactory property="price"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="80.0" text="%market.offer.demand">
<cellValueFactory><PropertyValueFactory property="count"/></cellValueFactory>
</TableColumn>
<TableColumn fx:id="sortBuy" minWidth="90.0" text="%market.order.profit" sortType="DESCENDING">
<cellFactory><DoubleCell/></cellFactory>
<cellValueFactory><PropertyValueFactory property="profit"/></cellValueFactory>
@@ -115,10 +135,10 @@
<fx:reference source="sortBuy"/>
</sortOrder>
</TableView>
</TitledPane>
</panes>
<expandedPane>
<fx:reference source="sells"/>
</expandedPane>
</TitledPane>
</panes>
<expandedPane>
<fx:reference source="paneSells"/>
</expandedPane>
</Accordion>
</HBox>
</GridPane>

2
client/src/main/resources/view/router.fxml
View File

@@ -80,7 +80,7 @@
<TableView fx:id="tblOrders" VBox.vgrow="ALWAYS">
<columns>
<TableColumn minWidth="210.0" text="%market.order.seller">
<cellValueFactory><PropertyValueFactory property="vendor"/></cellValueFactory>
<cellValueFactory><PropertyValueFactory property="station"/></cellValueFactory>
</TableColumn>
<TableColumn minWidth="180.0" text="%market.item.name">
<cellValueFactory><PropertyValueFactory property="name"/></cellValueFactory>

2
client/src/main/resources/view/settings.fxml
View File

@@ -15,7 +15,7 @@
</columnConstraints>
<Label text="%settings.emdn" styleClass="settings-group" GridPane.halignment="CENTER" GridPane.columnSpan="2"/>
<Label text="%settings.emdn.on" GridPane.rowIndex="1"/>
<CheckBox fx:id="emdnOn" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
<CheckBox fx:id="emdnOn" GridPane.columnIndex="1" GridPane.rowIndex="1" disable="true"/>
<Label text="%settings.emdn.sub" GridPane.rowIndex="2" />
<TextField fx:id="emdnSubServ" GridPane.columnIndex="1" GridPane.rowIndex="2" />
<Label text="%settings.emdn.updateOnly" GridPane.rowIndex="3" />

2
client/src/main/resources/view/style.css
View File

@@ -61,7 +61,7 @@ HBox.fields-group hbox-margin{
-fx-fill-height: true;
}
.path-vendor {
.path-system {
-fx-alignment: center-left;
-fx-text-alignment: left;
}

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

@@ -10,7 +10,7 @@
<?import ru.trader.view.support.NumberField?>
<?import javafx.geometry.Insets?>
<GridPane xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8"
fx:controller="ru.trader.controllers.VendorEditorController" styleClass="dialog"
fx:controller="ru.trader.controllers.StationEditorController" styleClass="dialog"
vgap="10" hgap="4">
<fx:define><Insets fx:id="hbox_margin" left="10" /></fx:define>
<TextField fx:id="name" GridPane.columnSpan="2" alignment="CENTER" />