Merge branch 'development' of https://github.com/PTE-SH/ShadowHunterGame into development

This commit is contained in:
Paul Gross 2020-05-13 17:43:41 +02:00
commit a866aa6914
2 changed files with 307 additions and 198 deletions

View File

@ -4,6 +4,7 @@
<?import javafx.scene.control.Button?> <?import javafx.scene.control.Button?>
<?import javafx.scene.control.CheckBox?> <?import javafx.scene.control.CheckBox?>
<?import javafx.scene.control.Label?> <?import javafx.scene.control.Label?>
<?import javafx.scene.control.RadioButton?>
<?import javafx.scene.control.TextField?> <?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.AnchorPane?> <?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.BorderPane?> <?import javafx.scene.layout.BorderPane?>
@ -11,152 +12,204 @@
<?import javafx.scene.layout.VBox?> <?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?> <?import javafx.scene.text.Font?>
<AnchorPane fx:id="rootPane" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ihm.controller.PlayersController"> <AnchorPane fx:id="rootPane" stylesheets="@style/menu.css" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ihm.controller.PlayersController">
<children> <children>
<BorderPane styleClass="background" stylesheets="@style/menu.css" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0"> <BorderPane styleClass="background" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
<left> <left>
<VBox alignment="CENTER" prefHeight="688.0" prefWidth="240.0" BorderPane.alignment="CENTER"> <VBox alignment="CENTER" prefHeight="688.0" prefWidth="240.0" BorderPane.alignment="CENTER">
<children> <children>
<HBox fx:id="hb7" alignment="CENTER_RIGHT" prefHeight="67.0" prefWidth="340.0" rotate="90.0"> <VBox alignment="CENTER" prefHeight="688.0" prefWidth="214.0" rotate="180.0" spacing="150.0">
<children> <children>
<TextField prefHeight="51.0" prefWidth="149.0"> <HBox alignment="CENTER_RIGHT" prefWidth="274.0" rotate="270.0">
<font> <children>
<Font size="24.0" /> <VBox alignment="BOTTOM_CENTER" prefHeight="100.0" prefWidth="214.0">
</font> <children>
</TextField> <HBox alignment="CENTER" prefHeight="43.0" prefWidth="295.0">
<Button mnemonicParsing="false" prefHeight="55.0" prefWidth="45.0" styleClass="bouton" stylesheets="@style/menu.css" text="+"> <children>
<font> <RadioButton mnemonicParsing="false" text="RadioButton" />
<Font size="24.0" /> <RadioButton mnemonicParsing="false" text="RadioButton" />
</font> <RadioButton mnemonicParsing="false" text="RadioButton" />
<HBox.margin> </children>
<Insets left="10.0" right="10.0" /> </HBox>
</HBox.margin> <HBox fx:id="hb8" alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
<padding> <children>
<Insets right="5.0" /> <TextField prefHeight="51.0" prefWidth="149.0">
</padding> <font>
</Button> <Font size="24.0" />
<CheckBox mnemonicParsing="false"> </font>
<font> </TextField>
<Font size="24.0" /> <Button mnemonicParsing="false" prefHeight="55.0" prefWidth="45.0" styleClass="bouton" text="+">
</font> <font>
</CheckBox> <Font size="24.0" />
</font>
<padding>
<Insets right="5.0" />
</padding>
<HBox.margin>
<Insets left="10.0" right="10.0" />
</HBox.margin>
</Button>
<CheckBox mnemonicParsing="false">
<font>
<Font size="24.0" />
</font>
</CheckBox>
</children>
</HBox>
</children>
</VBox>
</children>
</HBox>
<HBox alignment="CENTER_RIGHT" layoutX="10.0" layoutY="304.0" prefHeight="100.0" prefWidth="299.0" rotate="270.0">
<children>
<VBox alignment="BOTTOM_CENTER" prefHeight="100.0" prefWidth="214.0">
<children>
<HBox alignment="CENTER" prefHeight="43.0" prefWidth="295.0">
<children>
<RadioButton mnemonicParsing="false" text="RadioButton" />
<RadioButton mnemonicParsing="false" text="RadioButton" />
<RadioButton mnemonicParsing="false" text="RadioButton" />
</children>
</HBox>
<HBox fx:id="hb7" alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
<children>
<TextField prefHeight="51.0" prefWidth="149.0">
<font>
<Font size="24.0" />
</font>
</TextField>
<Button mnemonicParsing="false" prefHeight="55.0" prefWidth="45.0" styleClass="bouton" text="+">
<font>
<Font size="24.0" />
</font>
<padding>
<Insets right="5.0" />
</padding>
<HBox.margin>
<Insets left="10.0" right="10.0" />
</HBox.margin>
</Button>
<CheckBox mnemonicParsing="false">
<font>
<Font size="24.0" />
</font>
</CheckBox>
</children>
</HBox>
</children>
</VBox>
</children>
</HBox>
</children> </children>
<VBox.margin> </VBox>
<Insets bottom="150.0" left="-100.0" />
</VBox.margin>
</HBox>
<HBox fx:id="hb8" alignment="CENTER_LEFT" rotate="90.0">
<children>
<TextField prefHeight="51.0" prefWidth="149.0">
<font>
<Font size="24.0" />
</font>
</TextField>
<Button mnemonicParsing="false" prefHeight="55.0" prefWidth="45.0" styleClass="bouton" stylesheets="@style/menu.css" text="+">
<font>
<Font size="24.0" />
</font>
<HBox.margin>
<Insets left="10.0" right="10.0" />
</HBox.margin>
<padding>
<Insets right="5.0" />
</padding>
</Button>
<CheckBox mnemonicParsing="false">
<font>
<Font size="24.0" />
</font>
</CheckBox>
</children>
<VBox.margin>
<Insets left="-100.0" top="200.0" />
</VBox.margin>
</HBox>
</children> </children>
</VBox> </VBox>
</left> </left>
<right> <right>
<VBox alignment="CENTER" prefHeight="688.0" prefWidth="248.0" BorderPane.alignment="CENTER"> <VBox alignment="CENTER" prefHeight="688.0" prefWidth="214.0" spacing="150.0" BorderPane.alignment="CENTER">
<children> <children>
<HBox fx:id="hb4" alignment="CENTER_LEFT" prefHeight="100.0" prefWidth="200.0" rotate="270.0"> <HBox alignment="CENTER_RIGHT" prefWidth="274.0" rotate="270.0">
<children> <children>
<TextField prefHeight="51.0" prefWidth="149.0"> <VBox alignment="BOTTOM_CENTER" prefHeight="100.0" prefWidth="214.0">
<font> <children>
<Font size="24.0" /> <HBox alignment="CENTER" prefHeight="43.0" prefWidth="295.0">
</font> <children>
</TextField> <RadioButton mnemonicParsing="false" text="RadioButton" />
<Button mnemonicParsing="false" prefHeight="55.0" prefWidth="45.0" styleClass="bouton" stylesheets="@style/menu.css" text="+"> <RadioButton mnemonicParsing="false" text="RadioButton" />
<font> <RadioButton mnemonicParsing="false" text="RadioButton" />
<Font size="24.0" /> </children>
</font> </HBox>
<HBox.margin> <HBox fx:id="hb4" alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
<Insets left="10.0" right="10.0" /> <children>
</HBox.margin> <TextField prefHeight="51.0" prefWidth="149.0">
<padding> <font>
<Insets right="5.0" /> <Font size="24.0" />
</padding> </font>
</Button> </TextField>
<CheckBox mnemonicParsing="false"> <Button mnemonicParsing="false" prefHeight="55.0" prefWidth="45.0" styleClass="bouton" text="+">
<font> <font>
<Font size="24.0" /> <Font size="24.0" />
</font> </font>
</CheckBox> <padding>
<Insets right="5.0" />
</padding>
<HBox.margin>
<Insets left="10.0" right="10.0" />
</HBox.margin>
</Button>
<CheckBox mnemonicParsing="false">
<font>
<Font size="24.0" />
</font>
</CheckBox>
</children>
</HBox>
</children>
</VBox>
</children> </children>
<VBox.margin>
<Insets bottom="150.0" right="-100.0" />
</VBox.margin>
</HBox> </HBox>
<HBox fx:id="hb3" alignment="CENTER_RIGHT" prefHeight="100.0" prefWidth="200.0" rotate="270.0"> <HBox alignment="CENTER_RIGHT" layoutX="10.0" layoutY="304.0" prefHeight="100.0" prefWidth="299.0" rotate="270.0">
<children> <children>
<TextField prefHeight="51.0" prefWidth="149.0"> <VBox alignment="BOTTOM_CENTER" prefHeight="100.0" prefWidth="214.0">
<font> <children>
<Font size="24.0" /> <HBox alignment="CENTER" prefHeight="43.0" prefWidth="295.0">
</font> <children>
</TextField> <RadioButton mnemonicParsing="false" text="RadioButton" />
<Button mnemonicParsing="false" prefHeight="55.0" prefWidth="45.0" styleClass="bouton" stylesheets="@style/menu.css" text="+"> <RadioButton mnemonicParsing="false" text="RadioButton" />
<font> <RadioButton mnemonicParsing="false" text="RadioButton" />
<Font size="24.0" /> </children>
</font> </HBox>
<padding> <HBox fx:id="hb3" alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
<Insets right="5.0" /> <children>
</padding> <TextField prefHeight="51.0" prefWidth="149.0">
<HBox.margin> <font>
<Insets left="10.0" right="10.0" /> <Font size="24.0" />
</HBox.margin> </font>
</Button> </TextField>
<CheckBox mnemonicParsing="false"> <Button mnemonicParsing="false" prefHeight="55.0" prefWidth="45.0" styleClass="bouton" text="+">
<font> <font>
<Font size="24.0" /> <Font size="24.0" />
</font> </font>
</CheckBox> <padding>
<Insets right="5.0" />
</padding>
<HBox.margin>
<Insets left="10.0" right="10.0" />
</HBox.margin>
</Button>
<CheckBox mnemonicParsing="false">
<font>
<Font size="24.0" />
</font>
</CheckBox>
</children>
</HBox>
</children>
</VBox>
</children> </children>
<VBox.margin>
<Insets right="-100.0" top="150.0" />
</VBox.margin>
</HBox> </HBox>
</children> </children>
</VBox> </VBox>
</right> </right>
<center> <center>
<VBox alignment="CENTER" prefHeight="486.0" prefWidth="392.0" BorderPane.alignment="CENTER"> <VBox alignment="CENTER" prefHeight="486.0" prefWidth="553.0" BorderPane.alignment="CENTER">
<children> <children>
<Label styleClass="titre" stylesheets="@style/menu.css" text="%entrez.nom.joueur"> <Label styleClass="titre" text="%entrez.nom.joueur">
<font> <font>
<Font size="48.0" /> <Font size="48.0" />
</font> </font>
</Label> </Label>
<Label styleClass="titre" stylesheets="@style/menu.css" text="%nombre.joueur.minimum"> <Label styleClass="titre" text="%nombre.joueur.minimum">
<font> <font>
<Font size="36.0" /> <Font size="36.0" />
</font> </font>
</Label> </Label>
<Label styleClass="titre" stylesheets="@style/menu.css" text="%cocher.case"> <Label styleClass="titre" text="%cocher.case">
<font> <font>
<Font size="36.0" /> <Font size="36.0" />
</font> </font>
</Label> </Label>
<Button fx:id="btnCommencer" mnemonicParsing="false" onMouseClicked="#commencerJeux" styleClass="bouton" stylesheets="@style/menu.css" text="%commencer.partie"> <Button fx:id="btnCommencer" mnemonicParsing="false" onMouseClicked="#commencerJeux" styleClass="bouton" text="%commencer.partie">
<font> <font>
<Font size="24.0" /> <Font size="24.0" />
</font> </font>
@ -164,7 +217,7 @@
<Insets top="20.0" /> <Insets top="20.0" />
</VBox.margin> </VBox.margin>
</Button> </Button>
<Button layoutX="283.0" layoutY="379.0" mnemonicParsing="false" onMouseClicked="#retour" prefHeight="55.0" prefWidth="247.0" styleClass="bouton" stylesheets="@style/menu.css" text="Retour"> <Button layoutX="283.0" layoutY="379.0" mnemonicParsing="false" onMouseClicked="#retour" prefHeight="55.0" prefWidth="247.0" styleClass="bouton" text="Retour">
<font> <font>
<Font size="24.0" /> <Font size="24.0" />
</font> </font>
@ -178,94 +231,16 @@
<top> <top>
<HBox alignment="CENTER" prefHeight="110.0" prefWidth="1280.0" BorderPane.alignment="CENTER"> <HBox alignment="CENTER" prefHeight="110.0" prefWidth="1280.0" BorderPane.alignment="CENTER">
<children> <children>
<HBox fx:id="hb6" alignment="CENTER" rotate="180.0"> <VBox alignment="CENTER" prefHeight="110.0" prefWidth="559.0" spacing="10.0">
<children> <children>
<TextField> <HBox fx:id="hb6" alignment="CENTER" prefWidth="754.0">
<font>
<Font size="24.0" />
</font>
</TextField>
<Button mnemonicParsing="false" prefHeight="55.0" prefWidth="55.0" styleClass="bouton" stylesheets="@style/menu.css" text="+">
<font>
<Font size="24.0" />
</font>
<HBox.margin>
<Insets left="10.0" right="10.0" />
</HBox.margin>
</Button>
<CheckBox mnemonicParsing="false">
<font>
<Font size="24.0" />
</font>
</CheckBox>
</children>
</HBox>
<HBox fx:id="hb5" alignment="CENTER" rotate="180.0">
<children>
<TextField accessibleRole="PARENT">
<font>
<Font size="24.0" />
</font>
<HBox.margin>
<Insets />
</HBox.margin>
</TextField>
<Button mnemonicParsing="false" prefHeight="55.0" prefWidth="55.0" styleClass="bouton" stylesheets="@style/menu.css" text="+">
<font>
<Font size="24.0" />
</font>
<HBox.margin>
<Insets left="10.0" right="10.0" />
</HBox.margin>
</Button>
<CheckBox mnemonicParsing="false">
<font>
<Font size="24.0" />
</font>
</CheckBox>
</children>
<HBox.margin>
<Insets left="30.0" />
</HBox.margin>
</HBox>
</children>
</HBox>
</top>
<bottom>
<VBox alignment="CENTER" prefHeight="94.0" prefWidth="1280.0" BorderPane.alignment="CENTER">
<children>
<HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
<children>
<HBox fx:id="hb1" alignment="CENTER">
<children>
<TextField prefHeight="51.0" prefWidth="298.0">
<font>
<Font size="24.0" />
</font>
</TextField>
<Button mnemonicParsing="false" prefHeight="55.0" prefWidth="55.0" styleClass="bouton" stylesheets="@style/menu.css" text="+">
<font>
<Font size="24.0" />
</font>
<HBox.margin>
<Insets left="10.0" right="10.0" />
</HBox.margin>
</Button>
<CheckBox mnemonicParsing="false">
<font>
<Font size="24.0" />
</font>
</CheckBox>
</children>
</HBox>
<HBox fx:id="hb2" alignment="CENTER">
<children> <children>
<TextField> <TextField>
<font> <font>
<Font size="24.0" /> <Font size="24.0" />
</font> </font>
</TextField> </TextField>
<Button mnemonicParsing="false" prefHeight="55.0" prefWidth="55.0" styleClass="bouton" stylesheets="@style/menu.css" text="+"> <Button mnemonicParsing="false" prefHeight="55.0" prefWidth="55.0" styleClass="bouton" text="+">
<font> <font>
<Font size="24.0" /> <Font size="24.0" />
</font> </font>
@ -279,13 +254,147 @@
</font> </font>
</CheckBox> </CheckBox>
</children> </children>
<HBox.margin>
<Insets left="30.0" />
</HBox.margin>
</HBox> </HBox>
<HBox alignment="CENTER" prefHeight="20.0" prefWidth="762.0">
<children>
<RadioButton contentDisplay="CENTER" mnemonicParsing="false" rotate="180.0" text="RadioButton" />
<RadioButton mnemonicParsing="false" rotate="180.0" text="RadioButton" />
<RadioButton mnemonicParsing="false" rotate="180.0" text="RadioButton" />
</children>
</HBox>
</children>
</VBox>
<VBox alignment="CENTER" spacing="10.0">
<children>
<HBox fx:id="hb5" alignment="CENTER" prefHeight="55.0" prefWidth="537.0">
<children>
<TextField accessibleRole="PARENT">
<font>
<Font size="24.0" />
</font>
<HBox.margin>
<Insets />
</HBox.margin>
</TextField>
<Button mnemonicParsing="false" prefHeight="55.0" prefWidth="55.0" styleClass="bouton" text="+">
<font>
<Font size="24.0" />
</font>
<HBox.margin>
<Insets left="10.0" right="10.0" />
</HBox.margin>
</Button>
<CheckBox mnemonicParsing="false">
<font>
<Font size="24.0" />
</font>
</CheckBox>
</children>
</HBox>
<HBox alignment="CENTER" prefHeight="6.0" prefWidth="356.0">
<children>
<RadioButton mnemonicParsing="false" rotate="180.0" text="RadioButton" />
<RadioButton mnemonicParsing="false" rotate="180.0" text="RadioButton" />
<RadioButton mnemonicParsing="false" rotate="180.0" text="RadioButton" />
</children>
</HBox>
</children>
</VBox>
</children>
</HBox>
</top>
<bottom>
<VBox alignment="CENTER" prefHeight="0.0" prefWidth="902.0" BorderPane.alignment="CENTER">
<children>
<HBox alignment="CENTER" prefHeight="129.0" prefWidth="1280.0">
<children>
<VBox alignment="CENTER" prefHeight="70.0" prefWidth="1338.0" spacing="20.0">
<children>
<HBox alignment="CENTER" prefHeight="43.0" prefWidth="688.0">
<children>
<RadioButton mnemonicParsing="false" text="RadioButton" />
<RadioButton mnemonicParsing="false" text="RadioButton" />
<RadioButton mnemonicParsing="false" text="RadioButton" />
</children>
<padding>
<Insets bottom="-5.0" />
</padding>
</HBox>
<HBox fx:id="hb1" alignment="CENTER">
<children>
<TextField prefHeight="51.0" prefWidth="298.0">
<font>
<Font size="24.0" />
</font>
</TextField>
<Button mnemonicParsing="false" prefHeight="55.0" prefWidth="55.0" styleClass="bouton" text="+">
<font>
<Font size="24.0" />
</font>
<HBox.margin>
<Insets left="10.0" right="10.0" />
</HBox.margin>
</Button>
<CheckBox mnemonicParsing="false">
<font>
<Font size="24.0" />
</font>
</CheckBox>
</children>
<padding>
<Insets bottom="10.0" top="-3.0" />
</padding>
</HBox>
</children>
<opaqueInsets>
<Insets />
</opaqueInsets>
</VBox>
<VBox alignment="CENTER" prefHeight="70.0" prefWidth="1213.0">
<children>
<HBox alignment="CENTER" prefHeight="43.0" prefWidth="688.0">
<children>
<RadioButton mnemonicParsing="false" text="RadioButton" />
<RadioButton mnemonicParsing="false" text="RadioButton" />
<RadioButton mnemonicParsing="false" text="RadioButton" />
</children>
<padding>
<Insets bottom="10.0" />
</padding>
</HBox>
<HBox fx:id="hb2" alignment="CENTER" prefHeight="63.0" prefWidth="433.0">
<children>
<TextField prefHeight="51.0" prefWidth="310.0">
<font>
<Font size="24.0" />
</font>
</TextField>
<Button mnemonicParsing="false" prefHeight="55.0" prefWidth="55.0" styleClass="bouton" text="+">
<font>
<Font size="24.0" />
</font>
<HBox.margin>
<Insets left="10.0" right="10.0" />
</HBox.margin>
</Button>
<CheckBox mnemonicParsing="false">
<font>
<Font size="24.0" />
</font>
</CheckBox>
</children>
<padding>
<Insets bottom="10.0" />
</padding>
</HBox>
</children>
</VBox>
</children> </children>
</HBox> </HBox>
</children> </children>
<opaqueInsets>
<Insets />
</opaqueInsets>
</VBox> </VBox>
</bottom> </bottom>
</BorderPane> </BorderPane>

View File

@ -21,7 +21,7 @@
<Font size="24.0" /> <Font size="24.0" />
</font> </font>
</Button> </Button>
<Button mnemonicParsing="false" onMouseClicked="#ouvrirParametres" styleClass="bouton" text="Paramètres"> <Button mnemonicParsing="false" onMouseClicked="#ouvrirParametres" styleClass="bouton" text="%parametre">
<font> <font>
<Font size="24.0" /> <Font size="24.0" />
</font> </font>