Merge branch 'main' of https://gitlab.sowgro.net/guitarheros/guitarhero

4 files changed, 31 insertions, 11 deletions

diff --git a/src/gui/Driver.java b/src/gui/Driver.java
index 7f44608..1813e96 100644
--- a/src/gui/Driver.java
+++ b/src/gui/Driver.java
@@ -1,16 +1,10 @@
 package gui;
 
-import javafx.util.Duration;
-import javafx.animation.KeyFrame;
-import javafx.animation.KeyValue;
-import javafx.animation.Timeline;
 import javafx.application.Application;
 import javafx.application.Platform;
-import javafx.beans.property.Property;
 import javafx.geometry.Side;
 import javafx.scene.Scene;
 import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
 import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyCombination;
 import javafx.scene.input.KeyEvent;
@@ -23,7 +17,13 @@ import javafx.scene.layout.Pane;
 import javafx.stage.Stage;
 import main.LevelController;
 import main.SettingsController;
-import org.json.simple.parser.ParseException;
+
+// import javafx.scene.image.ImageView;
+// import javafx.beans.property.Property;
+// import javafx.util.Duration;
+// import javafx.animation.KeyFrame;
+// import javafx.animation.KeyValue;
+// import javafx.animation.Timeline;
 
 import devmenu.DebugMenu;
 
diff --git a/src/gui/LevelSelector.java b/src/gui/LevelSelector.java
index 9a5c6df..07ace6e 100644
--- a/src/gui/LevelSelector.java
+++ b/src/gui/LevelSelector.java
@@ -11,6 +11,7 @@ import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
 import javafx.scene.layout.VBox;
 import main.Level;
+import main.LevelController;
 
 public class LevelSelector extends Pane
 {   
@@ -33,7 +34,7 @@ public class LevelSelector extends Pane
         titleCol.setCellValueFactory(new PropertyValueFactory<Level, String>("title"));
         artistCol.setCellValueFactory(new PropertyValueFactory<Level, String>("artist"));
 
-        levels.setItems(Driver.levelController.levelList);
+        levels.setItems(LevelController.levelList);
 
         levels.prefWidthProperty().bind(super.prefWidthProperty().multiply(0.25)); 
         levels.prefHeightProperty().bind(super.prefHeightProperty().multiply(0.75));
diff --git a/src/gui/LevelSurround.java b/src/gui/LevelSurround.java
index 3f10925..d5dcd33 100644
--- a/src/gui/LevelSurround.java
+++ b/src/gui/LevelSurround.java
@@ -18,7 +18,6 @@ import javafx.scene.text.Text;
 import main.Difficulty;
 import main.Level;
 import main.ScoreController;
-import sound.AudioFilePlayer;
 
 public class LevelSurround extends Pane
 {   
diff --git a/src/gui/Settings.java b/src/gui/Settings.java
index 0d757f5..056c71e 100644
--- a/src/gui/Settings.java
+++ b/src/gui/Settings.java
@@ -4,6 +4,7 @@ import javafx.geometry.Insets;
 import javafx.geometry.Pos;
 import javafx.scene.control.Button;
 import javafx.scene.control.Slider;
+import javafx.scene.control.ToggleButton;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.Pane;
@@ -65,23 +66,42 @@ public class Settings extends Pane
         fullBox.setPadding(new Insets(10));
 
 
+        Text devLabel = new Text("Advanced");
+        devLabel.getStyleClass().add("t3");
+        
+        Button levelEdit = new Button("Level Utility");
+        levelEdit.setOnAction(e -> new devmenu.LevelList());
+
         Button devMenu = new Button();
         devMenu.setText("Debug Menu");
         devMenu.setOnAction(e -> Driver.debug.show());
 
+        VBox devBox = new VBox();
+        devBox.getStyleClass().add("box");
+        devBox.getChildren().addAll(devLabel,levelEdit,devMenu);
+        devBox.setVisible(false);
+        devBox.setManaged(false);
+        devBox.setPadding(new Insets(10));
+
+        ToggleButton advanced = new ToggleButton("Advanced");
+        advanced.getStyleClass().remove("toggle-button");
+        advanced.getStyleClass().add("button");
+        advanced.selectedProperty().bindBidirectional(devBox.managedProperty());
+        advanced.selectedProperty().bindBidirectional(devBox.visibleProperty());
+
         Button exit = new Button();
         exit.setText("Back");
         exit.setOnAction(e -> Driver.setMenu(new MainMenu()));
 
         BorderPane buttonBox = new BorderPane();
         buttonBox.setLeft(exit);
-        buttonBox.setRight(devMenu);
+        buttonBox.setRight(advanced);
 
 
         VBox options = new VBox();
         options.setSpacing(10);
         options.setAlignment(Pos.CENTER);
-        options.getChildren().addAll(musicBox,SFXBox,fullBox,buttonBox);
+        options.getChildren().addAll(musicBox,SFXBox,fullBox,devBox,buttonBox);
         options.maxWidthProperty().bind(super.prefWidthProperty().multiply(0.25)); 
         options.setMinWidth(400);
         options.prefHeightProperty().bind(super.prefHeightProperty());