From 296a8aff49c2fa7892acae25387e6325e75241d2 Mon Sep 17 00:00:00 2001
From: Gabriel Tofvesson <gabriel.tofvesson@hotmail.com>
Date: Sun, 30 Oct 2016 15:47:01 +0100
Subject: [PATCH] Moved layouts

---
 src/Launcher/Main.java                             | 2 +-
 src/{Launcher => assets/layout}/Main_Launcher.fxml | 6 +++---
 src/{Launcher => assets/layout}/sample.fxml        | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename src/{Launcher => assets/layout}/Main_Launcher.fxml (86%)
 rename src/{Launcher => assets/layout}/sample.fxml (92%)

diff --git a/src/Launcher/Main.java b/src/Launcher/Main.java
index 6d94d52..08c4a28 100644
--- a/src/Launcher/Main.java
+++ b/src/Launcher/Main.java
@@ -29,7 +29,7 @@ public class Main extends Application {
     public void start(Stage primaryStage) throws Exception{
 
         primaryStage.initStyle(StageStyle.UNDECORATED);
-        Parent root = FXMLLoader.load(getClass().getResource("Main_Launcher.fxml"));
+        Parent root = FXMLLoader.load(getClass().getResource("../assets/layout/Main_Launcher.fxml"));
         primaryStage.setTitle("Team-Avion Launcher [WIP]");
         primaryStage.setScene(new Scene(root, 900, 500));
         primaryStage.show();
diff --git a/src/Launcher/Main_Launcher.fxml b/src/assets/layout/Main_Launcher.fxml
similarity index 86%
rename from src/Launcher/Main_Launcher.fxml
rename to src/assets/layout/Main_Launcher.fxml
index 20780bc..3635ebb 100644
--- a/src/Launcher/Main_Launcher.fxml
+++ b/src/assets/layout/Main_Launcher.fxml
@@ -6,11 +6,11 @@
 <?import javafx.scene.shape.Rectangle?>
 <?import javafx.scene.text.Font?>
 
-<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500" prefWidth="900" stylesheets="@../assets/style/nav.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
+<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500" prefWidth="900" stylesheets="@../style/nav.css" xmlns="http://javafx.com/javafx/8.0.112-ea" xmlns:fx="http://javafx.com/fxml/1">
    <children>
       <Rectangle id="rectangle" arcHeight="5.0" arcWidth="5.0" fill="white" height="50.0" strokeType="INSIDE" width="900.0" />
-      <Button id="exit" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="862.0" layoutY="13.0" mnemonicParsing="false" stylesheets="@../assets/style/nav.css" text="X" textFill="WHITE" />
-       <Button id="min" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="841.0" layoutY="13.0" mnemonicParsing="false" stylesheets="@../assets/style/nav.css" text="-" textFill="WHITE" />
+      <Button id="exit" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="862.0" layoutY="13.0" mnemonicParsing="false" stylesheets="@../style/nav.css" text="X" textFill="WHITE" />
+       <Button id="min" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="841.0" layoutY="13.0" mnemonicParsing="false" stylesheets="@../style/nav.css" text="-" textFill="WHITE" />
        <Label layoutX="46.0" layoutY="11.0" text="Team-Avion Launcher" textFill="WHITE">
          <font>
             <Font name="Centaur" size="24.0" />
diff --git a/src/Launcher/sample.fxml b/src/assets/layout/sample.fxml
similarity index 92%
rename from src/Launcher/sample.fxml
rename to src/assets/layout/sample.fxml
index 7144e85..604f1c5 100644
--- a/src/Launcher/sample.fxml
+++ b/src/assets/layout/sample.fxml
@@ -10,7 +10,7 @@
 <Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="500" prefWidth="900" style="-fx-background-color: rgb(42, 44, 58);" xmlns="http://javafx.com/javafx/8.0.102" xmlns:fx="http://javafx.com/fxml/1">
    <children>
       <Rectangle id="rectangle" arcHeight="5.0" arcWidth="5.0" fill="white" height="50.0" strokeType="INSIDE" style="-fx-fill: rgb(29, 31, 48);" width="900.0" />
-      <Button id="exit" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="862.0" layoutY="13.0" mnemonicParsing="false" style="-fx-background-color: rgb(29, 31, 48);" stylesheets="@../assets/style/nav.css" text="X" textFill="WHITE" />
+      <Button id="exit" alignment="TOP_RIGHT" contentDisplay="RIGHT" layoutX="862.0" layoutY="13.0" mnemonicParsing="false" style="-fx-background-color: rgb(29, 31, 48);" stylesheets="@../style/nav.css" text="X" textFill="WHITE" />
       <Label layoutX="46.0" layoutY="11.0" text="Team Avion Launcher" textFill="WHITE">
          <font>
             <Font name="Centaur" size="24.0" />