From fc0be3945503bd99a56cd50a615e179557dd4194 Mon Sep 17 00:00:00 2001 From: Jannik Date: Mon, 18 Dec 2017 09:58:32 +0100 Subject: [PATCH] code clean up * cleaned up the playBtn code * added language section in settings --- .../java/com/cemu_UI/application/Main.java | 14 ++--- .../application/MainWindowController.java | 56 ++++++------------- src/main/resources/fxml/MainWindow.fxml | 26 ++++++--- 3 files changed, 39 insertions(+), 57 deletions(-) diff --git a/src/main/java/com/cemu_UI/application/Main.java b/src/main/java/com/cemu_UI/application/Main.java index 9ff4761..2096c7e 100644 --- a/src/main/java/com/cemu_UI/application/Main.java +++ b/src/main/java/com/cemu_UI/application/Main.java @@ -51,13 +51,11 @@ import javafx.scene.layout.AnchorPane; public class Main extends Application { - private Stage primaryStage; // TODO same as #Test01 - private MainWindowController mainWindowController; // TODO Needs more testing: if cemu_UI will work as - //normally expected this waring can be removed #Test01 - // if not working correctly remove private! - private CloudController cloudController; // TODO same as #Test01 - private AnchorPane pane; // TODO same as #Test01 - private Scene scene; // TODO same as #Test01 + private Stage primaryStage; + private MainWindowController mainWindowController; + private CloudController cloudController; + private AnchorPane pane; + private Scene scene; private static String userHome = System.getProperty("user.home"); private static String userName = System.getProperty("user.name"); private static String osName = System.getProperty("os.name"); @@ -234,8 +232,6 @@ public class Main extends Application { @Override public void changed(ObservableValue observable, Number oldValue, final Number newValue) { int xPosHelperMax = (int) Math.floor((mainWindowController.getMainAnchorPane().getWidth() - 36) / 217); - - mainWindowController.refreshplayBtnPosition(); // call only if there is enough space for a new row if (mainWindowController.getOldXPosHelper() != xPosHelperMax) { diff --git a/src/main/java/com/cemu_UI/application/MainWindowController.java b/src/main/java/com/cemu_UI/application/MainWindowController.java index f061156..0d3ebca 100644 --- a/src/main/java/com/cemu_UI/application/MainWindowController.java +++ b/src/main/java/com/cemu_UI/application/MainWindowController.java @@ -170,6 +170,9 @@ public class MainWindowController { @FXML private JFXToggleButton fullscreenToggleBtn; + + @FXML + private ChoiceBox languageChoisBox; @FXML private ChoiceBox branchChoisBox; @@ -203,6 +206,9 @@ public class MainWindowController { @FXML private HBox topHBox; + + @FXML + private HBox bottomHBox; @FXML private ImageView smmdbImageView; @@ -221,6 +227,9 @@ public class MainWindowController { @FXML private Label mainColorLbl; + + @FXML + private Label languageLbl; @FXML private Label updateLbl; @@ -276,7 +285,7 @@ public class MainWindowController { private String selectedGameTitle; private String id; private String version = "0.2.2"; - private String buildNumber = "065"; + private String buildNumber = "067"; private String versionName = "Puzzle Plank Galaxy"; private int xPos = -200; private int yPos = 17; @@ -295,6 +304,7 @@ public class MainWindowController { private File pictureCacheWin = new File(dirWin + "/picture_cache"); private File pictureCacheLinux = new File(dirLinux + "/picture_cache"); private ObservableList branches = FXCollections.observableArrayList("stable", "beta"); + private ObservableList languages = FXCollections.observableArrayList("english", "deutsch"); private ObservableList smmIDs = FXCollections.observableArrayList("fe31b7f2", "44fc5929"); // TODO add more IDs private ObservableList games = FXCollections.observableArrayList(); ObservableList courses = FXCollections.observableArrayList(); @@ -350,7 +360,6 @@ public class MainWindowController { if (getWindowWidth() > 100 && getWindowHeight() > 100) { mainAnchorPane.setPrefSize(getWindowWidth(), getWindowHeight()); } - refreshplayBtnPosition(); cemuTextField.setText(cemuPath); romTextField.setText(romPath); @@ -359,6 +368,8 @@ public class MainWindowController { cloudSyncToggleBtn.setSelected(isCloudSync()); autoUpdateToggleBtn.setSelected(isAutoUpdate()); branchChoisBox.setItems(branches); + languageChoisBox.setItems(languages); + bottomHBox.setPickOnBounds(false); if (isUseBeta()) { branchChoisBox.getSelectionModel().select(1); @@ -1293,19 +1304,6 @@ public class MainWindowController { gamesAnchorPane.getChildren().add(games.get(i).getVBox()); } } - - void refreshplayBtnPosition() { - double width; - - if (mainAnchorPane.getWidth() < 10) { - width = mainAnchorPane.getPrefWidth(); - } else { - width = mainAnchorPane.getWidth(); - } - playBtn.setLayoutX((width / 2) - 50); - totalPlaytimeBtn.setLayoutX((width / 2) - 50 - 20.5 - 100); - lastTimePlayedBtn.setLayoutX((width / 2) + 50 + 20.5); - } private void checkAutoUpdate() { @@ -1696,43 +1694,21 @@ public class MainWindowController { } private void playBtnSlideIn(){ - playBtn.setVisible(true); - lastTimePlayedBtn.setVisible(true); - totalPlaytimeBtn.setVisible(true); + bottomHBox.setVisible(true); playTrue = true; - TranslateTransition playBtnTransition = new TranslateTransition(Duration.millis(300), playBtn); + TranslateTransition playBtnTransition = new TranslateTransition(Duration.millis(300), bottomHBox); playBtnTransition.setFromY(56); playBtnTransition.setToY(0); playBtnTransition.play(); - - TranslateTransition lastTimePlayedBtnTransition = new TranslateTransition(Duration.millis(300), lastTimePlayedBtn); - lastTimePlayedBtnTransition.setFromY(56); - lastTimePlayedBtnTransition.setToY(0); - lastTimePlayedBtnTransition.play(); - - TranslateTransition timePlayedBtnTransition = new TranslateTransition(Duration.millis(300), totalPlaytimeBtn); - timePlayedBtnTransition.setFromY(56); - timePlayedBtnTransition.setToY(0); - timePlayedBtnTransition.play(); } private void playBtnSlideOut(){ playTrue = false; - TranslateTransition playBtnTransition = new TranslateTransition(Duration.millis(300), playBtn); + TranslateTransition playBtnTransition = new TranslateTransition(Duration.millis(300), bottomHBox); playBtnTransition.setFromY(0); playBtnTransition.setToY(56); playBtnTransition.play(); - - TranslateTransition lastTimePlayedBtnTransition = new TranslateTransition(Duration.millis(300), lastTimePlayedBtn); - lastTimePlayedBtnTransition.setFromY(0); - lastTimePlayedBtnTransition.setToY(56); - lastTimePlayedBtnTransition.play(); - - TranslateTransition timePlayedBtnTransition = new TranslateTransition(Duration.millis(300), totalPlaytimeBtn); - timePlayedBtnTransition.setFromY(0); - timePlayedBtnTransition.setToY(56); - timePlayedBtnTransition.play(); } private void editColor(String input){ diff --git a/src/main/resources/fxml/MainWindow.fxml b/src/main/resources/fxml/MainWindow.fxml index 4f85bb4..5502ba9 100644 --- a/src/main/resources/fxml/MainWindow.fxml +++ b/src/main/resources/fxml/MainWindow.fxml @@ -118,10 +118,16 @@ - + + + + @@ -205,13 +211,17 @@ - - - - + + + - - - + + + + + + + +