Voomra/trader
Archived
0
Fork 0
Code Activity

modify UI

Browse Source
This commit is contained in:
Mo
2015-10-27 14:22:56 +03:00
parent 6d706e00dd
commit 84585b5936
24 changed files with 485 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import javafx.scene.layout.BorderPane?>
<?import javafx.scene.layout.VBox?>
<BorderPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="ru.trader.controllers.MainController"
fx:id="mainPane"
@@ -48,7 +48,7 @@
</VBox>
</top>
<center>
<TabPane tabClosingPolicy="UNAVAILABLE" BorderPane.alignment="CENTER">
<TabPane fx:id="tabs" tabClosingPolicy="UNAVAILABLE" BorderPane.alignment="CENTER">
<Tab text="%market.items">
<fx:include fx:id="items" source="items.fxml"/>
</Tab>
@@ -56,15 +56,12 @@
<fx:include fx:id="offers" source="offers.fxml"/>
</Tab>
<Tab text="%main.tab.routes">
<fx:include fx:id="router" source="router.fxml"/>
<fx:include source="routeSearch.fxml"/>
</Tab>
<Tab text="%main.tab.search">
<fx:include source="search.fxml"/>
</Tab>
<Tab text="Маршрут">
<fx:include source="routeSearch.fxml"/>
</Tab>
<Tab text="Миссии">
<Tab fx:id="track" text="Текущий маршрут">
<fx:include source="routeTrack.fxml"/>
</Tab>
</TabPane>

86
client/src/main/resources/view/missions.fxml
View File

@@ -1,71 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.geometry.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.image.*?>
<?import javafx.scene.layout.*?>
<?import org.controlsfx.glyphfont.Glyph?>
<?import ru.trader.view.support.NumberField?>
<?import ru.trader.view.support.cells.ItemListCell?>
<?import ru.trader.view.support.ItemStringConverter?>
<?import ru.trader.view.support.NumberField?>
<GridPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="ru.trader.controllers.MissionsController"
hgap="10" vgap="5">
<columnConstraints>
<ColumnConstraints minWidth="180" />
<ColumnConstraints minWidth="180" />
<ColumnConstraints minWidth="180" />
<ColumnConstraints minWidth="100" maxWidth="100"/>
<ColumnConstraints minWidth="140" maxWidth="140"/>
</columnConstraints>
<Label text="Курьерские"/>
<HBox GridPane.rowIndex="1">
<Label text="Доставить на:"/>
<TextField fx:id="receiverText" prefWidth="160"/>
<HBox spacing="4" GridPane.columnSpan="2" alignment="CENTER">
<ToggleButton fx:id="courierBtn"><graphic>
<ImageView fitWidth="30" preserveRatio="true" pickOnBounds="true" smooth="true">
<image><Image url="@/images/courier_mission.jpg" /></image>
</ImageView></graphic>
</ToggleButton>
<ToggleButton fx:id="deliveryBtn"><graphic>
<ImageView fitWidth="30" preserveRatio="true" pickOnBounds="true" smooth="true">
<image><Image url="@/images/transport_mission.jpg" /></image>
</ImageView></graphic>
</ToggleButton>
<ToggleButton fx:id="supplyBtn"><graphic>
<ImageView fitWidth="30" preserveRatio="true" pickOnBounds="true" smooth="true">
<image><Image url="@/images/delivering_mission.jpg" /></image>
</ImageView></graphic>
</ToggleButton>
</HBox>
<HBox GridPane.rowIndex="3">
<Label text="Прибыль:"/>
<NumberField fx:id="courierProfit" value="0" />
</HBox>
<Button fx:id="addCourierBtn" prefWidth="30" onAction="#addCourier" GridPane.rowIndex="4">
<graphic><Glyph text="FontAwesome|PLUS"/></graphic>
</Button>
<Label text="Доставка" GridPane.columnIndex="1"/>
<HBox GridPane.rowIndex="1" GridPane.columnIndex="1">
<Label text="Доставить на:"/>
<TextField fx:id="buyerText" prefWidth="160"/>
</HBox>
<HBox GridPane.rowIndex="2" GridPane.columnIndex="1">
<Label text="Кол-во:"/>
<NumberField fx:id="deliveryCount" value="0"/>
</HBox>
<HBox GridPane.rowIndex="3" GridPane.columnIndex="1">
<Label text="Прибыль:"/>
<NumberField fx:id="deliveryProfit" value="0"/>
</HBox>
<Button fx:id="addDeliveryBtn" prefWidth="30" onAction="#addDelivery" GridPane.rowIndex="4" GridPane.columnIndex="1">
<graphic><Glyph text="FontAwesome|PLUS"/></graphic>
</Button>
<Label text="Поставка" GridPane.columnIndex="2"/>
<HBox GridPane.rowIndex="1" GridPane.columnIndex="2">
<Label text="Товар:"/>
<ComboBox fx:id="item" prefWidth="160">
<cellFactory><ItemListCell /></cellFactory>
<converter><ItemStringConverter /></converter>
</ComboBox>
</HBox>
<HBox GridPane.rowIndex="2" GridPane.columnIndex="2">
<Label text="Кол-во:"/>
<NumberField fx:id="supplyCount" value="0"/>
</HBox>
<HBox GridPane.rowIndex="3" GridPane.columnIndex="2">
<Label text="Прибыль:"/>
<NumberField fx:id="supplyProfit" value="0"/>
</HBox>
<Button fx:id="addSupplyBtn" prefWidth="30" onAction="#addSupply" GridPane.rowIndex="4" GridPane.columnIndex="2">
<graphic><Glyph text="FontAwesome|PLUS"/></graphic>
</Button>
<Label GridPane.rowIndex="1" text="%missions.label.starport"/>
<TextField fx:id="starportText" GridPane.rowIndex="1" GridPane.columnIndex="1"/>
<Label GridPane.rowIndex="2" text="%missions.label.cargo"/>
<ComboBox fx:id="cargo" GridPane.rowIndex="2" GridPane.columnIndex="1">
<cellFactory><ItemListCell /></cellFactory>
<converter><ItemStringConverter /></converter>
</ComboBox>
<Label GridPane.rowIndex="3" text="%missions.label.quantity"/>
<NumberField fx:id="quantity" GridPane.rowIndex="3" GridPane.columnIndex="1" value="0"/>
<Label GridPane.rowIndex="4" text="%missions.label.reward"/>
<NumberField fx:id="reward" GridPane.rowIndex="4" GridPane.columnIndex="1" value="0" />
</GridPane>

