From d1eaa3298cd0a0b65b6a673d115da805609f30b1 Mon Sep 17 00:00:00 2001
From: Michael-Jouanneau <tacomundu12@gmail.com>
Date: Sun, 30 Oct 2016 17:08:54 +0100
Subject: [PATCH] Chnaged things

---
 src/Launcher/Main.java      | 6 ++++--
 src/Launcher/Tabs.java      | 2 +-
 src/assets/layout/main.fxml | 9 +++++++--
 src/assets/style/nav.css    | 4 ++--
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/Launcher/Main.java b/src/Launcher/Main.java
index 36869aa..df99de4 100644
--- a/src/Launcher/Main.java
+++ b/src/Launcher/Main.java
@@ -21,13 +21,14 @@ import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import java.net.URL;
+import java.util.Set;
 
 public class Main extends Application {
 
     public static final URL mainLauncher = Main.class.getResource("../assets/layout/main.fxml");                        // Launcher body
 
     private double xOffset = 0, yOffset = 0;                                                                            // Offsets for dragging
-    private Button exit, min, Home_btn, Modpack_btn;                                                                    // Define buttons
+    private Button exit, min, Home_btn, Modpack_btn, Settings_btn;                                                                    // Define buttons
     private ImageView icon;
     private Image appIcon;
     private Rectangle dragBar;                                                                                          // Draggable top bar
@@ -52,6 +53,7 @@ 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");
         tab = (Pane) root.lookup("#tab");
         icon = (ImageView) root.lookup("#icon");
 
@@ -61,7 +63,7 @@ public class Main extends Application {
         min.setOnMouseClicked(event -> primaryStage.setIconified(true));                                                // Minimizes the program if minimize button is clicked
         Home_btn.setOnMouseClicked(event -> {if(activeTab!=Tabs.Home)(activeTab=Tabs.Home).switchTab(tab);});           // Sets the active tab to the home tab unless it's already active
         Modpack_btn.setOnMouseClicked(event -> {if(activeTab!=Tabs.Modpacks)(activeTab=Tabs.Modpacks).switchTab(tab);});// Sets the active tab to the modpacks tab unless it's already active
-
+        Settings_btn.setOnMouseClicked(event -> {if(activeTab!=Tabs.Settings)(activeTab=Tabs.Settings).switchTab(tab);});
 
         // Drag
         dragBar.setOnMousePressed(event -> {
diff --git a/src/Launcher/Tabs.java b/src/Launcher/Tabs.java
index ca77b30..8fb714b 100644
--- a/src/Launcher/Tabs.java
+++ b/src/Launcher/Tabs.java
@@ -8,7 +8,7 @@ import java.net.URL;
 
 public enum Tabs {
 
-    Modpacks(Main.class.getResource("../assets/layout/modpacks.fxml")), Home(Main.class.getResource("../assets/layout/home.fxml"));
+    Modpacks(Main.class.getResource("../assets/layout/modpacks.fxml")), Home(Main.class.getResource("../assets/layout/home.fxml")), Settings(Main.class.getResource("../assets/layout/settings.fxml"));
 
     public final URL url;
     private Parent loaded;
diff --git a/src/assets/layout/main.fxml b/src/assets/layout/main.fxml
index d039c0e..f6ef4c6 100644
--- a/src/assets/layout/main.fxml
+++ b/src/assets/layout/main.fxml
@@ -19,16 +19,21 @@
          </font>
       </Label>
       <Rectangle id="nav" arcHeight="5.0" arcWidth="5.0" fill="#101e38" height="450.0" layoutY="50.0" stroke="TRANSPARENT" strokeType="INSIDE" width="150.0" />
-      <Button id="Home-btn" layoutY="50.0" mnemonicParsing="false" prefHeight="39.0" prefWidth="150.0" text="Home" textFill="WHITE" textOverrun="CLIP">
+      <Button id="Home-btn" layoutY="50.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="150.0" text="Home" textFill="WHITE" textOverrun="CLIP">
          <font>
             <Font name="Centaur" size="16.0" />
          </font>
       </Button>
-      <Button id="Modpacks-btn" layoutY="89.0" mnemonicParsing="false" prefHeight="39.0" prefWidth="150.0" text="Modpack" textFill="WHITE" textOverrun="CLIP">
+      <Button id="Modpacks-btn" layoutY="90.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="150.0" text="Modpack" textFill="WHITE" textOverrun="CLIP">
           <font>
               <Font name="Centaur" size="16.0" />
           </font>
       </Button>
+       <Button id="Settings-btn" layoutY="130.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="150.0" text="Settings" textFill="WHITE" textOverrun="CLIP">
+           <font>
+               <Font name="Centaur" size="16.0" />
+           </font>
+       </Button>
       <Pane id="tab" layoutX="150.0" layoutY="50.0" prefHeight="450.0" prefWidth="750.0" />
       <Label layoutX="26.0" layoutY="455.0" text="Version : Dev-0.0.1" textFill="white" />
       <Label layoutX="9.0" layoutY="472.0" text="Copyright 2016 TeamAvion" textFill="WHITE">
diff --git a/src/assets/style/nav.css b/src/assets/style/nav.css
index d1c9818..bedea39 100644
--- a/src/assets/style/nav.css
+++ b/src/assets/style/nav.css
@@ -10,10 +10,10 @@
 #min:hover, #exit:hover{
     -fx-background-color: #bf0000;
 }
-#Home-btn, #Modpacks-btn {
+#Home-btn, #Modpacks-btn, #Settings-btn {
     -fx-background-color: rgba(0, 0, 0, 0);
 }
-#Home-btn:hover, #Modpacks-btn:hover {
+#Home-btn:hover, #Modpacks-btn:hover, #Settings-btn:hover {
     -fx-background-color: #0c182d;
     -fx-background-radius: 0em;
 }
\ No newline at end of file