From 78d44e7cc97a0246fde3a661b24050342baba7c7 Mon Sep 17 00:00:00 2001
From: Mauville <4991127@outlook.com>
Date: Sun, 29 Dec 2019 18:14:24 -0600
Subject: [PATCH] Remove dumb Numpad commands for NavKeys

---
 .idea/.gitignore                     |  2 ++
 .idea/SortH.iml                      |  2 ++
 .idea/compiler.xml                   |  1 +
 src/main/java/sample/Controller.java | 20 ++++++++---------
 src/main/resources/fxml/sample.fxml  | 33 +++++++++++-----------------
 5 files changed, 28 insertions(+), 30 deletions(-)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/SortH.iml

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..e7e9d11
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,2 @@
+# Default ignored files
+/workspace.xml
diff --git a/.idea/SortH.iml b/.idea/SortH.iml
new file mode 100644
index 0000000..78b2cc5
--- /dev/null
+++ b/.idea/SortH.iml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4" />
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index afc5305..e5113f8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -20,6 +20,7 @@
         <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
         <outputRelativeToContentRoot value="true" />
         <module name="SortHMav" />
+        <module name="SortH" />
       </profile>
     </annotationProcessing>
   </component>
diff --git a/src/main/java/sample/Controller.java b/src/main/java/sample/Controller.java
index 7ef394c..1337960 100644
--- a/src/main/java/sample/Controller.java
+++ b/src/main/java/sample/Controller.java
@@ -56,16 +56,16 @@ public class Controller {
     GridPane num = new GridPane();
 
     //Keyboard shortcuts
-    private final KeyCombination PCode = new KeyCodeCombination(KeyCode.DIGIT8);
-    private final KeyCombination threedeeCode = new KeyCodeCombination(KeyCode.DIGIT4);
-    private final KeyCombination TCode = new KeyCodeCombination(KeyCode.DIGIT2);
-    private final KeyCombination NPCode = new KeyCodeCombination(KeyCode.DIGIT6);
-    private final KeyCombination FDCode = new KeyCodeCombination(KeyCode.DIGIT8, KeyCombination.CONTROL_DOWN);
-    private final KeyCombination ECCode = new KeyCodeCombination(KeyCode.DIGIT4, KeyCombination.CONTROL_DOWN);
-    private final KeyCombination ACode = new KeyCodeCombination(KeyCode.DIGIT2, KeyCombination.CONTROL_DOWN);
-    private final KeyCombination OCode = new KeyCodeCombination(KeyCode.DIGIT6, KeyCombination.CONTROL_DOWN);
-    private final KeyCombination SkipCode = new KeyCodeCombination(KeyCode.DIGIT0, KeyCombination.CONTROL_DOWN);
-    private final KeyCombination SkipCode2 = new KeyCodeCombination(KeyCode.DIGIT0);
+    private final KeyCombination PCode = new KeyCodeCombination(KeyCode.UP);
+    private final KeyCombination ECCode = new KeyCodeCombination(KeyCode.LEFT);
+    private final KeyCombination TCode = new KeyCodeCombination(KeyCode.DOWN);
+    private final KeyCombination NPCode = new KeyCodeCombination(KeyCode.RIGHT);
+    private final KeyCombination FDCode = new KeyCodeCombination(KeyCode.UP, KeyCombination.CONTROL_DOWN);
+    private final KeyCombination  threedeeCode = new KeyCodeCombination(KeyCode.LEFT, KeyCombination.CONTROL_DOWN);
+    private final KeyCombination ACode = new KeyCodeCombination(KeyCode.DOWN, KeyCombination.CONTROL_DOWN);
+    private final KeyCombination OCode = new KeyCodeCombination(KeyCode.RIGHT, KeyCombination.CONTROL_DOWN);
+    private final KeyCombination SkipCode = new KeyCodeCombination(KeyCode.SPACE, KeyCombination.CONTROL_DOWN);
+    private final KeyCombination SkipCode2 = new KeyCodeCombination(KeyCode.SPACE);
 
     private List<File> imageFiles;
     private File cwd;
diff --git a/src/main/resources/fxml/sample.fxml b/src/main/resources/fxml/sample.fxml
index f813c8a..120f7a3 100644
--- a/src/main/resources/fxml/sample.fxml
+++ b/src/main/resources/fxml/sample.fxml
@@ -1,22 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.Insets?>
-<?import javafx.geometry.Rectangle2D?>
-<?import javafx.scene.Group?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.image.Image?>
-<?import javafx.scene.image.ImageView?>
-<?import javafx.scene.layout.BorderPane?>
-<?import javafx.scene.layout.ColumnConstraints?>
-<?import javafx.scene.layout.GridPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.RowConstraints?>
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.text.Font?>
-<?import javafx.scene.text.Text?>
+<?import javafx.geometry.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.image.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
 
-<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" xmlns="http://javafx.com/javafx/9.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="sample.Controller">
+<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="sample.Controller">
    <center>
       <Group BorderPane.alignment="CENTER">
          <children>
@@ -42,7 +33,7 @@
    <bottom>
       <HBox alignment="CENTER" prefHeight="29.0" prefWidth="600.0" BorderPane.alignment="CENTER">
          <children>
-            <Text fx:id="logField" strokeType="OUTSIDE" strokeWidth="0.0" text="Press 0 to Skip. Use numlock and control">
+            <Text fx:id="logField" strokeType="OUTSIDE" strokeWidth="0.0" text="Press SPACE to Skip. Use Arrows and Ctrl">
                <HBox.margin>
                   <Insets left="5.0" right="5.0" />
                </HBox.margin>
@@ -73,7 +64,7 @@
                         <Font name="Consolas" size="24.0" />
                      </font>
                   </Label>
-                  <Label fx:id="threedee" alignment="CENTER" prefHeight="22.0" prefWidth="53.0" text="3" textAlignment="CENTER" GridPane.halignment="CENTER" GridPane.rowIndex="1">
+                  <Label fx:id="EC" alignment="CENTER" prefHeight="22.0" prefWidth="53.0" text="EC" textAlignment="CENTER" GridPane.halignment="CENTER" GridPane.rowIndex="1">
                      <font>
                         <Font name="Consolas" size="24.0" />
                      </font>
@@ -95,7 +86,6 @@
                   </Label>
                </children>
             </GridPane>
-            <Button fx:id="button" mnemonicParsing="false" onAction="#setAccel" text="Set Accel" />
          </children>
       </Group>
    </left>
@@ -119,7 +109,7 @@
                         <Font size="24.0" />
                      </font>
                   </Label>
-                  <Label fx:id="EC" alignment="CENTER" prefHeight="22.0" prefWidth="57.0" text="EC" textAlignment="CENTER" GridPane.halignment="CENTER" GridPane.rowIndex="1">
+                  <Label fx:id="threed" alignment="CENTER" prefHeight="22.0" prefWidth="57.0" text="3" textAlignment="CENTER" GridPane.halignment="CENTER" GridPane.rowIndex="1">
                      <font>
                         <Font size="24.0" />
                      </font>
@@ -144,4 +134,7 @@
          </children>
       </Group>
    </right>
+   <top>
+      <Button fx:id="button" mnemonicParsing="false" onAction="#setAccel" text="Set Accel" BorderPane.alignment="CENTER" />
+   </top>
 </BorderPane>