diff --git a/src/main/java/seng302/visualiser/controllers/SplashScreenController.java b/src/main/java/seng302/visualiser/controllers/SplashScreenController.java index 442d4083..68082869 100644 --- a/src/main/java/seng302/visualiser/controllers/SplashScreenController.java +++ b/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() { diff --git a/src/main/java/seng302/visualiser/controllers/dialogs/KeyBindingDialogController.java b/src/main/java/seng302/visualiser/controllers/dialogs/KeyBindingDialogController.java index f64edd3c..e33911cc 100644 --- a/src/main/java/seng302/visualiser/controllers/dialogs/KeyBindingDialogController.java +++ b/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()); } /** diff --git a/src/main/resources/css/dialogs/KeyBindingDialog.css b/src/main/resources/css/dialogs/KeyBindingDialog.css index 6c7bff26..63338d0e 100644 --- a/src/main/resources/css/dialogs/KeyBindingDialog.css +++ b/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; } diff --git a/src/main/resources/views/dialogs/KeyBindingDialog.fxml b/src/main/resources/views/dialogs/KeyBindingDialog.fxml index 7fcf2e7f..11490e86 100644 --- a/src/main/resources/views/dialogs/KeyBindingDialog.fxml +++ b/src/main/resources/views/dialogs/KeyBindingDialog.fxml @@ -23,6 +23,7 @@ + - + prefWidth="140.0" text="RESET" GridPane.columnSpan="2" GridPane.halignment="LEFT" + GridPane.rowIndex="2" GridPane.valignment="CENTER"> + + + + + + + + +