From 48288b2401f1e0908f92357bb6854b5a1780555c Mon Sep 17 00:00:00 2001
From: Chiara <chiara.relevat@oulook.fr>
Date: Fri, 17 Apr 2020 16:43:24 +0200
Subject: [PATCH] retaillage des interfaces

---
 src/ihm/ressources/Choix_joueur.fxml | 188 ++++++++++++++++++++-------
 src/ihm/ressources/Menu.fxml         |   8 +-
 src/ihm/ressources/Plateau.fxml      |  20 +--
 src/ihm/ressources/style/plateau.css |   0
 4 files changed, 149 insertions(+), 67 deletions(-)
 create mode 100644 src/ihm/ressources/style/plateau.css

diff --git a/src/ihm/ressources/Choix_joueur.fxml b/src/ihm/ressources/Choix_joueur.fxml
index 676b57e..560e5a0 100644
--- a/src/ihm/ressources/Choix_joueur.fxml
+++ b/src/ihm/ressources/Choix_joueur.fxml
@@ -10,90 +10,144 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<BorderPane fx:id="rootPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" styleClass="background" stylesheets="@style/menu.css" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ihm.controller.PlayersController">
+<BorderPane fx:id="rootPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1280.0" styleClass="background" stylesheets="@style/menu.css" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ihm.controller.PlayersController">
    <bottom>
       <Button fx:id="btnCommencer" mnemonicParsing="false" onMouseClicked="#commencerJeux" styleClass="bouton" stylesheets="@style/menu.css" text="Commencer la partie" BorderPane.alignment="CENTER">
          <BorderPane.margin>
             <Insets bottom="10.0" />
-         </BorderPane.margin></Button>
+         </BorderPane.margin>
+         <font>
+            <Font size="36.0" />
+         </font></Button>
    </bottom>
    <top>
       <VBox alignment="CENTER" prefHeight="119.0" prefWidth="600.0" BorderPane.alignment="CENTER">
          <children>
             <Label styleClass="titre" stylesheets="@style/menu.css" text="Entrez le nom des joueurs">
                <font>
-                  <Font size="24.0" />
+                  <Font size="48.0" />
                </font>
             </Label>
             <Label styleClass="titre" stylesheets="@style/menu.css" text="(Il faut au moins 4 joueurs)">
                <font>
-                  <Font size="18.0" />
+                  <Font size="36.0" />
                </font>
             </Label>
-            <Label styleClass="titre" stylesheets="@style/menu.css" text="Cochez la checkbox pour que le joueur soit un joueur virtuel" />
+            <Label styleClass="titre" stylesheets="@style/menu.css" text="Cochez la checkbox pour que le joueur soit un joueur virtuel">
+               <font>
+                  <Font size="36.0" />
+               </font></Label>
          </children>
       </VBox>
    </top>
    <left>
-      <HBox alignment="CENTER_LEFT" prefHeight="256.0" prefWidth="306.0" BorderPane.alignment="CENTER">
+      <HBox alignment="CENTER_LEFT" prefHeight="533.0" prefWidth="520.0" BorderPane.alignment="CENTER">
          <children>
-            <VBox alignment="CENTER_LEFT" prefHeight="200.0" prefWidth="100.0">
+            <VBox alignment="CENTER_LEFT" prefHeight="533.0" prefWidth="1142.0">
                <children>
-                  <TextField />
+                  <TextField>
+                     <font>
+                        <Font size="24.0" />
+                     </font></TextField>
                   <TextField>
                      <VBox.margin>
                         <Insets top="5.0" />
-                     </VBox.margin></TextField>
+                     </VBox.margin>
+                     <font>
+                        <Font size="24.0" />
+                     </font></TextField>
                   <TextField>
                      <VBox.margin>
                         <Insets top="5.0" />
-                     </VBox.margin></TextField>
+                     </VBox.margin>
+                     <font>
+                        <Font size="24.0" />
+                     </font></TextField>
                   <TextField>
                      <VBox.margin>
                         <Insets top="5.0" />
-                     </VBox.margin></TextField>
+                     </VBox.margin>
+                     <font>
+                        <Font size="24.0" />
+                     </font></TextField>
                </children>
             </VBox>
-            <VBox prefHeight="200.0" prefWidth="100.0">
+            <VBox prefHeight="533.0" prefWidth="18.0">
                <children>
-                  <VBox alignment="CENTER" prefHeight="257.0" prefWidth="78.0">
+                  <VBox alignment="CENTER" prefHeight="533.0" prefWidth="258.0">
                      <children>
