From 03dd937713a2306dc1ced5172f831c7397cece8b Mon Sep 17 00:00:00 2001
From: David Wu <zwu18@uclive.ac.nz>
Date: Thu, 17 Aug 2017 16:33:52 +1200
Subject: [PATCH] Change fxml stuff. Added back to menu buttons.

---
 .../Controllers/HostController.java           |  5 +++++
 .../Controllers/LobbyController.java          |  5 +++++
 .../resources/visualiser/scenes/hostgame.fxml |  1 +
 .../resources/visualiser/scenes/lobby.fxml    | 19 ++++++++++++++++---
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/racevisionGame/src/main/java/visualiser/Controllers/HostController.java b/racevisionGame/src/main/java/visualiser/Controllers/HostController.java
index 2246b0e1..621f7e0d 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/HostController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/HostController.java
@@ -86,4 +86,9 @@ public class HostController extends Controller {
         hostWrapper.setVisible(true);
     }
 
+    public void menuBtnPressed(){
+        hostWrapper.setVisible(false);
+        parent.enterTitle();
+    }
+
 }
diff --git a/racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java b/racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
index f089842d..2bd10b0e 100644
--- a/racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
+++ b/racevisionGame/src/main/java/visualiser/Controllers/LobbyController.java
@@ -93,6 +93,11 @@ public class LobbyController extends Controller {
         }
     }
 
+    public void menuBtnPressed(){
+        lobbyWrapper.setVisible(false);
+        parent.enterTitle();
+    }
+
     /**
      * adds a new connection
      */
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml b/racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml
index 5657fa30..43fbf72e 100644
--- a/racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/hostgame.fxml
@@ -36,6 +36,7 @@
                   <Font size="17.0" />
                </font>
             </Label>
+            <Button mnemonicParsing="false" onAction="#menuBtnPressed" text="Main Menu" GridPane.halignment="CENTER" />
          </children>
       </GridPane>
    </children>
diff --git a/racevisionGame/src/main/resources/visualiser/scenes/lobby.fxml b/racevisionGame/src/main/resources/visualiser/scenes/lobby.fxml
index 2f84063e..91ec81ef 100644
--- a/racevisionGame/src/main/resources/visualiser/scenes/lobby.fxml
+++ b/racevisionGame/src/main/resources/visualiser/scenes/lobby.fxml
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
@@ -12,7 +17,7 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.text.Font?>
 
-<AnchorPane fx:id="lobbyWrapper" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="780.0" visible="false" xmlns="http://javafx.com/javafx/8.0.111" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.LobbyController">
+<AnchorPane fx:id="lobbyWrapper" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="780.0" visible="false" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="visualiser.Controllers.LobbyController">
    <children>
       <GridPane fx:id="connection" prefHeight="600.0" prefWidth="780.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
          <columnConstraints>
@@ -75,8 +80,11 @@
                <children>
                   <TextField fx:id="addressFld" promptText="Address">
                      <GridPane.margin>
-                        <Insets left="20.0" right="20.0" />
-                     </GridPane.margin></TextField>
+                        <Insets left="50.0" right="20.0" />
+                     </GridPane.margin>
+                     <opaqueInsets>
+                        <Insets />
+                     </opaqueInsets></TextField>
                   <TextField fx:id="portFld" promptText="Port Number" GridPane.columnIndex="1">
                      <GridPane.margin>
                         <Insets left="20.0" right="20.0" />
@@ -86,6 +94,11 @@
                   <Insets />
                </GridPane.margin>
             </GridPane>
+            <Button mnemonicParsing="false" onAction="#menuBtnPressed" text="Main Menu">
+               <GridPane.margin>
+                  <Insets left="50.0" />
+               </GridPane.margin>
+            </Button>
          </children>
       </GridPane>
    </children>