From 7c37fd3a05d5ac32a7e1f0affd2f903d66a79f40 Mon Sep 17 00:00:00 2001 From: Yessine-iut Date: Thu, 14 May 2020 23:28:17 +0200 Subject: [PATCH] Suppression du mode clair non fonctionnel --- src/ihm/controller/ParametreController.java | 37 +++------------------ src/ihm/ressources/parametre.fxml | 3 +- 2 files changed, 6 insertions(+), 34 deletions(-) diff --git a/src/ihm/controller/ParametreController.java b/src/ihm/controller/ParametreController.java index 17e6a3e..e08c533 100644 --- a/src/ihm/controller/ParametreController.java +++ b/src/ihm/controller/ParametreController.java @@ -25,8 +25,7 @@ public class ParametreController implements Initializable { private CheckBox cmusique; @FXML private CheckBox cbEffetSonore; - @FXML - private CheckBox clair; + @FXML private ComboBox langues; @FXML @@ -37,7 +36,7 @@ public class ParametreController implements Initializable { public static Locale LaLangue = Locale.FRANCE; public static boolean cbMusiqueCoche = false; // verifi si la checbox musical est coche public static boolean cbSonCoche = false; - public static boolean cbClair = false; + public static double slideValue; public static double slideValueEffets; public static String langueChoisi; @@ -59,7 +58,7 @@ public class ParametreController implements Initializable { cmusique.setSelected(cbMusiqueCoche); cbEffetSonore.setSelected(cbSonCoche); - clair.setSelected(cbClair); + sliderMusique.setValue(slideValue); sliderEffets.setValue(slideValueEffets); @@ -145,35 +144,9 @@ public class ParametreController implements Initializable { System.out.println(EffetSonore.isSoundOK()); } - // Pour la couleur du theme - - if (clair.isSelected()) { - // Pane root = - // FXMLLoader.load(getClass().getResource("../ressources/menu.fxml")); - - rootPane.setStyle("-fx-background-color: white;"); - rootPane.applyCss(); - } - rootPane.setStyle("-fx-background-color: white;"); - rootPane.applyCss(); - /* - * if (liste != null) { for (int i = 0; i < liste.length; i++) { - * - * System.out.println(liste[i]); System.out.println(i); repertoire2 = new - * File("../ressources/" + liste[i]); - * - * if (repertoire.isDirectory() == false) { if (liste[i] == "Plateau.fxml") { - * Pane root1 = FXMLLoader.load(getClass().getResource("../ressources/" + - * liste[i])); root1.setStyle("../ressources/style/plateau.css"); - * - * } Pane root1 = FXMLLoader.load(getClass().getResource("../ressources/" + - * liste[i])); root1.setStyle("../ressources/style/menuLight.css"); } } - * - * } - * - * } - */ + + // Quitter les paramètres EffetSonore.playSoundEffect(fileSound1); // emet un bruit sur le bouton si les effets sonores sont activés diff --git a/src/ihm/ressources/parametre.fxml b/src/ihm/ressources/parametre.fxml index 43fad9a..ed4abee 100644 --- a/src/ihm/ressources/parametre.fxml +++ b/src/ihm/ressources/parametre.fxml @@ -13,11 +13,10 @@ - + -