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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	src/Launcher/Main.java
This commit is contained in:
Gabriel Tofvesson 2016-11-13 22:54:27 +01:00
commit 9e4df9f927
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Launcher/Main.java
View File

@ -13,7 +13,6 @@ package Launcher;
import Launcher.net.Updater; import Launcher.net.Updater;
import com.tofvesson.reflection.SafeReflection; import com.tofvesson.reflection.SafeReflection;
import javafx.application.Application; import javafx.application.Application;
import javafx.fxml.FXMLLoader;
import javafx.scene.Node; import javafx.scene.Node;
import javafx.scene.Scene; import javafx.scene.Scene;
import javafx.scene.control.*; import javafx.scene.control.*;
@ -39,7 +38,6 @@ public class Main extends Application {
public static final int semVerMinor = 2; // Minor version public static final int semVerMinor = 2; // Minor version
public static final int semVerPatch = 1; // Patch version public static final int semVerPatch = 1; // Patch version
private double xOffset = 0, yOffset = 0; // Offsets for dragging private double xOffset = 0, yOffset = 0; // Offsets for dragging
private Button exit, min, Home_btn, Modpack_btn, Settings_btn, Instance_btn; // Define buttons private Button exit, min, Home_btn, Modpack_btn, Settings_btn, Instance_btn; // Define buttons
private ImageView icon; private ImageView icon;
@ -134,7 +132,6 @@ public class Main extends Application {
updateTabSelection(n.lookup("#Settings-Mine-btn"), TabType.SETTINGS); updateTabSelection(n.lookup("#Settings-Mine-btn"), TabType.SETTINGS);
Node minecraftLayout = Tabs.switchTab("settings_minecraft", (Pane) n.lookup("#Settings-Pane")); Node minecraftLayout = Tabs.switchTab("settings_minecraft", (Pane) n.lookup("#Settings-Pane"));
} }
}); });

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

@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?> <?import javafx.scene.control.Label?>
<?import javafx.scene.layout.Pane?> <?import javafx.scene.layout.Pane?>
<?import javafx.scene.text.Font?> <?import javafx.scene.text.Font?>
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="360.0" prefWidth="750.0" stylesheets="@../style/nav.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1"> <Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="360.0" prefWidth="750.0" stylesheets="@../style/nav.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
<children> <children>
<Label layoutX="22.0" layoutY="14.0" text="General Settings"> <Label layoutX="22.0" layoutY="14.0" text="General Settings">
@ -12,5 +12,8 @@
<Font name="Centaur" size="25.0" /> <Font name="Centaur" size="25.0" />
</font> </font>
</Label> </Label>
<Button layoutX="22.0" layoutY="72.0" mnemonicParsing="false" text="light" />
<Button layoutX="96.0" layoutY="72.0" mnemonicParsing="false" text="dark" />
<Button layoutX="170.0" layoutY="72.0" mnemonicParsing="false" text="default" />
</children> </children>
</Pane> </Pane>