-                        <Button mnemonicParsing="false" styleClass="bouton" stylesheets="@style/menu.css" text="+" />
                         <Button mnemonicParsing="false" styleClass="bouton" stylesheets="@style/menu.css" text="+">
+                           <font>
+                              <Font size="24.0" />
+                           </font>
                            <VBox.margin>
-                              <Insets top="5.0" />
+                              <Insets left="10.0" top="5.0" />
                            </VBox.margin></Button>
                         <Button mnemonicParsing="false" styleClass="bouton" stylesheets="@style/menu.css" text="+">
                            <VBox.margin>
-                              <Insets top="5.0" />
-                           </VBox.margin></Button>
+                              <Insets left="10.0" top="5.0" />
+                           </VBox.margin>
+                           <font>
+                              <Font size="24.0" />
+                           </font></Button>
                         <Button mnemonicParsing="false" styleClass="bouton" stylesheets="@style/menu.css" text="+">
                            <VBox.margin>
-                              <Insets top="5.0" />
-                           </VBox.margin></Button>
+                              <Insets left="10.0" top="5.0" />
+                           </VBox.margin>
+                           <font>
+                              <Font size="24.0" />
+                           </font></Button>
+                        <Button mnemonicParsing="false" styleClass="bouton" stylesheets="@style/menu.css" text="+">
+                           <VBox.margin>
+                              <Insets left="10.0" top="5.0" />
+                           </VBox.margin>
+                           <font>
+                              <Font size="24.0" />
+                           </font></Button>
                      </children>
                   </VBox>
                </children>
+               <HBox.margin>
+                  <Insets left="5.0" />
+               </HBox.margin>
             </VBox>
-            <VBox alignment="CENTER_LEFT" prefHeight="200.0" prefWidth="100.0">
+            <VBox alignment="CENTER_LEFT" prefHeight="533.0" prefWidth="76.0">
                <children>
                   <CheckBox mnemonicParsing="false" stylesheets="@style/menu.css">
                      <padding>
                         <Insets top="5.0" />
-                     </padding></CheckBox>
+                     </padding>
+                     <font>
+                        <Font size="24.0" />
+                     </font>
+                     <VBox.margin>
+                        <Insets left="10.0" />
+                     </VBox.margin></CheckBox>
                   <CheckBox mnemonicParsing="false" stylesheets="@style/menu.css">
-                     <padding>
-                        <Insets top="15.0" />
-                     </padding></CheckBox>
+                     <font>
+                        <Font size="24.0" />
+                     </font>
+                     <VBox.margin>
+                        <Insets left="10.0" top="30.0" />
+                     </VBox.margin></CheckBox>
                   <CheckBox mnemonicParsing="false" stylesheets="@style/menu.css">
-                     <padding>
-                        <Insets top="15.0" />
-                     </padding></CheckBox>
+                     <font>
+                        <Font size="24.0" />
+                     </font>
+                     <VBox.margin>
+                        <Insets left="10.0" top="30.0" />
+                     </VBox.margin></CheckBox>
                   <CheckBox mnemonicParsing="false" stylesheets="@style/menu.css">
-                     <padding>
-                        <Insets top="15.0" />
-                     </padding></CheckBox>
+                     <font>
+                        <Font size="24.0" />
+                     </font>
+                     <VBox.margin>
+                        <Insets left="10.0" top="30.0" />
+                     </VBox.margin></CheckBox>
                </children>
+               <HBox.margin>
+                  <Insets left="5.0" />
+               </HBox.margin>
             </VBox>
          </children>
          <BorderPane.margin>
@@ -102,62 +156,98 @@
       </HBox>
    </left>
    <right>
-      <HBox prefHeight="256.0" prefWidth="332.0" BorderPane.alignment="CENTER">
+      <HBox prefHeight="533.0" prefWidth="656.0" BorderPane.alignment="CENTER">
          <children>
-            <HBox prefHeight="256.0" prefWidth="275.0">
+            <HBox prefHeight="533.0" prefWidth="697.0">
                <children>
-                  <VBox alignment="CENTER_LEFT" prefHeight="200.0" prefWidth="100.0">
+                  <VBox alignment="CENTER_LEFT" prefHeight="533.0" prefWidth="380.0">
                      <children>
-                        <TextField />
+                        <TextField>
+                           <font>
+                              <Font size="24.0" />
+                           </font></TextField>
                         <TextField>
                            <VBox.margin>
                               <Insets top="5.0" />
