From 99574ce6efbefccb1369393256229bdc5bcd9591 Mon Sep 17 00:00:00 2001 From: Jannik Date: Mon, 11 Dec 2017 17:07:20 +0100 Subject: [PATCH] updated version to 0.2.2 build 061 * updated version to 0.2.2 build 061 * the license text textarea is not editable anymore --- .../cemu_UI/application/MainWindowController.java | 8 ++++---- .../com/cemu_UI/controller/UpdateController.java | 2 +- .../cemu_UI/uiElements/JFXTextAreaInfoDialog.java | 13 ++++++++++++- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/cemu_UI/application/MainWindowController.java b/src/main/java/com/cemu_UI/application/MainWindowController.java index d641630..14a7c71 100644 --- a/src/main/java/com/cemu_UI/application/MainWindowController.java +++ b/src/main/java/com/cemu_UI/application/MainWindowController.java @@ -275,8 +275,8 @@ public class MainWindowController { private String selectedGameTitleID; private String selectedGameTitle; private String id; - private String version = "0.2.1"; - private String buildNumber = "059"; + private String version = "0.2.2"; + private String buildNumber = "061"; private String versionName = "Puzzle Plank Galaxy"; private int xPos = -200; private int yPos = 17; @@ -739,8 +739,7 @@ public class MainWindowController { BufferedReader licenseBR = new BufferedReader( new InputStreamReader(getClass().getResourceAsStream("/licenses/licenses_show.txt"))); String currentLine; - - + while ((currentLine = licenseBR.readLine()) != null) { bodyText = bodyText + currentLine + "\n"; } @@ -753,6 +752,7 @@ public class MainWindowController { JFXTextAreaInfoDialog licenseDialog = new JFXTextAreaInfoDialog(headingText, bodyText, dialogBtnStyle, 510, 450, main.pane); licenseDialog.show(); + licenseDialog.getTextArea().setEditable(false); } }; diff --git a/src/main/java/com/cemu_UI/controller/UpdateController.java b/src/main/java/com/cemu_UI/controller/UpdateController.java index 09c3846..6b7d820 100644 --- a/src/main/java/com/cemu_UI/controller/UpdateController.java +++ b/src/main/java/com/cemu_UI/controller/UpdateController.java @@ -68,7 +68,7 @@ public class UpdateController implements Runnable { @Override public void run() { - System.out.println("checking for updates ..."); + LOGGER.info("beta:" + useBeta + "; checking for updates ..."); Platform.runLater(() -> { mainWindowController.getUpdateBtn().setText("checking for updates ..."); }); diff --git a/src/main/java/com/cemu_UI/uiElements/JFXTextAreaInfoDialog.java b/src/main/java/com/cemu_UI/uiElements/JFXTextAreaInfoDialog.java index 2c9afa8..fd8ff2f 100644 --- a/src/main/java/com/cemu_UI/uiElements/JFXTextAreaInfoDialog.java +++ b/src/main/java/com/cemu_UI/uiElements/JFXTextAreaInfoDialog.java @@ -40,6 +40,7 @@ public class JFXTextAreaInfoDialog { private String dialogBtnStyle; private int dialogWidth; private int dialogHeight; + private JFXTextArea textArea; private Pane pane; /** @@ -61,9 +62,11 @@ public class JFXTextAreaInfoDialog { } public void show() { + textArea = new JFXTextArea(bodyText); + JFXDialogLayout content = new JFXDialogLayout(); content.setHeading(new Text(headingText)); - content.setBody(new JFXTextArea(bodyText)); + content.setBody(textArea); content.setPrefSize(dialogWidth, dialogHeight); StackPane stackPane = new StackPane(); stackPane.autosize(); @@ -84,4 +87,12 @@ public class JFXTextAreaInfoDialog { AnchorPane.setLeftAnchor(stackPane, (pane.getWidth() - content.getPrefWidth()) / 2); dialog.show(); } + + public JFXTextArea getTextArea() { + return textArea; + } + + public void setTextArea(JFXTextArea textArea) { + this.textArea = textArea; + } }