From bc2b942e9947ab6f76341ebf42b6102dd7496e4d Mon Sep 17 00:00:00 2001
From: James Ball <james@ball.sh>
Date: Sat, 10 Jul 2021 19:02:21 +0100
Subject: [PATCH] Add text instructions for cycling between opened files

---
 src/main/java/sh/ball/gui/Controller.java | 11 +++++++----
 src/main/resources/fxml/osci-render.fxml  |  3 ++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/sh/ball/gui/Controller.java b/src/main/java/sh/ball/gui/Controller.java
index 33d6631..d889e3a 100644
--- a/src/main/java/sh/ball/gui/Controller.java
+++ b/src/main/java/sh/ball/gui/Controller.java
@@ -79,6 +79,8 @@ public class Controller implements Initializable, FrequencyListener, Listener {
   @FXML
   private Label fileLabel;
   @FXML
+  private Label jkLabel;
+  @FXML
   private Button recordButton;
   @FXML
   private Label recordLabel;
@@ -412,20 +414,21 @@ public class Controller implements Initializable, FrequencyListener, Listener {
   private void chooseFile(File chosenFile) {
     try {
       if (chosenFile.exists()) {
-        String path = chosenFile.getAbsolutePath();
         frameSets.clear();
         frameSetPaths.clear();
 
         if (chosenFile.isDirectory()) {
+          jkLabel.setVisible(true);
           for (File file : chosenFile.listFiles()) {
             try {
               frameSets.add(ParserFactory.getParser(file.getAbsolutePath()).parse());
-              frameSetPaths.add(file.getAbsolutePath());
+              frameSetPaths.add(file.getName());
             } catch (IOException ignored) {}
           }
         } else {
-          frameSets.add(ParserFactory.getParser(path).parse());
-          frameSetPaths.add(path);
+          jkLabel.setVisible(false);
+          frameSets.add(ParserFactory.getParser(chosenFile.getAbsolutePath()).parse());
+          frameSetPaths.add(chosenFile.getName());
         }
 
         currentFrameSet = 0;
diff --git a/src/main/resources/fxml/osci-render.fxml b/src/main/resources/fxml/osci-render.fxml
index 5752351..84184d2 100644
--- a/src/main/resources/fxml/osci-render.fxml
+++ b/src/main/resources/fxml/osci-render.fxml
@@ -16,10 +16,11 @@
        <Button fx:id="chooseFileButton" layoutX="14.0" layoutY="53.0" mnemonicParsing="false" prefHeight="26.0" prefWidth="114.0" text="Choose File" />
        <Label fx:id="fileLabel" layoutX="144.0" layoutY="57.0" maxWidth="270.0" prefHeight="18.0" prefWidth="246.0" text="cube.obj" />
          <Button fx:id="recordButton" layoutX="14.0" layoutY="129.0" mnemonicParsing="false" prefHeight="26.0" prefWidth="114.0" text="Record" />
-         <Label fx:id="recordLabel" layoutX="145.0" layoutY="140.0" maxWidth="270.0" prefHeight="18.0" prefWidth="245.0" />
+         <Label fx:id="recordLabel" layoutX="144.0" layoutY="133.0" maxWidth="270.0" prefHeight="18.0" prefWidth="245.0" />
          <Label id="frequency" fx:id="frequencyLabel" layoutX="13.0" layoutY="166.0" prefHeight="58.0" prefWidth="376.0" text="L/R Frequency:&#10; &#10;" />
          <ComboBox fx:id="deviceComboBox" layoutX="14.0" layoutY="11.0" prefHeight="26.0" prefWidth="376.0" />
          <Button fx:id="chooseFolderButton" layoutX="14.0" layoutY="91.0" mnemonicParsing="false" prefHeight="26.0" prefWidth="114.0" text="Choose Folder" />
+         <Label fx:id="jkLabel" layoutX="143.0" layoutY="95.0" maxWidth="270.0" prefHeight="18.0" prefWidth="246.0" text="Use j and k to cycle between files" visible="false" />
       </children>
    </AnchorPane>
    <TitledPane animated="false" collapsible="false" layoutX="423.0" layoutY="252.0" prefHeight="272.0" prefWidth="402.0" text="Effects">