diff --git a/client/src/main/java/ru/trader/controllers/VendorFilterController.java b/client/src/main/java/ru/trader/controllers/VendorFilterController.java index e2fb177..22e2927 100644 --- a/client/src/main/java/ru/trader/controllers/VendorFilterController.java +++ b/client/src/main/java/ru/trader/controllers/VendorFilterController.java @@ -33,6 +33,8 @@ public class VendorFilterController { private CheckBox cbDontBuy; @FXML private CheckBox cbSkipIllegal; + @FXML + private CheckBox cbIllegalOnly; private VendorFilter filter; private Dialog dlg; @@ -89,6 +91,7 @@ public class VendorFilterController { private void fill(VendorFilter filter){ this.filter = filter; + cbIllegalOnly.setSelected(filter.isIllegalOnly()); cbSkipIllegal.setSelected(filter.isSkipIllegal()); cbDontSell.setSelected(filter.isDontSell()); cbDontBuy.setSelected(filter.isDontBuy()); @@ -112,6 +115,7 @@ public class VendorFilterController { private void save() { LOG.trace("Old filter", filter); + filter.setIllegalOnly(cbIllegalOnly.isSelected()); filter.setSkipIllegal(cbSkipIllegal.isSelected()); filter.dontSell(cbDontSell.isSelected()); filter.dontBuy(cbDontBuy.isSelected()); diff --git a/client/src/main/resources/lang/locale_en_US.properties b/client/src/main/resources/lang/locale_en_US.properties index ea2ab3f..4c35026 100644 --- a/client/src/main/resources/lang/locale_en_US.properties +++ b/client/src/main/resources/lang/locale_en_US.properties @@ -213,6 +213,7 @@ filter.stations.global=Default filter # vFilter.fxml filter.stations.legalOnly=Legals only +filter.stations.illegalOnly=Sell illegal only filter.stations.notBuy=Don't buy filter.stations.notSell=Don't sell filter.stations.label.notBuy=Don't buy: diff --git a/client/src/main/resources/lang/locale_ru_RU.properties b/client/src/main/resources/lang/locale_ru_RU.properties index 1f1f5d2..ce54428 100644 --- a/client/src/main/resources/lang/locale_ru_RU.properties +++ b/client/src/main/resources/lang/locale_ru_RU.properties @@ -213,6 +213,7 @@ filter.stations.global=\u0413\u043B\u043E\u0431\u0430\u043B\u044C\u043D\u044B\u0 # vFilter.fxml filter.stations.legalOnly=\u0422\u043E\u043B\u044C\u043A\u043E \u043B\u0435\u0433\u0430\u043B\u044C\u043D\u044B\u0435 +filter.stations.illegalOnly=\u0422\u043E\u043B\u044C\u043A\u043E \u043A\u043E\u043D\u0442\u0440\u0430\u0431\u0430\u043D\u0434\u0430 filter.stations.notBuy=\u041D\u0435 \u043F\u043E\u043A\u0443\u043F\u0430\u0442\u044C filter.stations.notSell=\u041D\u0435 \u043F\u0440\u043E\u0434\u0430\u0432\u0430\u0442\u044C filter.stations.label.notBuy=\u041D\u0435 \u043F\u043E\u043A\u0443\u043F\u0430\u0442\u044C: diff --git a/client/src/main/resources/view/vFilter.fxml b/client/src/main/resources/view/vFilter.fxml index 159778f..a1a51d4 100644 --- a/client/src/main/resources/view/vFilter.fxml +++ b/client/src/main/resources/view/vFilter.fxml @@ -3,11 +3,13 @@ + + + -