Chnaged things

This commit is contained in:
Michael-Jouanneau 2016-11-04 20:44:58 +01:00
parent ae67307653
commit 3b0561cde6
6 changed files with 30 additions and 16 deletions

View File

@ -8,5 +8,14 @@
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="libRefTools" level="project" /> <orderEntry type="library" name="libRefTools" level="project" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$APPLICATION_HOME_DIR$/redist/annotations-java8.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
</component> </component>
</module> </module>

View File

@ -23,7 +23,9 @@ import javafx.scene.shape.Rectangle;
import javafx.stage.Stage; import javafx.stage.Stage;
import javafx.stage.StageStyle; import javafx.stage.StageStyle;
import java.net.URL; import java.net.URL;
import com.tofvesson.async.*; import com.tofvesson.async.*;
import org.jetbrains.annotations.Contract;
public class Main extends Application { public class Main extends Application {
@ -81,7 +83,7 @@ public class Main extends Application {
Modpack_btn.setOnMouseClicked(event ->{ Modpack_btn.setOnMouseClicked(event ->{
if(activeTab!=Tabs.Modpacks){ if(activeTab!=Tabs.Modpacks){
(activeTab=Tabs.Modpacks).switchTab(tab); // Sets the active tab to the modpacks tab unless it's already active (activeTab=Tabs.Modpacks).switchTab(tab); // Sets the active tab to the modpacks tab unless it's already active
//TODO: Create a dynamic updating string from the input ( Text Field )
} }
}); });
@ -92,6 +94,10 @@ public class Main extends Application {
} }
}); });
//TODO: Create a dynamic updating string from the input ( Text Field )
Async a = new Async(null, SafeReflection.getMethod(getClass(), "run", (Class<?>[]) null), null); Async a = new Async(null, SafeReflection.getMethod(getClass(), "run", (Class<?>[]) null), null);
System.out.println(a.await()); System.out.println(a.await());
@ -116,8 +122,10 @@ public class Main extends Application {
launch(args); launch(args);
} }
@Contract(pure = true)
public static int run(){ public static int run(){
return 1500; return 1500;
} }
} }

View File

@ -5,18 +5,15 @@
<?import javafx.scene.shape.Rectangle?> <?import javafx.scene.shape.Rectangle?>
<?import javafx.scene.text.Font?> <?import javafx.scene.text.Font?>
<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.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 id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.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>
<Rectangle id="Modpack-back" arcHeight="5.0" arcWidth="5.0" height="55.0" strokeType="INSIDE" width="750.0" /> <Rectangle id="Modpack-back" arcHeight="5.0" arcWidth="5.0" height="47.0" strokeType="INSIDE" width="750.0" />
<Label layoutX="54.0" layoutY="9.0" text="Home" textFill="WHITE"> <Label layoutX="34.0" layoutY="5.0" text="Home" textFill="WHITE">
<font> <font>
<Font name="Centaur" size="31.0" /> <Font name="Centaur" size="31.0" />
</font> </font>
</Label> </Label>
<Label layoutX="314.0" layoutY="15.0" text="This is a Dev Build ... things are subject to change" textFill="RED">
<font>
<Font name="Centaur" size="21.0" />
</font>
</Label>
</children> </children>
</Pane> </Pane>

View File

@ -35,7 +35,7 @@
</font> </font>
</Button> </Button>
<Pane id="tab" layoutX="150.0" layoutY="50.0" prefHeight="450.0" prefWidth="750.0" /> <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="17.0" layoutY="455.0" text="Version : PreDev-0.0.1" textFill="white" />
<Label layoutX="9.0" layoutY="472.0" text="Copyright 2016 TeamAvion" textFill="WHITE"> <Label layoutX="9.0" layoutY="472.0" text="Copyright 2016 TeamAvion" textFill="WHITE">
<font> <font>
<Font size="11.0" /> <Font size="11.0" />

View File

@ -1,21 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.Label?> <?import javafx.scene.control.Label?>
<?import javafx.scene.control.ScrollPane?>
<?import javafx.scene.control.TextField?> <?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.Pane?> <?import javafx.scene.layout.Pane?>
<?import javafx.scene.shape.Rectangle?> <?import javafx.scene.shape.Rectangle?>
<?import javafx.scene.text.Font?> <?import javafx.scene.text.Font?>
<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.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 id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.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>
<Rectangle id="Modpack-back" arcHeight="5.0" arcWidth="5.0" height="55.0" strokeType="INSIDE" width="750.0" /> <Rectangle id="Modpack-back" arcHeight="5.0" arcWidth="5.0" height="47.0" strokeType="INSIDE" width="750.0" />
<Label layoutX="34.0" layoutY="9.0" text="Modpacks" textFill="WHITE"> <Label layoutX="34.0" layoutY="5.0" text="Modpacks" textFill="WHITE">
<font> <font>
<Font name="Centaur" size="31.0" /> <Font name="Centaur" size="31.0" />
</font> </font>
</Label> </Label>
<TextField id="search-modpacks" layoutX="524.0" layoutY="9.0" prefHeight="25.0" prefWidth="212.0" promptText="Search Modpacks" /> <TextField id="search-modpacks" layoutX="524.0" layoutY="5.0" prefHeight="25.0" prefWidth="212.0" promptText="Search Modpacks" />
</children> </children>
</Pane> </Pane>

View File

@ -5,13 +5,15 @@
<?import javafx.scene.shape.Rectangle?> <?import javafx.scene.shape.Rectangle?>
<?import javafx.scene.text.Font?> <?import javafx.scene.text.Font?>
<Pane id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.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 id="pane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="450.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>
<Rectangle id="Modpack-back" arcHeight="5.0" arcWidth="5.0" height="55.0" strokeType="INSIDE" width="750.0" /> <Rectangle id="Modpack-back" arcHeight="5.0" arcWidth="5.0" height="47.0" strokeType="INSIDE" width="750.0" />
<Label layoutX="331.0" layoutY="9.0" text="Settings" textFill="WHITE"> <Label layoutX="34.0" layoutY="5.0" text="Settings" textFill="WHITE">
<font> <font>
<Font name="Centaur" size="31.0" /> <Font name="Centaur" size="31.0" />
</font> </font>
</Label> </Label>
</children> </children>
</Pane> </Pane>