Voomra/trader
Archived
0
Fork 0
Code Activity

implement filter for market analyzer

Browse Source
This commit is contained in:
iMoHax
2015-01-07 18:27:32 +03:00
parent 00d8f6e084
commit 9b1c975125
16 changed files with 757 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/src/main/resources/lang/locale_en_US.properties
View File

@@ -57,6 +57,7 @@ main.menu.settings=Settings
main.menu.settings.language=Language
main.menu.settings.language.item=English
main.menu.settings.parameters=Preferences
main.menu.settings.filter=Filter
# add item dialog
dialog.addItem.title=Adding new commodity
@@ -123,3 +124,11 @@ settings.performance.limit=Routes count:
sEditor.title=Star systems editor
sEditor.text.orientates=Landmarks:
sEditor.table.distance=Distance (LY)
# filter.fxml
filter.title=Edit Filter
filter.center=Center:
filter.radius=Rsdius(LY):
filter.distance=Distance to station(Ls):
filter.services=Services:
filter.excludes=Excludes stations:

10
client/src/main/resources/lang/locale_ru_RU.properties
View File

@@ -58,7 +58,7 @@ main.menu.settings=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438
main.menu.settings.language=\u042F\u0437\u044B\u043A
main.menu.settings.language.item=\u0420\u0443\u0441\u0441\u043A\u0438\u0439
main.menu.settings.parameters=\u041F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B
main.menu.settings.filter=\u0424\u0438\u043B\u044C\u0442\u0440
# add item dialog
dialog.addItem.title=\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u043D\u043E\u0432\u043E\u0433\u043E \u0442\u043E\u0432\u0430\u0440\u0430
@@ -124,3 +124,11 @@ settings.performance.limit=\u041A\u043E\u043B-\u0432\u043E \u043C\u0430\u0440\u0
sEditor.title=\u0420\u0435\u0434\u0430\u043A\u0442\u043E\u0440 \u0437\u0432\u0435\u0437\u0434\u043D\u044B\u0445 \u0441\u0438\u0441\u0442\u0435\u043C
sEditor.text.orientates=\u041E\u0440\u0438\u0435\u043D\u0442\u0438\u0440\u044B:
sEditor.table.distance=\u0414\u0438\u0441\u0442\u0430\u043D\u0446\u0438\u044F (LY)
# filter.fxml
filter.title=\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0430 \u0444\u0438\u043B\u044C\u0442\u0440\u0430
filter.center=\u0426\u0435\u043D\u0442\u0440:
filter.radius=\u0420\u0430\u0434\u0438\u0443\u0441(LY):
filter.distance=\u0414\u0438\u0441\u0442\u0430\u043D\u0446\u0438\u044F \u0434\u043E \u0441\u0442\u0430\u043D\u0446\u0438\u0438(Ls):
filter.services=\u0421\u0435\u0440\u0432\u0438\u0441\u044B:
filter.excludes=\u0418\u0441\u043A\u043B\u044E\u0447\u0430\u0435\u043C\u044B\u0435 \u0441\u0442\u0430\u043D\u0446\u0438\u0438:

52
client/src/main/resources/view/filter.fxml Normal file
View File

@@ -0,0 +1,52 @@
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.control.Label?>
<?import ru.trader.view.support.NumberField?>
<?import javafx.scene.control.CheckBox?>
<?import javafx.scene.control.ComboBox?>
<?import javafx.scene.layout.TilePane?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.layout.HBox?>
<?import org.controlsfx.glyphfont.Glyph?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.ListView?>
<GridPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ru.trader.controllers.FilterController"
styleClass="dialog" vgap="4" hgap="8">
<columnConstraints>
<ColumnConstraints minWidth="180" maxWidth="180"/>
<ColumnConstraints minWidth="220" maxWidth="220"/>
</columnConstraints>
<Label text="%filter.title" styleClass="settings-group" GridPane.halignment="CENTER" GridPane.columnSpan="2"/>
<Label text="%filter.center" GridPane.rowIndex="1"/>
<ComboBox fx:id="center" GridPane.columnIndex="1" GridPane.rowIndex="1" minWidth="220"/>
<Label text="%filter.radius" GridPane.rowIndex="2" />
<NumberField fx:id="radius" GridPane.columnIndex="1" GridPane.rowIndex="2" />
<Label text="%filter.distance" GridPane.rowIndex="3" />
<NumberField fx:id="distance" GridPane.columnIndex="1" GridPane.rowIndex="3" />
<Label text="%filter.services" GridPane.rowIndex="4" />
<TilePane hgap="5" vgap="5" tileAlignment="BASELINE_LEFT" GridPane.columnIndex="1" GridPane.rowIndex="4" >
<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"/>
</TilePane>
<Label text="%filter.excludes" GridPane.rowIndex="5" />
<VBox GridPane.rowIndex="6" spacing="4">
<ComboBox fx:id="system" minWidth="180"/>
<ComboBox fx:id="station" minWidth="180"/>
<HBox spacing="2" alignment="BASELINE_RIGHT">
<Button prefWidth="30" onAction="#add"><graphic><Glyph text="FontAwesome|PLUS"/></graphic></Button>
<Button prefWidth="30" onAction="#remove"><graphic><Glyph text="FontAwesome|MINUS"/></graphic></Button>
<Button prefWidth="30" onAction="#clean"><graphic><Glyph text="FontAwesome|TRASH_ALT"/></graphic></Button>
</HBox>
</VBox>
<ListView fx:id="excludes" GridPane.rowIndex="6" GridPane.columnIndex="1" maxHeight="200"/>
</GridPane>

1
client/src/main/resources/view/main.fxml
View File

@@ -22,6 +22,7 @@
<MenuItem text="%main.menu.edit.removeStation" onAction="#removeStation"/>
</Menu>
<Menu text="%main.menu.settings">
<MenuItem text="%main.menu.settings.filter" onAction="#editFilter"/>
<MenuItem text="%main.menu.settings.parameters" onAction="#editSettings"/>
<Menu fx:id="langs" text="%main.menu.settings.language"/>
</Menu>