-                           </VBox.margin></TextField>
+                           </VBox.margin>
+                           <font>
+                              <Font size="24.0" />
+                           </font></TextField>
                         <TextField>
                            <VBox.margin>
                               <Insets top="5.0" />
-                           </VBox.margin></TextField>
+                           </VBox.margin>
+                           <font>
+                              <Font size="24.0" />
+                           </font></TextField>
                         <TextField>
                            <VBox.margin>
                               <Insets top="5.0" />
-                           </VBox.margin></TextField>
+                           </VBox.margin>
+                           <font>
+                              <Font size="24.0" />
+                           </font></TextField>
                      </children>
                   </VBox>
                   <VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0">
                      <children>
-                        <Button mnemonicParsing="false" styleClass="bouton" stylesheets="@style/menu.css" text="+" />
+                        <Button mnemonicParsing="false" styleClass="bouton" stylesheets="@style/menu.css" text="+">
+                           <font>
+                              <Font size="24.0" />
+                           </font></Button>
                         <Button mnemonicParsing="false" styleClass="bouton" stylesheets="@style/menu.css" text="+">
                            <VBox.margin>
                               <Insets top="5.0" />
-                           </VBox.margin></Button>
+                           </VBox.margin>
+                           <font>
+                              <Font size="24.0" />
+                           </font></Button>
                         <Button mnemonicParsing="false" styleClass="bouton" stylesheets="@style/menu.css" text="+">
                            <VBox.margin>
                               <Insets top="5.0" />
-                           </VBox.margin></Button>
+                           </VBox.margin>
+                           <font>
+                              <Font size="24.0" />
+                           </font></Button>
                         <Button mnemonicParsing="false" styleClass="bouton" stylesheets="@style/menu.css" text="+">
                            <VBox.margin>
                               <Insets top="5.0" />
-                           </VBox.margin></Button>
+                           </VBox.margin>
+                           <font>
+                              <Font size="24.0" />
+                           </font></Button>
                      </children>
                   </VBox>
-                  <VBox alignment="CENTER_LEFT" prefHeight="200.0" prefWidth="100.0">
+                  <VBox alignment="CENTER_LEFT" prefHeight="533.0" prefWidth="194.0">
                      <children>
                         <CheckBox mnemonicParsing="false" stylesheets="@style/menu.css">
                            <VBox.margin>
                               <Insets top="5.0" />
-                           </VBox.margin></CheckBox>
+                           </VBox.margin>
+                           <font>
+                              <Font size="24.0" />
+                           </font></CheckBox>
                         <CheckBox mnemonicParsing="false" stylesheets="@style/menu.css">
                            <VBox.margin>
-                              <Insets top="15.0" />
-                           </VBox.margin></CheckBox>
+                              <Insets top="30.0" />
+                           </VBox.margin>
+                           <font>
+                              <Font size="24.0" />
+                           </font></CheckBox>
                         <CheckBox mnemonicParsing="false" stylesheets="@style/menu.css">
                            <VBox.margin>
-                              <Insets top="15.0" />
-                           </VBox.margin></CheckBox>
+                              <Insets top="30.0" />
+                           </VBox.margin>
+                           <font>
+                              <Font size="24.0" />
+                           </font></CheckBox>
                         <CheckBox mnemonicParsing="false" stylesheets="@style/menu.css">
                            <VBox.margin>
-                              <Insets top="15.0" />
-                           </VBox.margin></CheckBox>
+                              <Insets top="30.0" />
+                           </VBox.margin>
+                           <font>
+                              <Font size="24.0" />
+                           </font></CheckBox>
                      </children>
                   </VBox>
                </children>
diff --git a/src/ihm/ressources/Menu.fxml b/src/ihm/ressources/Menu.fxml
index cdd52ed..8c24f1a 100644
--- a/src/ihm/ressources/Menu.fxml
+++ b/src/ihm/ressources/Menu.fxml
@@ -5,19 +5,19 @@
 <?import javafx.scene.layout.Pane?>
 <?import javafx.scene.text.Font?>
 
-<Pane id="rootPane" fx:id="rootPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" styleClass="background" stylesheets="@style/menu.css" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ihm.controller.MenuController">
+<Pane id="rootPane" fx:id="rootPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1280.0" styleClass="background" stylesheets="@style/menu.css" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ihm.controller.MenuController">
    <children>
