From 7ceccb63ccb4300847c16820c124133bd6315d75 Mon Sep 17 00:00:00 2001 From: iMoHax Date: Mon, 21 Mar 2016 15:19:43 +0300 Subject: [PATCH] add missing field to offers screen --- .../trader/controllers/OffersController.java | 25 ++++++-- .../resources/lang/locale_en_US.properties | 15 ++++- .../resources/lang/locale_ru_RU.properties | 15 ++++- client/src/main/resources/view/offers.fxml | 63 +++++++++++-------- 4 files changed, 83 insertions(+), 35 deletions(-) diff --git a/client/src/main/java/ru/trader/controllers/OffersController.java b/client/src/main/java/ru/trader/controllers/OffersController.java index 7fbb733..3d4e244 100644 --- a/client/src/main/java/ru/trader/controllers/OffersController.java +++ b/client/src/main/java/ru/trader/controllers/OffersController.java @@ -11,10 +11,7 @@ import ru.trader.core.SERVICE_TYPE; import ru.trader.model.*; import ru.trader.model.support.BindingsHelper; import ru.trader.model.support.ChangeMarketListener; -import ru.trader.view.support.FactionStringConverter; -import ru.trader.view.support.GovernmentStringConverter; -import ru.trader.view.support.Localization; -import ru.trader.view.support.ViewUtils; +import ru.trader.view.support.*; import ru.trader.view.support.autocomplete.AutoCompletion; import ru.trader.view.support.autocomplete.CachedSuggestionProvider; import ru.trader.view.support.autocomplete.SystemsProvider; @@ -38,12 +35,18 @@ public class OffersController { @FXML private TableView tblBuy; @FXML + private Label type; + @FXML private Label faction; @FXML private Label government; @FXML private Label distance; @FXML + private Label economic; + @FXML + private Label subeconomic; + @FXML private CheckBox cbMarket; @FXML private CheckBox cbBlackMarket; @@ -134,9 +137,12 @@ public class OffersController { sells.clear(); buys.clear(); stationPane.setText(station.getName()); + type.setText(""); distance.setText(""); government.setText(""); faction.setText(""); + economic.setText(""); + subeconomic.setText(""); cbMarket.setSelected(false); cbBlackMarket.setSelected(false); cbRefuel.setSelected(false); @@ -147,9 +153,12 @@ public class OffersController { cbMediumLandpad.setSelected(false); cbLargeLandpad.setSelected(false); if (!ModelFabric.isFake(station)){ + type.setText(StationTypeStringConverter.toLocalizationString(station.getType())); faction.setText(FactionStringConverter.toLocalizationString(station.getFaction())); government.setText(GovernmentStringConverter.toLocalizationString(station.getGovernment())); distance.setText(String.valueOf(station.getDistance())); + economic.setText(EconomicTypeStringConverter.toLocalizationString(station.getEconomic())); + subeconomic.setText(EconomicTypeStringConverter.toLocalizationString(station.getSubEconomic())); cbMarket.setSelected(station.hasService(SERVICE_TYPE.MARKET)); cbBlackMarket.setSelected(station.hasService(SERVICE_TYPE.BLACK_MARKET)); cbRefuel.setSelected(station.hasService(SERVICE_TYPE.REFUEL)); @@ -196,6 +205,14 @@ public class OffersController { system.setValue(profile.getSystem()); } + @FXML + private void editSystem() { + SystemModel s = getSystem(); + if (!ModelFabric.isFake(s)){ + Screeners.showSystemsEditor(s); + } + } + @FXML private void addStation() { SystemModel s = getSystem(); diff --git a/client/src/main/resources/lang/locale_en_US.properties b/client/src/main/resources/lang/locale_en_US.properties index 1be374f..2c990f0 100644 --- a/client/src/main/resources/lang/locale_en_US.properties +++ b/client/src/main/resources/lang/locale_en_US.properties @@ -130,8 +130,6 @@ itemDesc.sellers=Sellers: itemDesc.buyers=Buyers: # offers.fxml -offers.text.distance=Distance: -offers.text.services=Services: offers.pane.sell=Selling commodities offers.pane.buy=Buying commodities @@ -267,4 +265,15 @@ helper.items=Commodities: #messages message.wrongNumber=Wrong number -message.wrongDuration=Wrong duration format, use like 1w1d1h1m1s \ No newline at end of file +message.wrongDuration=Wrong duration format, use like 1w1d1h1m1s + +#labels +label.allegiance=${market.allegiance}: +label.government=${market.government}: +label.economic=${market.economic}: +label.power=${market.power}: +label.powerState=${market.powerState}: +label.station.name=${market.station.name}: +label.station.distance=${market.station.distance}: +label.station.services=${market.station.services}: +label.station.type=${market.station.type}: \ No newline at end of file diff --git a/client/src/main/resources/lang/locale_ru_RU.properties b/client/src/main/resources/lang/locale_ru_RU.properties index 4194bea..1de64b5 100644 --- a/client/src/main/resources/lang/locale_ru_RU.properties +++ b/client/src/main/resources/lang/locale_ru_RU.properties @@ -131,8 +131,6 @@ itemDesc.sellers=\u041F\u0440\u043E\u0434\u0430\u0432\u0446\u044B: itemDesc.buyers=\u041F\u043E\u043A\u0443\u043F\u0430\u0442\u0435\u043B\u0438: # offers.fxml -offers.text.distance=\u0414\u0438\u0441\u0442\u0430\u043D\u0446\u0438\u044F: -offers.text.services=\u0421\u0435\u0440\u0432\u0438\u0441\u044B: offers.pane.sell=\u041F\u0440\u043E\u0434\u0430\u0432\u0430\u0435\u043C\u044B\u0435 \u0442\u043E\u0432\u0430\u0440\u044B offers.pane.buy=\u041F\u043E\u043A\u0443\u043F\u0430\u0435\u043C\u044B\u0435 \u0442\u043E\u0432\u0430\u0440\u044B @@ -268,4 +266,15 @@ helper.items=\u0422\u043E\u0432\u0430\u0440\u044B: #messages message.wrongNumber=\u0414\u043E\u0441\u0442\u0443\u043F\u043D\u044B \u0442\u043E\u043B\u044C\u043A\u043E \u0446\u0438\u0444\u0440\u044B -message.wrongDuration=\u041D\u0435\u0432\u0435\u0440\u043D\u044B\u0439 \u0444\u043E\u0440\u043C\u0430\u0442 \u043F\u0435\u0440\u0438\u043E\u0434\u0430, \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0439\u0442\u0435 \u0444\u043E\u0440\u043C\u0430\u0442 1w1d1h1m1s \ No newline at end of file +message.wrongDuration=\u041D\u0435\u0432\u0435\u0440\u043D\u044B\u0439 \u0444\u043E\u0440\u043C\u0430\u0442 \u043F\u0435\u0440\u0438\u043E\u0434\u0430, \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u0443\u0439\u0442\u0435 \u0444\u043E\u0440\u043C\u0430\u0442 1w1d1h1m1s + +#labels +label.allegiance=${market.allegiance}: +label.government=${market.government}: +label.economic=${market.economic}: +label.power=${market.power}: +label.powerState=${market.powerState}: +label.station.name=${market.station.name}: +label.station.distance=${market.station.distance}: +label.station.services=${market.station.services}: +label.station.type=${market.station.type}: \ No newline at end of file diff --git a/client/src/main/resources/view/offers.fxml b/client/src/main/resources/view/offers.fxml index af0bc26..9343f69 100644 --- a/client/src/main/resources/view/offers.fxml +++ b/client/src/main/resources/view/offers.fxml @@ -27,6 +27,8 @@ + + @@ -36,32 +38,43 @@ - - - - - - - + + + + + + + + + + +