23
client/src/main/resources/view/offers.fxml
View File

@@ -4,10 +4,10 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.control.cell.*?>
<?import javafx.scene.layout.*?>
<?import org.controlsfx.control.SegmentedButton?>
<?import ru.trader.view.support.cells.*?>
<GridPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="ru.trader.controllers.OffersController">
fx:controller="ru.trader.controllers.OffersController"
prefHeight="500">
<fx:define><Insets fx:id="stationsMargin" left="5" right="5" /></fx:define>
<fx:define><Insets fx:id="stationsPadding" left="12" right="10" /></fx:define>
@@ -17,14 +17,15 @@
<ColumnConstraints fillWidth="true"/>
</columnConstraints>
<TitledPane GridPane.rowSpan="3" text="%market.systems" minWidth="270" prefHeight="590" collapsible="false">
<TextField fx:id="systemText" />
</TitledPane>
<TitledPane GridPane.columnIndex="1" text="%market.stations" maxHeight="60" collapsible="false">
<SegmentedButton fx:id="stationsBar" />
</TitledPane>
<TitledPane GridPane.rowIndex="1" GridPane.columnIndex="1" text="" maxHeight="60" collapsible="false">
<VBox GridPane.rowSpan="2" GridPane.vgrow="ALWAYS" minWidth="270">
<TitledPane text="%market.system.name" collapsible="false">
<TextField fx:id="systemText" />
</TitledPane>
<TitledPane VBox.vgrow="ALWAYS" text="%market.stations" collapsible="false">
<ListView fx:id="stationsList"/>
</TitledPane>
</VBox>
<TitledPane fx:id="stationPane" GridPane.columnIndex="1" maxHeight="60" collapsible="false">
<VBox>
<HBox spacing="4">
<Label text="%offers.text.distance"/>
@@ -51,7 +52,7 @@
</VBox>
</TitledPane>
<Accordion GridPane.rowIndex="2" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.vgrow="ALWAYS">
<Accordion GridPane.rowIndex="1" GridPane.columnIndex="1" GridPane.hgrow="ALWAYS" GridPane.vgrow="ALWAYS">
<panes>
<TitledPane fx:id="paneSells" animated="false" text="%offers.pane.sell">
<TableView fx:id="tblSell" editable="true">

