From 6ae0587ce843491e44a04adfcee1a0d31296b830 Mon Sep 17 00:00:00 2001 From: JunkJumper <38364274+JunkJumper@users.noreply.github.com> Date: Mon, 27 Apr 2020 17:00:03 +0200 Subject: [PATCH 1/2] Delete databse.tar --- databse.tar | Bin 20480 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 databse.tar diff --git a/databse.tar b/databse.tar deleted file mode 100644 index ed4aaa6202ac5c3856a1e606068a10192054b933..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20480 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 b7VdMgGN0Odx<9!`;2wc{1nv>|77_SAmEgx~ From 36dff30b84b9d42ad278f3e37dccf3541c1f5406 Mon Sep 17 00:00:00 2001 From: Yessine Ben El Bey Date: Mon, 27 Apr 2020 17:09:53 +0200 Subject: [PATCH 2/2] Ecran parametre --- src/ihm/Main.java | 2 +- src/ihm/controller/ParametreController.java | 52 +++++++++++++++++++++ src/ihm/ressources/parametre.fxml | 42 +++++++++++++++++ src/ihm/ressources/style/menu.css | 10 +++- 4 files changed, 104 insertions(+), 2 deletions(-) create mode 100644 src/ihm/controller/ParametreController.java create mode 100644 src/ihm/ressources/parametre.fxml diff --git a/src/ihm/Main.java b/src/ihm/Main.java index eea36f6..ae4bc0f 100644 --- a/src/ihm/Main.java +++ b/src/ihm/Main.java @@ -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(); diff --git a/src/ihm/controller/ParametreController.java b/src/ihm/controller/ParametreController.java new file mode 100644 index 0000000..550c9a6 --- /dev/null +++ b/src/ihm/controller/ParametreController.java @@ -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 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); + + } + + } */ + +} diff --git a/src/ihm/ressources/parametre.fxml b/src/ihm/ressources/parametre.fxml new file mode 100644 index 0000000..e70b1b9 --- /dev/null +++ b/src/ihm/ressources/parametre.fxml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +