Voomra/trader
Archived
0
Fork 0
Code Activity

swap alliance and government fields on screens

Browse Source
This commit is contained in:
Mo
2016-04-03 13:49:26 +03:00
parent dc7c4b44de
commit 72f5cd2cf7
6 changed files with 34 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
client/src/main/resources/view/db/stations.fxml
View File

@@ -1,14 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.cell.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.control.cell.PropertyValueFactory?>
<?import javafx.scene.control.*?>
<?import ru.trader.view.support.cells.OfferCellValueImpl?>
<?import ru.trader.view.support.cells.DoubleCell?>
<?import ru.trader.view.support.cells.WritablePropertyValueFactory?>
<?import javafx.scene.layout.VBox?>
<?import ru.trader.view.support.cells.*?>
<VBox xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="ru.trader.db.controllers.StationsController">
<TableView fx:id="tblStations" editable="true" VBox.vgrow="ALWAYS" prefWidth="800">
@@ -22,12 +18,12 @@
<TableColumn fx:id="type" minWidth="100" text="%market.station.type">
<cellValueFactory><WritablePropertyValueFactory property="type"/></cellValueFactory>
</TableColumn>
<TableColumn fx:id="faction" minWidth="100" text="%market.allegiance">
<cellValueFactory><WritablePropertyValueFactory property="faction"/></cellValueFactory>
</TableColumn>
<TableColumn fx:id="government" minWidth="100" text="%market.government">
<cellValueFactory><WritablePropertyValueFactory property="government"/></cellValueFactory>
</TableColumn>
<TableColumn fx:id="faction" minWidth="100" text="%market.allegiance">
<cellValueFactory><WritablePropertyValueFactory property="faction"/></cellValueFactory>
</TableColumn>
<TableColumn fx:id="economic" minWidth="100" text="%market.economic">
<cellValueFactory><WritablePropertyValueFactory property="economic"/></cellValueFactory>
</TableColumn>

21
client/src/main/resources/view/db/systems.fxml
View File

@@ -1,13 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.cell.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.control.cell.PropertyValueFactory?>
<?import javafx.scene.control.*?>
<?import ru.trader.view.support.cells.OfferCellValueImpl?>
<?import ru.trader.view.support.cells.DoubleCell?>
<?import javafx.scene.layout.VBox?>
<?import ru.trader.view.support.cells.WritablePropertyValueFactory?>
<VBox xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="ru.trader.db.controllers.SystemsController">
@@ -25,18 +21,19 @@
<TableColumn minWidth="60" text="Z">
<cellValueFactory><PropertyValueFactory property="z"/></cellValueFactory>
</TableColumn>
<TableColumn fx:id="faction" minWidth="100" text="%market.allegiance">
<cellValueFactory><WritablePropertyValueFactory property="faction"/></cellValueFactory>
</TableColumn>
<TableColumn fx:id="government" minWidth="100" text="%market.government">
<cellValueFactory><WritablePropertyValueFactory property="government"/></cellValueFactory>
</TableColumn>
<TableColumn fx:id="power" minWidth="100" text="%market.power">
<cellValueFactory><WritablePropertyValueFactory property="power"/></cellValueFactory>
<TableColumn fx:id="faction" minWidth="100" text="%market.allegiance">
<cellValueFactory><WritablePropertyValueFactory property="faction"/></cellValueFactory>
</TableColumn>
<TableColumn fx:id="powerState" minWidth="100" text="%market.powerState">
<cellValueFactory><WritablePropertyValueFactory property="powerState"/></cellValueFactory>
</TableColumn>
<TableColumn fx:id="power" minWidth="100" text="%market.power">
<cellValueFactory><WritablePropertyValueFactory property="power"/></cellValueFactory>
</TableColumn>
</columns>
<columnResizePolicy>

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

