diff --git a/src/main/resources/no/ntnu/idatg1002/idatg1002_2022_group6/create-tournament-match.fxml b/src/main/resources/no/ntnu/idatg1002/idatg1002_2022_group6/create-tournament-match.fxml index 4ab82bd1b3e7f79710ade3ed95f8bc86a64b5dd9..19275e5f9cedf052a9ef668a25286f9b6e1c136e 100644 --- a/src/main/resources/no/ntnu/idatg1002/idatg1002_2022_group6/create-tournament-match.fxml +++ b/src/main/resources/no/ntnu/idatg1002/idatg1002_2022_group6/create-tournament-match.fxml @@ -1,18 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<?import java.lang.*?> -<?import java.util.*?> -<?import javafx.scene.*?> <?import javafx.scene.control.*?> <?import javafx.scene.layout.*?> +<?import javafx.scene.text.*?> -<?import javafx.scene.text.Font?> -<AnchorPane xmlns="http://javafx.com/javafx" - xmlns:fx="http://javafx.com/fxml" - fx:controller="no.ntnu.idatg1002.idatg1002_2022_group6.CreateTournamentMatchController" - prefHeight="400.0" prefWidth="600.0"> +<AnchorPane prefHeight="400.0" prefWidth="600.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.CreateTournamentMatchController"> <children> - <Button layoutX="263.0" layoutY="441.0" mnemonicParsing="false" onAction="#onPressPlayMatch" style="-fx-background-color: #297ca6;" text="PLAY MATCH" textFill="WHITE"> + <Button layoutX="233.0" layoutY="440.0" mnemonicParsing="false" onAction="#onPressPlayMatch" style="-fx-background-color: #297ca6;" text="Start tournament" textFill="WHITE"> <font> <Font size="36.0" /> </font> @@ -28,12 +22,7 @@ <Font size="24.0" /> </font> </Label> - <Label layoutX="373.0" layoutY="239.0" text="VS" textFill="RED"> - <font> - <Font size="36.0" /> - </font> - </Label> - <Label layoutX="297.0" layoutY="29.0" text="FACEOFF" textFill="#297ca6"> + <Label layoutX="264.0" layoutY="100.0" text="Tournament" textFill="#297ca6"> <font> <Font size="48.0" /> </font> 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 8bfe91f7ee2af514d6734179ed3b84fd1ce44f65..1749e826858b39eac6584354fc5f1d83ef14cf6e 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 @@ -28,7 +28,7 @@ </Label> <Button fx:id="pointPlayer1" layoutX="154.0" layoutY="335.0" mnemonicParsing="false" onAction="#onPressPointPlayer1" text="Point" /> <Button fx:id="pointPlayer2" layoutX="580.0" layoutY="335.0" mnemonicParsing="false" onAction="#onPressPointPlayer2" text="Point" /> - <Label fx:id="winnerLabel" layoutX="282.0" layoutY="120.0" textFill="#fff600"> + <Label fx:id="winnerLabel" contentDisplay="CENTER" layoutX="282.0" layoutY="100.0" textFill="darkblue"> <font> <Font size="36.0" /> </font></Label> @@ -37,8 +37,8 @@ <Font size="24.0" /> </font> </Label> - <Button fx:id="mainMenu" layoutX="348.0" layoutY="541.0" mnemonicParsing="false" onAction="#onPressReturnToMenu" 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 fx:id="mainMenu" layoutX="230.0" layoutY="530.0" mnemonicParsing="false" onAction="#onPressReturnToMenu" prefHeight="40.0" prefWidth="150.0" text="Return to main menu" /> + <Button fx:id="saveButton" layoutX="406.0" layoutY="530.0" mnemonicParsing="false" onAction="#onPressSaveMatch" prefHeight="40.0" prefWidth="150.0" text="Save game" /> + <Button fx:id="nextMatch" layoutX="362.0" layoutY="490.0" mnemonicParsing="false" onAction="#onNextMatchPress" text="Next match" /> </children> </Pane> diff --git a/src/main/resources/no/ntnu/idatg1002/idatg1002_2022_group6/tournament-view.fxml b/src/main/resources/no/ntnu/idatg1002/idatg1002_2022_group6/tournament-view.fxml index 48d3acfedc8df1fcbfd7dc24717d01baf21f040f..8a3e2cd102b5757dfd0e8db5e666b50aaeeea111 100644 --- a/src/main/resources/no/ntnu/idatg1002/idatg1002_2022_group6/tournament-view.fxml +++ b/src/main/resources/no/ntnu/idatg1002/idatg1002_2022_group6/tournament-view.fxml @@ -35,9 +35,5 @@ <font> <Font size="18.0" /> </font></Button> - <Button layoutX="303.0" layoutY="369.0" mnemonicParsing="false" onAction="#create32PlayerTournament" prefHeight="40.0" prefWidth="200.0" text="32 Player tournament"> - <font> - <Font size="18.0" /> - </font></Button> </children> </Pane>