From c20c6fb264ff8e3d12f8fdc7b0cff15fe702d23c Mon Sep 17 00:00:00 2001
From: Haoming Yin <hyi25@uclive.ac.nz>
Date: Fri, 22 Sep 2017 13:53:36 +1200
Subject: [PATCH] [WIP] Added new toggle for steer turning mode and submit and
 reset button (restore the setting to default)

- minor fix of UI elements to make the font smaller
- centred labels and buttons

tags: #story[1246]
---
 .../css/dialogs/KeyBindingDialog.css          | 23 +++--
 .../views/dialogs/KeyBindingDialog.fxml       | 97 ++++++++++++++-----
 2 files changed, 88 insertions(+), 32 deletions(-)

diff --git a/src/main/resources/css/dialogs/KeyBindingDialog.css b/src/main/resources/css/dialogs/KeyBindingDialog.css
index 33a239d3..6f85fd91 100644
--- a/src/main/resources/css/dialogs/KeyBindingDialog.css
+++ b/src/main/resources/css/dialogs/KeyBindingDialog.css
@@ -6,24 +6,35 @@
 JFXButton {
     -fx-background-color: -fx-pp-light-text-color;
     -fx-text-fill: -fx-pp-theme-color;
-    -fx-font-size: 17px;
-    -fx-effect: -fx-pp-dropshadow-dark;
+    -fx-font-size: 15px;
+    -fx-effect: -fx-pp-dropshadow-light;
 }
 
 Label {
-    -fx-font-size: 25px;
+    -fx-font-size: 20px;
     -fx-text-fill: -fx-pp-theme-color;
-    /*-fx-effect: -fx-pp-dropshadow-dark;*/
+    -fx-effect: -fx-pp-dropshadow-light;
 }
 
 JFXButton:hover {
-    -fx-font-size: 20px;
+    -fx-font-size: 18px;
     -fx-background-color: -fx-pp-light-theme-color;
     -fx-text-fill: -fx-pp-light-text-color;
 }
 
 JFXButton:focused {
-    -fx-font-size: 20px;
+    -fx-font-size: 18px;
     -fx-background-color: -fx-pp-theme-color;
     -fx-text-fill: -fx-pp-light-text-color;
+}
+
+JFXToggleButton {
+    -jfx-toggle-color: -fx-pp-theme-color;
+    -fx-text-fill: -fx-pp-theme-color;
+}
+
+#resetBtn, #confirmBtn {
+    -fx-background-color: -fx-pp-theme-color;
+    -fx-text-fill: -fx-pp-front-color;
+    -fx-effect: -fx-pp-dropshadow-light;
 }
\ No newline at end of file
diff --git a/src/main/resources/views/dialogs/KeyBindingDialog.fxml b/src/main/resources/views/dialogs/KeyBindingDialog.fxml
index 55a4c44f..29eaa1b3 100644
--- a/src/main/resources/views/dialogs/KeyBindingDialog.fxml
+++ b/src/main/resources/views/dialogs/KeyBindingDialog.fxml
@@ -2,25 +2,25 @@
 
 <?import com.jfoenix.controls.JFXButton?>
 <?import com.jfoenix.controls.JFXDialogLayout?>
+<?import com.jfoenix.controls.JFXToggleButton?>
 <?import java.net.URL?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.ColumnConstraints?>
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
-
 <JFXDialogLayout maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity"
-  minWidth="-Infinity" prefHeight="600.0" prefWidth="550.0" xmlns="http://javafx.com/javafx/8.0.111"
+  minWidth="-Infinity" prefHeight="650.0" prefWidth="550.0" xmlns="http://javafx.com/javafx/8"
   xmlns:fx="http://javafx.com/fxml/1"
   fx:controller="seng302.visualiser.controllers.dialogs.KeyBindingDialogController">
    <children>
       <GridPane>
         <columnConstraints>
-          <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
-            <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="100.0" prefWidth="100.0"/>
+            <ColumnConstraints hgrow="SOMETIMES" minWidth="100.0" prefWidth="100.0"/>
         </columnConstraints>
         <rowConstraints>
-          <RowConstraints maxHeight="90.0" minHeight="90.0" prefHeight="90.0" vgrow="SOMETIMES" />
+            <RowConstraints maxHeight="70.0" minHeight="70.0" prefHeight="70.0" vgrow="SOMETIMES"/>
           <RowConstraints maxHeight="60.0" minHeight="60.0" prefHeight="60.0" vgrow="SOMETIMES" />
           <RowConstraints maxHeight="60.0" minHeight="60.0" prefHeight="60.0" vgrow="SOMETIMES" />
             <RowConstraints maxHeight="60.0" minHeight="60.0" prefHeight="60.0" vgrow="SOMETIMES" />
