Move failed indicators in LevelList and DiffList

3 files changed, 38 insertions, 49 deletions

diff --git a/src/main/java/net/sowgro/npehero/editor/DiffList.java b/src/main/java/net/sowgro/npehero/editor/DiffList.java
index 45204ed..ab28af9 100755
--- a/src/main/java/net/sowgro/npehero/editor/DiffList.java
+++ b/src/main/java/net/sowgro/npehero/editor/DiffList.java
@@ -2,9 +2,9 @@ package net.sowgro.npehero.editor;
 
 import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.collections.ObservableList;
-import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.control.*;
+import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
@@ -22,10 +22,9 @@ import java.util.Collections;
 
 public class DiffList extends Page
 {
-    private final Label error;
-    private final HBox errorBox;
-    private HBox content = new HBox();
-    private Level level;
+    private final Button error;
+    private final HBox content = new HBox();
+    private final Level level;
 
     public DiffList(Level level, Page prev)
     {
@@ -60,19 +59,16 @@ public class DiffList extends Page
 
         diffs.setPrefWidth(400);
 
-        error = new Label();
-        errorBox = new HBox(error);
-        errorBox.setSpacing(10);
-        errorBox.setPadding(new Insets(10));
-        errorBox.getStyleClass().addAll("box", "red");
-        errorBox.setOnMouseClicked(_ -> {
+        error = new Button();
+        error.getStyleClass().add("red");
+        error.setOnAction(_ -> {
             // TODO
             Driver.setMenu(new ErrorList(level.difficulties.problems, this));
         });
         refresh();
 
         Button edit = new Button("Edit");
-        edit.setOnAction(e -> {
+        edit.setOnAction(_ -> {
             Sound.playSfx(Sound.FORWARD);
             Driver.setMenu(new DiffEditor(diffs.getSelectionModel().getSelectedItem(), this));
         });
@@ -80,7 +76,7 @@ public class DiffList extends Page
         edit.disableProperty().bind(diffs.getSelectionModel().selectedItemProperty().isNull());
 
         Button remove = new Button("Delete");
-        remove.setOnAction(e -> {
+        remove.setOnAction(_ -> {
             Sound.playSfx(Sound.FORWARD);
             try {
                 level.difficulties.remove(diffs.getSelectionModel().getSelectedItem());
@@ -92,7 +88,7 @@ public class DiffList extends Page
         remove.disableProperty().bind(diffs.getSelectionModel().selectedItemProperty().isNull());
 
         Button refresh = new Button("Refresh");
-        refresh.setOnAction(e -> {
+        refresh.setOnAction(_ -> {
             Sound.playSfx(Sound.FORWARD);
             try {
                 level.difficulties.read();
@@ -146,15 +142,19 @@ public class DiffList extends Page
         buttons.getChildren().addAll(create, edit, remove, moveUp, moveDown, refresh);
         buttons.setSpacing(10);
 
+        BorderPane bp = new BorderPane();
+        bp.setTop(buttons);
+        bp.setBottom(error);
+
         HBox main = new HBox();
-        main.getChildren().addAll(new VBox(diffs, errorBox),buttons);
+        main.getChildren().addAll(diffs, bp);
         main.setSpacing(10);
         main.prefHeightProperty().bind(content.prefHeightProperty().multiply(0.67));
         diffs.prefHeightProperty().bind(main.heightProperty());
 
         Button exit = new Button();
         exit.setText("Back");
-        exit.setOnAction(e -> {
+        exit.setOnAction(_ -> {
             Sound.playSfx(Sound.BACKWARD);
             Driver.setMenu(prev);
         });
@@ -192,11 +192,11 @@ public class DiffList extends Page
     public void refresh() {
         error.setText("Failed to load " + level.difficulties.problems.size() + " difficulty(s)");
         if (level.difficulties.problems.isEmpty()) {
-            errorBox.setVisible(false);
-            errorBox.setManaged(false);
+            error.setVisible(false);
+            error.setManaged(false);
         } else {
-            errorBox.setVisible(true);
-            errorBox.setManaged(true);
+            error.setVisible(true);
+            error.setManaged(true);
         }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/net/sowgro/npehero/editor/LevelList.java b/src/main/java/net/sowgro/npehero/editor/LevelList.java
index 492683f..22144a4 100755
--- a/src/main/java/net/sowgro/npehero/editor/LevelList.java
+++ b/src/main/java/net/sowgro/npehero/editor/LevelList.java
@@ -1,15 +1,11 @@
 package net.sowgro.npehero.editor;
 
 import javafx.beans.property.ReadOnlyStringWrapper;
-import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.control.*;
 import javafx.scene.control.Button;
-import javafx.scene.control.Label;
-import javafx.scene.layout.Pane;
+import javafx.scene.layout.*;
 import net.sowgro.npehero.Driver;
-import javafx.scene.layout.HBox;
-import javafx.scene.layout.VBox;
 import net.sowgro.npehero.gui.MainMenu;
 import net.sowgro.npehero.levelapi.Level;
 import net.sowgro.npehero.levelapi.Levels;
@@ -24,10 +20,9 @@ import java.nio.file.FileAlreadyExistsException;
 
 public class LevelList extends Page
 {
-    private HBox content = new HBox();
+    private final HBox content = new HBox();
 
-    private final Label error;
-    private final HBox errorBox;
+    private final Button error;
 
     public LevelList()
     {
@@ -72,18 +67,14 @@ public class LevelList extends Page
         levels.setPrefWidth(600);
         levels.prefHeightProperty().bind(content.prefHeightProperty().multiply(0.75));
 
-        error = new Label();
-        errorBox = new HBox(error);
-        errorBox.setSpacing(10);
-        errorBox.setPadding(new Insets(10));
-        errorBox.getStyleClass().addAll("box", "red");
-        errorBox.setOnMouseClicked(_ -> {
+        error = new Button();
+        error.getStyleClass().add("red");
+        error.setOnAction(_ -> {
             // TODO
             Driver.setMenu(new ErrorList(Levels.problems, this));
         });
         refresh();
 
-
         Button edit = new Button("Edit");
         edit.setOnAction(_ -> {
             Sound.playSfx(Sound.FORWARD);
@@ -93,7 +84,7 @@ public class LevelList extends Page
         edit.disableProperty().bind(levels.getSelectionModel().selectedItemProperty().isNull());
 
         Button remove = new Button("Delete");
-        remove.setOnAction(e -> {
+        remove.setOnAction(_ -> {
             Sound.playSfx(Sound.FORWARD);
             try {
                 Levels.remove(levels.getSelectionModel().getSelectedItem());
@@ -105,7 +96,7 @@ public class LevelList extends Page
         remove.disableProperty().bind(levels.getSelectionModel().selectedItemProperty().isNull());
 
         Button refresh = new Button("Refresh");
-        refresh.setOnAction(e -> {
+        refresh.setOnAction(_ -> {
             Sound.playSfx(Sound.FORWARD);
             try {
                 Levels.readData();
@@ -131,10 +122,12 @@ public class LevelList extends Page
         buttons.getChildren().addAll(create, edit, remove, refresh, viewFolder);
         buttons.setSpacing(10);
 
-
+        BorderPane bp = new BorderPane();
+        bp.setTop(buttons);
+        bp.setBottom(error);
 
         HBox main = new HBox();
-        main.getChildren().addAll(new VBox(levels, errorBox),buttons);
+        main.getChildren().addAll(levels, bp);
         main.setSpacing(10);
 
         Button exit = new Button();
@@ -175,13 +168,13 @@ public class LevelList extends Page
     }
 
     public void refresh() {
-        error.setText("Failed to load " + Levels.problems.size() + " level(s)");
+        error.setText(Levels.problems.size() + " Failed");
         if (Levels.problems.isEmpty()) {
-            errorBox.setVisible(false);
-            errorBox.setManaged(false);
+            error.setVisible(false);
+            error.setManaged(false);
         } else {
-            errorBox.setVisible(true);
-            errorBox.setManaged(true);
+            error.setVisible(true);
+            error.setManaged(true);
         }
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/net/sowgro/npehero/style.css b/src/main/resources/net/sowgro/npehero/style.css
index 2897092..61f2bad 100755
--- a/src/main/resources/net/sowgro/npehero/style.css
+++ b/src/main/resources/net/sowgro/npehero/style.css
@@ -267,14 +267,10 @@ CheckBox:selected > .box {
     /* -fx-border-width: 20; */
 }
 
-.red Label {
+.red {
     -fx-text-fill: red;
 }
 
-.red:hover Label {
-    -fx-underline: true;
-}
-
 .progress-bar {
     -fx-background-color: transparent;
     -fx-fill: white;