diff options
Diffstat (limited to 'src/devmenu')
| -rw-r--r-- | src/devmenu/LevelEditor.java | 26 | ||||
| -rw-r--r-- | src/devmenu/LevelList.java | 11 |
2 files changed, 28 insertions, 9 deletions
diff --git a/src/devmenu/LevelEditor.java b/src/devmenu/LevelEditor.java index a00ce57..9e65a0c 100644 --- a/src/devmenu/LevelEditor.java +++ b/src/devmenu/LevelEditor.java @@ -6,8 +6,12 @@ import javafx.collections.ObservableList; import javafx.scene.Scene; import javafx.scene.control.Button; import javafx.scene.control.ColorPicker; +import javafx.scene.control.ListCell; import javafx.scene.control.ListView; +import javafx.scene.control.TableColumn; +import javafx.scene.control.TableView; import javafx.scene.control.TextField; +import javafx.scene.control.cell.PropertyValueFactory; import javafx.scene.layout.HBox; import javafx.scene.layout.VBox; import javafx.scene.text.Text; @@ -71,10 +75,19 @@ public class LevelEditor Text diffLabel = new Text("Difficulties"); - ObservableList<Difficulty> diffList2 = FXCollections.observableArrayList(); - diffList2.addAll(level.getDiffList()); - ListView<Difficulty> diffList = new ListView<Difficulty>(); - diffList.setItems(diffList2); + TableView<Difficulty> diffList = new TableView<Difficulty>(); + + TableColumn<Difficulty,String> diffCol = new TableColumn<Difficulty,String>("Difficulty"); + TableColumn<Difficulty,Boolean> validCol = new TableColumn<Difficulty,Boolean>("Valid?"); + + diffList.getColumns().add(diffCol); + diffList.getColumns().add(validCol); + + diffCol.setCellValueFactory(new PropertyValueFactory<Difficulty,String>("title")); + validCol.setCellValueFactory(new PropertyValueFactory<Difficulty,Boolean>("valid")); + + diffList.setItems(level.getDiffList()); + Button edit = new Button("Edit"); edit.setOnAction(e -> new DiffEditor(diffList.getSelectionModel().getSelectedItem())); @@ -84,9 +97,8 @@ public class LevelEditor Button refresh = new Button("Refresh"); refresh.setOnAction(e -> { - diffList2.clear(); - diffList2.addAll(level.getDiffList()); - diffList.setItems(diffList2); + level.readData(); + diffList.setItems(level.getDiffList()); }); HBox buttons = new HBox(); diff --git a/src/devmenu/LevelList.java b/src/devmenu/LevelList.java index 7eaca84..7087472 100644 --- a/src/devmenu/LevelList.java +++ b/src/devmenu/LevelList.java @@ -29,14 +29,18 @@ public class LevelList TableColumn<Level,String> titleCol = new TableColumn<Level,String>("Title"); TableColumn<Level,String> artistCol = new TableColumn<Level,String>("Artist"); + TableColumn<Level,Boolean> validCol = new TableColumn<>("Valid?"); levels.getColumns().add(titleCol); levels.getColumns().add(artistCol); + levels.getColumns().add(validCol); titleCol.setCellValueFactory(new PropertyValueFactory<Level, String>("title")); artistCol.setCellValueFactory(new PropertyValueFactory<Level, String>("artist")); + validCol.setCellValueFactory(new PropertyValueFactory<Level, Boolean>("valid")); + + levels.setItems(LevelController.getLevelList()); - levels.setItems(LevelController.levelList); Button edit = new Button("Edit"); edit.setOnAction(e -> new LevelEditor(levels.getSelectionModel().getSelectedItem())); @@ -45,7 +49,10 @@ public class LevelList remove.setOnAction(e -> gui.Driver.levelController.removeLevel(levels.getSelectionModel().getSelectedItem())); Button refresh = new Button("Refresh"); - refresh.setOnAction(e -> levels.setItems(LevelController.levelList)); + refresh.setOnAction(e -> { + Driver.levelController.readData(); + levels.setItems(LevelController.getLevelList()); + }); HBox buttons = new HBox(); buttons.getChildren().addAll(edit,remove,refresh); |