Skip to content

GitLab

Commit c36616fa authored by Peining Li's avatar Peining Li
Browse files

Merge branch 'ihm-main/develop' into 'develop' 

Ihm main/develop

See merge request !174
parents 0d8193fc 89c07dc9
Hide whitespace changes
Inline Side-by-side
Showing with 310 additions and 322 deletions
Battleship/src/main/java/com/utclo23/ihmmain/IHMMain.java
View file @ c36616fa
......@@ -95,6 +95,7 @@ public class IHMMain {
}
public void toMenu() throws IOException{
primaryStage.setTitle("Battle Ship");
toScene(SceneName.MENU);
}
......
Battleship/src/main/java/com/utclo23/ihmmain/controller/CreateGameController.java
View file @ c36616fa
......@@ -5,7 +5,6 @@
*/
package com.utclo23.ihmmain.controller;
import com.utclo23.data.module.DataException;
import com.utclo23.data.structure.Game;
import com.utclo23.data.structure.GameType;
import java.io.IOException;
import javafx.event.ActionEvent;
......@@ -16,7 +15,6 @@ import javafx.scene.control.RadioButton;
import javafx.scene.control.TextField;
import javafx.scene.control.ToggleGroup;
import javafx.scene.image.ImageView;
import javax.swing.JOptionPane;
/**
* Controll of the createGame page.
......@@ -26,40 +24,31 @@ import javax.swing.JOptionPane;
public class CreateGameController extends AbstractController{
ToggleGroup mode;
ToggleGroup enemy;
@FXML
RadioButton radioButtonClassical;
@FXML
RadioButton radioButtonBelge;
@FXML
RadioButton radioButtonComputer;
@FXML
RadioButton radioButtonPlayer;
@FXML
CheckBox radioButtonAudience;
@FXML
CheckBox radioButtonChat;
@FXML
TextField gameNameField;
@FXML
private ImageView avatarImageView;
@FXML
private Label playerUsernameLabel;
@FXML
private ImageView avatarImageView;
@FXML
private Label playerUsernameLabel;
/**
* This function is called at the oppening of the page.
* It affects default values to Mode and Enemy and create the toggle groups
*/
@FXML
public void initialize(){
// Toggle Group
mode = new ToggleGroup();
......@@ -104,15 +93,13 @@ public class CreateGameController extends AbstractController{
private void validateCreateGame(ActionEvent event){
String names = gameNameField.getText();
gameNameField.setStyle("");
JOptionPane msg = new JOptionPane();
if (!names.isEmpty()){
GameType modes = (((RadioButton) mode.getSelectedToggle()).getText()).equals("CLASSIC") ? GameType.CLASSIC : GameType.BELGIAN;
boolean enemys = (((RadioButton) enemy.getSelectedToggle()).getText()).equals("Computer");
boolean chats = radioButtonChat.isSelected();
boolean audiences = radioButtonAudience.isSelected();
try{
Game newGame = getFacade().iDataIHMMain.createGame(names, enemys, audiences, chats, modes);
//msg.showMessageDialog(null, "Game created", "Information", JOptionPane.INFORMATION_MESSAGE);
getFacade().iDataIHMMain.createGame(names, enemys, audiences, chats, modes);
getFacade().iIHMTableToIHMMain.createInGameGUI(getIhmmain().primaryStage);
}catch (DataException e){
......
Battleship/src/main/resources/fxml/ihmmain/CreateGame.fxml
View file @ c36616fa
......@@ -11,49 +11,9 @@
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.shape.Line?>
<!--
<columnConstraints>
<ColumnConstraints percentWidth="35.0" hgrow="SOMETIMES" />
<ColumnConstraints percentWidth="35.0" hgrow="SOMETIMES" />
<ColumnConstraints percentWidth="35.0" hgrow="SOMETIMES" />
<ColumnConstraints percentWidth="35.0" hgrow="SOMETIMES" />
<ColumnConstraints percentWidth="35.0" hgrow="SOMETIMES" />
</columnConstraints>
<rowConstraints>
<RowConstraints percentHeight="35.0" vgrow="SOMETIMES" />
<RowConstraints percentHeight="5.0" vgrow="SOMETIMES" />
<RowConstraints percentHeight="5.0" vgrow="SOMETIMES" />
<RowConstraints percentHeight="5.0" vgrow="SOMETIMES" />
<RowConstraints percentHeight="5.0" vgrow="SOMETIMES" />
<RowConstraints percentHeight="5.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Label id="pageTitleLabel" GridPane.columnIndex="2" GridPane.rowIndex="1" text="Create a game" textAlignment="CENTER" />
<Label id="formLabel" alignment="CENTER_RIGHT" GridPane.columnIndex="1" GridPane.rowIndex="2" text="Name" />
<TextField fx:id="gameNameField" GridPane.columnIndex="2" GridPane.rowIndex="2" prefHeight="25.0" prefWidth="166.0" />
<Label id="formLabel" alignment="CENTER_RIGHT" GridPane.columnIndex="1" GridPane.rowIndex="3" text="Mode" />
<RadioButton fx:id="radioButtonClassical" alignment="CENTER_RIGHT" GridPane.columnIndex="2" GridPane.rowIndex="3" mnemonicParsing="false" text="CLASSIC" />
<RadioButton fx:id="radioButtonBelge" alignment="CENTER_RIGHT" GridPane.columnIndex="3" GridPane.rowIndex="3" mnemonicParsing="false" text="BELGIAN" />
<Label id="formLabel" alignment="CENTER_RIGHT" GridPane.columnIndex="1" GridPane.rowIndex="4" text="Enemy" />
<RadioButton fx:id="radioButtonComputer" alignment="CENTER_RIGHT" GridPane.columnIndex="2" GridPane.rowIndex="4" mnemonicParsing="false" text="Computer" />
<RadioButton fx:id="radioButtonPlayer" alignment="CENTER_RIGHT" GridPane.columnIndex="3" GridPane.rowIndex="4" mnemonicParsing="false" text="Player" />
<CheckBox fx:id="radioButtonAudience" GridPane.columnIndex="2" GridPane.rowIndex="5" mnemonicParsing="false" text="Audience" />
<CheckBox fx:id="radioButtonChat" GridPane.columnIndex="3" GridPane.rowIndex="5" mnemonicParsing="false" text="Chat" />
<Button GridPane.columnIndex="2" GridPane.rowIndex="6" mnemonicParsing="false" onAction="#validateCreateGame" text="Create" />
<Button GridPane.columnIndex="3" GridPane.rowIndex="6" mnemonicParsing="false" onAction="#back" text="Return" />
</children>
-->
<?import javafx.scene.control.*?>
<GridPane id="generalGrid" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="600" minWidth="800" prefHeight="768" prefWidth="1368" stylesheets="@../../styles/ihmmain.css" xmlns="http://javafx.com/javafx/9" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.utclo23.ihmmain.controller.CreateGameController">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" />
</columnConstraints>
......@@ -65,22 +25,21 @@
<RowConstraints percentHeight="10.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<GridPane maxWidth="300.0" minWidth="60.0" prefWidth="60.0" GridPane.halignment="RIGHT">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Label id="usernameLabel" fx:id="playerUsernameLabel" text="Label" GridPane.halignment="RIGHT" GridPane.valignment="CENTER" />
<ImageView fx:id="avatarImageView1" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.valignment="CENTER" />
</children>
</GridPane>
<GridPane maxWidth="300.0" minWidth="60.0" prefWidth="60.0" GridPane.halignment="RIGHT">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Label id="usernameLabel" fx:id="playerUsernameLabel" text="Label" GridPane.halignment="RIGHT" GridPane.valignment="CENTER" />
<ImageView fx:id="avatarImageView1" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.valignment="CENTER" />
</children>
</GridPane>
<Label id="pageTitleLabel" text="Create a game" textAlignment="CENTER" GridPane.columnIndex="0" GridPane.halignment="CENTER" GridPane.rowIndex="0" GridPane.valignment="CENTER" />
<Line fx:id="lineDesign" endX="100.0" startX="-100.0" styleClass="lineDesign" GridPane.halignment="CENTER" GridPane.valignment="BOTTOM" />
<GridPane GridPane.rowIndex="2">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" percentWidth="30.0" />
......@@ -91,28 +50,21 @@
<RowConstraints percentHeight="100.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<!-- DEBUT CORPS -->
<GridPane id="frameButton" GridPane.columnIndex="1">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" percentWidth="10.0" />
<ColumnConstraints hgrow="SOMETIMES" percentWidth="80.0" />
<ColumnConstraints hgrow="SOMETIMES" percentWidth="10.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints percentHeight="25.0" vgrow="SOMETIMES" />
<RowConstraints percentHeight="25.0" vgrow="SOMETIMES" />
<RowConstraints percentHeight="25.0" vgrow="SOMETIMES" />
<RowConstraints percentHeight="25.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<GridPane GridPane.columnIndex="1" GridPane.rowIndex="0">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" percentWidth="33.0" />
<ColumnConstraints hgrow="SOMETIMES" percentWidth="67.0" />
......@@ -122,7 +74,11 @@
</rowConstraints>
<children>
<Label id="formLabel" alignment="CENTER_RIGHT" text="Name" GridPane.columnIndex="0" GridPane.rowIndex="0" />
<TextField fx:id="gameNameField" prefHeight="25.0" prefWidth="166.0" GridPane.columnIndex="1" GridPane.rowIndex="0" />
<TextField fx:id="gameNameField" prefHeight="25.0" prefWidth="166.0" GridPane.columnIndex="1" GridPane.rowIndex="0" >
<tooltip>
<Tooltip text="Enter game's name."/>
</tooltip>
</TextField>
</children>
</GridPane>
......@@ -137,8 +93,16 @@
</rowConstraints>
<children>
<Label id="formLabel" alignment="CENTER_RIGHT" text="Mode" GridPane.columnIndex="0" GridPane.rowIndex="0" />
<RadioButton fx:id="radioButtonClassical" alignment="CENTER_RIGHT" mnemonicParsing="false" text="CLASSIC" GridPane.columnIndex="1" GridPane.rowIndex="0" />
<RadioButton fx:id="radioButtonBelge" alignment="CENTER_RIGHT" mnemonicParsing="false" text="BELGIAN" GridPane.columnIndex="2" GridPane.rowIndex="0" />
<RadioButton fx:id="radioButtonClassical" alignment="CENTER_RIGHT" mnemonicParsing="false" text="CLASSIC" GridPane.columnIndex="1" GridPane.rowIndex="0">
<tooltip>
<Tooltip text="Select if you want to play a classic game."/>
</tooltip>
</RadioButton>
<RadioButton fx:id="radioButtonBelge" GridPane.halignment="RIGHT" mnemonicParsing="false" text="BELGIAN" GridPane.columnIndex="2" GridPane.rowIndex="0" >
<tooltip>
<Tooltip text="Select if you want to play a Belgian game."/>
</tooltip>
</RadioButton>
</children>
</GridPane>
......@@ -153,8 +117,16 @@
</rowConstraints>
<children>
<Label id="formLabel" alignment="CENTER_RIGHT" text="Enemy" GridPane.columnIndex="0" GridPane.rowIndex="0" />
<RadioButton fx:id="radioButtonComputer" alignment="CENTER_RIGHT" mnemonicParsing="false" text="Computer" GridPane.columnIndex="1" GridPane.rowIndex="0" />
<RadioButton fx:id="radioButtonPlayer" alignment="CENTER_RIGHT" mnemonicParsing="false" text="Player" GridPane.columnIndex="2" GridPane.rowIndex="0" />
<RadioButton fx:id="radioButtonComputer" alignment="CENTER_RIGHT" mnemonicParsing="false" text="Computer" GridPane.columnIndex="1" GridPane.rowIndex="0" >
<tooltip>
<Tooltip text="Select if you want to play against the computer."/>
</tooltip>
</RadioButton>
<RadioButton fx:id="radioButtonPlayer" GridPane.halignment="RIGHT" mnemonicParsing="false" text="Player" GridPane.columnIndex="2" GridPane.rowIndex="0" >
<tooltip>
<Tooltip text="Select if you want to play against an other player."/>
</tooltip>
</RadioButton>
</children>
</GridPane>
......@@ -167,8 +139,16 @@
<RowConstraints percentHeight="100.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<CheckBox fx:id="radioButtonAudience" GridPane.columnIndex="0" GridPane.rowIndex="0" mnemonicParsing="false" text="Audience" GridPane.halignment="CENTER" GridPane.valignment="CENTER" />
<CheckBox fx:id="radioButtonChat" GridPane.columnIndex="1" GridPane.rowIndex="0" mnemonicParsing="false" text="Chat" GridPane.halignment="CENTER" GridPane.valignment="CENTER"/>
<CheckBox fx:id="radioButtonAudience" GridPane.columnIndex="0" GridPane.rowIndex="0" mnemonicParsing="false" text="Audience" GridPane.halignment="CENTER" GridPane.valignment="CENTER" >
<tooltip>
<Tooltip text="Check to allow viewers."/>
</tooltip>
</CheckBox>
<CheckBox fx:id="radioButtonChat" GridPane.columnIndex="1" GridPane.rowIndex="0" mnemonicParsing="false" text="Chat" GridPane.halignment="CENTER" GridPane.valignment="CENTER">
<tooltip>
<Tooltip text="Check to activate chat."/>
</tooltip>
</CheckBox>
</children>
</GridPane>
</children>
......@@ -188,15 +168,23 @@
<RowConstraints percentHeight="100.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Button GridPane.columnIndex="1" maxWidth="Infinity" GridPane.rowIndex="0" onAction="#validateCreateGame" text="Create" GridPane.halignment="CENTER" GridPane.valignment="CENTER"/>
<Button GridPane.columnIndex="3" maxWidth="Infinity" GridPane.rowIndex="0" onAction="#back" text="Return" GridPane.halignment="CENTER" GridPane.valignment="CENTER"/>
<Button GridPane.columnIndex="1" maxWidth="Infinity" GridPane.rowIndex="0" onAction="#validateCreateGame" text="Create" GridPane.halignment="CENTER" GridPane.valignment="CENTER">
<tooltip>
<Tooltip text="Click to create the game."/>
</tooltip>
</Button>
<Button GridPane.columnIndex="3" maxWidth="Infinity" GridPane.rowIndex="0" onAction="#back" text="Return" GridPane.halignment="CENTER" GridPane.valignment="CENTER">
<tooltip>
<Tooltip text="Click to go back to the menu."/>
</tooltip>
</Button>
</children>
</GridPane>
<ImageView fx:id="avatarImageView" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true" GridPane.halignment="RIGHT" GridPane.valignment="CENTER">
<GridPane.margin>
<Insets right="20.0" top="20.0" />
</GridPane.margin>
</ImageView>
<ImageView fx:id="avatarImageView" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true" GridPane.halignment="RIGHT" GridPane.valignment="CENTER">
<GridPane.margin>
<Insets right="20.0" top="20.0" />
</GridPane.margin>
</ImageView>
</children>
</GridPane>
Battleship/src/main/resources/fxml/ihmmain/CreateUser.fxml
View file @ c36616fa
......@@ -54,14 +54,14 @@
<Tooltip text="Your username is visible by the other players" />
</tooltip>
</TextField>
<PasswordField fx:id="passwordField" GridPane.columnIndex="1" GridPane.rowIndex="1">
<GridPane.margin>
<Insets left="20.0" right="20.0" />
</GridPane.margin>
<tooltip>
<Tooltip text="Your password" />
</tooltip>
</PasswordField>
<PasswordField fx:id="passwordField" GridPane.columnIndex="1" GridPane.rowIndex="1">
<GridPane.margin>
<Insets left="20.0" right="20.0" />
</GridPane.margin>
<tooltip>
<Tooltip text="Your password" />
</tooltip>
</PasswordField>
<TextField fx:id="firstNameField" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="2" GridPane.valignment="CENTER">
<GridPane.margin>
<Insets left="20.0" right="20.0" />
......
Battleship/src/main/resources/fxml/ihmmain/GameList.fxml
View file @ c36616fa
......@@ -60,23 +60,23 @@
</Button>
</children>
</GridPane>
<ImageView fx:id="avatarImageView" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true" GridPane.halignment="RIGHT" GridPane.valignment="CENTER">
<GridPane.margin>
<Insets right="20.0" top="20.0" />
</GridPane.margin>
</ImageView>
<GridPane maxWidth="300.0" minWidth="60.0" prefWidth="60.0" GridPane.halignment="RIGHT">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Label id="usernameLabel" fx:id="playerUsernameLabel" text="Label" GridPane.halignment="RIGHT" GridPane.valignment="CENTER" />
<ImageView fx:id="avatarImageView1" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.valignment="CENTER" />
</children>
</GridPane>
<ImageView fx:id="avatarImageView" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true" GridPane.halignment="RIGHT" GridPane.valignment="CENTER">
<GridPane.margin>
<Insets right="20.0" top="20.0" />
</GridPane.margin>
</ImageView>
<GridPane maxWidth="300.0" minWidth="60.0" prefWidth="60.0" GridPane.halignment="RIGHT">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Label id="usernameLabel" fx:id="playerUsernameLabel" text="Label" GridPane.halignment="RIGHT" GridPane.valignment="CENTER" />
<ImageView fx:id="avatarImageView1" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.valignment="CENTER" />
</children>
</GridPane>
</children>
</GridPane>
Battleship/src/main/resources/fxml/ihmmain/IpList.fxml
View file @ c36616fa
......@@ -13,64 +13,80 @@
<?import javafx.scene.shape.Line?>
<GridPane id="generalGrid" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" stylesheets="@../../styles/ihmmain.css" xmlns="http://javafx.com/javafx/9" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.utclo23.ihmmain.controller.IpListController">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints percentHeight="10.0" vgrow="SOMETIMES" />
<RowConstraints percentHeight="70.0" vgrow="SOMETIMES" />
<RowConstraints percentHeight="10.0" vgrow="SOMETIMES" />
<RowConstraints percentHeight="10.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<GridPane maxWidth="300.0" minWidth="60.0" prefWidth="60.0" GridPane.halignment="RIGHT">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Label id="usernameLabel" fx:id="playerUsernameLabel" text="Label" GridPane.halignment="RIGHT" GridPane.valignment="CENTER" />
<ImageView fx:id="avatarImageView1" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.valignment="CENTER" />
</children>
</GridPane>
<Label id="pageTitleLabel" text="LIST OF IP" GridPane.columnIndex="0" GridPane.halignment="CENTER" GridPane.rowIndex="0" GridPane.valignment="CENTER" />
<Line fx:id="lineDesign" endX="100.0" startX="-100.0" styleClass="lineDesign" GridPane.halignment="CENTER" GridPane.valignment="BOTTOM" />
<TableView fx:id="ipList" prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="1" />
<Button fx:id="validateButton" mnemonicParsing="false" onAction="#validateList" text="VALIDATE AND RETURN" GridPane.columnIndex="0" GridPane.halignment="CENTER" GridPane.rowIndex="3" GridPane.valignment="CENTER">
<tooltip>
<Tooltip text="Click to validate the changes and go back to the menu." />
</tooltip>
</Button>
<GridPane GridPane.rowIndex="2">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" percentWidth="10.0" />
<ColumnConstraints hgrow="SOMETIMES" percentWidth="40.0" />
<ColumnConstraints hgrow="SOMETIMES" percentWidth="40.0" />
<ColumnConstraints hgrow="SOMETIMES" percentWidth="10.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<TextField fx:id="ipAddressField" GridPane.columnIndex="1">
<tooltip>
<Tooltip text="Enter the IP address you want to add." />
</tooltip>
</TextField>
<Button fx:id="addRemoveButton" mnemonicParsing="false" onAction="#addIpAddress" prefHeight="25.0" text="ADD" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.valignment="CENTER">
<tooltip>
<Tooltip text="Click to add the IP address." />
</tooltip>
</Button>
</children>
</GridPane>
<ImageView fx:id="avatarImageView" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true" GridPane.halignment="RIGHT" GridPane.valignment="CENTER">
<GridPane.margin>
<Insets right="20.0" top="20.0" />
</GridPane.margin>
</ImageView>
</children>
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints percentHeight="10.0" vgrow="SOMETIMES" />
<RowConstraints percentHeight="70.0" vgrow="SOMETIMES" />
<RowConstraints percentHeight="10.0" vgrow="SOMETIMES" />
<RowConstraints percentHeight="10.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<GridPane maxWidth="300.0" minWidth="60.0" prefWidth="60.0" GridPane.halignment="RIGHT">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Label id="usernameLabel" fx:id="playerUsernameLabel" text="Label" GridPane.halignment="RIGHT" GridPane.valignment="CENTER" />
<ImageView fx:id="avatarImageView1" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.valignment="CENTER" />
</children>
</GridPane>
<Label id="pageTitleLabel" text="LIST OF IP" GridPane.columnIndex="0" GridPane.halignment="CENTER" GridPane.rowIndex="0" GridPane.valignment="CENTER" />
<Line fx:id="lineDesign" endX="100.0" startX="-100.0" styleClass="lineDesign" GridPane.halignment="CENTER" GridPane.valignment="BOTTOM" />
<TableView fx:id="ipList" prefHeight="200.0" prefWidth="200.0" GridPane.rowIndex="1" />
<!-- -->
<GridPane id="ManageGrid" GridPane.rowIndex="3">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" percentWidth="35" />
<ColumnConstraints hgrow="SOMETIMES" percentWidth="30" />
<ColumnConstraints hgrow="SOMETIMES" percentWidth="35" />
</columnConstraints>
<rowConstraints>
<RowConstraints percentHeight="100.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Button fx:id="validateButton" maxWidth="Infinity" mnemonicParsing="false" onAction="#validateList" text="VALIDATE AND RETURN" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.valignment="CENTER">
<tooltip>
<Tooltip text="Click to validate the changes and go back to the menu." />
</tooltip>
</Button>
</children>
</GridPane>
<!-- -->
<GridPane GridPane.rowIndex="2">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" percentWidth="10.0" />
<ColumnConstraints hgrow="SOMETIMES" percentWidth="40.0" />
<ColumnConstraints hgrow="SOMETIMES" percentWidth="40.0" />
<ColumnConstraints hgrow="SOMETIMES" percentWidth="10.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<TextField fx:id="ipAddressField" GridPane.columnIndex="1">
<tooltip>
<Tooltip text="Enter the IP address you want to add." />
</tooltip>
</TextField>
<Button fx:id="addRemoveButton" mnemonicParsing="false" onAction="#addIpAddress" prefHeight="25.0" text="ADD" GridPane.columnIndex="2" GridPane.halignment="CENTER" GridPane.valignment="CENTER">
<tooltip>
<Tooltip text="Click to add the IP address." />
</tooltip>
</Button>
</children>
</GridPane>
<ImageView fx:id="avatarImageView" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true" GridPane.halignment="RIGHT" GridPane.valignment="CENTER">
<GridPane.margin>
<Insets right="20.0" top="20.0" />
</GridPane.margin>
</ImageView>
</children>
</GridPane>
Battleship/src/main/resources/fxml/ihmmain/Login.fxml
View file @ c36616fa
......@@ -43,12 +43,12 @@
<Tooltip text="Click to create a new local player account."/>
</tooltip>
</Button>
<Button fx:id="exitButton" onAction="#exitAction" text="Exit" GridPane.columnIndex="1" GridPane.rowIndex="6" GridPane.halignment="CENTER" maxWidth="Infinity">
<Button fx:id="exitButton" onAction="#exitAction" text="Exit" GridPane.columnIndex="2" GridPane.rowIndex="6" GridPane.halignment="CENTER" maxWidth="Infinity">
<tooltip>
<Tooltip text="Click to exit the application."/>
</tooltip>
</Button>
<Button fx:id="loginButton" defaultButton="true" onAction="#loginAction" text="Login" GridPane.columnIndex="2" GridPane.rowIndex="6" GridPane.halignment="CENTER" maxWidth="Infinity">
<Button fx:id="loginButton" defaultButton="true" onAction="#loginAction" text="Login" GridPane.columnIndex="1" GridPane.rowIndex="6" GridPane.halignment="CENTER" maxWidth="Infinity">
<tooltip>
<Tooltip text="Click to login once your username and password have been completed."/>
</tooltip>
......
Battleship/src/main/resources/fxml/ihmmain/Menu.fxml
View file @ c36616fa
......@@ -87,18 +87,18 @@
</GridPane>
</children>
</GridPane>
<GridPane maxWidth="300.0" minWidth="60.0" prefWidth="60.0" GridPane.halignment="RIGHT">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Label id="usernameLabel" fx:id="playerUsernameLabel" text="Label" GridPane.halignment="RIGHT" GridPane.valignment="CENTER" />
<ImageView fx:id="avatarImageView" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.valignment="CENTER" />
</children>
</GridPane>
<GridPane maxWidth="300.0" minWidth="60.0" prefWidth="60.0" GridPane.halignment="RIGHT">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
<ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Label id="usernameLabel" fx:id="playerUsernameLabel" text="Label" GridPane.halignment="RIGHT" GridPane.valignment="CENTER" />
<ImageView fx:id="avatarImageView" fitHeight="100.0" fitWidth="100.0" pickOnBounds="true" preserveRatio="true" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.valignment="CENTER" />
</children>
</GridPane>
</children>
</GridPane>
Battleship/src/main/resources/fxml/ihmmain/NetworkInterface.fxml
View file @ c36616fa
......@@ -13,7 +13,6 @@
<GridPane id="generalGrid" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="600" minWidth="800" prefHeight="768" prefWidth="1368" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.utclo23.ihmmain.controller.NetworkInterfaceChoiceController" stylesheets="@../../styles/ihmmain.css">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES"/>
</columnConstraints>
......@@ -37,18 +36,9 @@
<RowConstraints percentHeight="100.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<!-- DEBUT CORPS -->
<ListView fx:id="listNetworks" GridPane.halignment="CENTER" GridPane.columnIndex="1" GridPane.valignment="CENTER" />
<ListView fx:id="listNetworks" GridPane.halignment="CENTER" GridPane.columnIndex="1" GridPane.valignment="CENTER" />
</children>
</GridPane>