diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..b378b9a Binary files /dev/null and b/.DS_Store differ diff --git a/src/.DS_Store b/src/.DS_Store new file mode 100644 index 0000000..1373bf7 Binary files /dev/null and b/src/.DS_Store differ diff --git a/src/main/.DS_Store b/src/main/.DS_Store new file mode 100644 index 0000000..8e9cd3e Binary files /dev/null and b/src/main/.DS_Store differ diff --git a/src/main/java/.DS_Store b/src/main/java/.DS_Store new file mode 100644 index 0000000..4d0f601 Binary files /dev/null and b/src/main/java/.DS_Store differ diff --git a/src/main/java/directory/.DS_Store b/src/main/java/directory/.DS_Store new file mode 100644 index 0000000..aa92fa0 Binary files /dev/null and b/src/main/java/directory/.DS_Store differ diff --git a/src/main/java/launcher/Controller.java b/src/main/java/launcher/Controller.java index 9f57069..e83902d 100644 --- a/src/main/java/launcher/Controller.java +++ b/src/main/java/launcher/Controller.java @@ -52,7 +52,7 @@ public class Controller{ manager = new FolderViewManager(dirTree); // 2 statements in 1 line is best IronFile[] hardDrives = IronFile.listRoots(); // an array of hard drives menubar.setUseSystemMenuBar(true); //allows use of native menu bars, luckily an easy 1 liner - manager.setRootDirectory(hardDrives); + // manager.setRootDirectory(hardDrives); Ideally only show tree view of files the user drags in } /** * Action event triggered when user clicks. This method will add tag directly to IronFile diff --git a/src/main/java/launcher/Main.java b/src/main/java/launcher/Main.java index 25c122a..375d969 100644 --- a/src/main/java/launcher/Main.java +++ b/src/main/java/launcher/Main.java @@ -18,13 +18,18 @@ public class Main extends Application { @Override public void start(Stage primaryStage) throws Exception{ // setUserAgentStylesheet(STYLESHEET_CASPIAN); - Parent root = FXMLLoader.load(getClass().getResource("/StartPage.fxml")); + + FXMLLoader loader = new FXMLLoader(); + Parent root = loader.load(getClass().getResource("/StartPage.fxml").openStream()); primaryStage.setTitle("Iron-gate!"); primaryStage.setScene(new Scene(root, 990, 700)); Scene scene = primaryStage.getScene(); // we get the scene from above scene.getStylesheets().clear(); // clear any styles // scene.getStylesheets().add("/main/resources/mainStyle.css"); // absolute path primaryStage.show(); + Controller controller = loader.getController(); + controller.initializeSceneEvents(); + } public static void main(String[] args) { launch(args);