1 files changed, 12 insertions, 20 deletions

diff --git a/src/main/java/net/sowgro/npehero/gui/Settings.java b/src/main/java/net/sowgro/npehero/gui/Settings.java
index 8d345a0..cc6815c 100755
--- a/src/main/java/net/sowgro/npehero/gui/Settings.java
+++ b/src/main/java/net/sowgro/npehero/gui/Settings.java
@@ -4,7 +4,6 @@ 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;
@@ -70,26 +69,20 @@ public class Settings extends Pane
         fullBox.setPadding(new Insets(10));
 
 
-        Text devLabel = new Text("Advanced");
-        devLabel.getStyleClass().add("t3");
+        Text controlsLabel = new Text("Key Bindings");
+        controlsLabel.getStyleClass().add("t3");
 
-        Button devMenu = new Button();
-        devMenu.setText("Debug Menu");
-        devMenu.setOnAction(e -> {
+        Button controlsButton = new Button();
+        controlsButton.setText("Edit");
+        controlsButton.setOnAction(_ -> {
             SoundController.playSfx(SoundController.FORWARD);
-//            Driver.debug.show();
+            Driver.setMenu(new ControlEditor());
         });
 
-        VBox devBox = new VBox();
-        devBox.getStyleClass().add("box");
-        devBox.getChildren().addAll(devLabel,devMenu);
-        devBox.setVisible(false);
-        devBox.setManaged(false);
-        devBox.setPadding(new Insets(10));
-
-        ToggleButton advanced = new ToggleButton("Advanced");
-        advanced.selectedProperty().bindBidirectional(devBox.managedProperty());
-        advanced.selectedProperty().bindBidirectional(devBox.visibleProperty());
+        VBox controlsBox = new VBox();
+        controlsBox.getStyleClass().add("box");
+        controlsBox.getChildren().addAll(controlsLabel, controlsButton);
+        controlsBox.setPadding(new Insets(10));
 
         Button exit = new Button();
         exit.setText("Back");
@@ -101,13 +94,11 @@ public class Settings extends Pane
 
         BorderPane buttonBox = new BorderPane();
         buttonBox.setLeft(exit);
-        buttonBox.setRight(advanced);
-
 
         VBox options = new VBox();
         options.setSpacing(10);
         options.setAlignment(Pos.CENTER);
-        options.getChildren().addAll(musicBox,SFXBox,fullBox,devBox,buttonBox);
+        options.getChildren().addAll(musicBox,SFXBox,fullBox,controlsBox,buttonBox);
         options.maxWidthProperty().bind(super.prefWidthProperty().multiply(0.25)); 
         options.setMinWidth(400);
         options.prefHeightProperty().bind(super.prefHeightProperty());
@@ -120,3 +111,4 @@ public class Settings extends Pane
         super.getChildren().add(rootBox);
     }
 }
+