12
client/src/main/resources/view/profile.fxml
View File

@@ -11,19 +11,23 @@
<Label text="Имя:" />
<TextField fx:id="name" />
<StackPane>
<HBox fx:id="profileInfo">
<HBox fx:id="profileInfo" spacing="4">
<Label text="Баланс:" />
<NumberField fx:id="balance" />
<Label text="Система:" />
<TextField fx:id="systemText" />
<Button fx:id="btnAddSystem"/>
<Button fx:id="btnAddSystem" minWidth="30">
<graphic><Glyph text="FontAwesome|EDIT"/></graphic>
</Button>
<Label text="Станция:" />
<ComboBox fx:id="station" />
<Button fx:id="btnAddStation"/>
<Button fx:id="btnAddStation" minWidth="30">
<graphic><Glyph text="FontAwesome|EDIT"/></graphic>
</Button>
<Label text="В доке:" />
<CheckBox fx:id="docked" />
</HBox>
<HBox fx:id="shipInfo">
<HBox fx:id="shipInfo" spacing="4">
<Label text="Трюм:" />
<NumberField fx:id="cargo" maxWidth="60"/>
<Label text="Топливный бак:" />

66
client/src/main/resources/view/routeSearch.fxml
View File

@@ -2,35 +2,43 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import ru.trader.view.support.cells.OfferListCell?>
<?import javafx.geometry.Insets?>
<?import ru.trader.view.support.NumberField?>
<?import org.controlsfx.glyphfont.Glyph?>
<?import org.controlsfx.glyphfont.*?>
<VBox xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="ru.trader.controllers.RouteSearchController"
spacing="4" >
<HBox>
<HBox>
<Label text="От:" />
<TextField fx:id="fromSystemText" />
<ComboBox fx:id="fromStation" />
<Button onAction="#currentAsFrom"/>
fx:controller="ru.trader.controllers.RouteSearchController">
<TitledPane text="%router.pane.route" minHeight="80" collapsible="false">
<VBox spacing="4">
<HBox spacing="10" alignment="CENTER">
<HBox spacing="2" alignment="BASELINE_LEFT">
<Label text="%router.pane.route.from" />
<TextField fx:id="fromSystemText" />
<ComboBox fx:id="fromStation" minWidth="140"/>
<Button minWidth="30" onAction="#currentAsFrom"><graphic><Glyph text="FontAwesome|MAP_MARKER"/></graphic></Button>
</HBox>
<HBox spacing="2" alignment="BASELINE_LEFT">
<Label text="%router.pane.route.to" />
<TextField fx:id="toSystemText" />
<ComboBox fx:id="toStation" minWidth="140"/>
<Button minWidth="30" onAction="#loop"><graphic><Glyph text="FontAwesome|RETWEET"/></graphic></Button>
</HBox>
<CheckBox fx:id="cbFast" text="%router.pane.route.fast"/>
</HBox>
<HBox spacing="10" alignment="CENTER">
<Button prefWidth="80" text="%router.button.search" onAction="#search" />
<Button prefWidth="80" text="%router.button.top" onAction="#searchTop" />
</HBox>
</VBox>
</TitledPane>
<TitledPane text="%router.pane.missions" collapsible="false">
<HBox spacing="10">
<fx:include fx:id="missions" source="missions.fxml"/>
<HBox spacing="4" maxHeight="200">
<VBox spacing="4" alignment="TOP_RIGHT">
<Button prefWidth="30" onAction="#addMission"><graphic><Glyph text="FontAwesome|PLUS"/></graphic></Button>
<Button prefWidth="30" onAction="#removeMission"><graphic><Glyph text="FontAwesome|MINUS"/></graphic></Button>
<Button prefWidth="30" onAction="#clearMissions"><graphic><Glyph text="FontAwesome|TRASH"/></graphic></Button>
</VBox>
<ListView fx:id="missionsList" />
</HBox>
</HBox>
<HBox>
<Label text="До:" />
<TextField fx:id="toSystemText" />
<ComboBox fx:id="toStation" />
<Button onAction="#loop"/>
</HBox>
<CheckBox fx:id="cbFast" text="Быстрый"/>
<Button prefWidth="80" text="Найти" onAction="#search" />
</HBox>
<VBox>
<fx:include fx:id="missions" source="missions.fxml"/>
<HBox>
<ListView fx:id="missionsList" />
<Button prefWidth="30" onAction="#removeMission"><graphic><Glyph text="FontAwesome|MINUS"/></graphic></Button>
</HBox>
</VBox>
</TitledPane>
</VBox>

