diff --git a/Avancee.odt b/Avancee.odt index dfd38b9..fe3bb80 100644 Binary files a/Avancee.odt and b/Avancee.odt differ diff --git a/Banniere.java b/Banniere.java index eb2be10..c95221e 100644 --- a/Banniere.java +++ b/Banniere.java @@ -1,6 +1,5 @@ import javax.swing.*; import java.awt.*; -import java.awt.event.*; public class Banniere extends JPanel { private FrameJeu fenetre; @@ -26,17 +25,17 @@ public class Banniere extends JPanel { public void setVictoire(){ this.add(new Fin("Victoire !",this.getSize())); this.repaint(); - JButton menu = new JButton("Revenir au menu"); - menu.addActionListener(new MenuListener(this.fenetre)); - this.add(menu); + // TODO : délai + new FrameMenu(); + this.fenetre.dispose(); } // Méthode pour indiquer au joueur sa Défaite public void setDefaite(){ this.add(new Fin("Défaite !",this.getSize())); this.repaint(); - JButton menu = new JButton("Revenir au menu"); - menu.addActionListener(new MenuListener(this.fenetre)); - this.add(menu); + // TODO : délai + new FrameMenu(); + this.fenetre.dispose(); } } \ No newline at end of file diff --git a/FrameMenu.java b/FrameMenu.java index ca8070f..089a23c 100644 --- a/FrameMenu.java +++ b/FrameMenu.java @@ -26,9 +26,9 @@ public class FrameMenu extends JFrame{ // On créer les zones de textes de saisie - this.sliderLignes = new JSlider(4,30); - this.sliderColonnes = new JSlider(4,30); - this.sliderMines = new JSlider(1,900, 16); + this.sliderLignes = new JSlider(4,30,20); + this.sliderColonnes = new JSlider(4,30,25); + this.sliderMines = new JSlider(1,900, 50); sliderLignes.addChangeListener(new SettingsListener(0,this)); sliderColonnes.addChangeListener(new SettingsListener(1,this)); diff --git a/Rapport.odt b/Rapport.odt new file mode 100644 index 0000000..d401991 Binary files /dev/null and b/Rapport.odt differ