add settings dialog

client/src/main/resources/lang/locale_en_US.properties

@@ -29,6 +29,13 @@ routes.jumps=Jumps
 routes.refills=Refills
 routes.lands=Landings
 
+# Dialog
+dialog.confirm.save=Changes were not saved, save changes?
+dialog.button.save=Save
+dialog.button.edit=Edit
+dialog.button.remove=Remove
+dialog.button.clear=Clear
+
 # main.fxml
 main.title=Trader
 main.menu.file=File
@@ -36,17 +43,15 @@ main.menu.file.save=Save
 main.menu.file.import=Import...
 main.menu.file.language=Language
 main.menu.file.language.item=English
+main.menu.file.settings=Settings
 main.menu.edit=Edit
 main.menu.edit.addStation=Add Station
 main.menu.edit.addItem=Add Commodity
 main.menu.edit.editStation=Edit Station
 
-# save confirm dialog
-dialogs.save=Changes were not saved, save changes?
-
 # add item dialog
-dialogs.addItem.title=Adding new commodity
-dialogs.addItem.message=Enter commodity name
+dialog.addItem.title=Adding new commodity
+dialog.addItem.message=Enter commodity name
 
 # items.fxml
 
@@ -69,7 +74,6 @@ orders.title=Create orders
 topOrders.title=TOP orders
 
 # vEditor.fxml
-vEditor.save=Save
 vEditor.title.add=Add Station
 vEditor.title.edit=Edit Station
 
@@ -86,9 +90,14 @@ router.pane.route=Route parameters
 router.pane.route.from=From:
 router.pane.route.to=To:
 router.pane.route.jumps=Jumps:
-route.button.edit=Edit
-route.button.remove=Remove
-route.button.clear=Clear
 route.button.top=TOP 100
 router.pane.total=Total
 router.pane.total.profit=Profit:
+
+# settings.fxml
+settings.title=Settings
+settings.emdn=Elite Market Data Network
+settings.emdn.on=Active
+settings.emdn.sub=Server SUB:
+settings.emdn.updateOnly=Update price only:
+settings.emdn.auto=Auto update (sec.):

client/src/main/resources/lang/locale_ru_RU.properties

@@ -29,6 +29,14 @@ 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
 
+# 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?
+dialog.button.save=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C
+dialog.button.edit=\u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C
+dialog.button.remove=\u0423\u0434\u0430\u043B\u0438\u0442\u044C
+dialog.button.clear=\u041E\u0447\u0438\u0441\u0442\u0438\u0442\u044C
+
+
 # main.fxml
 main.title=\u0422\u043E\u0440\u0433\u043E\u0439\u0434
 main.menu.file=\u0424\u0430\u0439\u043B
@@ -36,17 +44,16 @@ main.menu.file.save=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C
 main.menu.file.import=\u0418\u043C\u043F\u043E\u0440\u0442...
 main.menu.file.language=\u042F\u0437\u044B\u043A
 main.menu.file.language.item=\u0420\u0443\u0441\u0441\u043A\u0438\u0439
+main.menu.file.settings=\u041F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B
 main.menu.edit=\u041F\u0440\u0430\u0432\u043A\u0430
 main.menu.edit.addStation=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0441\u0442\u0430\u043D\u0446\u0438\u044E
 main.menu.edit.addItem=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0442\u043E\u0432\u0430\u0440
 main.menu.edit.editStation=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u0441\u0442\u0430\u043D\u0446\u0438\u044E
 
-# save confirm dialog
-dialogs.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?
 
 # add item dialog
-dialogs.addItem.title=\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u043D\u043E\u0432\u043E\u0433\u043E \u0442\u043E\u0432\u0430\u0440\u0430
-dialogs.addItem.message=\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 \u0442\u043E\u0432\u0430\u0440\u0430
+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
+dialog.addItem.message=\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 \u0442\u043E\u0432\u0430\u0440\u0430
 
 # items.fxml
 
@@ -69,7 +76,6 @@ orders.title=\u0421\u043E\u0437\u0434\u0430\u043D\u0438\u0435 \u0437\u0430\u043A
 topOrders.title=TOP \u0437\u0430\u043A\u0430\u0437\u043E\u0432
 
 # vEditor.fxml
-vEditor.save=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C
 vEditor.title.add=\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u0441\u0442\u0430\u043D\u0446\u0438\u0438
 vEditor.title.edit=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u0435 \u0441\u0442\u0430\u043D\u0446\u0438\u0438
 
@@ -86,9 +92,15 @@ router.pane.route=\u041F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B \u043C\
 router.pane.route.from=\u041E\u0442:
 router.pane.route.to=\u0414\u043E:
 router.pane.route.jumps=\u041F\u0440\u044B\u0436\u043A\u043E\u0432:
