From e1174a07c8e29eecb87959b97dc706f978c42e9d Mon Sep 17 00:00:00 2001 From: polo Date: Thu, 2 Jul 2026 21:41:19 +0200 Subject: =?UTF-8?q?suite=20de=20la=20migration=20maven=20+=20java=20et=20j?= =?UTF-8?q?avafx=20plus=20r=C3=A9cents:=20images=20dans=20resources,=20con?= =?UTF-8?q?structeur=20d'Image,=20bonne=20bibli=20pour=20tailleEcran?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/images/accueil.jpg | Bin 138738 -> 0 bytes src/main/java/images/android-fill.png | Bin 698 -> 0 bytes src/main/java/images/android-line.png | Bin 773 -> 0 bytes src/main/java/images/armees/BlackTemplars.png | Bin 95304 -> 0 bytes src/main/java/images/armees/android-fill.png | Bin 698 -> 0 bytes src/main/java/images/deco.png | Bin 4808 -> 0 bytes src/main/java/images/inversion_icons.png | Bin 1338 -> 0 bytes src/main/java/images/tournoi1.jpg | Bin 66986 -> 0 bytes src/main/java/images/tournoi2.jpg | Bin 115464 -> 0 bytes src/main/java/images/tournoi3.jpg | Bin 259922 -> 0 bytes src/main/java/images/wip.jpg | Bin 46406 -> 0 bytes src/main/java/module-info.java | 1 + src/main/java/vue/AfficheCreerListe.java | 9 ++++++--- src/main/java/vue/AfficheEvenement.java | 4 +++- src/main/java/vue/AfficheTopMenu.java | 3 ++- src/main/java/vue/simulation/AfficheSimulation.java | 7 +++++-- src/main/resources/images/accueil.jpg | Bin 0 -> 138738 bytes src/main/resources/images/android-fill.png | Bin 0 -> 698 bytes src/main/resources/images/android-line.png | Bin 0 -> 773 bytes src/main/resources/images/armees/BlackTemplars.png | Bin 0 -> 95304 bytes src/main/resources/images/armees/android-fill.png | Bin 0 -> 698 bytes src/main/resources/images/deco.png | Bin 0 -> 4808 bytes src/main/resources/images/inversion_icons.png | Bin 0 -> 1338 bytes src/main/resources/images/tournoi1.jpg | Bin 0 -> 66986 bytes src/main/resources/images/tournoi2.jpg | Bin 0 -> 115464 bytes src/main/resources/images/tournoi3.jpg | Bin 0 -> 259922 bytes src/main/resources/images/wip.jpg | Bin 0 -> 46406 bytes 27 files changed, 17 insertions(+), 7 deletions(-) delete mode 100644 src/main/java/images/accueil.jpg delete mode 100644 src/main/java/images/android-fill.png delete mode 100644 src/main/java/images/android-line.png delete mode 100644 src/main/java/images/armees/BlackTemplars.png delete mode 100644 src/main/java/images/armees/android-fill.png delete mode 100644 src/main/java/images/deco.png delete mode 100644 src/main/java/images/inversion_icons.png delete mode 100644 src/main/java/images/tournoi1.jpg delete mode 100644 src/main/java/images/tournoi2.jpg delete mode 100644 src/main/java/images/tournoi3.jpg delete mode 100644 src/main/java/images/wip.jpg create mode 100644 src/main/resources/images/accueil.jpg create mode 100644 src/main/resources/images/android-fill.png create mode 100644 src/main/resources/images/android-line.png create mode 100644 src/main/resources/images/armees/BlackTemplars.png create mode 100644 src/main/resources/images/armees/android-fill.png create mode 100644 src/main/resources/images/deco.png create mode 100644 src/main/resources/images/inversion_icons.png create mode 100644 src/main/resources/images/tournoi1.jpg create mode 100644 src/main/resources/images/tournoi2.jpg create mode 100644 src/main/resources/images/tournoi3.jpg create mode 100644 src/main/resources/images/wip.jpg (limited to 'src') diff --git a/src/main/java/images/accueil.jpg b/src/main/java/images/accueil.jpg deleted file mode 100644 index bc59db0..0000000 Binary files a/src/main/java/images/accueil.jpg and /dev/null differ diff --git a/src/main/java/images/android-fill.png b/src/main/java/images/android-fill.png deleted file mode 100644 index ac7e1fa..0000000 Binary files a/src/main/java/images/android-fill.png and /dev/null differ diff --git a/src/main/java/images/android-line.png b/src/main/java/images/android-line.png deleted file mode 100644 index 80952c9..0000000 Binary files a/src/main/java/images/android-line.png and /dev/null differ diff --git a/src/main/java/images/armees/BlackTemplars.png b/src/main/java/images/armees/BlackTemplars.png deleted file mode 100644 index 7f02866..0000000 Binary files a/src/main/java/images/armees/BlackTemplars.png and /dev/null differ diff --git a/src/main/java/images/armees/android-fill.png b/src/main/java/images/armees/android-fill.png deleted file mode 100644 index ac7e1fa..0000000 Binary files a/src/main/java/images/armees/android-fill.png and /dev/null differ diff --git a/src/main/java/images/deco.png b/src/main/java/images/deco.png deleted file mode 100644 index 50e5e72..0000000 Binary files a/src/main/java/images/deco.png and /dev/null differ diff --git a/src/main/java/images/inversion_icons.png b/src/main/java/images/inversion_icons.png deleted file mode 100644 index f8cf209..0000000 Binary files a/src/main/java/images/inversion_icons.png and /dev/null differ diff --git a/src/main/java/images/tournoi1.jpg b/src/main/java/images/tournoi1.jpg deleted file mode 100644 index 70b0f8c..0000000 Binary files a/src/main/java/images/tournoi1.jpg and /dev/null differ diff --git a/src/main/java/images/tournoi2.jpg b/src/main/java/images/tournoi2.jpg deleted file mode 100644 index 9a3a662..0000000 Binary files a/src/main/java/images/tournoi2.jpg and /dev/null differ diff --git a/src/main/java/images/tournoi3.jpg b/src/main/java/images/tournoi3.jpg deleted file mode 100644 index 77fe608..0000000 Binary files a/src/main/java/images/tournoi3.jpg and /dev/null differ diff --git a/src/main/java/images/wip.jpg b/src/main/java/images/wip.jpg deleted file mode 100644 index 771e8fd..0000000 Binary files a/src/main/java/images/wip.jpg and /dev/null differ 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/resources/images/accueil.jpg b/src/main/resources/images/accueil.jpg new file mode 100644 index 0000000..bc59db0 Binary files /dev/null and b/src/main/resources/images/accueil.jpg differ diff --git a/src/main/resources/images/android-fill.png b/src/main/resources/images/android-fill.png new file mode 100644 index 0000000..ac7e1fa Binary files /dev/null and b/src/main/resources/images/android-fill.png differ diff --git a/src/main/resources/images/android-line.png b/src/main/resources/images/android-line.png new file mode 100644 index 0000000..80952c9 Binary files /dev/null and b/src/main/resources/images/android-line.png differ diff --git a/src/main/resources/images/armees/BlackTemplars.png b/src/main/resources/images/armees/BlackTemplars.png new file mode 100644 index 0000000..7f02866 Binary files /dev/null and b/src/main/resources/images/armees/BlackTemplars.png differ diff --git a/src/main/resources/images/armees/android-fill.png b/src/main/resources/images/armees/android-fill.png new file mode 100644 index 0000000..ac7e1fa Binary files /dev/null and b/src/main/resources/images/armees/android-fill.png differ diff --git a/src/main/resources/images/deco.png b/src/main/resources/images/deco.png new file mode 100644 index 0000000..50e5e72 Binary files /dev/null and b/src/main/resources/images/deco.png differ diff --git a/src/main/resources/images/inversion_icons.png b/src/main/resources/images/inversion_icons.png new file mode 100644 index 0000000..f8cf209 Binary files /dev/null and b/src/main/resources/images/inversion_icons.png differ diff --git a/src/main/resources/images/tournoi1.jpg b/src/main/resources/images/tournoi1.jpg new file mode 100644 index 0000000..70b0f8c Binary files /dev/null and b/src/main/resources/images/tournoi1.jpg differ diff --git a/src/main/resources/images/tournoi2.jpg b/src/main/resources/images/tournoi2.jpg new file mode 100644 index 0000000..9a3a662 Binary files /dev/null and b/src/main/resources/images/tournoi2.jpg differ diff --git a/src/main/resources/images/tournoi3.jpg b/src/main/resources/images/tournoi3.jpg new file mode 100644 index 0000000..77fe608 Binary files /dev/null and b/src/main/resources/images/tournoi3.jpg differ diff --git a/src/main/resources/images/wip.jpg b/src/main/resources/images/wip.jpg new file mode 100644 index 0000000..771e8fd Binary files /dev/null and b/src/main/resources/images/wip.jpg differ -- cgit v1.2.3