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

This commit is contained in:
JunkJumper 2020-04-27 17:10:44 +02:00
commit cc6579816a
5 changed files with 104 additions and 2 deletions

Binary file not shown.

View File

@ -16,7 +16,7 @@ public class Main extends Application {
public void start(Stage primaryStage) throws Exception {
System.out.println("Lancement de l'application");
final URL fxmlURL = getClass().getResource("ressources/Jouer_tour(1)lancer_des.fxml"); // "ressources/Jouer_tour(1)lancer_des.fxml"
final URL fxmlURL = getClass().getResource("ressources/parametre.fxml"); // "ressources/Jouer_tour(1)lancer_des.fxml"
final ResourceBundle bundle = ResourceBundle.getBundle("domaine.properties.langue", Locale.FRANCE);
final FXMLLoader fxmlLoader = new FXMLLoader(fxmlURL, bundle);
Pane root = fxmlLoader.load();

View File

@ -0,0 +1,52 @@
package ihm.controller;
import java.io.IOException;
import java.net.URL;
import java.util.ResourceBundle;
import ihm.Musique;
import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader;
import javafx.fxml.Initializable;
import javafx.scene.control.Button;
import javafx.scene.control.CheckBox;
import javafx.scene.control.ComboBox;
import javafx.scene.input.MouseEvent;
import javafx.scene.layout.Pane;
public class ParametreController implements Initializable{
@FXML private Pane rootPane;
@FXML private CheckBox cmusique;
@FXML private CheckBox clair;
@FXML private ComboBox<String> langues;
@Override
public void initialize(URL arg0, ResourceBundle arg1) {
langues.getItems().add("Anglais");
langues.getItems().add("Allemand");
langues.getItems().add("Espagnol");
langues.getItems().add("Français");
}
/*@FXML
public void enregistre(MouseEvent mouseEvent) throws IOException{
if(cmusique.isSelected()==true) {
String filepath = "src//ihm//ressources//musique//The_Red_Fox_Tavern.wav"; // lien vers la musique :
// https://www.youtube.com/watch?v=LBpKUIyOHdo
Musique musiqueObjet = new Musique();
//musiqueObjet.playMusique(filepath);
Pane root = FXMLLoader.load(getClass().getResource("ressources/parametre.fxml"));
//root.setStyle("ressources/style/menuLight.css);
}
} */
}

View File

@ -0,0 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.CheckBox?>
<?import javafx.scene.control.ComboBox?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>
<Pane fx:id="rootPane" prefHeight="595.0" prefWidth="758.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.ParametreController">
<children>
<HBox alignment="TOP_CENTER" layoutX="146.0" layoutY="171.0" prefHeight="242.0" prefWidth="507.0" spacing="10.0">
<children>
<VBox prefHeight="309.0" prefWidth="127.0" spacing="50.0">
<children>
<CheckBox fx:id="clair" mnemonicParsing="false" styleClass="checkBox" text="Mode clair" />
<CheckBox fx:id="cmusique" mnemonicParsing="false" styleClass="checkBox" text="Musique" />
<CheckBox mnemonicParsing="false" styleClass="checkBox" text="Effet" />
<VBox prefHeight="200.0" prefWidth="100.0" spacing="10.0">
<children>
<Label styleClass="titre" text="Langue">
<font>
<Font size="18.0" />
</font>
</Label>
<ComboBox fx:id="langues" prefHeight="26.0" prefWidth="90.0" />
</children>
</VBox>
</children>
</VBox>
</children>
</HBox>
<Label layoutX="309.0" layoutY="23.0" styleClass="titre" text="Paramètre">
<font>
<Font size="36.0" />
</font>
</Label>
<Button layoutX="340.0" layoutY="525.0" mnemonicParsing="false" styleClass="bouton" stylesheets="@style/menu.css" text="Enregistrer" />
</children>
</Pane>

View File

@ -13,4 +13,12 @@
-fx-background-color: #1d1d1d;
-fx-text-fill: #d8d8d8;
-fx-background-insets: 0 0 0 0, 0, 1, 2;
}
}
.checkBox {
-fx-border-width: 2;
-fx-background-radius: 0;
-fx-background-color: #1d1d1d;
-fx-text-fill: #d8d8d8;
-fx-background-insets: 0 0 0 0, 0, 1, 2;
}