@@ -1,8 +1,8 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import org.controlsfx.control.CheckComboBox?>
<?import org.controlsfx.glyphfont.*?>
<?import ru.trader.view.support.NumberField?>
<?import org.controlsfx.control.CheckComboBox?>
<GridPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ru.trader.controllers.FilterController"
styleClass="dialog" vgap="4" hgap="8">
<columnConstraints>
@@ -27,14 +27,14 @@
</VBox>
</HBox>
<HBox GridPane.rowIndex="5" GridPane.columnSpan="2" spacing="10" alignment="CENTER">
<VBox prefWidth="200" alignment="CENTER">
<Label text="%market.allegiance"/>
<CheckComboBox fx:id="factions" maxWidth="200" />
</VBox>
<VBox prefWidth="200" alignment="CENTER">
<Label text="%market.government"/>
<CheckComboBox fx:id="governments" maxWidth="200" />
</VBox>
<VBox prefWidth="200" alignment="CENTER">
<Label text="%market.allegiance"/>
<CheckComboBox fx:id="factions" maxWidth="200" />
</VBox>
</HBox>
<Label text="%filter.excludes" GridPane.rowIndex="6" />
<VBox GridPane.rowIndex="7" spacing="4">

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

@@ -4,8 +4,8 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.control.cell.*?>
<?import javafx.scene.layout.*?>
<?import ru.trader.view.support.cells.*?>
<?import org.controlsfx.glyphfont.Glyph?>
<?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"
prefHeight="500">
@@ -54,10 +54,10 @@
</columnConstraints>
<Label text="%label.station.type" />
<Label fx:id="type" GridPane.columnIndex="1"/>
<Label text="%label.allegiance" GridPane.columnIndex="2"/>
<Label fx:id="faction" GridPane.columnIndex="3" />
<Label text="%label.government" GridPane.columnIndex="4" />
<Label fx:id="government" GridPane.columnIndex="5" />
<Label text="%label.allegiance" GridPane.columnIndex="2"/>
<Label fx:id="faction" GridPane.columnIndex="3" />
<HBox GridPane.columnIndex="6" GridPane.rowSpan="2" alignment="TOP_RIGHT">
<Label fx:id="warningIcon" styleClass="icon-warning" prefWidth="30" prefHeight="30" visible="false">
<graphic><Glyph text="FontAwesome|WARNING" /></graphic>

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

@@ -55,18 +55,18 @@
<TableColumn fx:id="clnName" minWidth="180.0" text="%market.systems">
<cellValueFactory><PropertyValueFactory property="name"/></cellValueFactory>
</TableColumn>
<TableColumn fx:id="clnFaction" minWidth="100" text="%market.allegiance">
<cellValueFactory><PropertyValueFactory property="faction"/></cellValueFactory>
</TableColumn>
<TableColumn fx:id="clnGovernment" minWidth="100" text="%market.government">
<cellValueFactory><PropertyValueFactory property="government"/></cellValueFactory>
</TableColumn>
<TableColumn fx:id="clnPower" minWidth="100" text="%market.power">
<cellValueFactory><PropertyValueFactory property="power"/></cellValueFactory>
<TableColumn fx:id="clnFaction" minWidth="100" text="%market.allegiance">
<cellValueFactory><PropertyValueFactory property="faction"/></cellValueFactory>
</TableColumn>
<TableColumn fx:id="clnPowerState" minWidth="100" text="%market.powerState">
<cellValueFactory><PropertyValueFactory property="powerState"/></cellValueFactory>
</TableColumn>
<TableColumn fx:id="clnPower" minWidth="100" text="%market.power">
<cellValueFactory><PropertyValueFactory property="power"/></cellValueFactory>
</TableColumn>
<TableColumn fx:id="clnX" minWidth="60.0" text="x">
<cellValueFactory><PropertyValueFactory property="x"/></cellValueFactory>
</TableColumn>

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

@@ -13,14 +13,14 @@
<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.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>
<VBox prefWidth="200" alignment="CENTER">
<Label text="%market.allegiance"/>
<ComboBox fx:id="faction" maxWidth="200" />
</VBox>
</HBox>
<HBox GridPane.rowIndex="2" GridPane.columnSpan="2" spacing="10" alignment="CENTER">
<VBox prefWidth="180" alignment="CENTER">
@@ -39,7 +39,7 @@
<HBox GridPane.rowIndex="3" GridPane.columnIndex="1" spacing="4">
<VBox prefWidth="200" alignment="CENTER">
<Label text="%vEditor.text.distance"/>
<NumberField fx:id="distance" maxWidth="60" />
<NumberField fx:id="distance" maxWidth="100" />
</VBox>
<VBox HBox.hgrow="ALWAYS" alignment="CENTER">
<Label text="%vEditor.text.services"/>