From 89c2c4636592220f7eb89bf9316d9e9afa42ae92 Mon Sep 17 00:00:00 2001
From: Mo <born19th@gmail.com>
Date: Sat, 16 Apr 2016 16:20:06 +0300
Subject: [PATCH] change refuel text

---
 .../java/ru/trader/controllers/HelperController.java     | 7 +++++--
 .../java/ru/trader/controllers/RouteTrackController.java | 2 +-
 .../src/main/java/ru/trader/view/support/ViewUtils.java  | 9 ++++++++-
 client/src/main/resources/lang/locale_ru_RU.properties   | 2 +-
 client/src/main/resources/view/helper.fxml               | 2 +-
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/client/src/main/java/ru/trader/controllers/HelperController.java b/client/src/main/java/ru/trader/controllers/HelperController.java
index dc262a7..a39c630 100644
--- a/client/src/main/java/ru/trader/controllers/HelperController.java
+++ b/client/src/main/java/ru/trader/controllers/HelperController.java
@@ -20,7 +20,10 @@ import ru.trader.KeyBinding;
 import ru.trader.Main;
 import ru.trader.model.*;
 import ru.trader.view.support.ViewUtils;
-import ru.trader.view.support.cells.*;
+import ru.trader.view.support.cells.OfferDecoratedListCell;
+import ru.trader.view.support.cells.OrderDecoratedListCell;
+import ru.trader.view.support.cells.OrderListCell;
+import ru.trader.view.support.cells.StationListCell;
 
 import javax.swing.*;
 
@@ -214,7 +217,7 @@ public class HelperController {
                 distance.setText("");
                 stationDistance.setText("");
             }
-            refuel.setText(String.valueOf(entry.getRefill()));
+            refuel.setText(ViewUtils.fuelToString(entry.getRefill(), MainController.getProfile().getShipTank()));
             buyOrders.setItems(entry.orders());
             sellOrders.setItems(entry.sellOrders());
             missions.setItems(entry.getCompletedMissions());
diff --git a/client/src/main/java/ru/trader/controllers/RouteTrackController.java b/client/src/main/java/ru/trader/controllers/RouteTrackController.java
index 5c09308..5742ce3 100644
--- a/client/src/main/java/ru/trader/controllers/RouteTrackController.java
+++ b/client/src/main/java/ru/trader/controllers/RouteTrackController.java
@@ -148,7 +148,7 @@ public class RouteTrackController {
             station.setText(entry.getStation().getName());
             system.setText(entry.getStation().getSystem().getName());
             time.setText(ViewUtils.timeToString(entry.getTime()));
-            refuel.setText(String.valueOf(entry.getRefill()));
+            refuel.setText(ViewUtils.fuelToString(entry.getRefill(), MainController.getProfile().getShipTank()));
             buyOrders.setItems(entry.orders());
             sellOrders.setItems(entry.sellOrders());
             missionsList.setItems(entry.missions());
diff --git a/client/src/main/java/ru/trader/view/support/ViewUtils.java b/client/src/main/java/ru/trader/view/support/ViewUtils.java
index c4e2905..4b94cb6 100644
--- a/client/src/main/java/ru/trader/view/support/ViewUtils.java
+++ b/client/src/main/java/ru/trader/view/support/ViewUtils.java
@@ -6,7 +6,9 @@ import javafx.application.Platform;
 import javafx.collections.ObservableList;
 import javafx.event.Event;
 import javafx.event.EventHandler;
-import javafx.scene.control.*;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TablePosition;
+import javafx.scene.control.TableView;
 
 import javax.swing.*;
 import java.awt.event.InputEvent;
@@ -96,4 +98,9 @@ public class ViewUtils {
         return buf.toString();
     }
 
+
+    public static String fuelToString(double fuel, double tank){
+        if (tank == 0) return String.format("%.0f t", fuel);
+        return String.format("%.1f%%", fuel*100 / tank);
+    }
 }
diff --git a/client/src/main/resources/lang/locale_ru_RU.properties b/client/src/main/resources/lang/locale_ru_RU.properties
index 64013e9..1f1f5d2 100644
--- a/client/src/main/resources/lang/locale_ru_RU.properties
+++ b/client/src/main/resources/lang/locale_ru_RU.properties
@@ -258,7 +258,7 @@ missions.supply.text=\u041A\u0443\u043F\u0438\u0442\u044C \u0438 \u0434\u043E\u0
 helper.system=\u0421\u0438\u0441\u0442\u0435\u043C\u0430:
 helper.station=\u0421\u0442\u0430\u043D\u0446\u0438\u044F:
 helper.time=\u0412\u0440\u0435\u043C\u044F:
-helper.refuel=\u0417\u0430\u043F\u0440\u0430\u0432\u0438\u0442\u044C:
+helper.refuel=\u0417\u0430\u043F\u0440\u0430\u0432\u0438\u0442\u044C \u0434\u043E:
 helper.sell=\u041F\u0440\u043E\u0434\u0430\u0442\u044C:
 helper.buy=\u041A\u0443\u043F\u0438\u0442\u044C:
 helper.missions=\u0421\u0434\u0430\u0442\u044C \u043C\u0438\u0441\u0441\u0438\u0438:
diff --git a/client/src/main/resources/view/helper.fxml b/client/src/main/resources/view/helper.fxml
index 3908d32..8e3d92a 100644
--- a/client/src/main/resources/view/helper.fxml
+++ b/client/src/main/resources/view/helper.fxml
@@ -23,7 +23,7 @@
             <Label fx:id="stationDistance" text="123456 ls" styleClass="text-small"/>
         </VBox>
     </HBox>
-    <HBox fx:id="refuelGroup"><Label text="%helper.refuel" /><Label fx:id="refuel" /></HBox>
+    <HBox fx:id="refuelGroup" spacing="5"><Label text="%helper.refuel" /><Label fx:id="refuel" /></HBox>
     <HBox>
         <ToggleButton fx:id="infoBtn" minWidth="30">
             <graphic><Glyph text="FontAwesome|INFO"/></graphic>