Linked the first fxml id tags from the fxml files for the new start up screens
#story[1087]
This commit is contained in:
@@ -3,13 +3,11 @@ package visualiser.Controllers;
|
|||||||
import javafx.collections.FXCollections;
|
import javafx.collections.FXCollections;
|
||||||
import javafx.collections.ObservableList;
|
import javafx.collections.ObservableList;
|
||||||
import javafx.fxml.FXML;
|
import javafx.fxml.FXML;
|
||||||
import javafx.scene.control.Button;
|
import javafx.scene.control.*;
|
||||||
import javafx.scene.control.TableColumn;
|
|
||||||
import javafx.scene.control.TableView;
|
|
||||||
import javafx.scene.control.TextField;
|
|
||||||
import javafx.scene.layout.AnchorPane;
|
import javafx.scene.layout.AnchorPane;
|
||||||
import visualiser.model.RaceConnection;
|
import visualiser.model.RaceConnection;
|
||||||
|
|
||||||
|
import javax.xml.soap.Text;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.net.Socket;
|
import java.net.Socket;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
@@ -35,6 +33,46 @@ public class ConnectionController extends Controller {
|
|||||||
@FXML
|
@FXML
|
||||||
private TextField portField;
|
private TextField portField;
|
||||||
|
|
||||||
|
|
||||||
|
/*Title Screen fxml items*/
|
||||||
|
@FXML
|
||||||
|
private Button hostGameTitleBtn;
|
||||||
|
@FXML
|
||||||
|
private Button connectGameBtn;
|
||||||
|
@FXML
|
||||||
|
private RadioButton nightRadioBtn;
|
||||||
|
@FXML
|
||||||
|
private RadioButton dayRadioButton;
|
||||||
|
|
||||||
|
/*Lobby fxml items*/
|
||||||
|
@FXML
|
||||||
|
private TableView lobbyTable;
|
||||||
|
@FXML
|
||||||
|
private TableColumn gameNameColumn;
|
||||||
|
@FXML
|
||||||
|
private TableColumn hostNameColumn;
|
||||||
|
@FXML
|
||||||
|
private TableColumn playerCountColumn;
|
||||||
|
@FXML
|
||||||
|
private TextField playerNameField;
|
||||||
|
@FXML
|
||||||
|
private Button joinGameBtn;
|
||||||
|
|
||||||
|
/*Host game fxml items*/
|
||||||
|
@FXML
|
||||||
|
private TextField gameNameField;
|
||||||
|
@FXML
|
||||||
|
private TextField hostNameField;
|
||||||
|
@FXML
|
||||||
|
private TextField hostGameBtn;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private ObservableList<RaceConnection> connections;
|
private ObservableList<RaceConnection> connections;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -40,7 +40,7 @@
|
|||||||
<Insets left="50.0" />
|
<Insets left="50.0" />
|
||||||
</GridPane.margin>
|
</GridPane.margin>
|
||||||
</TextField>
|
</TextField>
|
||||||
<Button fx:id="connectGameBtn" mnemonicParsing="false" text="Connect to Game" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="2">
|
<Button fx:id="joinGameBtn" mnemonicParsing="false" text="Connect to Game" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="2">
|
||||||
<GridPane.margin>
|
<GridPane.margin>
|
||||||
<Insets right="50.0" />
|
<Insets right="50.0" />
|
||||||
</GridPane.margin>
|
</GridPane.margin>
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
|
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
|
||||||
</rowConstraints>
|
</rowConstraints>
|
||||||
<children>
|
<children>
|
||||||
<Button fx:id="hostGameBtn" maxWidth="204.0" mnemonicParsing="false" text="Host Game" GridPane.halignment="LEFT" GridPane.rowIndex="1">
|
<Button fx:id="hostGameTitleBtn" maxWidth="204.0" mnemonicParsing="false" text="Host Game" GridPane.halignment="LEFT" GridPane.rowIndex="1">
|
||||||
<font>
|
<font>
|
||||||
<Font size="20.0" />
|
<Font size="20.0" />
|
||||||
</font>
|
</font>
|
||||||
|
|||||||
Reference in New Issue
Block a user