GabrielTofvesson/TeamAvionLauncher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Gabriel Tofvesson 2016-12-22 20:38:45 +01:00
commit 86bfbd4cd8
6 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Launcher/Main.java
View File

@ -69,6 +69,8 @@ public class Main extends Application {
private PasswordField Password_minecraft;
Node activeTab, settings_activeTab;
private Label dialog_changer;
private CheckBox RAM_Default, Minimized_window_minecraft_launch, Close_window_minecraft_launch;
private Slider RAM_slider;
Async stringUpdater;
@ -108,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");
@ -233,6 +234,16 @@ public class Main extends Application {
});
});
});
Node Minecraft_settings = Tabs.load("settings_minecraft");
RAM_Default = (CheckBox) Minecraft_settings.lookup("#RAM-Default");
RAM_slider = (Slider) Minecraft_settings.lookup("#RAM-slider");
// Default States for the General Settings
RAM_slider.setDisable(true);
RAM_Default.setSelected(true);
}
});

4
src/assets/layout/settings_generic.fxml
View File

@ -31,12 +31,12 @@
<Font name="Century" size="15.0" />
</font>
</CheckBox>
<CheckBox id="lable" layoutX="35.0" layoutY="185.0" mnemonicParsing="false" text="Close Window when Mincraft Launches">
<CheckBox id="Close_window_minecraft_launch" disable="true" layoutX="35.0" layoutY="185.0" mnemonicParsing="false" text="Close Window when Mincraft Launches">
<font>
<Font name="Century" size="15.0" />
</font>
</CheckBox>
<CheckBox id="lable" layoutX="344.0" layoutY="185.0" mnemonicParsing="false" selected="true" text="Minimize Window when Minecraft Launches">
<CheckBox id="Minimized_window_minecraft_launch" layoutX="344.0" layoutY="185.0" mnemonicParsing="false" selected="true" text="Minimize Window when Minecraft Launches">
<font>
<Font name="Century" size="15.0" />
</font>

4
src/assets/layout/settings_minecraft.fxml
View File

@ -20,13 +20,13 @@
</font></Label>
<Button id="minecraft-login-btn" layoutX="90.0" layoutY="71.0" mnemonicParsing="false" prefHeight="30.0" prefWidth="59.0" text="Login" />
<Label id="login" layoutX="160.0" layoutY="78.0" text="Not logged in" />
<Slider id="lable" blockIncrement="1.0" disable="true" layoutX="15.0" layoutY="147.0" majorTickUnit="1.0" max="16.0" minorTickCount="0" prefHeight="37.0" prefWidth="286.0" showTickLabels="true" showTickMarks="true" value="8.0" />
<Slider id="RAM-slider" blockIncrement="1.0" layoutX="15.0" layoutY="147.0" majorTickUnit="1.0" max="16.0" minorTickCount="0" prefHeight="37.0" prefWidth="286.0" showTickLabels="true" showTickMarks="true" value="8.0" />
<Label id="lable" layoutX="14.0" layoutY="123.0" text="Alocated RAM :">
<font>
<Font name="Century" size="15.0" />
</font>
</Label>
<CheckBox id="lable" layoutX="149.0" layoutY="124.0" mnemonicParsing="false" selected="true" text="Use Systems Default">
<CheckBox id="RAM-Default" layoutX="149.0" layoutY="124.0" mnemonicParsing="false" text="Use Systems Default">
<font>
<Font name="Century" size="13.0" />
</font>

2
src/assets/style/dark-theme.css
View File

@ -57,7 +57,7 @@
-fx-text-fill: black;
}
#lable {
#lable, #RAM-Default, #RAM-slider, #Minimized_window_minecraft_launch, #Close_window_minecraft_launch {
-fx-text-fill: white;
}

2
src/assets/style/default-theme.css
View File

@ -57,7 +57,7 @@
-fx-text-fill: black;
}
#lable {
#lable, #RAM-Default, #RAM-slider, #Minimized_window_minecraft_launch, #Close_window_minecraft_launch {
-fx-text-fill: white;
}

2
src/assets/style/light-theme.css
View File

@ -57,7 +57,7 @@
-fx-text-fill: black;
}
#lable {
#lable, #RAM-Default, #RAM-slider, #Minimized_window_minecraft_launch, #Close_window_minecraft_launch {
-fx-text-fill: black;
}