22
client/src/main/resources/view/routeTrack.fxml
View File

@@ -1,16 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import ru.trader.view.support.cells.OfferListCell?>
<?import javafx.geometry.Insets?>
<?import ru.trader.view.support.NumberField?>
<?import org.controlsfx.glyphfont.Glyph?>
<VBox xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
<HBox xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="ru.trader.controllers.RouteTrackController"
spacing="4" >
<HBox fx:id="track" minHeight="100"/>
<VBox>
<ToggleButton minWidth="30" onAction="#toggleEdit">
<graphic><Glyph text="FontAwesome|EDIT"/></graphic>
</ToggleButton>
@@ -19,8 +16,12 @@
<fx:include fx:id="missions" source="missions.fxml"/>
<HBox>
<ListView fx:id="addMissionsList" maxHeight="150"/>
<Button prefWidth="30" onAction="#removeMission"><graphic><Glyph text="FontAwesome|MINUS"/></graphic></Button>
<Button prefWidth="80" text="Добавить" onAction="#addMissions" />
<VBox spacing="4" alignment="TOP_RIGHT">
<Button prefWidth="30" onAction="#addMission"><graphic><Glyph text="FontAwesome|PLUS"/></graphic></Button>
<Button prefWidth="30" onAction="#removeMission"><graphic><Glyph text="FontAwesome|MINUS"/></graphic></Button>
<Button prefWidth="30" onAction="#clearMissions"><graphic><Glyph text="FontAwesome|TRASH"/></graphic></Button>
</VBox>
<Button prefWidth="80" text="Добавить" onAction="#addMissionsToTrack" />
</HBox>
</VBox>
<VBox fx:id="infoGroup">
@@ -44,4 +45,7 @@
</VBox>
</VBox>
</StackPane>
</VBox>
</VBox>
<VBox fx:id="track" minWidth="200"/>
</HBox>

2
client/src/main/resources/view/search.fxml
View File

@@ -16,7 +16,7 @@
<ColumnConstraints fillWidth="true"/>
</columnConstraints>
<TitledPane text="%market.systems" prefHeight="590" collapsible="false">
<TitledPane text="%market.systems" prefHeight="500" collapsible="false">
<GridPane vgap="4">
<columnConstraints>
<ColumnConstraints minWidth="100"/>

44
client/src/main/resources/view/settings.fxml
View File

