Voomra/trader
Archived
0
Fork 0
Code Activity

modify helper screen

Browse Source
This commit is contained in:
iMoHax
2015-10-09 14:17:10 +03:00
parent 0dcabd50a3
commit fd85de72c6
5 changed files with 20 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/src/main/java/ru/trader/controllers/HelperController.java
View File

@@ -187,11 +187,6 @@ public class HelperController {
}
}
@FXML
private void pause(){
}
@FXML
private void previous(){
int index = route.getCurrentEntry();

1
client/src/main/java/ru/trader/controllers/RouteSearchController.java
View File

@@ -84,7 +84,6 @@ public class RouteSearchController {
RouteModel route = path.get();
route.addAll(0, missionsList.getItems());
profile.setRoute(route);
Screeners.toggleHelper();
}
});
}

1
client/src/main/java/ru/trader/controllers/RouterController.java
View File

@@ -279,7 +279,6 @@ public class RouterController {
if (path.isPresent()){
orders.addAll(path.get().getOrders());
addRouteToPath(path.get());
Screeners.toggleHelper();
}
});
}

47
client/src/main/resources/view/helper.fxml
View File

@@ -9,49 +9,38 @@
<?import org.controlsfx.glyphfont.Glyph?>
<VBox xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1"
fx:controller="ru.trader.controllers.HelperController"
spacing="4" >
spacing="4" maxWidth="160">
<HBox><Label text="Система:" /><Label fx:id="system" /></HBox>
<HBox><Label text="Станция:" /><Label fx:id="station" /></HBox>
<HBox><Label text="Время:" /><Label fx:id="time" /></HBox>
<HBox fx:id="refuelGroup"><Label text="Заправить:" /><Label fx:id="refuel" /></HBox>
<HBox fx:id="ordersGroup" maxHeight="100">
<VBox>
<Label text="Продать:" />
<ListView fx:id="sellOrders"/>
</VBox>
<VBox>
<Label text="Купить:" />
<ListView fx:id="buyOrders"/>
</VBox>
</HBox>
<VBox fx:id="missionsGroup" maxHeight="100">
<VBox fx:id="ordersGroup" maxHeight="240">
<Label text="Продать:" />
<ListView fx:id="sellOrders"/>
<Label text="Купить:" />
<ListView fx:id="buyOrders"/>
</VBox>
<VBox fx:id="missionsGroup" maxHeight="120">
<Label text="Сдать миссии:" />
<ListView fx:id="missions"/>
</VBox>
<HBox fx:id="infoGroup">
<VBox maxHeight="100">
<Label text="Станции:" />
<ListView fx:id="stations"/>
</VBox>
<VBox maxHeight="100">
<Label text="Товары:" />
<ListView fx:id="sellOffers"/>
</VBox>
</HBox>
<VBox fx:id="infoGroup" maxHeight="240">
<Label text="Станции:" />
<ListView fx:id="stations"/>
<Label text="Товары:" />
<ListView fx:id="sellOffers"/>
</VBox>
<HBox>
<Button prefWidth="30" onAction="#previous">
<Button minWidth="30" onAction="#previous">
<graphic><Glyph text="FontAwesome|ARROW_LEFT"/></graphic>
</Button>
<Button prefWidth="30" onAction="#pause">
<graphic><Glyph text="FontAwesome|PAUSE"/></graphic>
</Button>
<Button prefWidth="30" onAction="#next">
<Button minWidth="30" onAction="#next">
<graphic><Glyph text="FontAwesome|ARROW_RIGHT"/></graphic>
</Button>
<Button prefWidth="30" onAction="#copy">
<Button minWidth="30" onAction="#copy">
<graphic><Glyph text="FontAwesome|COPY"/></graphic>
</Button>
<ToggleButton fx:id="infoBtn" prefWidth="30">
<ToggleButton fx:id="infoBtn" minWidth="30">
<graphic><Glyph text="FontAwesome|HELP"/></graphic>
</ToggleButton>
</HBox>

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

@@ -38,10 +38,10 @@
<Label fx:id="jumpRange"/>
</HBox>
</StackPane>
<ToggleButton prefWidth="30" onAction="#toggleShipInfo">
<ToggleButton minWidth="30" onAction="#toggleShipInfo">
<graphic><Glyph text="FontAwesome|SPACE_SHUTTLE"/></graphic>
</ToggleButton>
<ToggleButton prefWidth="30" onAction="#toggleHelper">
<ToggleButton minWidth="30" onAction="#toggleHelper">
<graphic><Glyph text="FontAwesome|ROCKET"/></graphic>
</ToggleButton>
</HBox>