diff --git a/src/ihm/PopUp.java b/src/ihm/PopUp.java index 98d9acc..6fea44f 100644 --- a/src/ihm/PopUp.java +++ b/src/ihm/PopUp.java @@ -1,16 +1,15 @@ package ihm; +import javafx.scene.Parent; import javafx.scene.Scene; -import javafx.scene.layout.Pane; import javafx.stage.Modality; import javafx.stage.Stage; public class PopUp { private Scene scene; private Stage popupwindow; - private Pane pane; - public PopUp (Pane p, String titre) { + public PopUp (Parent p, String titre) { popupwindow = new Stage(); popupwindow.initModality(Modality.APPLICATION_MODAL); diff --git a/src/ihm/controller/AfficherCarteController.java b/src/ihm/controller/AfficherCarteController.java index 078e7c8..6b04fc3 100644 --- a/src/ihm/controller/AfficherCarteController.java +++ b/src/ihm/controller/AfficherCarteController.java @@ -1,14 +1,13 @@ package ihm.controller; -import java.io.IOException; import java.net.URL; import java.util.ResourceBundle; import javafx.fxml.FXML; -import javafx.fxml.FXMLLoader; import javafx.fxml.Initializable; import javafx.scene.control.Label; import javafx.scene.layout.Pane; +import main.Joueur; public class AfficherCarteController implements Initializable{ @@ -16,13 +15,13 @@ public class AfficherCarteController implements Initializable{ @FXML private Label competence; @FXML private Pane root; - private PlateauController plateau; - @Override public void initialize(URL arg0, ResourceBundle arg1) { - System.out.println(root.getUserData()); - //nom.setText((String) root.getUserData()); - competence.setText("dfghjk"); } + + public void showInformation(Joueur j) { + //nom.setText(j.getCartePersonnage().getNom()); + //competence.setText(j.getCartePersonnage().getDescription()); + } } diff --git a/src/ihm/controller/MenuController.java b/src/ihm/controller/MenuController.java index c8ea3d8..7e9e0d2 100644 --- a/src/ihm/controller/MenuController.java +++ b/src/ihm/controller/MenuController.java @@ -1,5 +1,7 @@ package ihm.controller; +import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.IOException; import java.net.URL; import java.util.ResourceBundle; @@ -20,8 +22,14 @@ public class MenuController implements Initializable{ @Override public void initialize(URL arg0, ResourceBundle arg1) { // TODO Auto-generated method stub - //Image image = new Image("../ressources/img/logo.png"); - //titre.setImage(image); + FileInputStream input; + try { + input = new FileInputStream("src\\ihm\\ressources\\img\\logo.png"); + Image image = new Image(input); + titre.setImage(image); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } } @FXML diff --git a/src/ihm/controller/PlateauController.java b/src/ihm/controller/PlateauController.java index 8f3e8bf..f5f4201 100644 --- a/src/ihm/controller/PlateauController.java +++ b/src/ihm/controller/PlateauController.java @@ -11,17 +11,14 @@ import ihm.PopUp; import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; import javafx.fxml.Initializable; +import javafx.scene.Parent; import javafx.scene.control.Button; import javafx.scene.control.Label; -import javafx.scene.layout.Pane; import javafx.scene.layout.VBox; -import javafx.scene.layout.BorderPane; import javafx.scene.layout.HBox; import main.Joueur; public class PlateauController implements Initializable { - @FXML private BorderPane root; - private List listJoueur = new ArrayList(); private List vboxJoueur = new ArrayList(); private List - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - - - - - - + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/src/ihm/ressources/Reveler_son_identite.fxml b/src/ihm/ressources/Reveler_son_identite.fxml index b4f40c6..06c05f9 100644 --- a/src/ihm/ressources/Reveler_son_identite.fxml +++ b/src/ihm/ressources/Reveler_son_identite.fxml @@ -7,7 +7,7 @@ - + @@ -15,7 +15,7 @@ -