suite de la migration maven + java et javafx plus récents: images dans resources, constructeur d'Image, bonne bibli pour tailleEcran

16 files changed, 17 insertions, 7 deletions

diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index f429622..d0f4ca0 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -1,5 +1,6 @@
 module ppe_javafx {
     requires javafx.controls;
+    requires javafx.graphics;
     requires java.sql;
     requires org.mariadb.jdbc;
     exports application;
diff --git a/src/main/java/vue/AfficheCreerListe.java b/src/main/java/vue/AfficheCreerListe.java
index 4c5bd70..2877067 100644
--- a/src/main/java/vue/AfficheCreerListe.java
+++ b/src/main/java/vue/AfficheCreerListe.java
@@ -1,9 +1,10 @@
 package vue;
 
-import java.awt.Dimension;
+import application.Main;
 import controlleur.Instanciation;
 import controlleur.StockageCreerListe;
 import javafx.geometry.Pos;
+import javafx.geometry.Rectangle2D;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.ChoiceBox;
@@ -15,6 +16,7 @@ import javafx.scene.image.ImageView;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Font;
+import javafx.stage.Screen;
 import javafx.stage.Stage;
 import modele.Bouton;
 import modele.User;
@@ -23,7 +25,7 @@ public class AfficheCreerListe {
         public static void afficheCreerListe(Stage primaryStage,User session) {
                 
                 //Definission hauteur largeur pour afficher un peu responsive
-                Dimension tailleEcran = java.awt.Toolkit.getDefaultToolkit().getScreenSize();
+                Rectangle2D tailleEcran = Screen.getPrimary().getVisualBounds();
                 double hauteur = tailleEcran.getHeight()/2;
                 double largeur = tailleEcran.getWidth()/2;
                 
@@ -43,7 +45,8 @@ public class AfficheCreerListe {
                 VBox droiteCorps= new VBox();
                 Scene scene = new Scene(root,largeur,hauteur);
                 Label titre = new Label("StatHammer");
-                Image logoFaction = new Image("images/wip.jpg");
+                //Image logoFaction = new Image("images/wip.jpg");
+                Image logoFaction = new Image(Main.class.getResource("/images/wip.jpg").toExternalForm());
                 ImageView iv1 = new ImageView(logoFaction);
                 ImageView iv2 = new ImageView(logoFaction);
                 Button creation = new Button("Créer et sauvegarder une Armée");
diff --git a/src/main/java/vue/AfficheEvenement.java b/src/main/java/vue/AfficheEvenement.java
index 9188476..2626ea7 100644
--- a/src/main/java/vue/AfficheEvenement.java
+++ b/src/main/java/vue/AfficheEvenement.java
@@ -1,5 +1,6 @@
 package vue;
 
+import application.Main;
 import controlleur.Connexion;
 import controlleur.EvenementController;
 import javafx.scene.control.Button;
@@ -61,7 +62,8 @@ public class AfficheEvenement {
               }
 
                 // Image avec centrage et un peu plus de style sombre
-                Image imageAccueil = new Image("images/" + Connexion.event.getNom_image());
+                //Image imageAccueil = new Image("images/" + Connexion.event.getNom_image());
+                Image imageAccueil = new Image(Main.class.getResource("/images/" + Connexion.event.getNom_image()).toExternalForm());
                 ImageView iv1 = new ImageView();
                 iv1.setImage(imageAccueil);
                 iv1.setFitWidth(500);
diff --git a/src/main/java/vue/AfficheTopMenu.java b/src/main/java/vue/AfficheTopMenu.java
index f0449aa..6abcdf5 100644
--- a/src/main/java/vue/AfficheTopMenu.java
+++ b/src/main/java/vue/AfficheTopMenu.java
@@ -36,7 +36,8 @@ public class AfficheTopMenu extends HBox
 
            
             
-            Image icons_deco = new Image("/images/deco.png");
+            //Image icons_deco = new Image("/images/deco.png");
+            Image icons_deco = new Image(getClass().getResource("/images/deco.png").toExternalForm());
                 ImageView icons_deco_box = new ImageView(icons_deco);
                 btn_logout.setGraphic(icons_deco_box);
                 icons_deco_box.setPreserveRatio(true);
diff --git a/src/main/java/vue/simulation/AfficheSimulation.java b/src/main/java/vue/simulation/AfficheSimulation.java
index bb658a3..6ceb3dd 100644
--- a/src/main/java/vue/simulation/AfficheSimulation.java
+++ b/src/main/java/vue/simulation/AfficheSimulation.java
@@ -6,6 +6,7 @@ import vue.AfficheTopMenu;
 import java.util.ArrayList;
 
 import application.Battle;
+import application.Main;
 import controlleur.ControlleurSimu;
 import javafx.geometry.Insets;
 import javafx.geometry.Pos;
@@ -98,13 +99,15 @@ public class AfficheSimulation
                 Button btn_simulate = new Button("Action !!");
                 btn_simulate.setStyle("-fx-font-size: 15;");
                 
-                Image icons_inversion = new Image("/images/inversion_icons.png");
+                //Image icons_inversion = new Image("/images/inversion_icons.png");
+                Image icons_inversion = new Image(Main.class.getResource("/images/inversion_icons.png").toExternalForm());
                 ImageView icons_inversion_box = new ImageView(icons_inversion);
                 Button btn_reverse_armies = new Button();
                 btn_reverse_armies.setGraphic(icons_inversion_box);
         
                 // grande image
-        Image image_col2 = new Image("/images/wip.jpg");
+        //Image image_col2 = new Image("/images/wip.jpg");
+        Image image_col2 = new Image(Main.class.getResource("/images/wip.jpg").toExternalForm());
                 ImageView image_box = new ImageView();
                 image_box.setPreserveRatio(true);
                 image_box.fitWidthProperty().bind(column2.widthProperty());
diff --git a/src/main/java/images/accueil.jpg b/src/main/resources/images/accueil.jpg
index bc59db0..bc59db0 100644
--- a/src/main/java/images/accueil.jpg
+++ b/src/main/resources/images/accueil.jpg
diff --git a/src/main/java/images/android-fill.png b/src/main/resources/images/android-fill.png
index ac7e1fa..ac7e1fa 100644
--- a/src/main/java/images/android-fill.png
+++ b/src/main/resources/images/android-fill.png
diff --git a/src/main/java/images/android-line.png b/src/main/resources/images/android-line.png
index 80952c9..80952c9 100644
--- a/src/main/java/images/android-line.png
+++ b/src/main/resources/images/android-line.png
diff --git a/src/main/java/images/armees/BlackTemplars.png b/src/main/resources/images/armees/BlackTemplars.png
index 7f02866..7f02866 100644
--- a/src/main/java/images/armees/BlackTemplars.png
+++ b/src/main/resources/images/armees/BlackTemplars.png
diff --git a/src/main/java/images/armees/android-fill.png b/src/main/resources/images/armees/android-fill.png
index ac7e1fa..ac7e1fa 100644
--- a/src/main/java/images/armees/android-fill.png
+++ b/src/main/resources/images/armees/android-fill.png
diff --git a/src/main/java/images/deco.png b/src/main/resources/images/deco.png
index 50e5e72..50e5e72 100644
--- a/src/main/java/images/deco.png
+++ b/src/main/resources/images/deco.png
diff --git a/src/main/java/images/inversion_icons.png b/src/main/resources/images/inversion_icons.png
index f8cf209..f8cf209 100644
--- a/src/main/java/images/inversion_icons.png
+++ b/src/main/resources/images/inversion_icons.png
diff --git a/src/main/java/images/tournoi1.jpg b/src/main/resources/images/tournoi1.jpg
index 70b0f8c..70b0f8c 100644
--- a/src/main/java/images/tournoi1.jpg
+++ b/src/main/resources/images/tournoi1.jpg
diff --git a/src/main/java/images/tournoi2.jpg b/src/main/resources/images/tournoi2.jpg
index 9a3a662..9a3a662 100644
--- a/src/main/java/images/tournoi2.jpg
+++ b/src/main/resources/images/tournoi2.jpg
diff --git a/src/main/java/images/tournoi3.jpg b/src/main/resources/images/tournoi3.jpg
index 77fe608..77fe608 100644
--- a/src/main/java/images/tournoi3.jpg
+++ b/src/main/resources/images/tournoi3.jpg
diff --git a/src/main/java/images/wip.jpg b/src/main/resources/images/wip.jpg
index 771e8fd..771e8fd 100644
--- a/src/main/java/images/wip.jpg
+++ b/src/main/resources/images/wip.jpg