diff --git a/HeatUp/src/de/heatup/ui/Main.java b/HeatUp/src/de/heatup/ui/Main.java index 030a6cf..6c2ca8f 100644 --- a/HeatUp/src/de/heatup/ui/Main.java +++ b/HeatUp/src/de/heatup/ui/Main.java @@ -54,7 +54,6 @@ public class Main extends JFrame implements Runnable { private static JPanel actionPanel; private static JPanel creditsPanel; - private static JPanel menuPanel; public void repack() { diff --git a/HeatUp/src/de/heatup/ui/menu/HighscorePanel.java b/HeatUp/src/de/heatup/ui/menu/HighscorePanel.java index cf7954c..3e2faca 100644 --- a/HeatUp/src/de/heatup/ui/menu/HighscorePanel.java +++ b/HeatUp/src/de/heatup/ui/menu/HighscorePanel.java @@ -5,6 +5,8 @@ import java.awt.Color; import java.awt.Dimension; import java.awt.Font; import java.awt.GridLayout; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; import javax.swing.JLabel; import javax.swing.JPanel; @@ -13,14 +15,15 @@ import de.heatup.highscore.ScoreEntry; import de.heatup.logging.Logger; import de.heatup.mapengine.MapEngine; import de.heatup.ui.FontLoader; +import de.heatup.ui.PanelBuilder; public class HighscorePanel { private static JPanel highscorePanel = new JPanel(); // panels and labels - private static JPanel headingPanel, dividerPanel; - private static JLabel headingLabel, dividerLabel; + private static JPanel headingPanel, dividerPanel, exit; + private static JLabel headingLabel, dividerLabel, exitLabel; private static JPanel scores; @@ -56,6 +59,28 @@ public class HighscorePanel { initHighscorePanelContent(); highscorePanel.add(scores, BorderLayout.CENTER); + + exit = new JPanel(); + exit.setBackground(Color.BLACK); + + exitLabel = new JLabel("[ zurück zum Menü ]"); + exitLabel.setForeground(Color.YELLOW); + exitLabel.setFont(emulogicSmall); + + exitLabel.addMouseListener(new MouseAdapter() { + public void mouseClicked(MouseEvent e) { + // @TODO: implement show credits + HighscorePanel.getHighscorePanel().setVisible(false); + + PanelBuilder.getOuterPanel().add(MenuPanel.getMenuPanel(), BorderLayout.CENTER); + MenuPanel.getMenuPanel().setVisible(true); + + Logger.write("back to menu"); + } + }); + + exit.add(exitLabel); + // highscorePanel.add(exit); } diff --git a/HeatUp/src/de/heatup/ui/menu/MenuPanel.java b/HeatUp/src/de/heatup/ui/menu/MenuPanel.java index e240d24..9e7bc77 100644 --- a/HeatUp/src/de/heatup/ui/menu/MenuPanel.java +++ b/HeatUp/src/de/heatup/ui/menu/MenuPanel.java @@ -230,6 +230,10 @@ public class MenuPanel { showTutorial.addMouseListener(new MouseAdapter() { public void mouseClicked(MouseEvent e) { // @TODO: implement show tutorial + + menuPanel.setVisible(false); + TutorialPanel p = new TutorialPanel(); + PanelBuilder.getOuterPanel().add(TutorialPanel.getTutorialPanel(), BorderLayout.CENTER); Logger.write("show tutorial"); } });