From 0e946aff657ca750d0f2720e7e3f3144f9455109 Mon Sep 17 00:00:00 2001
From: Yessine-iut <yessinebenelebey0305@gmail.com>
Date: Fri, 15 May 2020 13:04:32 +0200
Subject: [PATCH 1/4] Correction erreur

---
 src/ihm/controller/PlayersController.java | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/ihm/controller/PlayersController.java b/src/ihm/controller/PlayersController.java
index 730829f..88f5ac5 100644
--- a/src/ihm/controller/PlayersController.java
+++ b/src/ihm/controller/PlayersController.java
@@ -332,7 +332,7 @@ public class PlayersController implements Initializable{
 	}
 	public boolean textVide() {
 		for(int i=0;i<txt.size();i++) {
-			if(txt.get(i).isEditable() && txt.get(i).getText().equals("") || txt.get(i).isEditable() && txt.get(i).getText().isBlank()) {
+			if(txt.get(i).isEditable() && txt.get(i).getText().equals("") && txt.get(i).getText().isBlank()) {
 				return true;
 			}
 		}
@@ -377,19 +377,7 @@ public class PlayersController implements Initializable{
 		}
 		return false;
 	}
-/*	public boolean nomAutorise() {
-	
-		int i=0;
-		while(i<txt.size()) {
-			if(txt.get(i).isEditable() && txt.get(i).getText().isBlank()) {
-				return false;
-			}
-			i++;
-		}
-		
-		return true;
 
-	}*/
 	@FXML
 	public void retour(MouseEvent me) throws IOException {
 		InputStream fileSound1 =  getClass().getResourceAsStream("/ihm/ressources/musique/BEEP1.wav");

From 0f236205102645675701261e527de64523e0f4d1 Mon Sep 17 00:00:00 2001
From: Bastien NOEL <bastien.noel@hotmail.fr>
Date: Fri, 15 May 2020 13:28:38 +0200
Subject: [PATCH 2/4] recentrage, alignement et modoficationde la taille de
 police nom perso

---
 src/ihm/ressources/PlateauTest2.fxml | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/ihm/ressources/PlateauTest2.fxml b/src/ihm/ressources/PlateauTest2.fxml
index abbc952..bc9a16f 100644
--- a/src/ihm/ressources/PlateauTest2.fxml
+++ b/src/ihm/ressources/PlateauTest2.fxml
@@ -420,7 +420,7 @@
                                     <Insets bottom="-50.0" top="-45.0" />
                                  </VBox.margin>
                               </Button>
-                              <GridPane>
+                              <GridPane alignment="CENTER" hgap="5.0" vgap="5.0">
                                 <columnConstraints>
                                   <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
                                     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
@@ -469,10 +469,12 @@
                                           <VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0">
                                              <children>
                                                 <Label styleClass="text" text="Charles" />
-                                                <Label layoutX="29.0" layoutY="16.0" styleClass="text" text="Metamorphe" />
+                                                <Label layoutX="29.0" layoutY="16.0" styleClass="text" text="Metamorphe">
+                                                   <font>
+                                                      <Font size="10.0" />
+                                                   </font></Label>
                                              </children>
                                           </VBox>
-                                          <VBox prefHeight="200.0" prefWidth="100.0" />
                                        </children>
                                     </StackPane>
                                     <StackPane prefHeight="150.0" prefWidth="200.0" GridPane.columnIndex="12">
@@ -498,7 +500,10 @@
                                        <children>
                                           <VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0">
                                              <children>
-                                                <Label styleClass="text" text="Loup-Garou" />
+                                                <Label styleClass="text" text="Loup-Garou">
+                                                   <font>
+                                                      <Font size="10.0" />
+                                                   </font></Label>
                                                 <Label layoutX="38.0" layoutY="16.0" styleClass="text" text="George" />
                                              </children>
                                           </VBox>

From d464b37f8fb845ad46b0419fce7b49c6fa6d74a1 Mon Sep 17 00:00:00 2001
From: Bastien NOEL <bastien.noel@hotmail.fr>
Date: Fri, 15 May 2020 13:39:33 +0200
Subject: [PATCH 3/4] supression des pions inutiles sur les bords du plateau

---
 src/ihm/ressources/PlateauTest2.fxml | 35 ----------------------------
 1 file changed, 35 deletions(-)

diff --git a/src/ihm/ressources/PlateauTest2.fxml b/src/ihm/ressources/PlateauTest2.fxml
index bc9a16f..43cfdbd 100644
--- a/src/ihm/ressources/PlateauTest2.fxml
+++ b/src/ihm/ressources/PlateauTest2.fxml
@@ -16,7 +16,6 @@
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
-<?import javafx.scene.shape.Circle?>
 <?import javafx.scene.text.Font?>
 
 <AnchorPane fx:id="rootPane" styleClass="background" stylesheets="@style/plateau.css" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ihm.controller.PlateauController">
@@ -300,23 +299,6 @@
                                     <RowConstraints vgrow="ALWAYS" />
                                  </rowConstraints>
                                  <children>
-                                    <GridPane>
-                                       <columnConstraints>
-                                          <ColumnConstraints />
-                                       </columnConstraints>
-                                       <rowConstraints>
-                                          <RowConstraints vgrow="SOMETIMES" />
-                                          <RowConstraints vgrow="SOMETIMES" />
-                                          <RowConstraints vgrow="SOMETIMES" />
-                                          <RowConstraints vgrow="SOMETIMES" />
-                                       </rowConstraints>
-                                       <children>
-                                          <Circle fill="#ff1f1f" radius="10.0" stroke="BLACK" strokeType="INSIDE" />
-                                          <Circle fill="#ffd71f" radius="10.0" stroke="BLACK" strokeType="INSIDE" GridPane.rowIndex="1" />
-                                          <Circle fill="#ecff1f" radius="10.0" stroke="BLACK" strokeType="INSIDE" GridPane.rowIndex="2" />
-                                          <Circle fill="#64ff1f" radius="10.0" stroke="BLACK" strokeType="INSIDE" GridPane.rowIndex="3" />
-                                       </children>
-                                    </GridPane>
                                     <GridPane fx:id="gridPaneLieux" hgap="20.0" GridPane.columnIndex="1">
                                       <columnConstraints>
                                         <ColumnConstraints />
@@ -389,23 +371,6 @@
                                           </HBox>
                                        </children>
                                     </GridPane>
-                                    <GridPane GridPane.columnIndex="2">
-                                       <columnConstraints>
-                                          <ColumnConstraints />
-                                       </columnConstraints>
-                                       <rowConstraints>
-                                          <RowConstraints vgrow="SOMETIMES" />
-                                          <RowConstraints vgrow="SOMETIMES" />
-                                          <RowConstraints vgrow="SOMETIMES" />
-                                          <RowConstraints vgrow="SOMETIMES" />
-                                       </rowConstraints>
-                                       <children>
-                                          <Circle fill="#21ffee" radius="10.0" stroke="BLACK" strokeType="INSIDE" />
-                                          <Circle fill="#2168ff" radius="10.0" stroke="BLACK" strokeType="INSIDE" GridPane.rowIndex="1" />
-                                          <Circle fill="#d921ff" radius="10.0" stroke="BLACK" strokeType="INSIDE" GridPane.rowIndex="2" />
-                                          <Circle fill="#ff21ad" radius="10.0" stroke="BLACK" strokeType="INSIDE" GridPane.rowIndex="3" />
-                                       </children>
-                                    </GridPane>
                                  </children>
                               </GridPane>
                               <Button mnemonicParsing="false" onMouseClicked="#mettreEnPause" styleClass="boutonPause">

From 0b9bf5cb13fb3d39c93fec0e9609e3291438d966 Mon Sep 17 00:00:00 2001
From: Bastien NOEL <bastien.noel@hotmail.fr>
Date: Fri, 15 May 2020 14:03:34 +0200
Subject: [PATCH 4/4] correction d'un problemet sur le menu pause

---
 src/ihm/ressources/Pause.fxml | 180 ++++++++++++++++++----------------
 1 file changed, 94 insertions(+), 86 deletions(-)

diff --git a/src/ihm/ressources/Pause.fxml b/src/ihm/ressources/Pause.fxml
index 42a962e..e0ca80d 100644
--- a/src/ihm/ressources/Pause.fxml
+++ b/src/ihm/ressources/Pause.fxml
@@ -19,111 +19,119 @@
                   <Font size="48.0" />
                </font>
             </Label>
-            <VBox>
+            <HBox prefHeight="100.0" prefWidth="200.0">
                <children>
-                  <Label style="-fx-border-width: 0 0 0.5 0; -fx-border-color: #e2e2e2;" text="%sons">
-                     <font>
-                        <Font size="18.0" />
-                     </font>
-                  </Label>
-                  <HBox alignment="CENTER_LEFT">
+                  <VBox prefHeight="322.0" prefWidth="315.0">
                      <children>
-                        <Label text="%musique">
-                           <HBox.margin>
-                              <Insets right="300.0" />
-                           </HBox.margin>
+                        <Label style="-fx-border-width: 0 0 0.5 0; -fx-border-color: #e2e2e2;" text="%sons">
                            <font>
-                              <Font size="14.0" />
+                              <Font size="18.0" />
                            </font>
                         </Label>
-                        <CheckBox fx:id="cbMusique" mnemonicParsing="false">
-                           <HBox.margin>
+                        <HBox alignment="CENTER_LEFT">
+                           <children>
+                              <Label text="%musique">
+                                 <HBox.margin>
+                                    <Insets />
+                                 </HBox.margin>
+                                 <font>
+                                    <Font size="14.0" />
+                                 </font>
+                              </Label>
+                           </children>
+                           <VBox.margin>
                               <Insets bottom="5.0" />
-                           </HBox.margin>
-                        </CheckBox>
-                     </children>
-                     <VBox.margin>
-                        <Insets bottom="5.0" />
-                     </VBox.margin>
-                  </HBox>
-                  <HBox prefHeight="0.0" prefWidth="540.0">
-                     <children>
-                        <Slider fx:id="sliderMusiquePause" blockIncrement="1.0" majorTickUnit="1.0" max="1.0" minorTickCount="10" onMouseClicked="#slideVolumeMusique" prefHeight="14.0" prefWidth="194.0" value="0.1" />
-                     </children>
-                  </HBox>
-                  <Label prefHeight="18.0" prefWidth="198.0" styleClass="text" stylesheets="@style/plateau.css" text="The Red Fox Tavern - Curran Son">
-                     <opaqueInsets>
-                        <Insets />
-                     </opaqueInsets>
-                     <padding>
-                        <Insets bottom="20.0" left="5.0" />
-                     </padding>
-                  </Label>
-                  <HBox alignment="CENTER_LEFT">
-                     <children>
-                        <Label text="%effet">
-                           <HBox.margin>
-                              <Insets right="273.0" />
-                           </HBox.margin>
+                           </VBox.margin>
+                        </HBox>
+                        <HBox>
+                           <children>
+                              <Slider fx:id="sliderMusiquePause" blockIncrement="1.0" majorTickUnit="1.0" max="1.0" minorTickCount="10" onMouseClicked="#slideVolumeMusique" prefHeight="14.0" prefWidth="194.0" value="0.1" />
+                           </children>
+                        </HBox>
+                        <Label prefHeight="18.0" prefWidth="198.0" styleClass="text" stylesheets="@style/plateau.css" text="The Red Fox Tavern - Curran Son">
+                           <opaqueInsets>
+                              <Insets />
+                           </opaqueInsets>
+                           <padding>
+                              <Insets bottom="20.0" left="5.0" />
+                           </padding>
+                        </Label>
+                        <HBox alignment="CENTER_LEFT">
+                           <children>
+                              <Label text="%effet">
+                                 <HBox.margin>
+                                    <Insets />
+                                 </HBox.margin>
+                                 <font>
+                                    <Font size="14.0" />
+                                 </font>
+                              </Label>
+                           </children>
+                        </HBox>
+                        <HBox prefHeight="0.0" prefWidth="540.0">
+                           <children>
+                              <Slider fx:id="sliderEffetsPause" blockIncrement="1.0" majorTickUnit="1.0" max="0.0" min="-20.0" minorTickCount="10" onMouseClicked="#slideVolumeEffets" prefHeight="14.0" prefWidth="194.0" />
+                           </children>
+                        </HBox>
+                        <Button fx:id="reglesPause" mnemonicParsing="false" onMouseClicked="#afficherReglePause" text="%regles">
                            <font>
                               <Font size="14.0" />
                            </font>
+                           <VBox.margin>
+                              <Insets top="30.0" />
+                           </VBox.margin>
+                        </Button>
+                        <Label style="-fx-border-width: 0 0 0.5 0; -fx-border-color: #e2e2e2;" text="%jeux">
+                           <VBox.margin>
+                              <Insets top="50.0" />
+                           </VBox.margin>
+                           <font>
+                              <Font size="18.0" />
+                           </font>
                         </Label>
-                        <CheckBox fx:id="cbEffet" mnemonicParsing="false" />
+                        <HBox>
+                           <VBox.margin>
+                              <Insets top="5.0" />
+                           </VBox.margin>
+                           <children>
+                              <Button mnemonicParsing="false" onMouseClicked="#reprendre" text="%reprendre.partie">
+                                 <HBox.margin>
+                                    <Insets right="25.0" />
+                                 </HBox.margin>
+                                 <font>
+                                    <Font size="14.0" />
+                                 </font>
+                              </Button>
+                           </children>
+                        </HBox>
                      </children>
-                  </HBox>
-                  <HBox prefHeight="0.0" prefWidth="540.0">
+                     <padding>
+                        <Insets left="100.0" />
+                     </padding>
+                  </VBox>
+                  <VBox prefHeight="325.0" prefWidth="199.0">
                      <children>
-                        <Slider fx:id="sliderEffetsPause" blockIncrement="1.0" majorTickUnit="1.0" max="0.0" min="-20.0" minorTickCount="10" onMouseClicked="#slideVolumeEffets" prefHeight="14.0" prefWidth="194.0" />
-                     </children>
-                  </HBox>
-                  <Button fx:id="reglesPause" mnemonicParsing="false" onMouseClicked="#afficherReglePause" text="%regles">
-                     <font>
-                        <Font size="14.0" />
-                     </font>
-                     <VBox.margin>
-                        <Insets top="30.0" />
-                     </VBox.margin>
-                  </Button>
-                  <Label style="-fx-border-width: 0 0 0.5 0; -fx-border-color: #e2e2e2;" text="%jeux">
-                     <VBox.margin>
-                        <Insets top="50.0" />
-                     </VBox.margin>
-                     <font>
-                        <Font size="18.0" />
-                     </font>
-                  </Label>
-                  <HBox>
-                     <VBox.margin>
-                        <Insets top="5.0" />
-                     </VBox.margin>
-                     <children>
-                        <Button mnemonicParsing="false" onMouseClicked="#reprendre" text="%reprendre.partie">
-                           <HBox.margin>
-                              <Insets right="25.0" />
-                           </HBox.margin>
-                           <font>
-                              <Font size="14.0" />
-                           </font>
-                        </Button>
+                        <CheckBox fx:id="cbMusique" mnemonicParsing="false">
+                           <VBox.margin>
+                              <Insets bottom="50.0" top="30.0" />
+                           </VBox.margin>
+                        </CheckBox>
+                        <CheckBox fx:id="cbEffet" alignment="CENTER" mnemonicParsing="false" />
                         <Button mnemonicParsing="false" onMouseClicked="#quitter" style="-fx-text-fill: red;" text="%quitter.jeu">
-                           <HBox.margin>
-                              <Insets left="25.0" />
-                           </HBox.margin>
                            <font>
                               <Font size="14.0" />
                            </font>
+                           <VBox.margin>
+                              <Insets top="171.0" />
+                           </VBox.margin>
                         </Button>
                      </children>
-                  </HBox>
+                     <HBox.margin>
+                        <Insets />
+                     </HBox.margin>
+                  </VBox>
                </children>
-               <VBox.margin>
-                  <Insets top="50.0" />
-               </VBox.margin>
-               <padding>
-                  <Insets left="100.0" />
-               </padding>
-            </VBox>
+            </HBox>
          </children>
       </VBox>
    </children>