@@ -1,18 +1,13 @@
<?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?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<?import ru.trader.view.support.*?>
<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" disable="true"/>
@@ -22,11 +17,32 @@
<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" />
<Label text="%settings.performance" styleClass="settings-group" GridPane.halignment="CENTER" GridPane.columnSpan="2" GridPane.rowIndex="5"/>
<Label text="%settings.performance.segmentSize" GridPane.rowIndex="6" />
<NumberField fx:id="segmentSize" maxWidth="100" GridPane.columnIndex="1" GridPane.rowIndex="6" />
<Label text="%settings.performance.limit" GridPane.rowIndex="7" />
<NumberField fx:id="pathsCount" maxWidth="100" GridPane.columnIndex="1" GridPane.rowIndex="7" />
-->
<Label text="EDCE" styleClass="settings-group" GridPane.halignment="CENTER" GridPane.columnSpan="2"/>
<Label text="Включить" GridPane.rowIndex="1"/>
<CheckBox fx:id="edceActive" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
<Label text="Интервал" GridPane.rowIndex="2" />
<NumberField fx:id="edceInterval" maxWidth="100" GridPane.columnIndex="1" GridPane.rowIndex="2" />
<Label text="%settings.performance" styleClass="settings-group" GridPane.halignment="CENTER" GridPane.columnSpan="2" GridPane.rowIndex="3"/>
<Label text="Прыжков:" GridPane.rowIndex="4" />
<NumberField fx:id="jumps" maxWidth="100" GridPane.columnIndex="1" GridPane.rowIndex="4" />
<Label text="Посадок:" GridPane.rowIndex="5" />
<NumberField fx:id="lands" maxWidth="100" GridPane.columnIndex="1" GridPane.rowIndex="5" />
<Label text="Количество маршрутов:" GridPane.rowIndex="6" />
<NumberField fx:id="routesCount" maxWidth="100" GridPane.columnIndex="1" GridPane.rowIndex="6" />
<Label text="Параметры поиска" styleClass="settings-group" GridPane.halignment="CENTER" GridPane.columnSpan="2" GridPane.rowIndex="7"/>
<Label text="Стоимость 1т топлива:" GridPane.rowIndex="8" />
<NumberField fx:id="fuelPrice" maxWidth="100" GridPane.columnIndex="1" GridPane.rowIndex="8" />
<Label text="Тип маршрутов:" GridPane.rowIndex="9" />
<ComboBox fx:id="pathPriority" maxWidth="100" GridPane.columnIndex="1" GridPane.rowIndex="9" />
<Label text="Время гиперпрыжка:" GridPane.rowIndex="10" />
<NumberField fx:id="jumpTime" maxWidth="100" GridPane.columnIndex="1" GridPane.rowIndex="10" />
<Label text="Время посадки:" GridPane.rowIndex="11" />
<NumberField fx:id="landingTime" maxWidth="100" GridPane.columnIndex="1" GridPane.rowIndex="11" />
<Label text="Время взлета:" GridPane.rowIndex="12" />
<NumberField fx:id="takeoffTime" maxWidth="100" GridPane.columnIndex="1" GridPane.rowIndex="12" />
<Label text="Время перезарядки FSD:" GridPane.rowIndex="13" />
<NumberField fx:id="rechargeTime" maxWidth="100" GridPane.columnIndex="1" GridPane.rowIndex="13" />
</GridPane>

48
client/src/main/resources/view/style.css
View File

@@ -134,4 +134,52 @@ HBox.fields-group hbox-margin{
#items HBox.reset Glyph:hover {
-fx-opacity: 1;
}
#helper {
-fx-border-style: solid;
-fx-border-color: #b83500;
-fx-opacity: 0.85;
}
#helper.root {
-fx-base: #232323;
-fx-background: -fx-base;
-fx-control-inner-background: -fx-base;
-fx-control-inner-background-alt: -fx-base;
-fx-light-text-color: orangered;
-fx-mid-text-color: derive(-fx-light-text-color, -50%);
-fx-dark-text-color: derive(-fx-light-text-color, -90%);
-fx-accent: #c93700;
-fx-default-button: #861818;
-fx-focus-color: #bb6b00;
-fx-faint-focus-color: #bb6b0022;
}
.text-small, .text-medium, .text-big {
-fx-font-weight: bold;
}
.text-big {
-fx-font-size: 19;
}
.text-medium {
-fx-font-size: 14;
}
.text-small {
-fx-font-size: 12;
}
.service-ok {
-fx-text-fill: green;
}
.service-warning {
-fx-text-fill: red;
}