-      <Label layoutX="126.0" layoutY="46.0" styleClass="titre" text="Shadow Hunters">
+      <Label layoutX="437.0" layoutY="193.0" styleClass="titre" text="Shadow Hunters">
          <font>
             <Font size="48.0" />
          </font>
       </Label>
-      <Button layoutX="242.0" layoutY="149.0" mnemonicParsing="false" onMouseClicked="#commencerPartie" prefHeight="51.0" prefWidth="102.0" styleClass="bouton" text="Jouer">
+      <Button layoutX="553.0" layoutY="296.0" mnemonicParsing="false" onMouseClicked="#commencerPartie" prefHeight="51.0" prefWidth="102.0" styleClass="bouton" text="Jouer">
          <font>
             <Font size="24.0" />
          </font>
       </Button>
-      <Button layoutX="242.0" layoutY="235.0" mnemonicParsing="false" onMouseClicked="#afficherRegle" styleClass="bouton" text="Regles">
+      <Button layoutX="554.0" layoutY="387.0" mnemonicParsing="false" onMouseClicked="#afficherRegle" styleClass="bouton" text="Regles">
          <font>
             <Font size="24.0" />
          </font>
diff --git a/src/ihm/ressources/Plateau.fxml b/src/ihm/ressources/Plateau.fxml
index 66059d7..d4ac337 100644
--- a/src/ihm/ressources/Plateau.fxml
+++ b/src/ihm/ressources/Plateau.fxml
@@ -9,11 +9,11 @@
 <?import javafx.scene.shape.Circle?>
 <?import javafx.scene.shape.Rectangle?>
 
-<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="590.0" prefWidth="919.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
+<Pane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1280.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
    <children>
-      <VBox prefHeight="583.0" prefWidth="920.0">
+      <VBox prefHeight="801.0" prefWidth="1284.0">
          <children>
-            <HBox alignment="CENTER" prefHeight="146.0" prefWidth="892.0">
+            <HBox alignment="CENTER" prefHeight="331.0" prefWidth="1284.0">
                <children>
                   <VBox alignment="CENTER" prefHeight="146.0" prefWidth="244.0">
                      <children>
@@ -151,7 +151,7 @@
                   <Insets bottom="5.0" />
                </padding>
             </HBox>
-            <HBox alignment="CENTER" prefHeight="279.0" prefWidth="921.0">
+            <HBox alignment="CENTER" prefHeight="465.0" prefWidth="1284.0">
                <children>
                   <VBox alignment="TOP_CENTER" prefHeight="279.0" prefWidth="88.0">
                      <children>
@@ -172,7 +172,7 @@
                         </Rectangle>
                      </children>
                   </VBox>
-                  <HBox prefHeight="279.0" prefWidth="795.0">
+                  <HBox prefHeight="282.0" prefWidth="795.0">
                      <children>
                         <VBox prefHeight="279.0" prefWidth="771.0">
                            <children>
@@ -184,10 +184,6 @@
                                           <Circle fill="#fccb0a" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
                                           <Circle fill="#f1ff1f" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
                                           <Circle fill="#1fff35" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
-                                          <Circle fill="DODGERBLUE" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
-                                          <Circle fill="DODGERBLUE" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
-                                          <Circle fill="DODGERBLUE" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
-                                          <Circle fill="DODGERBLUE" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
                                        </children>
                                     </VBox>
                                     <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
@@ -214,10 +210,6 @@
                                           <Circle fill="#4421ff" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
                                           <Circle fill="#ff21d8" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
                                           <Circle fill="#d521ff" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
-                                          <Circle fill="DODGERBLUE" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
-                                          <Circle fill="DODGERBLUE" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
-                                          <Circle fill="DODGERBLUE" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
-                                          <Circle fill="DODGERBLUE" radius="8.0" stroke="BLACK" strokeType="INSIDE" />
                                        </children>
                                     </VBox>
                                  </children>
@@ -384,7 +376,7 @@
                   </VBox>
                </children>
             </HBox>
-            <HBox alignment="CENTER" prefHeight="146.0" prefWidth="892.0">
+            <HBox alignment="CENTER" prefHeight="379.0" prefWidth="1284.0">
                <children>
                   <VBox alignment="CENTER" prefHeight="146.0" prefWidth="244.0" rotate="180.0">
                      <children>
diff --git a/src/ihm/ressources/style/plateau.css b/src/ihm/ressources/style/plateau.css
new file mode 100644
index 0000000..e69de29