diff --git a/src/main/java/fabrik/simulator/pic16f84/Controller_FileSelect.java b/src/main/java/fabrik/simulator/pic16f84/Controller_FileSelect.java index ef0b08b..2d9fcda 100644 --- a/src/main/java/fabrik/simulator/pic16f84/Controller_FileSelect.java +++ b/src/main/java/fabrik/simulator/pic16f84/Controller_FileSelect.java @@ -36,7 +36,7 @@ public class Controller_FileSelect { FileChooser fileChooser = new FileChooser(); fileChooser.setTitle("Open LST File"); fileChooser.getExtensionFilters().addAll( - new FileChooser.ExtensionFilter("LST Files", "*.lst"), + new FileChooser.ExtensionFilter("LST Files", "*.lst", "*.LST"), new FileChooser.ExtensionFilter("All Files", "*.*")); return fileChooser.showOpenDialog(null); } diff --git a/src/main/java/fabrik/simulator/pic16f84/CreateWindow.java b/src/main/java/fabrik/simulator/pic16f84/CreateWindow.java index 0aa5475..67ee83f 100644 --- a/src/main/java/fabrik/simulator/pic16f84/CreateWindow.java +++ b/src/main/java/fabrik/simulator/pic16f84/CreateWindow.java @@ -9,7 +9,7 @@ import javafx.scene.Scene; import javafx.scene.control.Label; import javafx.scene.control.TableColumn; import javafx.scene.control.TableView; -import javafx.scene.layout.AnchorPane; +import javafx.scene.layout.GridPane; import javafx.scene.layout.VBox; import javafx.stage.Stage; @@ -65,20 +65,23 @@ public class CreateWindow extends Application { Label pclathLabel = new Label("PCLATH: 0x" + Integer.toHexString(DataRegister.getRegister(DataRegister.getPCLATH())).toUpperCase()); Label intconLabel = new Label("INTCON: 0x" + Integer.toHexString(DataRegister.getRegister(DataRegister.getINTCON())).toUpperCase()); - FXMLLoader fxmlLoader = new FXMLLoader(CreateWindow.class.getResource("frontend.fxml")); - Parent loadedRoot = fxmlLoader.load(); + FXMLLoader codewindow = new FXMLLoader(CreateWindow.class.getResource("frontend.fxml")); + Parent code = codewindow.load(); + // Erstelle einen VBox, um die TableView und Labels anzuzeigen - VBox root = new VBox(); - root.getChildren().addAll(tableView, pclLabel, statusLabel, fsrLabel, pclathLabel, intconLabel); + VBox table = new VBox(); + table.getChildren().addAll(tableView, pclLabel, statusLabel, fsrLabel, pclathLabel, intconLabel); - AnchorPane Parent = new AnchorPane(); - Parent.getChildren().addAll(root, loadedRoot); + GridPane grid = new GridPane(); + grid.add(table, 0, 1); + grid.add(code, 1, 1); + grid.relocate(0, 0); - Scene scene = new Scene(Parent, 1600, 800); + Scene scene = new Scene(grid, 1600, 800); primaryStage.setScene(scene); primaryStage.setTitle("Simulator"); primaryStage.show();