@@ -29,44 +29,89 @@
             <RowConstraints maxHeight="60.0" minHeight="60.0" prefHeight="60.0" vgrow="SOMETIMES" />
             <RowConstraints maxHeight="60.0" minHeight="60.0" prefHeight="60.0" vgrow="SOMETIMES" />
             <RowConstraints maxHeight="60.0" minHeight="60.0" prefHeight="60.0" vgrow="SOMETIMES" />
+            <RowConstraints maxHeight="80.0" minHeight="80.0" prefHeight="80.0" vgrow="SOMETIMES"/>
         </rowConstraints>
          <children>
             <Label fx:id="keyBindingDialogHeader" text="CUSTOM KEYBIND" GridPane.columnSpan="2" GridPane.halignment="CENTER" GridPane.valignment="CENTER" />
-            <Label text="ZOOM IN" GridPane.halignment="LEFT" GridPane.rowIndex="1" GridPane.valignment="CENTER">
+             <Label text="ZOOM IN" GridPane.halignment="CENTER" GridPane.rowIndex="1"
+               GridPane.valignment="CENTER">
                <GridPane.margin>
-                  <Insets left="40.0" />
+                   <Insets/>
                </GridPane.margin></Label>
-            <Label text="ZOOM OUT" GridPane.halignment="LEFT" GridPane.rowIndex="2" GridPane.valignment="CENTER">
+             <Label text="ZOOM OUT" GridPane.halignment="CENTER" GridPane.rowIndex="2"
+               GridPane.valignment="CENTER">
                <GridPane.margin>
-                  <Insets left="40.0" />
+                   <Insets/>
                </GridPane.margin></Label>
-            <Label text="VMG" GridPane.halignment="LEFT" GridPane.rowIndex="3" GridPane.valignment="CENTER">
+             <Label text="VMG" GridPane.halignment="CENTER" GridPane.rowIndex="3"
+               GridPane.valignment="CENTER">
                <GridPane.margin>
-                  <Insets left="40.0" />
+                   <Insets/>
                </GridPane.margin></Label>
-            <Label text="SAILS IN/OUT" GridPane.halignment="LEFT" GridPane.rowIndex="4" GridPane.valignment="CENTER">
+             <Label text="SAILS IN/OUT" GridPane.halignment="CENTER" GridPane.rowIndex="4"
+               GridPane.valignment="CENTER">
                <GridPane.margin>
-                  <Insets left="40.0" />
+                   <Insets/>
                </GridPane.margin></Label>
-            <Label text="TACK/GYBE" GridPane.halignment="LEFT" GridPane.rowIndex="5" GridPane.valignment="CENTER">
+             <Label text="TACK/GYBE" GridPane.halignment="CENTER" GridPane.rowIndex="5"
+               GridPane.valignment="CENTER">
                <GridPane.margin>
-                  <Insets left="40.0" />
+                   <Insets/>
                </GridPane.margin></Label>
-            <Label text="UPWIND" GridPane.halignment="LEFT" GridPane.rowIndex="6" GridPane.valignment="CENTER">
+             <Label text="UPWIND" GridPane.halignment="CENTER" GridPane.rowIndex="6"
+               GridPane.valignment="CENTER">
                <GridPane.margin>
-                  <Insets left="40.0" />
+                   <Insets/>
                </GridPane.margin></Label>
-            <Label text="DOWNWIND" GridPane.halignment="LEFT" GridPane.rowIndex="7" GridPane.valignment="CENTER">
+             <Label text="DOWNWIND" GridPane.halignment="CENTER" GridPane.rowIndex="7"
+               GridPane.valignment="CENTER">
                <GridPane.margin>
-                  <Insets left="40.0" />
+                   <Insets/>
                </GridPane.margin></Label>
