diff --git a/src/main/java/com/cemu_UI/application/Main.java b/src/main/java/com/cemu_UI/application/Main.java index 2949436..309abff 100644 --- a/src/main/java/com/cemu_UI/application/Main.java +++ b/src/main/java/com/cemu_UI/application/Main.java @@ -176,7 +176,7 @@ public class Main extends Application { // init here as it loads the games to the mwc and the gui, therefore the window must exist mainWindowController.init(); - mainWindowController.dbController.init(); + mainWindowController.getDbController().init(); // if cloud sync is activated start sync if(mainWindowController.isCloudSync()) { diff --git a/src/main/java/com/cemu_UI/application/MainWindowController.java b/src/main/java/com/cemu_UI/application/MainWindowController.java index 0efbe79..2ccc68c 100644 --- a/src/main/java/com/cemu_UI/application/MainWindowController.java +++ b/src/main/java/com/cemu_UI/application/MainWindowController.java @@ -265,11 +265,15 @@ public class MainWindowController { @FXML private JFXTreeTableColumn timeColumn = new JFXTreeTableColumn<>("time"); + + private enum CloudService { + GoogleDrive, Dropbox + } - Main main; - DBController dbController; - SmmdbAPIController smmdbAPIController; - playGame playGame; + private Main main; + private DBController dbController; + private SmmdbAPIController smmdbAPIController; + private playGame playGame; private static MainWindowController MWC; private UpdateController updateController; private boolean menuTrue = false; @@ -1050,6 +1054,7 @@ public class MainWindowController { public void handle(ActionEvent event){ cloudSync = true; //TODO rework for other cloud services +// CloudService service = CloudService.GoogleDrive; cloudService = "GoogleDrive"; // start cloud sync in new thread @@ -1832,6 +1837,18 @@ public class MainWindowController { return resizedImage; } + public Main getMain() { + return main; + } + + public DBController getDbController() { + return dbController; + } + + public void setMainAnchorPane(AnchorPane mainAnchorPane) { + this.mainAnchorPane = mainAnchorPane; + } + public String getCemuPath() { return cemuPath; } diff --git a/src/main/java/com/cemu_UI/application/playGame.java b/src/main/java/com/cemu_UI/application/playGame.java index 7cfb24c..1a0ebfc 100644 --- a/src/main/java/com/cemu_UI/application/playGame.java +++ b/src/main/java/com/cemu_UI/application/playGame.java @@ -54,7 +54,7 @@ public class playGame extends Thread{ Process p; Platform.runLater(() -> { - mainWindowController.main.getPrimaryStage().setIconified(true); // minimize cemu_UI + mainWindowController.getMain().getPrimaryStage().setIconified(true); // minimize cemu_UI }); startTime = System.currentTimeMillis(); try { @@ -86,14 +86,14 @@ public class playGame extends Thread{ } else { mainWindowController.totalPlaytimeBtn.setText(dbController.getTotalPlaytime(selectedGameTitleID) + " min"); } - mainWindowController.main.getPrimaryStage().setIconified(false); // maximize cemu_UI + mainWindowController.getMain().getPrimaryStage().setIconified(false); // maximize cemu_UI }); //sync savegame with cloud service if (mainWindowController.isCloudSync()) { mainWindowController.setLastLocalSync(Instant.now().getEpochSecond()); - mainWindowController.main.getCloudController().sync(mainWindowController.getCloudService(), - mainWindowController.getCemuPath(), mainWindowController.main.getDirectory().getPath()); + mainWindowController.getMain().getCloudController().sync(mainWindowController.getCloudService(), + mainWindowController.getCemuPath(), mainWindowController.getMain().getDirectory().getPath()); } } catch (IOException | InterruptedException e) {