diff --git a/bin/application/MainWindow.fxml b/bin/application/MainWindow.fxml index 1c8e6d9..dd8360d 100644 --- a/bin/application/MainWindow.fxml +++ b/bin/application/MainWindow.fxml @@ -16,9 +16,9 @@ - + - + @@ -60,31 +60,38 @@ - - - - - + + + + + + + + + diff --git a/bin/application/MainWindowController$1.class b/bin/application/MainWindowController$1.class index c0193a7..6109112 100644 Binary files a/bin/application/MainWindowController$1.class and b/bin/application/MainWindowController$1.class differ diff --git a/bin/application/MainWindowController$10.class b/bin/application/MainWindowController$10.class index bd8e82c..c45c4ec 100644 Binary files a/bin/application/MainWindowController$10.class and b/bin/application/MainWindowController$10.class differ diff --git a/bin/application/MainWindowController$11.class b/bin/application/MainWindowController$11.class index c0b6029..ff5134d 100644 Binary files a/bin/application/MainWindowController$11.class and b/bin/application/MainWindowController$11.class differ diff --git a/bin/application/MainWindowController$12.class b/bin/application/MainWindowController$12.class index 01521d7..28d1351 100644 Binary files a/bin/application/MainWindowController$12.class and b/bin/application/MainWindowController$12.class differ diff --git a/bin/application/MainWindowController$2.class b/bin/application/MainWindowController$2.class index 0ae5aa7..ff23970 100644 Binary files a/bin/application/MainWindowController$2.class and b/bin/application/MainWindowController$2.class differ diff --git a/bin/application/MainWindowController$3.class b/bin/application/MainWindowController$3.class index c8204c7..6ab1557 100644 Binary files a/bin/application/MainWindowController$3.class and b/bin/application/MainWindowController$3.class differ diff --git a/bin/application/MainWindowController$4.class b/bin/application/MainWindowController$4.class index d0c5e8e..e88ad17 100644 Binary files a/bin/application/MainWindowController$4.class and b/bin/application/MainWindowController$4.class differ diff --git a/bin/application/MainWindowController$5.class b/bin/application/MainWindowController$5.class index e471562..19d2eb0 100644 Binary files a/bin/application/MainWindowController$5.class and b/bin/application/MainWindowController$5.class differ diff --git a/bin/application/MainWindowController$6.class b/bin/application/MainWindowController$6.class index 05d03fb..12e0910 100644 Binary files a/bin/application/MainWindowController$6.class and b/bin/application/MainWindowController$6.class differ diff --git a/bin/application/MainWindowController$7.class b/bin/application/MainWindowController$7.class index 9054b33..dd579b8 100644 Binary files a/bin/application/MainWindowController$7.class and b/bin/application/MainWindowController$7.class differ diff --git a/bin/application/MainWindowController$8.class b/bin/application/MainWindowController$8.class index 347a652..3dac233 100644 Binary files a/bin/application/MainWindowController$8.class and b/bin/application/MainWindowController$8.class differ diff --git a/bin/application/MainWindowController$9.class b/bin/application/MainWindowController$9.class index b1008db..eb9fc7c 100644 Binary files a/bin/application/MainWindowController$9.class and b/bin/application/MainWindowController$9.class differ diff --git a/bin/application/MainWindowController.class b/bin/application/MainWindowController.class index add6727..caeb3ca 100644 Binary files a/bin/application/MainWindowController.class and b/bin/application/MainWindowController.class differ diff --git a/src/application/MainWindow.fxml b/src/application/MainWindow.fxml index 1c8e6d9..dd8360d 100644 --- a/src/application/MainWindow.fxml +++ b/src/application/MainWindow.fxml @@ -16,9 +16,9 @@ - + - + @@ -60,31 +60,38 @@ - - - - - + + + + + + + + + diff --git a/src/application/MainWindowController.java b/src/application/MainWindowController.java index ca04f93..83287ed 100644 --- a/src/application/MainWindowController.java +++ b/src/application/MainWindowController.java @@ -127,6 +127,9 @@ public class MainWindowController { @FXML private JFXButton romTFBtn; + @FXML + private JFXButton updateBtn; + @FXML private JFXButton smmdbDownloadBtn; @@ -152,14 +155,23 @@ public class MainWindowController { private TextFlow smmdbTextFlow; @FXML - private JFXColorPicker colorPicker; - - @FXML - private JFXToggleButton fullscreenToggleBtn; + private JFXColorPicker colorPicker; @FXML private JFXToggleButton cloudSyncToggleBtn; + + @FXML + private JFXToggleButton autoUpdateToggleBtn; + + @FXML + private JFXToggleButton fullscreenToggleBtn; + @FXML + private AnchorPane mainAnchorPane; + + @FXML + private AnchorPane gamesAnchorPane; + @FXML private AnchorPane settingsAnchorPane; @@ -167,13 +179,10 @@ public class MainWindowController { private AnchorPane smmdbAnchorPane; @FXML - private AnchorPane gamesAnchorPane; + private ScrollPane mainScrollPane; @FXML - private AnchorPane mainAnchorPane; - - @FXML - private ScrollPane scrollPaneMain; + private ScrollPane settingsScrollPane; @FXML private ScrollPane smmdbScrollPane; @@ -190,6 +199,24 @@ public class MainWindowController { @FXML private Label helpLabel; + @FXML + private Label cemu_UISettingsLbl; + + @FXML + private Label cemuDirectoryLbl; + + @FXML + private Label romDirectoryLbl; + + @FXML + private Label mainColorLbl; + + @FXML + private Label updateLbl; + + @FXML + private Label cemuSettingsLbl; + @FXML private JFXTreeTableView courseTreeTable = new JFXTreeTableView(); @@ -341,7 +368,7 @@ public class MainWindowController { menuTrue = true; } if (settingsTrue) { - settingsAnchorPane.setVisible(false); + settingsScrollPane.setVisible(false); // setPath(tfPath.getText()); saveSettings(); settingsTrue = false; @@ -619,11 +646,11 @@ public class MainWindowController { smmdbTrue = false; } if (settingsTrue) { - settingsAnchorPane.setVisible(false); + settingsScrollPane.setVisible(false); settingsTrue = false; saveSettings(); } else { - settingsAnchorPane.setVisible(true); + settingsScrollPane.setVisible(true); settingsTrue = true; } } @@ -714,6 +741,16 @@ public class MainWindowController { } } + @FXML + void updateBtnAction(ActionEvent event) { + // TODO implement and call update method + } + + @FXML + void autoUpdateToggleBtnAction(ActionEvent event) { + // TODO implement auto update function + } + @FXML void smmdbDownloadBtnAction(ActionEvent event){ String downloadUrl = "http://smmdb.ddns.net/api/downloadcourse?id=" + id + "&type=zip"; @@ -1239,8 +1276,8 @@ public class MainWindowController { xPosHelper++; } - System.out.println("Breit: " + mainAnchorPane.getPrefWidth()); - System.out.println("Breit2: " + mainAnchorPane.getWidth()); +// System.out.println("Breit: " + mainAnchorPane.getPrefWidth()); +// System.out.println("Breit2: " + mainAnchorPane.getWidth()); // System.out.println("xPosHelper: " + xPosHelper); // System.out.println("yPos: " + yPos); // System.out.println("xPos: " + xPos); @@ -1269,9 +1306,10 @@ public class MainWindowController { playBtn.setStyle("-fx-text-fill: WHITE; -fx-font-family: Roboto Medium;"); cemuTFBtn.setStyle(btnStyleWhite); romTFBtn.setStyle(btnStyleWhite); + updateBtn.setStyle(btnStyleWhite); smmdbDownloadBtn.setStyle(btnStyleWhite); playBtn.setStyle(btnStyleWhite); - + aboutBtn.setGraphic(info_white); settingsBtn.setGraphic(settings_white); addBtn.setGraphic(add_circle_white); @@ -1290,6 +1328,7 @@ public class MainWindowController { playBtn.setStyle("-fx-text-fill: BLACK; -fx-font-family: Roboto Medium;"); cemuTFBtn.setStyle(btnStyleBlack); romTFBtn.setStyle(btnStyleBlack); + updateBtn.setStyle(btnStyleBlack); smmdbDownloadBtn.setStyle(btnStyleBlack); playBtn.setStyle(btnStyleBlack);