add faction and government fields
This commit is contained in:
Mo
@@ -1,3 +1,24 @@
|
||||
faction.FEDERATION=Federation
|
||||
faction.EMPIRE=Empire
|
||||
faction.ALLIANCE=Alliance
|
||||
faction.INDEPENDENT=Independent
|
||||
faction.NONE=None
|
||||
|
||||
government.ANARCHY=Anarchy
|
||||
government.COLONY=Colony
|
||||
government.COMMUNISM=Communism
|
||||
government.CONFEDERACY=Confederacy
|
||||
government.COOPERATIVE=Cooperative
|
||||
government.CORPORATE=Corporate
|
||||
government.DEMOCRACY=Democracy
|
||||
government.DICTATORSHIP=Dictatorship
|
||||
government.FEUDAL=Feudal
|
||||
government.IMPERIAL=Imperial
|
||||
government.PATRONAGE=Patronage
|
||||
government.PRISON_COLONY=Prison colony
|
||||
government.THEOCRACY=Theocracy
|
||||
government.NONE=None
|
||||
|
||||
services.MARKET=Commodities
|
||||
services.BLACK_MARKET=Black Market
|
||||
services.REPAIR=Repair
|
||||
@@ -6,6 +27,7 @@ services.OUTFIT=Outfit
|
||||
services.SHIPYARD=Shipyard
|
||||
services.MEDIUM_LANDPAD=Medium Pad
|
||||
services.LARGE_LANDPAD=Large Pad
|
||||
|
||||
item.group.chemicals=Chemicals
|
||||
item.explosives=Explosives
|
||||
item.hydrogenfuel=Hydrogen Fuel
|
||||
|
||||
@@ -8,6 +8,8 @@ market.offers=Offers
|
||||
market.item.name=Commodity
|
||||
market.system.name=System
|
||||
market.station.name=Station
|
||||
market.allegiance=Allegiance
|
||||
market.government=Government
|
||||
|
||||
# Offer
|
||||
market.offer.buy=Buy
|
||||
|
||||
@@ -8,6 +8,8 @@ market.offers=\u0417\u0430\u043A\u0430\u0437\u044B
|
||||
market.item.name=\u0422\u043E\u0432\u0430\u0440
|
||||
market.system.name=\u0421\u0438\u0441\u0442\u0435\u043C\u0430
|
||||
market.station.name=\u0421\u0442\u0430\u043D\u0446\u0438\u044F
|
||||
market.allegiance=\u041F\u0440\u0438\u043D\u0430\u0434\u043B\u0435\u0436\u043D\u043E\u0441\u0442\u044C
|
||||
market.government=\u0424\u043E\u0440\u043C\u0430 \u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u044F
|
||||
|
||||
# Offer
|
||||
market.offer.buy=\u041F\u043E\u043A\u0443\u043F\u043A\u0430
|
||||
|
||||
@@ -1,5 +1,26 @@
|
||||
main.menu.settings.language.item=\u0420\u0443\u0441\u0441\u043A\u0438\u0439
|
||||
|
||||
faction.FEDERATION=\u0424\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044F
|
||||
faction.EMPIRE=\u0418\u043C\u043F\u0435\u0440\u0438\u044F
|
||||
faction.ALLIANCE=\u0410\u043B\u044C\u044F\u043D\u0441
|
||||
faction.INDEPENDENT=\u041D\u0435\u0437\u0430\u0432\u0438\u0441\u0438\u043C\u044B\u0435
|
||||
faction.NONE=\u041D\u0435\u0442
|
||||
|
||||
government.ANARCHY=\u0410\u043D\u0430\u0440\u0445\u0438\u044F
|
||||
government.COLONY=\u041A\u043E\u043B\u043E\u043D\u0438\u044F
|
||||
government.COMMUNISM=\u041A\u043E\u043C\u043C\u0443\u043D\u0438\u0437\u043C
|
||||
government.CONFEDERACY=\u041A\u043E\u043D\u0444\u0435\u0434\u0435\u0440\u0430\u0446\u0438\u044F
|
||||
government.COOPERATIVE=\u041A\u043E\u043E\u043F\u0435\u0440\u0430\u0446\u0438\u044F
|
||||
government.CORPORATE=\u041A\u043E\u0440\u043F\u043E\u0440\u0430\u0442\u0438\u0432\u043D\u0430\u044F
|
||||
government.DEMOCRACY=\u0414\u0435\u043C\u043E\u043A\u0440\u0430\u0442\u0438\u044F
|
||||
government.DICTATORSHIP=\u0414\u0438\u043A\u0442\u0430\u0442\u0443\u0440\u0430
|
||||
government.FEUDAL=\u0424\u0435\u043E\u0434\u0430\u043B\u044C\u043D\u0430\u044F
|
||||
government.IMPERIAL=\u0418\u043C\u043F\u0435\u0440\u0441\u043A\u0430\u044F
|
||||
government.PATRONAGE=\u041F\u043E\u043F\u0435\u0447\u0438\u0442\u0435\u043B\u044C\u0441\u0442\u0432\u043E
|
||||
government.PRISON_COLONY=\u0422\u044E\u0440\u0435\u043C\u043D\u0430\u044F \u043A\u043E\u043B\u043E\u043D\u0438\u044F
|
||||
government.THEOCRACY=\u0422\u0435\u043E\u043A\u0440\u0430\u0442\u0438\u044F
|
||||
government.NONE=\u041D\u0435\u0442
|
||||
|
||||
services.MARKET=\u0420\u044B\u043D\u043E\u043A
|
||||
services.BLACK_MARKET=\u0427\u0435\u0440\u043D\u044B\u0439 \u0440\u044B\u043D\u043E\u043A
|
||||
services.REPAIR=\u0420\u0435\u043C\u043E\u043D\u0442
|
||||
|
||||
@@ -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">
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user