Voomra/trader
Archived
0
Fork 0
Code Activity

add faction and government fields

Browse Source
This commit is contained in:
Mo
2015-09-27 14:56:00 +03:00
parent bcd7ebbd04
commit fb98d8860a
34 changed files with 621 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,16 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.*?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.*?>
<?import javafx.scene.control.cell.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.control.cell.PropertyValueFactory?>
<?import ru.trader.view.support.cells.PriceCellImpl?>
<?import ru.trader.view.support.cells.OfferCellValueImpl?>
<?import ru.trader.view.support.cells.DoubleCell?>
<?import org.controlsfx.glyphfont.Glyph?>
<?import org.controlsfx.control.SegmentedButton?>
<?import ru.trader.view.support.cells.*?>
<GridPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="ru.trader.controllers.OffersController">
@@ -39,9 +34,16 @@
<SegmentedButton fx:id="stationsBar" />
</TitledPane>
<TitledPane GridPane.rowIndex="1" GridPane.columnIndex="1" text="" maxHeight="60" collapsible="false">
<HBox spacing="4">
<Label text="%offers.text.distance"/>
<Label fx:id="distance" minWidth="60"/>
<VBox>
<HBox spacing="4">
<Label text="%offers.text.distance"/>
<Label fx:id="distance" minWidth="60"/>
<Label text="%market.allegiance"/>
<Label fx:id="faction" minWidth="60"/>
<Label text="%market.government"/>
<Label fx:id="government" minWidth="60"/>
</HBox>
<HBox spacing="4">
<Label text="%offers.text.services"/>
<HBox spacing="15">
<CheckBox fx:id="cbMarket" text="%services.MARKET"/>
@@ -54,6 +56,7 @@
<CheckBox fx:id="cbLargeLandpad" text="%services.LARGE_LANDPAD"/>
</HBox>
</HBox>
</VBox>
</TitledPane>
<Accordion GridPane.rowIndex="2" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.vgrow="ALWAYS">

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

@@ -1,20 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.Insets?>
<?import javafx.scene.control.*?>
<?import javafx.scene.control.cell.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.control.cell.PropertyValueFactory?>
<?import org.controlsfx.glyphfont.Glyph?>
<?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.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" />
<HBox GridPane.rowIndex="1" GridPane.columnIndex="1" spacing="4">
<HBox GridPane.rowIndex="1" GridPane.columnSpan="2" spacing="10" alignment="CENTER">
<VBox prefWidth="200" alignment="CENTER">
<Label text="%market.allegiance"/>
<ComboBox fx:id="faction" maxWidth="200" />
</VBox>
<VBox prefWidth="200" alignment="CENTER">
<Label text="%market.government"/>
<ComboBox fx:id="government" maxWidth="200" />
</VBox>
</HBox>
<HBox GridPane.rowIndex="2" GridPane.columnIndex="1" spacing="4">
<VBox prefWidth="200" alignment="CENTER">
<Label text="%vEditor.text.distance"/>
<NumberField fx:id="distance" maxWidth="60" />
@@ -33,13 +41,13 @@
</TilePane>
</VBox>
</HBox>
<VBox GridPane.rowIndex="2" alignment="CENTER" spacing="10">
<VBox GridPane.rowIndex="3" alignment="CENTER" spacing="10">
<Button prefWidth="30" onAction="#up"><graphic><Glyph text="FontAwesome|ARROW_UP"/></graphic></Button>
<Button prefWidth="30" onAction="#down"><graphic><Glyph text="FontAwesome|ARROW_DOWN"/></graphic></Button>
<Button prefWidth="30" onAction="#add"><graphic><Glyph text="FontAwesome|PLUS"/></graphic></Button>
<Button prefWidth="30" onAction="#updateFromEMDN"><graphic><Glyph text="FontAwesome|REFRESH"/></graphic></Button>
</VBox>
<TableView fx:id="items" prefWidth="575" editable="true" GridPane.columnIndex="1" GridPane.rowIndex="2">
<TableView fx:id="items" prefWidth="575" editable="true" GridPane.columnIndex="1" GridPane.rowIndex="3">
<columns>
<TableColumn minWidth="200.0" text="%market.item.name" editable="false">
<cellValueFactory><PropertyValueFactory property="name"/></cellValueFactory>