From 2f35baef398ad29d8c6db9d2e3a67940ac470e91 Mon Sep 17 00:00:00 2001 From: huangyuhui Date: Wed, 29 Aug 2018 20:28:43 +0800 Subject: [PATCH] Convert settings.fxml to Java code --- .gitignore | 3 + .../org/jackhuang/hmcl/ui/SettingsPage.java | 59 +-- .../org/jackhuang/hmcl/ui/SettingsView.java | 459 ++++++++++++++++++ .../main/resources/assets/fxml/setting.fxml | 164 ------- 4 files changed, 465 insertions(+), 220 deletions(-) create mode 100644 HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsView.java delete mode 100644 HMCL/src/main/resources/assets/fxml/setting.fxml diff --git a/.gitignore b/.gitignore index ce62b990a..7cd7067a5 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,6 @@ NVIDIA # eclipse .classpath .project + +# netbeans +.nb-gradle \ No newline at end of file diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsPage.java b/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsPage.java index 8f4bd9a80..5061a7c9e 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsPage.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/ui/SettingsPage.java @@ -62,67 +62,14 @@ import java.util.Collections; import java.util.Objects; import java.util.Optional; -public final class SettingsPage extends StackPane implements DecoratorPage { +public final class SettingsPage extends SettingsView implements DecoratorPage { private final StringProperty title = new SimpleStringProperty(this, "title", i18n("settings.launcher")); - @FXML - private JFXTextField txtProxyHost; - @FXML - private JFXTextField txtProxyPort; - @FXML - private JFXTextField txtProxyUsername; - @FXML - private JFXPasswordField txtProxyPassword; - @FXML - private JFXTextField txtFontSize; - @FXML - private JFXComboBox