diff --git a/client/src/main/java/ru/trader/controllers/FilterController.java b/client/src/main/java/ru/trader/controllers/FilterController.java index cb6baa1..639ff73 100644 --- a/client/src/main/java/ru/trader/controllers/FilterController.java +++ b/client/src/main/java/ru/trader/controllers/FilterController.java @@ -18,6 +18,7 @@ import ru.trader.view.support.autocomplete.AutoCompletion; import ru.trader.view.support.autocomplete.CachedSuggestionProvider; import ru.trader.view.support.autocomplete.SystemsProvider; import ru.trader.view.support.cells.CustomListCell; + import java.util.Optional; public class FilterController { @@ -40,6 +41,8 @@ public class FilterController { @FXML private CheckBox cbBlackMarket; @FXML + private CheckBox cbRefuel; + @FXML private CheckBox cbRepair; @FXML private CheckBox cbMunition; @@ -109,6 +112,7 @@ public class FilterController { distance.setValue(filter.getDistance()); cbMarket.setSelected(filter.has(SERVICE_TYPE.MARKET)); cbBlackMarket.setSelected(filter.has(SERVICE_TYPE.BLACK_MARKET)); + cbRefuel.setSelected(filter.has(SERVICE_TYPE.REFUEL)); cbMunition.setSelected(filter.has(SERVICE_TYPE.MUNITION)); cbRepair.setSelected(filter.has(SERVICE_TYPE.REPAIR)); cbOutfit.setSelected(filter.has(SERVICE_TYPE.OUTFIT)); @@ -134,6 +138,7 @@ public class FilterController { filter.setDistance(distance.getValue().doubleValue()); if (cbMarket.isSelected()) filter.add(SERVICE_TYPE.MARKET); else filter.remove(SERVICE_TYPE.MARKET); if (cbBlackMarket.isSelected()) filter.add(SERVICE_TYPE.BLACK_MARKET); else filter.remove(SERVICE_TYPE.BLACK_MARKET); + if (cbRefuel.isSelected()) filter.add(SERVICE_TYPE.REFUEL); else filter.remove(SERVICE_TYPE.REFUEL); if (cbMunition.isSelected()) filter.add(SERVICE_TYPE.MUNITION); else filter.remove(SERVICE_TYPE.MUNITION); if (cbRepair.isSelected()) filter.add(SERVICE_TYPE.REPAIR); else filter.remove(SERVICE_TYPE.REPAIR); if (cbOutfit.isSelected()) filter.add(SERVICE_TYPE.OUTFIT); else filter.remove(SERVICE_TYPE.OUTFIT); diff --git a/client/src/main/java/ru/trader/controllers/OffersController.java b/client/src/main/java/ru/trader/controllers/OffersController.java index e7b6c2f..5c4cd7b 100644 --- a/client/src/main/java/ru/trader/controllers/OffersController.java +++ b/client/src/main/java/ru/trader/controllers/OffersController.java @@ -2,7 +2,6 @@ package ru.trader.controllers; import javafx.application.Platform; import javafx.collections.FXCollections; -import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.geometry.Insets; import javafx.scene.control.*; @@ -51,6 +50,8 @@ public class OffersController { @FXML private CheckBox cbBlackMarket; @FXML + private CheckBox cbRefuel; + @FXML private CheckBox cbRepair; @FXML private CheckBox cbMunition; @@ -159,6 +160,7 @@ public class OffersController { distance.setText(String.valueOf(station.getDistance())); cbMarket.setSelected(station.hasService(SERVICE_TYPE.MARKET)); cbBlackMarket.setSelected(station.hasService(SERVICE_TYPE.BLACK_MARKET)); + cbRefuel.setSelected(station.hasService(SERVICE_TYPE.REFUEL)); cbMunition.setSelected(station.hasService(SERVICE_TYPE.MUNITION)); cbRepair.setSelected(station.hasService(SERVICE_TYPE.REPAIR)); cbOutfit.setSelected(station.hasService(SERVICE_TYPE.OUTFIT)); diff --git a/client/src/main/java/ru/trader/controllers/SearchController.java b/client/src/main/java/ru/trader/controllers/SearchController.java index c694c23..75b5d5d 100644 --- a/client/src/main/java/ru/trader/controllers/SearchController.java +++ b/client/src/main/java/ru/trader/controllers/SearchController.java @@ -43,6 +43,8 @@ public class SearchController { @FXML private CheckBox cbBlackMarket; @FXML + private CheckBox cbRefuel; + @FXML private CheckBox cbRepair; @FXML private CheckBox cbMunition; @@ -115,6 +117,7 @@ public class SearchController { filter.setDistance(distance.getValue().doubleValue()); if (cbMarket.isSelected()) filter.add(SERVICE_TYPE.MARKET); else filter.remove(SERVICE_TYPE.MARKET); if (cbBlackMarket.isSelected()) filter.add(SERVICE_TYPE.BLACK_MARKET); else filter.remove(SERVICE_TYPE.BLACK_MARKET); + if (cbRefuel.isSelected()) filter.add(SERVICE_TYPE.REFUEL); else filter.remove(SERVICE_TYPE.REFUEL); if (cbMunition.isSelected()) filter.add(SERVICE_TYPE.MUNITION); else filter.remove(SERVICE_TYPE.MUNITION); if (cbRepair.isSelected()) filter.add(SERVICE_TYPE.REPAIR); else filter.remove(SERVICE_TYPE.REPAIR); if (cbOutfit.isSelected()) filter.add(SERVICE_TYPE.OUTFIT); else filter.remove(SERVICE_TYPE.OUTFIT); diff --git a/client/src/main/java/ru/trader/controllers/StationEditorController.java b/client/src/main/java/ru/trader/controllers/StationEditorController.java index 5f1d11c..d6c6799 100644 --- a/client/src/main/java/ru/trader/controllers/StationEditorController.java +++ b/client/src/main/java/ru/trader/controllers/StationEditorController.java @@ -50,6 +50,8 @@ public class StationEditorController { @FXML private CheckBox cbMarket; @FXML + private CheckBox cbRefuel; + @FXML private CheckBox cbBlackMarket; @FXML private CheckBox cbRepair; @@ -101,6 +103,7 @@ public class StationEditorController { distance.numberProperty().bindBidirectional(updater.distanceProperty()); cbMarket.selectedProperty().bindBidirectional(updater.serviceProperty(SERVICE_TYPE.MARKET)); cbBlackMarket.selectedProperty().bindBidirectional(updater.serviceProperty(SERVICE_TYPE.BLACK_MARKET)); + cbRefuel.selectedProperty().bindBidirectional(updater.serviceProperty(SERVICE_TYPE.REFUEL)); cbMunition.selectedProperty().bindBidirectional(updater.serviceProperty(SERVICE_TYPE.MUNITION)); cbRepair.selectedProperty().bindBidirectional(updater.serviceProperty(SERVICE_TYPE.REPAIR)); cbOutfit.selectedProperty().bindBidirectional(updater.serviceProperty(SERVICE_TYPE.OUTFIT)); diff --git a/client/src/main/resources/lang/locale.properties b/client/src/main/resources/lang/locale.properties index e61e081..82855fd 100644 --- a/client/src/main/resources/lang/locale.properties +++ b/client/src/main/resources/lang/locale.properties @@ -25,6 +25,7 @@ services.REPAIR=Repair services.MUNITION=Munition services.OUTFIT=Outfit services.SHIPYARD=Shipyard +services.REFUEL=Refuel services.MEDIUM_LANDPAD=Medium Pad services.LARGE_LANDPAD=Large Pad diff --git a/client/src/main/resources/lang/locale_en_US.properties b/client/src/main/resources/lang/locale_en_US.properties index 8477c1f..b4fa8c4 100644 --- a/client/src/main/resources/lang/locale_en_US.properties +++ b/client/src/main/resources/lang/locale_en_US.properties @@ -35,6 +35,8 @@ routes.path=Path routes.jumps=Jumps routes.refills=Refills routes.lands=Landings +routes.time=Time +routes.profitByTime=Cr/Sec # Dialog dialog.confirm.save=Changes were not saved, save changes? diff --git a/client/src/main/resources/lang/locale_ru_RU.properties b/client/src/main/resources/lang/locale_ru_RU.properties index fdefa1d..54b7a0b 100644 --- a/client/src/main/resources/lang/locale_ru_RU.properties +++ b/client/src/main/resources/lang/locale_ru_RU.properties @@ -35,6 +35,8 @@ routes.path=\u041F\u0443\u0442\u044C routes.jumps=\u041F\u0440\u044B\u0436\u043A\u043E\u0432 routes.refills=\u0417\u0430\u043F\u0440\u0430\u0432\u043E\u043A routes.lands=\u041F\u043E\u0441\u0430\u0434\u043E\u043A +routes.time=\u0412\u0440\u0435\u043C\u044F +routes.profitByTime=\u041A\u0440/\u0421\u0435\u043A # Dialog dialog.confirm.save=\u0418\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u044F \u043D\u0435 \u0431\u044B\u043B\u0438 \u0441\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u044B, \u0441\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C? diff --git a/client/src/main/resources/lang/locale_ru_RU_FULL.properties b/client/src/main/resources/lang/locale_ru_RU_FULL.properties index d7f1b34..1be7f1b 100644 --- a/client/src/main/resources/lang/locale_ru_RU_FULL.properties +++ b/client/src/main/resources/lang/locale_ru_RU_FULL.properties @@ -21,12 +21,13 @@ government.PRISON_COLONY=\u0422\u044E\u0440\u0435\u043C\u043D\u0430\u044F \u043A government.THEOCRACY=\u0422\u0435\u043E\u043A\u0440\u0430\u0442\u0438\u044F government.NONE=\u041D\u0435\u0442 -services.MARKET=\u0420\u044B\u043D\u043E\u043A +services.MARKET=\u041F\u0440\u0435\u0434\u043C\u0435\u0442\u044B \u043F\u043E\u0442\u0440\u0435\u0431\u043B\u0435\u043D\u0438\u044F services.BLACK_MARKET=\u0427\u0435\u0440\u043D\u044B\u0439 \u0440\u044B\u043D\u043E\u043A -services.REPAIR=\u0420\u0435\u043C\u043E\u043D\u0442 -services.MUNITION=\u0411\u043E\u0435\u043F\u0440\u0438\u043F\u0430\u0441\u044B +services.REPAIR=\u041F\u043E\u0447\u0438\u043D\u043A\u0430 +services.MUNITION=\u041F\u0435\u0440\u0435\u0432\u043E\u043E\u0440\u0443\u0436\u0435\u043D\u0438\u0435 services.OUTFIT=\u0421\u043D\u0430\u0440\u044F\u0436\u0435\u043D\u0438\u044F services.SHIPYARD=\u041A\u043E\u0441\u043C\u043E\u0432\u0435\u0440\u0444\u044C +services.REFUEL=\u0414\u043E\u0437\u0430\u043F\u0440\u0430\u0432\u043A\u0430 services.MEDIUM_LANDPAD=\u0421\u0440\u0435\u0434\u043D\u044F\u044F services.LARGE_LANDPAD=\u0411\u043E\u043B\u044C\u0448\u0430\u044F item.group.chemicals=\u0425\u0438\u043C\u0438\u043A\u0430\u0442\u044B diff --git a/client/src/main/resources/view/filter.fxml b/client/src/main/resources/view/filter.fxml index a56506f..c8e1270 100644 --- a/client/src/main/resources/view/filter.fxml +++ b/client/src/main/resources/view/filter.fxml @@ -1,18 +1,7 @@ - - - - - - - - - - - + + - - - + @@ -27,9 +16,10 @@