-route.button.edit=\u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C
-route.button.remove=\u0423\u0434\u0430\u043B\u0438\u0442\u044C
-route.button.clear=\u041E\u0447\u0438\u0441\u0442\u0438\u0442\u044C
 route.button.top=TOP 100
 router.pane.total=\u0418\u0442\u043E\u0433\u043E
 router.pane.total.profit=\u041F\u0440\u0438\u0431\u044B\u043B\u044C:
+
+# settings.fxml
+settings.title=\u041F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u044B
+settings.emdn=Elite Market Data Network
+settings.emdn.on=\u0412\u043A\u043B\u044E\u0447\u0438\u0442\u044C
+settings.emdn.sub=\u0421\u0435\u0440\u0432\u0435\u0440 SUB:
+settings.emdn.updateOnly=\u0422\u043E\u043B\u044C\u043A\u043E \u043E\u0431\u043D\u043E\u0432\u043B\u044F\u0442\u044C \u0446\u0435\u043D\u044B:
+settings.emdn.auto=\u041E\u0431\u043D\u043E\u0432\u043B\u044F\u0442\u044C \u0430\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 \u0447\u0435\u0440\u0435\u0437 (\u0441\u0435\u043A.):
+

client/src/main/resources/view/main.fxml

@@ -12,6 +12,7 @@
            <Menu text="%main.menu.file">
                <MenuItem text="%main.menu.file.save" onAction="#save"/>
                <MenuItem text="%main.menu.file.import" onAction="#importWorld"/>
+               <MenuItem text="%main.menu.file.settings" onAction="#editSettings"/>
                <Menu fx:id="langs" text="%main.menu.file.language"/>
            </Menu>
            <Menu text="%main.menu.edit">

client/src/main/resources/view/router.fxml

@@ -47,9 +47,9 @@
                 <Separator GridPane.columnSpan="2" GridPane.rowIndex="3" GridPane.margin="$separator_margin"/>
                 <VBox GridPane.columnSpan="2" GridPane.rowIndex="4" spacing="5">
                     <HBox alignment="CENTER" spacing="5">
-                        <Button fx:id="editBtn" text="%route.button.edit" onAction="#editOrders"/>
-                        <Button fx:id="removeBtn" text="%route.button.remove" onAction="#removeSelected"/>
-                        <Button text="%route.button.clear" onAction="#removeAll" />
+                        <Button fx:id="editBtn" text="%dialog.button.edit" onAction="#editOrders"/>
+                        <Button fx:id="removeBtn" text="%dialog.button.remove" onAction="#removeSelected"/>
+                        <Button text="%dialog.button.clear" onAction="#removeAll" />
                     </HBox>
                     <HBox alignment="CENTER" spacing="5">
                         <Button prefWidth="80" text="%market.offers" onAction="#showOrders" />

client/src/main/resources/view/settings.fxml

@@ -0,0 +1,26 @@
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.control.Label?>
+<?import ru.trader.view.support.NumberField?>
+
+<?import ru.trader.view.support.TitledBorder?>
+
+<?import javafx.scene.control.CheckBox?>
+<?import javafx.scene.control.TextField?>
+<GridPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ru.trader.controllers.SettingsController"
+              styleClass="dialog" vgap="4" hgap="8">
+        <columnConstraints>
+            <ColumnConstraints />
+            <ColumnConstraints minWidth="260"  maxWidth="260"/>
+        </columnConstraints>
+        <Label text="%settings.emdn" styleClass="settings-group" GridPane.halignment="CENTER" GridPane.columnSpan="2"/>
+        <Label text="%settings.emdn.on" GridPane.rowIndex="1"/>
+        <CheckBox fx:id="emdnOn" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
+        <Label text="%settings.emdn.sub" GridPane.rowIndex="2" />
+        <TextField fx:id="emdnSubServ" GridPane.columnIndex="1" GridPane.rowIndex="2" />
+        <Label text="%settings.emdn.updateOnly" GridPane.rowIndex="3" />
+        <CheckBox fx:id="emdnUpdateOnly" GridPane.columnIndex="1" GridPane.rowIndex="3" />
+        <Label text="%settings.emdn.auto" GridPane.rowIndex="4" />
+        <NumberField fx:id="emdnUpdateTime" maxWidth="100" GridPane.columnIndex="1" GridPane.rowIndex="4" />
+</GridPane>
+

client/src/main/resources/view/style.css

@@ -49,6 +49,10 @@ HBox.fields-group hbox-margin{
     -fx-alignment: center;
 }
 
+.settings-group {
+    -fx-font-weight: bold;
+}
+
 
 /*   Path      */
 .path {