From fd85de72c6accd808266f1187defb066f3d16ff3 Mon Sep 17 00:00:00 2001
From: iMoHax <born19th@gmail.com>
Date: Fri, 9 Oct 2015 14:17:10 +0300
Subject: [PATCH] modify helper screen

---
 .../trader/controllers/HelperController.java  |  5 --
 .../controllers/RouteSearchController.java    |  1 -
 .../trader/controllers/RouterController.java  |  1 -
 client/src/main/resources/view/helper.fxml    | 47 +++++++------------
 client/src/main/resources/view/profile.fxml   |  4 +-
 5 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/client/src/main/java/ru/trader/controllers/HelperController.java b/client/src/main/java/ru/trader/controllers/HelperController.java
index f732acc..b23be71 100644
--- a/client/src/main/java/ru/trader/controllers/HelperController.java
+++ b/client/src/main/java/ru/trader/controllers/HelperController.java
@@ -187,11 +187,6 @@ public class HelperController {
         }
     }
 
-    @FXML
-    private void pause(){
-
-    }
-
     @FXML
     private void previous(){
         int index = route.getCurrentEntry();
diff --git a/client/src/main/java/ru/trader/controllers/RouteSearchController.java b/client/src/main/java/ru/trader/controllers/RouteSearchController.java
index 2d33460..e7cee17 100644
--- a/client/src/main/java/ru/trader/controllers/RouteSearchController.java
+++ b/client/src/main/java/ru/trader/controllers/RouteSearchController.java
@@ -84,7 +84,6 @@ public class RouteSearchController {
                 RouteModel route = path.get();
                 route.addAll(0, missionsList.getItems());
                 profile.setRoute(route);
-                Screeners.toggleHelper();
             }
         });
     }
diff --git a/client/src/main/java/ru/trader/controllers/RouterController.java b/client/src/main/java/ru/trader/controllers/RouterController.java
index 5e266bd..027d135 100644
--- a/client/src/main/java/ru/trader/controllers/RouterController.java
+++ b/client/src/main/java/ru/trader/controllers/RouterController.java
@@ -279,7 +279,6 @@ public class RouterController {
             if (path.isPresent()){
                 orders.addAll(path.get().getOrders());
                 addRouteToPath(path.get());
-                Screeners.toggleHelper();
             }
         });
     }
diff --git a/client/src/main/resources/view/helper.fxml b/client/src/main/resources/view/helper.fxml
index 85f3428..0d4b4a5 100644
--- a/client/src/main/resources/view/helper.fxml
+++ b/client/src/main/resources/view/helper.fxml
@@ -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>
diff --git a/client/src/main/resources/view/profile.fxml b/client/src/main/resources/view/profile.fxml
index 0a6df5a..dbf4d6a 100644
--- a/client/src/main/resources/view/profile.fxml
+++ b/client/src/main/resources/view/profile.fxml
@@ -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>