Added confirm button in keybinding dialog.

-  clicking confirm button will exit the dialog
- [WIP] exit without clicking confirm button will still save changes, which should be fixed in the future

tags: #story[1273]

src/main/java/seng302/visualiser/controllers/SplashScreenController.java

@@ -1,24 +1,12 @@
 package seng302.visualiser.controllers;
 
-import com.jfoenix.controls.JFXDecorator;
-import com.jfoenix.controls.JFXSnackbar;
-import javafx.application.Platform;
-import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
-import javafx.fxml.Initializable;
-import javafx.scene.Parent;
-import javafx.scene.Scene;
-import javafx.scene.SceneAntialiasing;
-import javafx.scene.image.Image;
-import javafx.scene.layout.StackPane;
-import javafx.stage.Stage;
-import seng302.gameServer.ServerAdvertiser;
-import seng302.utilities.Sounds;
-import seng302.visualiser.GameClient;
-
-import java.io.IOException;
 import java.net.URL;
 import java.util.ResourceBundle;
+import javafx.application.Platform;
+import javafx.fxml.FXML;
+import javafx.fxml.Initializable;
+import javafx.scene.layout.StackPane;
+import javafx.stage.Stage;
 
 /**
  * Created by Kusal on 26-Sep-17.
@@ -37,7 +25,7 @@ public class SplashScreenController implements Initializable{
     class SplashScreen extends Thread {
         public void run(){
             try {
-                Thread.sleep(2000);
+                Thread.sleep(3000);
                 Platform.runLater(new Runnable() {
                     @Override
                     public void run() {

src/main/java/seng302/visualiser/controllers/dialogs/KeyBindingDialogController.java

@@ -27,7 +27,7 @@ public class KeyBindingDialogController implements Initializable {
     @FXML
     private Label closeLabel;
     @FXML
-    private JFXButton zoomInbtn;
+    private JFXButton zoomInBtn;
     @FXML
     private JFXButton zoomOutBtn;
     @FXML
@@ -43,6 +43,8 @@ public class KeyBindingDialogController implements Initializable {
     @FXML
     private JFXButton resetBtn;
     @FXML
+    private JFXButton confirmBtn;
+    @FXML
     private Label upwindLabel;
     @FXML
     private Label downwindLabel;
@@ -70,7 +72,7 @@ public class KeyBindingDialogController implements Initializable {
         gameKeyBind = GameKeyBind.getInstance();
         buttons = new ArrayList<>();
         Collections.addAll(buttons,
-            zoomInbtn, zoomOutBtn, vmgBtn, sailInOutBtn, tackGybeBtn, upwindBtn, downwindBtn,
+            zoomInBtn, zoomOutBtn, vmgBtn, sailInOutBtn, tackGybeBtn, upwindBtn, downwindBtn,
             viewButton, rightButton, leftButton, forwardButton, backwardButton);
         bindButtonWithAction();
         loadKeyBind();
@@ -91,6 +93,7 @@ public class KeyBindingDialogController implements Initializable {
         });
 
         closeLabel.setOnMouseClicked(event -> ViewManager.getInstance().closeKeyBindingDialog());
+        confirmBtn.setOnMouseClicked(event -> ViewManager.getInstance().closeKeyBindingDialog());
     }
 
     /**

src/main/resources/css/dialogs/KeyBindingDialog.css

@@ -35,14 +35,14 @@ JFXToggleButton {
     -fx-text-fill: -fx-pp-theme-color;
 }
 
-#resetBtn {
+#resetBtn, #confirmBtn {
     -fx-background-color: -fx-pp-theme-color;
     -fx-text-fill: -fx-pp-front-color;
     -fx-effect: -fx-pp-dropshadow-light;
     -fx-font-size: 18;
 }
 
-#resetBtn:hover {
+#resetBtn:hover, #confirmBtn:hover {
     -fx-font-size: 20;
 }
 

src/main/resources/views/dialogs/KeyBindingDialog.fxml

@@ -23,6 +23,7 @@
       <GridPane>
         <columnConstraints>
             <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0"/>
+            <ColumnConstraints/>
         </columnConstraints>
         <rowConstraints>
             <RowConstraints maxHeight="-Infinity" minHeight="-Infinity" prefHeight="60.0"
@@ -112,7 +113,7 @@
                                              <Insets/>
                                          </GridPane.margin>
                                      </Label>
-                                     <JFXButton id="ZOOM IN" fx:id="zoomInbtn" buttonType="RAISED"
+                                     <JFXButton id="ZOOM IN" fx:id="zoomInBtn" buttonType="RAISED"
                                        maxHeight="-Infinity" maxWidth="-Infinity" minHeight="35.0"
                                        minWidth="-Infinity" prefWidth="120.0" text="Z"
                                        GridPane.columnIndex="1" GridPane.halignment="CENTER"
@@ -223,8 +224,19 @@
                GridPane.valignment="TOP"/>
              <JFXButton fx:id="resetBtn" buttonType="RAISED" maxHeight="-Infinity"
                maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="45.0"
-               prefWidth="150.0" text="RESET" GridPane.columnSpan="2" GridPane.halignment="CENTER"
+               prefWidth="140.0" text="RESET" GridPane.columnSpan="2" GridPane.halignment="LEFT"
-               GridPane.rowIndex="2" GridPane.valignment="CENTER"/>
+               GridPane.rowIndex="2" GridPane.valignment="CENTER">
+                 <GridPane.margin>
+                     <Insets left="60.0"/>
+                 </GridPane.margin>
+             </JFXButton>
+             <JFXButton fx:id="confirmBtn" buttonType="RAISED" maxHeight="-Infinity"
+               maxWidth="-Infinity" minHeight="45.0" minWidth="140.0" prefHeight="45.0"
+               prefWidth="140.0" text="CONFIRM" GridPane.halignment="RIGHT" GridPane.rowIndex="2">
+                 <GridPane.margin>
+                     <Insets right="60.0"/>
+                 </GridPane.margin>
+             </JFXButton>
          </children>
       </GridPane>
    </children>