Redesigned NewFuelStationTab

diff --git a/src/main/java/de/diejungsvondertanke/tankstelle/controllers/FuelStationUIController.java b/src/main/java/de/diejungsvondertanke/tankstelle/controllers/FuelStationUIController.java
index 557253562f4d0c1c0bb4affa1d38229f710cd17b..9f4d1d4198820bffe6bd3e0529b695fcfc7e76e5 100644 (file)
--- a/src/main/java/de/diejungsvondertanke/tankstelle/controllers/FuelStationUIController.java
+++ b/src/main/java/de/diejungsvondertanke/tankstelle/controllers/FuelStationUIController.java
@@ -16,6 +16,7 @@ import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
+import javafx.scene.layout.VBox;
 
 /**
  * Main controller class
@@ -41,7 +42,8 @@ public class FuelStationUIController {
     @FXML
     private HBox searchTabContainer;
     @FXML
-    private GridPane newStationTabContainer;
+    // private GridPane newStationTabContainer;
+    private VBox newStationTabContainer;
     @FXML
     private BorderPane overviewTabContainer;
 

diff --git a/src/main/java/de/diejungsvondertanke/tankstelle/controllers/OverviewTabController.java b/src/main/java/de/diejungsvondertanke/tankstelle/controllers/OverviewTabController.java
index 529caa85376ff00c83758761975f9ae7676bb98e..eb25b1450982dfa8fbac23acf0f6f325de368030 100644 (file)
--- a/src/main/java/de/diejungsvondertanke/tankstelle/controllers/OverviewTabController.java
+++ b/src/main/java/de/diejungsvondertanke/tankstelle/controllers/OverviewTabController.java
@@ -55,7 +55,7 @@ public class OverviewTabController {
         // table.getItems().add(new FuelRow("TestStation", "TestType", "Diesel", 123,
 
         // 999, 1.23f));
-        System.out.println("On FX thread? " + Platform.isFxApplicationThread());
+        // System.out.println("On FX thread? " + Platform.isFxApplicationThread());
 
         for (FuelStation station : Main.fuelStations) {
             for (Fuel f : station.fuels) {

diff --git a/src/main/resources/ui/FuelStationUI.fxml b/src/main/resources/ui/FuelStationUI.fxml
index f06036ee8b78f2408d4c252fcf3a32c3b0be2a18..e8727d2cbe0ac23cd445d08e4c8eaabf1dc9db7f 100644 (file)
--- a/src/main/resources/ui/FuelStationUI.fxml
+++ b/src/main/resources/ui/FuelStationUI.fxml
@@ -37,7 +37,7 @@
                     <HBox fx:id="searchTabContainer" />
                 </Tab>
                 <Tab text="New fuel station" closable="false">
-                    <GridPane fx:id="newStationTabContainer" />
+                    <VBox fx:id="newStationTabContainer" />
                 </Tab>
                 <Tab text="Overview" closable="false">
                     <BorderPane fx:id="overviewTabContainer" />

diff --git a/src/main/resources/ui/NewStationTab.fxml b/src/main/resources/ui/NewStationTab.fxml
index 911d8b6c9fa177291c416c956f5a0d3d730ede4d..a8545338fd0897eea7b66aed124515766b45972f 100644 (file)
--- a/src/main/resources/ui/NewStationTab.fxml
+++ b/src/main/resources/ui/NewStationTab.fxml
@@ -3,41 +3,39 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
-<GridPane xmlns:fx="http://javafx.com/fxml"
+<VBox xmlns:fx="http://javafx.com/fxml"
        fx:controller="de.diejungsvondertanke.tankstelle.controllers.NewStationTabController"
-       hgap="10" vgap="10">
+       spacing="10">
        <padding>
               <Insets top="15" right="15" bottom="15" left="15" />
        </padding>
 
-       <Label text="Size:" GridPane.rowIndex="0" GridPane.columnIndex="0" />
+       <HBox>
+              <Label text="Size:" />
+       </HBox>
 
-       <fx:define>
-              <ToggleGroup fx:id="group" />
-       </fx:define>
-       <RadioButton fx:id="rbSmall" text="Small" selected="true"
-              toggleGroup="$group"
-              GridPane.rowIndex="1" GridPane.columnIndex="0"
-              onAction="#setAttributeTypeFromSmallStation" />
-       <RadioButton fx:id="rbMedium" text="Medium"
-              toggleGroup="$group"
-              GridPane.rowIndex="1" GridPane.columnIndex="1"
-              onAction="#setAttributeTypeFromMediumStation" />
-       <RadioButton fx:id="rbLarge" text="Large"
-              toggleGroup="$group"
-              GridPane.rowIndex="1" GridPane.columnIndex="2"
-              onAction="#setAttributeTypeFromLargeStation" />
+       <HBox>
+              <fx:define>
+                     <ToggleGroup fx:id="group" />
+              </fx:define>
+              <RadioButton fx:id="rbSmall" text="Small" selected="true"
+                     toggleGroup="$group"
+                     onAction="#setAttributeTypeFromSmallStation" />
+              <RadioButton fx:id="rbMedium" text="Medium"
+                     toggleGroup="$group"
+                     onAction="#setAttributeTypeFromMediumStation" />
+              <RadioButton fx:id="rbLarge" text="Large"
+                     toggleGroup="$group"
+                     onAction="#setAttributeTypeFromLargeStation" />
 
-       <Label fx:id="attrLabel" text="Attribute:" GridPane.rowIndex="2" GridPane.columnIndex="0" />
-       <TextField fx:id="txtAttr" GridPane.rowIndex="2" GridPane.columnIndex="1"
-              GridPane.columnSpan="2" />
-
-       <Label text="Hint:" GridPane.rowIndex="3" GridPane.columnIndex="0" />
-       <Label text="Small=vending machines, Medium=m², Large=supermarket-company"
-              wrapText="true"
-              GridPane.rowIndex="3" GridPane.columnIndex="1" GridPane.columnSpan="2" />
-
-       <Button text="Add fuel station" onAction="#add"
-              GridPane.rowIndex="4" GridPane.columnIndex="0" GridPane.columnSpan="3" />
-
-</GridPane>
\ No newline at end of file
+       </HBox>
+       <HBox>
+              <Label fx:id="attrLabel" text="Number of drink vending machines:" />
+       </HBox>
+       <HBox>
+              <TextField fx:id="txtAttr" />
+       </HBox>
+       <HBox>
+              <Button text="Add fuel station" onAction="#add" />
+       </HBox>
+</VBox>
\ No newline at end of file