Voomra/trader
Archived
0
Fork 0
Code Activity

change refuel text

Browse Source
This commit is contained in:
Mo
2016-04-16 16:20:06 +03:00
parent 3af401dbf4
commit 89c2c46365
5 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,10 @@ import ru.trader.KeyBinding;
import ru.trader.Main; import ru.trader.Main;
import ru.trader.model.*; import ru.trader.model.*;
import ru.trader.view.support.ViewUtils; 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.*; import javax.swing.*;
@@ -214,7 +217,7 @@ public class HelperController {
distance.setText(""); distance.setText("");
stationDistance.setText(""); stationDistance.setText("");
} }
refuel.setText(String.valueOf(entry.getRefill())); refuel.setText(ViewUtils.fuelToString(entry.getRefill(), MainController.getProfile().getShipTank()));
buyOrders.setItems(entry.orders()); buyOrders.setItems(entry.orders());
sellOrders.setItems(entry.sellOrders()); sellOrders.setItems(entry.sellOrders());
missions.setItems(entry.getCompletedMissions()); missions.setItems(entry.getCompletedMissions());

2
client/src/main/java/ru/trader/controllers/RouteTrackController.java
View File

@@ -148,7 +148,7 @@ public class RouteTrackController {
station.setText(entry.getStation().getName()); station.setText(entry.getStation().getName());
system.setText(entry.getStation().getSystem().getName()); system.setText(entry.getStation().getSystem().getName());
time.setText(ViewUtils.timeToString(entry.getTime())); 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()); buyOrders.setItems(entry.orders());
sellOrders.setItems(entry.sellOrders()); sellOrders.setItems(entry.sellOrders());
missionsList.setItems(entry.missions()); missionsList.setItems(entry.missions());

9
client/src/main/java/ru/trader/view/support/ViewUtils.java
View File

@@ -6,7 +6,9 @@ import javafx.application.Platform;
import javafx.collections.ObservableList; import javafx.collections.ObservableList;
import javafx.event.Event; import javafx.event.Event;
import javafx.event.EventHandler; 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 javax.swing.*;
import java.awt.event.InputEvent; import java.awt.event.InputEvent;
@@ -96,4 +98,9 @@ public class ViewUtils {
return buf.toString(); 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);
}
} }

2
client/src/main/resources/lang/locale_ru_RU.properties
View File

@@ -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.system=\u0421\u0438\u0441\u0442\u0435\u043C\u0430:
helper.station=\u0421\u0442\u0430\u043D\u0446\u0438\u044F: helper.station=\u0421\u0442\u0430\u043D\u0446\u0438\u044F:
helper.time=\u0412\u0440\u0435\u043C\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.sell=\u041F\u0440\u043E\u0434\u0430\u0442\u044C:
helper.buy=\u041A\u0443\u043F\u0438\u0442\u044C: helper.buy=\u041A\u0443\u043F\u0438\u0442\u044C:
helper.missions=\u0421\u0434\u0430\u0442\u044C \u043C\u0438\u0441\u0441\u0438\u0438: helper.missions=\u0421\u0434\u0430\u0442\u044C \u043C\u0438\u0441\u0441\u0438\u0438:

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

@@ -23,7 +23,7 @@
<Label fx:id="stationDistance" text="123456 ls" styleClass="text-small"/> <Label fx:id="stationDistance" text="123456 ls" styleClass="text-small"/>
</VBox> </VBox>
</HBox> </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> <HBox>
<ToggleButton fx:id="infoBtn" minWidth="30"> <ToggleButton fx:id="infoBtn" minWidth="30">
<graphic><Glyph text="FontAwesome|INFO"/></graphic> <graphic><Glyph text="FontAwesome|INFO"/></graphic>