diff --git a/src/main/resources/no/ntnu/idatg1002/idatg1002_2022_group6/create-bracket-view.fxml b/src/main/resources/no/ntnu/idatg1002/idatg1002_2022_group6/create-bracket-view.fxml
index 6107b24ab58cefea4c2820074fdcbef2c5bab7a8..b99f3105313807518a9da5ae1cf35196297d0055 100644
--- a/src/main/resources/no/ntnu/idatg1002/idatg1002_2022_group6/create-bracket-view.fxml
+++ b/src/main/resources/no/ntnu/idatg1002/idatg1002_2022_group6/create-bracket-view.fxml
@@ -2,7 +2,6 @@
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
-<?import javafx.scene.shape.*?>
<?import javafx.scene.text.*?>
<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/11.0.14-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatg1002.idatg1002_2022_group6.BracketViewController">
@@ -13,13 +12,6 @@
<TextField fx:id="textFieldPlayer1" editable="true" layoutX="26.0" layoutY="27.0" prefHeight="25.0" prefWidth="120.0" />
<TextField fx:id="textFieldPlayer3" editable="true" layoutX="26.0" layoutY="161.0" prefHeight="25.0" prefWidth="120.0" />
<TextField fx:id="textFieldPlayer4" editable="true" layoutX="26.0" layoutY="211.0" prefHeight="25.0" prefWidth="120.0" />
- <TextField fx:id="textFieldSemi2" editable="false" layoutX="175.0" layoutY="149.0" prefHeight="25.0" prefWidth="120.0" />
- <TextField fx:id="textFieldSemi1" editable="false" layoutX="175.0" layoutY="90.0" prefHeight="25.0" prefWidth="120.0" />
- <Button fx:id="Play1" layoutX="146.0" layoutY="52.0" mnemonicParsing="false" onAction="#onPressAdd" text="Add" />
- <Button layoutX="242.0" layoutY="120.0" mnemonicParsing="false" onAction="#onPressPlay" text="Play" />
- <Line endX="100.0" layoutX="153.0" layoutY="85.0" startX="45.0" startY="-24.333335876464844" />
- <Line endX="-37.0" endY="-21.333328247070312" layoutX="295.0" layoutY="198.0" startX="-100.0" />
- <Line endX="141.0" endY="-103.33332824707031" layoutX="198.0" layoutY="132.0" startX="95.0" startY="1.6666717529296875" />
</children>
</Pane>
<Pane fx:id="pane4" layoutX="428.0" layoutY="323.0" prefHeight="250.0" prefWidth="350.0">
@@ -28,9 +20,6 @@
<TextField fx:id="textFieldPlayer14" editable="true" layoutX="216.0" layoutY="75.0" prefHeight="25.0" prefWidth="120.0" />
<TextField fx:id="textFieldPlayer16" editable="true" layoutX="216.0" layoutY="211.0" prefHeight="25.0" prefWidth="120.0" />
<TextField fx:id="textFieldPlayer15" editable="true" layoutX="216.0" layoutY="163.0" prefHeight="25.0" prefWidth="120.0" />
- <TextField fx:id="textFieldSemi7" layoutX="55.0" layoutY="88.0" prefHeight="25.0" prefWidth="120.0" />
- <TextField fx:id="textFieldSemi8" layoutX="55.0" layoutY="151.0" prefHeight="25.0" prefWidth="120.0" />
- <TextArea layoutX="-91.0" layoutY="96.0" prefHeight="58.0" prefWidth="131.0" />
</children></Pane>
<Pane fx:id="pane2" layoutX="22.0" layoutY="323.0" prefHeight="250.0" prefWidth="350.0">
<children>
@@ -38,31 +27,22 @@
<TextField fx:id="textFieldPlayer6" editable="true" layoutX="26.0" layoutY="75.0" prefHeight="25.0" prefWidth="120.0" />
<TextField fx:id="textFieldPlayer8" editable="true" layoutX="26.0" layoutY="211.0" prefHeight="25.0" prefWidth="120.0" />
<TextField fx:id="textFieldPlayer7" editable="true" layoutX="26.0" layoutY="163.0" prefHeight="25.0" prefWidth="120.0" />
- <TextField fx:id="textFieldSemi3" editable="false" layoutX="175.0" layoutY="88.0" prefHeight="25.0" prefWidth="120.0" />
- <TextField fx:id="textFieldSemi4" editable="false" layoutX="175.0" layoutY="151.0" prefHeight="25.0" prefWidth="120.0" />
</children>
</Pane>
- <TextField fx:id="textFieldFinal" editable="false" layoutX="326.0" layoutY="275.0" prefHeight="41.0" prefWidth="149.0">
- <font>
- <Font size="24.0" />
- </font>
- </TextField>
<Pane fx:id="pane3" layoutX="436.0" layoutY="14.0" prefHeight="250.0" prefWidth="350.0">
<children>
<TextField fx:id="textFieldPlayer9" editable="true" layoutX="216.0" layoutY="25.0" prefHeight="25.0" prefWidth="120.0" />
<TextField fx:id="textFieldPlayer10" editable="true" layoutX="216.0" layoutY="75.0" prefHeight="25.0" prefWidth="120.0" />
<TextField fx:id="textFieldPlayer12" editable="true" layoutX="216.0" layoutY="211.0" prefHeight="25.0" prefWidth="120.0" />
<TextField fx:id="textFieldPlayer11" editable="true" layoutX="216.0" layoutY="163.0" prefHeight="25.0" prefWidth="120.0" />
- <TextField fx:id="textFieldSemi5" layoutX="55.0" layoutY="88.0" prefHeight="25.0" prefWidth="120.0" />
- <TextField fx:id="textFieldSemi6" layoutX="55.0" layoutY="151.0" prefHeight="25.0" prefWidth="120.0" />
- <TextArea layoutX="-93.0" layoutY="106.0" prefHeight="58.0" prefWidth="131.0" />
</children>
</Pane>
<Button fx:id="TournamentView" layoutX="375.0" layoutY="561.0" mnemonicParsing="false" onAction="#onPressBackToTournamentView" text="Back" />
- <Line endX="-5.0" endY="27.666664123535156" layoutX="401.0" layoutY="80.0" startX="-5.0" startY="-17.333332061767578" />
- <Button layoutX="378.0" layoutY="523.0" mnemonicParsing="false" onAction="#onPressLoad" text="Load previous" />
- <Line endX="131.0" endY="93.66665649414062" layoutX="414.0" layoutY="186.0" startX="-14.0" />
- <Line endX="149.0" endY="-47.0" layoutX="401.0" layoutY="370.0" startX="1.0" startY="40.666656494140625" />
- <Line endX="101.0" endY="35.666656494140625" layoutX="385.0" layoutY="264.0" startX="139.0" startY="35.666656494140625" />
+ <Button fx:id="Play1" layoutX="377.0" layoutY="202.0" mnemonicParsing="false" onAction="#onPressAdd" text="Add players" />
+ <Button layoutX="368.0" layoutY="321.0" mnemonicParsing="false" onAction="#onPressPlay" text="Start the tournament" />
+ <Button layoutX="335.0" layoutY="520.0" mnemonicParsing="false" onAction="#onPressLoad" text="Load saved tournament" />
+ <Text layoutX="292.0" layoutY="73.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Write the names of the contestants in the text inputs" />
+ <Text layoutX="311.0" layoutY="152.0" strokeType="OUTSIDE" strokeWidth="0.0" text="When you have finished press "Add players"" />
+ <Text layoutX="310.0" layoutY="277.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Press "Start the tournament" to proceed" />
</children>
</Pane>
diff --git a/src/main/resources/no/ntnu/idatg1002/idatg1002_2022_group6/create-bracket-view32.fxml b/src/main/resources/no/ntnu/idatg1002/idatg1002_2022_group6/create-bracket-view32.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..b99f3105313807518a9da5ae1cf35196297d0055
--- /dev/null
+++ b/src/main/resources/no/ntnu/idatg1002/idatg1002_2022_group6/create-bracket-view32.fxml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
+
+<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/11.0.14-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatg1002.idatg1002_2022_group6.BracketViewController">
+ <children>
+ <Pane fx:id="pane1" layoutX="22.0" layoutY="14.0" prefHeight="250.0" prefWidth="350.0">
+ <children>
+ <TextField fx:id="textFieldPlayer2" editable="true" layoutX="26.0" layoutY="77.0" prefHeight="25.0" prefWidth="120.0" />
+ <TextField fx:id="textFieldPlayer1" editable="true" layoutX="26.0" layoutY="27.0" prefHeight="25.0" prefWidth="120.0" />
+ <TextField fx:id="textFieldPlayer3" editable="true" layoutX="26.0" layoutY="161.0" prefHeight="25.0" prefWidth="120.0" />
+ <TextField fx:id="textFieldPlayer4" editable="true" layoutX="26.0" layoutY="211.0" prefHeight="25.0" prefWidth="120.0" />
+ </children>
+ </Pane>
+ <Pane fx:id="pane4" layoutX="428.0" layoutY="323.0" prefHeight="250.0" prefWidth="350.0">
+ <children>
+ <TextField fx:id="textFieldPlayer13" editable="true" layoutX="216.0" layoutY="25.0" prefHeight="25.0" prefWidth="120.0" />
+ <TextField fx:id="textFieldPlayer14" editable="true" layoutX="216.0" layoutY="75.0" prefHeight="25.0" prefWidth="120.0" />
+ <TextField fx:id="textFieldPlayer16" editable="true" layoutX="216.0" layoutY="211.0" prefHeight="25.0" prefWidth="120.0" />
+ <TextField fx:id="textFieldPlayer15" editable="true" layoutX="216.0" layoutY="163.0" prefHeight="25.0" prefWidth="120.0" />
+ </children></Pane>
+ <Pane fx:id="pane2" layoutX="22.0" layoutY="323.0" prefHeight="250.0" prefWidth="350.0">
+ <children>
+ <TextField fx:id="textFieldPlayer5" editable="true" layoutX="26.0" layoutY="25.0" prefHeight="25.0" prefWidth="120.0" />
+ <TextField fx:id="textFieldPlayer6" editable="true" layoutX="26.0" layoutY="75.0" prefHeight="25.0" prefWidth="120.0" />
+ <TextField fx:id="textFieldPlayer8" editable="true" layoutX="26.0" layoutY="211.0" prefHeight="25.0" prefWidth="120.0" />
+ <TextField fx:id="textFieldPlayer7" editable="true" layoutX="26.0" layoutY="163.0" prefHeight="25.0" prefWidth="120.0" />
+ </children>
+ </Pane>
+ <Pane fx:id="pane3" layoutX="436.0" layoutY="14.0" prefHeight="250.0" prefWidth="350.0">
+ <children>
+ <TextField fx:id="textFieldPlayer9" editable="true" layoutX="216.0" layoutY="25.0" prefHeight="25.0" prefWidth="120.0" />
+ <TextField fx:id="textFieldPlayer10" editable="true" layoutX="216.0" layoutY="75.0" prefHeight="25.0" prefWidth="120.0" />
+ <TextField fx:id="textFieldPlayer12" editable="true" layoutX="216.0" layoutY="211.0" prefHeight="25.0" prefWidth="120.0" />
+ <TextField fx:id="textFieldPlayer11" editable="true" layoutX="216.0" layoutY="163.0" prefHeight="25.0" prefWidth="120.0" />
+ </children>
+ </Pane>
+ <Button fx:id="TournamentView" layoutX="375.0" layoutY="561.0" mnemonicParsing="false" onAction="#onPressBackToTournamentView" text="Back" />
+ <Button fx:id="Play1" layoutX="377.0" layoutY="202.0" mnemonicParsing="false" onAction="#onPressAdd" text="Add players" />
+ <Button layoutX="368.0" layoutY="321.0" mnemonicParsing="false" onAction="#onPressPlay" text="Start the tournament" />
+ <Button layoutX="335.0" layoutY="520.0" mnemonicParsing="false" onAction="#onPressLoad" text="Load saved tournament" />
+ <Text layoutX="292.0" layoutY="73.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Write the names of the contestants in the text inputs" />
+ <Text layoutX="311.0" layoutY="152.0" strokeType="OUTSIDE" strokeWidth="0.0" text="When you have finished press "Add players"" />
+ <Text layoutX="310.0" layoutY="277.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Press "Start the tournament" to proceed" />
+ </children>
+</Pane>
diff --git a/src/main/resources/no/ntnu/idatg1002/idatg1002_2022_group6/create-bracket-view4.fxml b/src/main/resources/no/ntnu/idatg1002/idatg1002_2022_group6/create-bracket-view4.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..bbfd5d354e2ad9cd15d70c85402935cf25342b03
--- /dev/null
+++ b/src/main/resources/no/ntnu/idatg1002/idatg1002_2022_group6/create-bracket-view4.fxml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
+
+<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/11.0.14-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatg1002.idatg1002_2022_group6.BracketViewController">
+ <children>
+ <Pane fx:id="pane1" layoutX="22.0" layoutY="14.0" prefHeight="250.0" prefWidth="350.0">
+ <children>
+ <TextField fx:id="textFieldPlayer2" editable="true" layoutX="26.0" layoutY="77.0" prefHeight="25.0" prefWidth="120.0" />
+ <TextField fx:id="textFieldPlayer1" editable="true" layoutX="26.0" layoutY="27.0" prefHeight="25.0" prefWidth="120.0" />
+ <TextField fx:id="textFieldPlayer3" editable="true" layoutX="26.0" layoutY="161.0" prefHeight="25.0" prefWidth="120.0" />
+ <TextField fx:id="textFieldPlayer4" editable="true" layoutX="26.0" layoutY="211.0" prefHeight="25.0" prefWidth="120.0" />
+ </children>
+ </Pane>
+
+ <Button fx:id="TournamentView" layoutX="375.0" layoutY="561.0" mnemonicParsing="false" onAction="#onPressBackToTournamentView" text="Back" />
+ <Button fx:id="Play1" layoutX="377.0" layoutY="202.0" mnemonicParsing="false" onAction="#onPressAdd" text="Add players" />
+ <Button layoutX="368.0" layoutY="321.0" mnemonicParsing="false" onAction="#onPressPlay" text="Start the tournament" />
+ <Button layoutX="335.0" layoutY="520.0" mnemonicParsing="false" onAction="#onPressLoad" text="Load saved tournament" />
+ <Text layoutX="292.0" layoutY="73.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Write the names of the contestants in the text inputs" />
+ <Text layoutX="311.0" layoutY="152.0" strokeType="OUTSIDE" strokeWidth="0.0" text="When you have finished press "Add players"" />
+ <Text layoutX="310.0" layoutY="277.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Press "Start the tournament" to proceed" />
+ </children>
+</Pane>
diff --git a/src/main/resources/no/ntnu/idatg1002/idatg1002_2022_group6/create-bracket-view8.fxml b/src/main/resources/no/ntnu/idatg1002/idatg1002_2022_group6/create-bracket-view8.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..d6edb7daffc79b04e94ae89aca483e73676eb83b
--- /dev/null
+++ b/src/main/resources/no/ntnu/idatg1002/idatg1002_2022_group6/create-bracket-view8.fxml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.*?>
+
+<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/11.0.14-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatg1002.idatg1002_2022_group6.BracketViewController">
+ <children>
+ <Pane fx:id="pane1" layoutX="22.0" layoutY="14.0" prefHeight="250.0" prefWidth="350.0">
+ <children>
+ <TextField fx:id="textFieldPlayer2" editable="true" layoutX="26.0" layoutY="77.0" prefHeight="25.0" prefWidth="120.0" />
+ <TextField fx:id="textFieldPlayer1" editable="true" layoutX="26.0" layoutY="27.0" prefHeight="25.0" prefWidth="120.0" />
+ <TextField fx:id="textFieldPlayer3" editable="true" layoutX="26.0" layoutY="161.0" prefHeight="25.0" prefWidth="120.0" />
+ <TextField fx:id="textFieldPlayer4" editable="true" layoutX="26.0" layoutY="211.0" prefHeight="25.0" prefWidth="120.0" />
+ </children>
+ </Pane>
+
+
+ <Pane fx:id="pane3" layoutX="436.0" layoutY="14.0" prefHeight="250.0" prefWidth="350.0">
+ <children>
+ <TextField fx:id="textFieldPlayer9" editable="true" layoutX="216.0" layoutY="25.0" prefHeight="25.0" prefWidth="120.0" />
+ <TextField fx:id="textFieldPlayer10" editable="true" layoutX="216.0" layoutY="75.0" prefHeight="25.0" prefWidth="120.0" />
+ <TextField fx:id="textFieldPlayer12" editable="true" layoutX="216.0" layoutY="211.0" prefHeight="25.0" prefWidth="120.0" />
+ <TextField fx:id="textFieldPlayer11" editable="true" layoutX="216.0" layoutY="163.0" prefHeight="25.0" prefWidth="120.0" />
+ </children>
+ </Pane>
+ <Button fx:id="TournamentView" layoutX="375.0" layoutY="561.0" mnemonicParsing="false" onAction="#onPressBackToTournamentView" text="Back" />
+ <Button fx:id="Play1" layoutX="377.0" layoutY="202.0" mnemonicParsing="false" onAction="#onPressAdd" text="Add players" />
+ <Button layoutX="368.0" layoutY="321.0" mnemonicParsing="false" onAction="#onPressPlay" text="Start the tournament" />
+ <Button layoutX="335.0" layoutY="520.0" mnemonicParsing="false" onAction="#onPressLoad" text="Load saved tournament" />
+ <Text layoutX="292.0" layoutY="73.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Write the names of the contestants in the text inputs" />
+ <Text layoutX="311.0" layoutY="152.0" strokeType="OUTSIDE" strokeWidth="0.0" text="When you have finished press "Add players"" />
+ <Text layoutX="310.0" layoutY="277.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Press "Start the tournament" to proceed" />
+ </children>
+</Pane>
diff --git a/src/main/resources/no/ntnu/idatg1002/idatg1002_2022_group6/tournament-match-view.fxml b/src/main/resources/no/ntnu/idatg1002/idatg1002_2022_group6/tournament-match-view.fxml
index 4eb9dadd4cf4517575d3ceffecd594d79173f3c6..bca4e6c68160e0d7758e7b208b444af9182ac514 100644
--- a/src/main/resources/no/ntnu/idatg1002/idatg1002_2022_group6/tournament-match-view.fxml
+++ b/src/main/resources/no/ntnu/idatg1002/idatg1002_2022_group6/tournament-match-view.fxml
@@ -40,6 +40,5 @@
<Button fx:id="mainMenu" layoutX="348.0" layoutY="541.0" mnemonicParsing="false" onAction="#onPressBackToMenu" text="Return to main menu" />
<Button fx:id="saveButton" layoutX="705.0" layoutY="541.0" mnemonicParsing="false" onAction="#onPressSaveMatch" text="Save game" />
<Button fx:id="nextMatch" layoutX="541.0" layoutY="541.0" mnemonicParsing="false" onAction="#onNextMatchPress" text="Next match" />
- <Button layoutX="322.0" layoutY="46.0" mnemonicParsing="false" text="Your mom" />
</children>
</Pane>