diff --git a/src/Launcher/Main.java b/src/Launcher/Main.java index a985290..436cea4 100644 --- a/src/Launcher/Main.java +++ b/src/Launcher/Main.java @@ -14,6 +14,7 @@ import javafx.application.Application; import javafx.fxml.FXMLLoader; import javafx.scene.Scene; import javafx.scene.control.Button; +import javafx.scene.image.Image; import javafx.scene.layout.Pane; import javafx.scene.shape.Rectangle; import javafx.stage.Stage; @@ -39,7 +40,8 @@ public class Main extends Application { primaryStage.setTitle("Team-Avion Launcher [WIP]"); primaryStage.setScene(new Scene(root, 900, 500)); primaryStage.show(); - + primaryStage.getIcons().clear(); + primaryStage.getIcons().add(new Image("file:../assets/icons/app.png")); // Field initialization exit = (Button) root.lookup("#exit"); @@ -49,12 +51,14 @@ public class Main extends Application { Modpack_btn = (Button) root.lookup("#Modpacks-btn"); tab = (Pane) root.lookup("#tab"); + // Infrastructural navigation exit.setOnMouseClicked(event -> primaryStage.close()); min.setOnMouseClicked(event -> primaryStage.setIconified(true)); Home_btn.setOnMouseClicked(event -> { if(activeTab!=Tabs.Home) (activeTab=Tabs.Home).switchTab(tab); }); Modpack_btn.setOnMouseClicked(event -> { if(activeTab!=Tabs.Modpacks) (activeTab=Tabs.Modpacks).switchTab(tab); }); + // Drag dragBar.setOnMousePressed(event -> { xOffset = event.getSceneX(); @@ -65,6 +69,7 @@ public class Main extends Application { primaryStage.setY(event.getScreenY() - yOffset); }); + // Set up default layout Tabs.Home.switchTab(tab); } diff --git a/src/Launcher/Tabs.java b/src/Launcher/Tabs.java index af28412..ca77b30 100644 --- a/src/Launcher/Tabs.java +++ b/src/Launcher/Tabs.java @@ -1,8 +1,8 @@ package Launcher; import javafx.fxml.FXMLLoader; +import javafx.scene.Parent; import javafx.scene.layout.Pane; - import java.io.IOException; import java.net.URL; @@ -11,6 +11,7 @@ public enum Tabs { Modpacks(Main.class.getResource("../assets/layout/modpacks.fxml")), Home(Main.class.getResource("../assets/layout/home.fxml")); public final URL url; + private Parent loaded; Tabs(URL url){ this.url = url; } @@ -18,7 +19,7 @@ public enum Tabs { public void switchTab(Pane holder){ holder.getChildren().clear(); try { - holder.getChildren().add(FXMLLoader.load(url)); + holder.getChildren().add(loaded==null?loaded=FXMLLoader.load(url):loaded); } catch (IOException e) { e.printStackTrace(); } diff --git a/src/Launcher/net/Updater.java b/src/Launcher/net/Updater.java index 7b61ab9..0b8d339 100644 --- a/src/Launcher/net/Updater.java +++ b/src/Launcher/net/Updater.java @@ -16,16 +16,16 @@ public class Updater { conn = new URL(URL).openConnection(); } - public void downloadPorn(){ - //TODO: Download lots of porn + public void downloadStuff(){ + //TODO: Download lots of stuff } - public void downloadMorePorn(){ - //TODO: Download more porn + public void downloadMoreStuff(){ + //TODO: Download more stuff } - public void downloadEvenMorePorn(){ - //TODO: Download even more porn + public void downloadEvenMoreStuff(){ + //TODO: Download even more stuff } public static Updater getInstance(String url) throws IOException { diff --git a/src/assets/icons/app.png b/src/assets/icons/app.png new file mode 100644 index 0000000..09159d4 Binary files /dev/null and b/src/assets/icons/app.png differ diff --git a/src/assets/style/nav.css b/src/assets/style/nav.css index 7b8ce80..2169b43 100644 --- a/src/assets/style/nav.css +++ b/src/assets/style/nav.css @@ -15,5 +15,6 @@ -fx-background-color: rgba(0, 0, 0, 0); } #Home-btn:hover, #Modpacks-btn:hover { - -fx-background-color: rgba(50, 50, 50, 1) + -fx-background-color: rgba(50, 50, 50, 1); + -fx-background-radius: 0em; } \ No newline at end of file