From 29c64f37cf0c483153891bd8f7e35dd578a94ccd Mon Sep 17 00:00:00 2001
From: Adrien <adn.frndz@gmail.com>
Date: Thu, 24 Sep 2026 13:59:28 +0200
Subject: [PATCH] =?UTF-8?q?Menu=20finalis=C3=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/views/PrimaryWindow.java    | 67 +++++++++++++------
 1 file changed, 45 insertions(+), 22 deletions(-)

diff --git a/ProjetJava/src/main/java/views/PrimaryWindow.java b/ProjetJava/src/main/java/views/PrimaryWindow.java
index e6ecc43..edb1215 100644
--- a/ProjetJava/src/main/java/views/PrimaryWindow.java
+++ b/ProjetJava/src/main/java/views/PrimaryWindow.java
@@ -13,9 +13,11 @@ import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JRadioButtonMenuItem;
+import javax.swing.JSeparator;
 import javax.swing.JTabbedPane;
 import javax.swing.SwingUtilities;
 import services.GameLevel;
+import utils.Level;
 
 /**
  *
@@ -39,30 +41,44 @@ public class PrimaryWindow extends JFrame {
         // Creation de la page d'accueil
         HomePage homePage = new HomePage();
 
-        // Activité
-        JMenu menuActivite = new JMenu("Activité");
+        // Menu
+        JMenu menu = new JMenu("Menu");
+
+        // Activités
+        JMenu activities = new JMenu("Activités");
         JMenuItem dessin = new JMenuItem("Dessin");
         JMenuItem calcul = new JMenuItem("Calcul");
         JMenuItem question = new JMenuItem("Question");
 
-        menuActivite.add(dessin);
-        menuActivite.add(calcul);
-        menuActivite.add(question);
-
         // Niveau
-        JMenu menuNiveau = new JMenu("Niveau");
-        ButtonGroup groupeNiveau = new ButtonGroup();
-        JRadioButtonMenuItem niveau1 = new JRadioButtonMenuItem("Niveau 1", true);
-        JRadioButtonMenuItem niveau2 = new JRadioButtonMenuItem("Niveau 2");
-        groupeNiveau.add(niveau1);
-        groupeNiveau.add(niveau2);
-        menuNiveau.add(niveau1);
-        menuNiveau.add(niveau2);
-
-        // Administration [TEST]
-        JMenu menuAdmin = new JMenu("Administration");
+        JMenu level = new JMenu("Niveau");
+        ButtonGroup levelGroup = new ButtonGroup();
+        JRadioButtonMenuItem level1 = new JRadioButtonMenuItem("Niveau 1", true);
+        JRadioButtonMenuItem level2 = new JRadioButtonMenuItem("Niveau 2");
+        
+        // Administration
+        JMenu admin = new JMenu("Administration");
         JMenuItem authPart = new JMenuItem("S'authentifier");
-        menuAdmin.add(authPart);
+        
+        
+        // Insertion
+        menu.add(activities);
+        activities.add(dessin);
+        activities.add(calcul);
+        activities.add(question);
+        
+        menu.add(new JSeparator());
+
+        menu.add(level);
+        level.add(level1);
+        level.add(level2);
+        levelGroup.add(level1);
+        levelGroup.add(level2);
+        
+        menu.add(new JSeparator());
+        
+        menu.add(admin);
+        admin.add(authPart);
 
         authPart.addActionListener(e -> {
             String test = JOptionPane.showInputDialog(this, "Message mdp");
@@ -98,11 +114,8 @@ public class PrimaryWindow extends JFrame {
             }
 
         });
-        // menuAdmin.add(new JMenuItem("S'authentifier"));
 
-        menuBar.add(menuActivite);
-        menuBar.add(menuNiveau);
-        menuBar.add(menuAdmin);
+        menuBar.add(menu);
         setJMenuBar(menuBar); // Ajout du menu à la fenêtre
 
         // Création du niveau de jeu
@@ -187,6 +200,16 @@ public class PrimaryWindow extends JFrame {
             revalidate();
             repaint();
         });
+        
+        // Action du menu item Niveau 1
+        level1.addActionListener(e -> {
+            gameLevel.setLevel(Level.EASY);
+        });
+        
+        // Action du menu item Niveau 2
+        level2.addActionListener(e -> {
+            gameLevel.setLevel(Level.HARD);
+        });
     }
 
     public static void main(String[] args) {
-- 
GitLab