-            <JFXButton fx:id="zoomInbtn" buttonType="RAISED" prefWidth="150.0" text="Z" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="1" GridPane.valignment="CENTER" />
-            <JFXButton fx:id="zoomOutBtn" buttonType="RAISED" prefWidth="150.0" text="X" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="2" GridPane.valignment="CENTER" />
-            <JFXButton fx:id="vmgBtn" buttonType="RAISED" prefWidth="150.0" text="SPACE" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="CENTER" />
-            <JFXButton fx:id="sailInOutBtn" buttonType="RAISED" prefWidth="150.0" text="SHIFT" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="4" GridPane.valignment="CENTER" />
-            <JFXButton fx:id="tackGybeBtn" buttonType="RAISED" prefWidth="150.0" text="ENTER" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="5" GridPane.valignment="CENTER" />
-            <JFXButton fx:id="upwindBtn" buttonType="RAISED" prefWidth="150.0" text="PAGE_UP" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="6" GridPane.valignment="CENTER" />
-            <JFXButton fx:id="downwindBtn" buttonType="RAISED" prefWidth="150.0" text="PAGE_DOWN" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="7" GridPane.valignment="CENTER" />
+             <JFXButton fx:id="zoomInbtn" buttonType="RAISED" maxHeight="-Infinity"
+               maxWidth="-Infinity" minHeight="40.0" minWidth="-Infinity" prefWidth="150.0" text="Z"
+               GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="1"
+               GridPane.valignment="CENTER"/>
+             <JFXButton fx:id="zoomOutBtn" buttonType="RAISED" maxHeight="-Infinity"
+               maxWidth="-Infinity" minHeight="40.0" minWidth="-Infinity" prefWidth="150.0" text="X"
+               GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="2"
+               GridPane.valignment="CENTER"/>
+             <JFXButton fx:id="vmgBtn" buttonType="RAISED" maxHeight="-Infinity"
+               maxWidth="-Infinity" minHeight="40.0" minWidth="-Infinity" prefWidth="150.0"
+               text="SPACE" GridPane.columnIndex="1" GridPane.halignment="CENTER"
+               GridPane.rowIndex="3" GridPane.valignment="CENTER"/>
+             <JFXButton fx:id="sailInOutBtn" buttonType="RAISED" maxHeight="-Infinity"
+               maxWidth="-Infinity" minHeight="40.0" minWidth="-Infinity" prefWidth="150.0"
+               text="SHIFT" GridPane.columnIndex="1" GridPane.halignment="CENTER"
+               GridPane.rowIndex="4" GridPane.valignment="CENTER"/>
+             <JFXButton fx:id="tackGybeBtn" buttonType="RAISED" maxHeight="-Infinity"
+               maxWidth="-Infinity" minHeight="40.0" minWidth="-Infinity" prefWidth="150.0"
+               text="ENTER" GridPane.columnIndex="1" GridPane.halignment="CENTER"
+               GridPane.rowIndex="5" GridPane.valignment="CENTER"/>
+             <JFXButton fx:id="upwindBtn" buttonType="RAISED" maxHeight="-Infinity"
+               maxWidth="-Infinity" minHeight="40.0" minWidth="-Infinity" prefWidth="150.0"
+               text="PAGE_UP" GridPane.columnIndex="1" GridPane.halignment="CENTER"
+               GridPane.rowIndex="6" GridPane.valignment="CENTER"/>
+             <JFXButton fx:id="downwindBtn" buttonType="RAISED" maxHeight="-Infinity"
+               maxWidth="-Infinity" minHeight="40.0" minWidth="-Infinity" prefWidth="150.0"
+               text="PAGE_DOWN" GridPane.columnIndex="1" GridPane.halignment="CENTER"
+               GridPane.rowIndex="7" GridPane.valignment="CENTER"/>
+             <JFXToggleButton minHeight="40.0" prefHeight="40.0" text="OFF / ON"
+               GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="8"/>
+             <Label text="CONTINUOUSLY TURNING" GridPane.halignment="CENTER" GridPane.rowIndex="8"
+               GridPane.valignment="CENTER">
+                 <GridPane.margin>
+                     <Insets/>
+                 </GridPane.margin>
+             </Label>
+             <JFXButton fx:id="confirmBtn" buttonType="RAISED" maxHeight="-Infinity"
+               maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="40.0"
+               prefWidth="150.0" text="CONFIRM" GridPane.columnIndex="1"
+               GridPane.halignment="CENTER" GridPane.rowIndex="9" GridPane.valignment="CENTER"/>
+             <JFXButton fx:id="resetBtn" buttonType="RAISED" maxHeight="-Infinity"
+               maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="40.0"
+               prefWidth="150.0" text="RESET" GridPane.halignment="CENTER" GridPane.rowIndex="9"
+               GridPane.valignment="CENTER"/>
          </children>
       </GridPane>
    </children>