aboutsummaryrefslogtreecommitdiff
path: root/src/devmenu
diff options
context:
space:
mode:
Diffstat (limited to 'src/devmenu')
-rw-r--r--src/devmenu/DiffEditor.java9
-rw-r--r--src/devmenu/NotesEditor.java14
2 files changed, 15 insertions, 8 deletions
diff --git a/src/devmenu/DiffEditor.java b/src/devmenu/DiffEditor.java
index 727510d..0991fb0 100644
--- a/src/devmenu/DiffEditor.java
+++ b/src/devmenu/DiffEditor.java
@@ -35,7 +35,7 @@ public class DiffEditor
Text bpmLabel = new Text("BPM");
TextField bpm = new TextField(diff.bpm+"");
- Text numBeatsLabel = new Text("Number of beats");
+ Text numBeatsLabel = new Text("Number of beats (set by notes editor)");
TextField numBeats = new TextField(diff.numBeats+"");
Text priorityLabel = new Text("priority (lower first)");
@@ -56,6 +56,11 @@ public class DiffEditor
Button playLevel = new Button("Launch level");
playLevel.setOnAction(e -> Driver.setMenu(new LevelSurround(diff.level, diff, new MainMenu())));
+ Button refresh = new Button("Refresh");
+ refresh.setOnAction( e -> {
+ numBeats.setText(diff.numBeats+"");
+ });
+
Button save = new Button("Save");
save.setOnAction(e -> { //assigns text feilds to values
diff.title = title.getText();
@@ -66,7 +71,7 @@ public class DiffEditor
});
VBox main = new VBox();
- main.getChildren().addAll(folderNameLabel,folderName,titleLabel,title,bpmLabel,bpm,numBeatsLabel,numBeats,priorityLabel,priority,editNotes,editScores,playLevel,save);
+ main.getChildren().addAll(folderNameLabel,folderName,titleLabel,title,bpmLabel,bpm,numBeatsLabel,numBeats,refresh,priorityLabel,priority,editNotes,editScores,playLevel,save);
Scene scene = new Scene(main);
primaryStage.setScene(scene);
primaryStage.show();
diff --git a/src/devmenu/NotesEditor.java b/src/devmenu/NotesEditor.java
index 269bf84..2ac0c88 100644
--- a/src/devmenu/NotesEditor.java
+++ b/src/devmenu/NotesEditor.java
@@ -85,15 +85,17 @@ public class NotesEditor
private void stop()
{
- try {
- Driver.soundController.endSong();
- diff.numBeats = (int)timer.time();
- timer = null;
- writer.close();
- help.setText(t1);
+ try
+ {
+ Driver.soundController.endSong();
+ diff.numBeats = (int)timer.time();
+ timer = null;
+ writer.close();
+ help.setText(t1);
}
catch (Exception e)
{
+ //System.err.println("tried to stop but already stopped");
}
}
} \ No newline at end of file