From 0e269a5b64a8ee02018ee370dc15e63d59d8a6bd Mon Sep 17 00:00:00 2001 From: Michael-Jouanneau Date: Thu, 22 Dec 2016 17:56:01 +0100 Subject: [PATCH] Added things --- src/Launcher/Main.java | 13 ++++++++----- src/assets/layout/settings_minecraft.fxml | 4 ++-- src/assets/style/dark-theme.css | 2 +- src/assets/style/default-theme.css | 2 +- src/assets/style/light-theme.css | 2 +- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/Launcher/Main.java b/src/Launcher/Main.java index 4844b71..d0da58e 100644 --- a/src/Launcher/Main.java +++ b/src/Launcher/Main.java @@ -23,10 +23,7 @@ import javafx.collections.ObservableList; import javafx.scene.Node; import javafx.scene.Parent; import javafx.scene.Scene; -import javafx.scene.control.Button; -import javafx.scene.control.Label; -import javafx.scene.control.PasswordField; -import javafx.scene.control.TextField; +import javafx.scene.control.*; import javafx.scene.image.Image; import javafx.scene.image.ImageView; import javafx.scene.input.MouseEvent; @@ -72,6 +69,8 @@ public class Main extends Application { private PasswordField Password_minecraft; Node activeTab, settings_activeTab; private Label dialog_changer; + private CheckBox RAM_Default; + private Slider RAM_slider; Async stringUpdater; @@ -111,7 +110,6 @@ public class Main extends Application { dragBar = (Rectangle) root.lookup("#rectangle"); - Home_btn = (Button) root.lookup("#Home-btn"); Modpack_btn = (Button) root.lookup("#Modpacks-btn"); Settings_btn = (Button) root.lookup("#Settings-btn"); @@ -221,6 +219,11 @@ public class Main extends Application { System.out.println("Logging in ...."); }); }); + + RAM_Default = (CheckBox) Tabs.load("settings_minecraft").lookup("#RAM-Default"); + RAM_slider = (Slider) Tabs.load("settings_minecraft").lookup("#RAM-slider"); + RAM_slider.setDisable(true); + RAM_Default.setSelected(true); } }); diff --git a/src/assets/layout/settings_minecraft.fxml b/src/assets/layout/settings_minecraft.fxml index e1c4aee..12c5026 100644 --- a/src/assets/layout/settings_minecraft.fxml +++ b/src/assets/layout/settings_minecraft.fxml @@ -20,13 +20,13 @@