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
#	src/assets/layout/modpacks.fxml
This commit is contained in:
Gabriel Tofvesson 2016-11-04 20:51:38 +01:00
commit b741ab636d
6 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
TAL.iml
View File

@ -8,5 +8,14 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<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>
</module>

1
src/Launcher/Main.java
View File

@ -82,7 +82,6 @@ public class Main extends Application {
if(activeTab!=Tabs.Modpacks){
(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 )
System.out.println(Tabs.Modpacks.loaded.lookup("#searchModpacks"));
}
});

11
src/assets/layout/home.fxml
View File

@ -5,18 +5,15 @@
<?import javafx.scene.shape.Rectangle?>
<?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">
<children>
<Rectangle id="Modpack-back" arcHeight="5.0" arcWidth="5.0" height="55.0" strokeType="INSIDE" width="750.0" />
<Label layoutX="54.0" layoutY="9.0" text="Home" textFill="WHITE">
<Rectangle id="Modpack-back" arcHeight="5.0" arcWidth="5.0" height="47.0" strokeType="INSIDE" width="750.0" />
<Label layoutX="34.0" layoutY="5.0" text="Home" textFill="WHITE">
<font>
<Font name="Centaur" size="31.0" />
</font>
</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>
</Pane>

2
src/assets/layout/main.fxml
View File

@ -35,7 +35,7 @@
</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="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">
<font>
<Font size="11.0" />

2
src/assets/layout/modpacks.fxml
View File

@ -16,6 +16,6 @@
<Font name="Centaur" size="31.0" />
</font>
</Label>
<TextField id="searchModpacks" layoutX="524.0" layoutY="9.0" prefHeight="25.0" prefWidth="212.0" promptText="Search Modpacks" />
<TextField id="search-modpacks" layoutX="524.0" layoutY="9.0" prefHeight="25.0" prefWidth="212.0" promptText="Search Modpacks" />
</children>
</Pane>

6
src/assets/layout/settings.fxml
View File

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