- implement add item dialog
- implement add group dialog - implement remove system and station - small fixes
This commit is contained in:
@@ -35,6 +35,7 @@ routes.lands=Landings
|
||||
|
||||
# Dialog
|
||||
dialog.confirm.save=Changes were not saved, save changes?
|
||||
dialog.confirm.remove=Are you sure you want to delete %s?
|
||||
dialog.button.save=Save
|
||||
dialog.button.edit=Edit
|
||||
dialog.button.remove=Remove
|
||||
@@ -60,8 +61,13 @@ main.menu.settings.parameters=Preferences
|
||||
main.menu.settings.filter=Filter
|
||||
|
||||
# add item dialog
|
||||
dialog.addItem.title=Adding new commodity
|
||||
dialog.addItem.message=Enter commodity name
|
||||
dialog.item.title=Adding new commodity
|
||||
dialog.item.id=ID:
|
||||
dialog.item.group=Group:
|
||||
# add group dialog
|
||||
dialog.group.title=Adding new group
|
||||
dialog.group.id=ID:
|
||||
dialog.group.type=Type:
|
||||
|
||||
# items.fxml
|
||||
|
||||
@@ -105,7 +111,7 @@ router.pane.route=Route parameters
|
||||
router.pane.route.from=From:
|
||||
router.pane.route.to=To:
|
||||
router.pane.route.jumps=Jumps:
|
||||
route.button.top=TOP 100
|
||||
router.button.top=TOP 100
|
||||
router.pane.total=Total
|
||||
router.pane.total.profit=Profit:
|
||||
|
||||
|
||||
@@ -35,6 +35,7 @@ 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.confirm.remove=\u0412\u044B \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043B\u044C\u043D\u043E \u0445\u043E\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043B\u0438\u0442\u044C %s?
|
||||
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
|
||||
@@ -61,8 +62,13 @@ main.menu.settings.parameters=\u041F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u
|
||||
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
|
||||
dialog.addItem.message=\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 \u0442\u043E\u0432\u0430\u0440\u0430
|
||||
dialog.item.title=\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u043D\u043E\u0432\u043E\u0433\u043E \u0442\u043E\u0432\u0430\u0440\u0430
|
||||
dialog.item.id=ID:
|
||||
dialog.item.group=\u0413\u0440\u0443\u043F\u043F\u0430:
|
||||
# add group dialog
|
||||
dialog.group.title=\u0414\u043E\u0431\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u043D\u043E\u0432\u043E\u0439 \u0433\u0440\u0443\u043F\u043F\u044B
|
||||
dialog.group.id=ID:
|
||||
dialog.group.type=\u0422\u0438\u043F:
|
||||
|
||||
# items.fxml
|
||||
|
||||
@@ -105,7 +111,7 @@ 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.top=TOP 100
|
||||
router.button.top=TOP 100
|
||||
router.pane.total=\u0418\u0442\u043E\u0433\u043E
|
||||
router.pane.total.profit=\u041F\u0440\u0438\u0431\u044B\u043B\u044C:
|
||||
|
||||
|
||||
15
client/src/main/resources/view/groupAdd.fxml
Normal file
15
client/src/main/resources/view/groupAdd.fxml
Normal file
@@ -0,0 +1,15 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<?import javafx.scene.control.*?>
|
||||
<?import javafx.scene.layout.*?>
|
||||
|
||||
|
||||
<HBox xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
|
||||
styleClass="dialog"
|
||||
fx:controller="ru.trader.controllers.GroupAddController" spacing="4">
|
||||
<Label text="%dialog.group.id"/>
|
||||
<TextField fx:id="name" minWidth="200"/>
|
||||
<Label text="%dialog.group.type"/>
|
||||
<ComboBox fx:id="type" minWidth="200"/>
|
||||
|
||||
</HBox>
|
||||
16
client/src/main/resources/view/itemAdd.fxml
Normal file
16
client/src/main/resources/view/itemAdd.fxml
Normal file
@@ -0,0 +1,16 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<?import javafx.scene.control.*?>
|
||||
<?import javafx.scene.layout.*?>
|
||||
|
||||
|
||||
<?import org.controlsfx.glyphfont.Glyph?>
|
||||
<HBox xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
|
||||
styleClass="dialog"
|
||||
fx:controller="ru.trader.controllers.ItemAddController" spacing="4">
|
||||
<Label text="%dialog.item.id"/>
|
||||
<TextField fx:id="name" minWidth="200"/>
|
||||
<Label text="%dialog.item.group"/>
|
||||
<ComboBox fx:id="group" minWidth="200"/>
|
||||
<Button prefWidth="30" onAction="#add"><graphic><Glyph text="FontAwesome|PLUS"/></graphic></Button>
|
||||
</HBox>
|
||||
@@ -56,11 +56,11 @@
|
||||
</HBox>
|
||||
<HBox alignment="CENTER" spacing="5">
|
||||
<Button prefWidth="80" text="%market.offers" onAction="#showOrders" />
|
||||
<Button text="%route.button.top" onAction="#showTopOrders" />
|
||||
<Button text="%router.button.top" onAction="#showTopOrders" />
|
||||
</HBox>
|
||||
<HBox alignment="CENTER" spacing="5">
|
||||
<Button prefWidth="80" text="%routes" onAction="#showRoutes" />
|
||||
<Button text="%route.button.top" onAction="#showTopRoutes" />
|
||||
<Button text="%router.button.top" onAction="#showTopRoutes" />
|
||||
</HBox>
|
||||
</VBox>
|
||||
</GridPane>
|
||||
|
||||
Reference in New Issue
Block a user