Voomra/trader
Archived
0
Fork 0
Code Activity

add size of landpad in services

Browse Source
This commit is contained in:
iMoHax
2014-12-01 17:30:10 +03:00
parent 70676f078f
commit 1abd9cb9df
7 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/main/java/ru/trader/controllers/OffersController.java
View File

@@ -53,6 +53,10 @@ public class OffersController {
private CheckBox cbOutfit;
@FXML
private CheckBox cbShipyard;
@FXML
private CheckBox cbMediumLandpad;
@FXML
private CheckBox cbLargeLandpad;
private final List<OfferModel> sells = FXCollections.observableArrayList();
private final List<OfferModel> buys = FXCollections.observableArrayList();
@@ -146,6 +150,8 @@ public class OffersController {
cbRepair.setSelected(station.hasService(SERVICE_TYPE.REPAIR));
cbOutfit.setSelected(station.hasService(SERVICE_TYPE.OUTFIT));
cbShipyard.setSelected(station.hasService(SERVICE_TYPE.SHIPYARD));
cbMediumLandpad.setSelected(station.hasService(SERVICE_TYPE.MEDIUM_LANDPAD));
cbLargeLandpad.setSelected(station.hasService(SERVICE_TYPE.LARGE_LANDPAD));
sells.addAll(station.getSells());
buys.addAll(station.getBuys());
}

6
client/src/main/java/ru/trader/controllers/StationEditorController.java
View File

@@ -58,6 +58,10 @@ public class StationEditorController {
private CheckBox cbOutfit;
@FXML
private CheckBox cbShipyard;
@FXML
private CheckBox cbMediumLandpad;
@FXML
private CheckBox cbLargeLandpad;
private StationUpdater updater;
@@ -102,6 +106,8 @@ public class StationEditorController {
cbRepair.selectedProperty().bindBidirectional(updater.serviceProperty(SERVICE_TYPE.REPAIR));
cbOutfit.selectedProperty().bindBidirectional(updater.serviceProperty(SERVICE_TYPE.OUTFIT));
cbShipyard.selectedProperty().bindBidirectional(updater.serviceProperty(SERVICE_TYPE.SHIPYARD));
cbMediumLandpad.selectedProperty().bindBidirectional(updater.serviceProperty(SERVICE_TYPE.MEDIUM_LANDPAD));
cbLargeLandpad.selectedProperty().bindBidirectional(updater.serviceProperty(SERVICE_TYPE.LARGE_LANDPAD));
items.setItems(updater.getOffers());
}

2
client/src/main/resources/lang/locale.properties
View File

@@ -4,6 +4,8 @@ services.REPAIR=Repair
services.MUNITION=Munition
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 Fuels

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

@@ -43,13 +43,15 @@
<Label text="%offers.text.distance"/>
<Label fx:id="distance" minWidth="60"/>
<Label text="%offers.text.services"/>
<HBox spacing="20">
<HBox spacing="15">
<CheckBox fx:id="cbMarket" text="%services.MARKET"/>
<CheckBox fx:id="cbBlackMarket" text="%services.BLACK_MARKET"/>
<CheckBox fx:id="cbRepair" text="%services.REPAIR"/>
<CheckBox fx:id="cbMunition" text="%services.MUNITION"/>
<CheckBox fx:id="cbOutfit" text="%services.OUTFIT"/>
<CheckBox fx:id="cbShipyard" text="%services.SHIPYARD"/>
<CheckBox fx:id="cbMediumLandpad" text="%services.MEDIUM_LANDPAD"/>
<CheckBox fx:id="cbLargeLandpad" text="%services.LARGE_LANDPAD"/>
</HBox>
</HBox>

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

@@ -28,6 +28,8 @@
<CheckBox fx:id="cbMunition" text="%services.MUNITION"/>
<CheckBox fx:id="cbOutfit" text="%services.OUTFIT"/>
<CheckBox fx:id="cbShipyard" text="%services.SHIPYARD"/>
<CheckBox fx:id="cbMediumLandpad" text="%services.MEDIUM_LANDPAD"/>
<CheckBox fx:id="cbLargeLandpad" text="%services.LARGE_LANDPAD"/>
</TilePane>
</VBox>
</HBox>