From e5608f6a626c833963b5d263c16cc26a44049714 Mon Sep 17 00:00:00 2001
From: shebang <timbo@c-maxx.net>
Date: Tue, 13 Jan 2015 04:39:40 +0100
Subject: [PATCH] added Menu to the actual game, some fixes are required

---
 HeatUp/src/de/heatup/ui/Main.java           | 16 ++++++++--------
 HeatUp/src/de/heatup/ui/menu/MenuPanel.java | 10 +++++++++-
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/HeatUp/src/de/heatup/ui/Main.java b/HeatUp/src/de/heatup/ui/Main.java
index 34e1191..72f7b71 100644
--- a/HeatUp/src/de/heatup/ui/Main.java
+++ b/HeatUp/src/de/heatup/ui/Main.java
@@ -26,6 +26,7 @@ import de.heatup.objects.StaticObject;
 import de.heatup.timers.HardwareResetTimers;
 import de.heatup.ui.actionPanel.ActionControl;
 import de.heatup.ui.actionPanel.ActionWatcher;
+import de.heatup.ui.menu.MenuPanel;
 
 
 public class Main extends JFrame implements Runnable {
@@ -47,11 +48,12 @@ public class Main extends JFrame implements Runnable {
 	private static JPanel outerPanel;
 	private static JPanel statusPanel;
 	private static JPanel gamePanel;
-	private static JPanel menuPanel;
 	private static JPanel leftPanel;
 	private static JPanel rightPanel;
 	private static JPanel actionPanel;
 	
+	private static JPanel menuPanel;
+	
 	public Main(){
 		setTitle("HeatUP!");
 		setDefaultCloseOperation(EXIT_ON_CLOSE);
@@ -79,13 +81,6 @@ public class Main extends JFrame implements Runnable {
 		gamePanel.setFocusable(false);
 		gamePanel.setBackground(Color.black);
 
-		menuPanel = new JPanel();
-		menuPanel.setLayout(null);
-		menuPanel.setPreferredSize(new Dimension(800,600));
-		menuPanel.setFocusable(false);
-		menuPanel.setBackground(Color.black);
-
-		
 		actionPanel = new JPanel();
 		actionPanel.setLayout(new GridLayout(1,1));
 		actionPanel.setPreferredSize(new Dimension(800,80));
@@ -99,12 +94,17 @@ public class Main extends JFrame implements Runnable {
 		rightPanel.setLayout(null);
 		rightPanel.setBackground(Color.black);
 		
+		MenuPanel.setMenuPanel();
+		menuPanel = MenuPanel.getMenuPanel();
+		
 		outerPanel.add(statusPanel,BorderLayout.NORTH);
 		outerPanel.add(leftPanel, BorderLayout.WEST);
 		outerPanel.add(rightPanel, BorderLayout.EAST);
 		outerPanel.add(gamePanel,BorderLayout.CENTER);
 		outerPanel.add(actionPanel,BorderLayout.SOUTH);
 		
+		outerPanel.add(menuPanel, BorderLayout.CENTER);
+		
 		add(outerPanel);
 		pack();
 		setVisible(true);
diff --git a/HeatUp/src/de/heatup/ui/menu/MenuPanel.java b/HeatUp/src/de/heatup/ui/menu/MenuPanel.java
index 6804ab5..eceb157 100644
--- a/HeatUp/src/de/heatup/ui/menu/MenuPanel.java
+++ b/HeatUp/src/de/heatup/ui/menu/MenuPanel.java
@@ -7,7 +7,10 @@ import java.awt.event.MouseEvent;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 
+import de.heatup.logging.Logger;
 import de.heatup.ui.FontLoader;
+import de.heatup.ui.Main;
+import de.heatup.ui.PanelBuilder;
 
 public class MenuPanel {
 	
@@ -33,6 +36,9 @@ public class MenuPanel {
 	
 	public static void setMenuPanel() {		
 		
+		menuPanel.setPreferredSize(new Dimension(800,600));
+		menuPanel.setFocusable(false);
+		
 		GridLayout menuGrid = new GridLayout(5, 1);
 		menuPanel.setBackground(Color.BLACK);
 		menuPanel.setLayout(menuGrid);
@@ -68,7 +74,9 @@ public class MenuPanel {
 		startGame.addMouseListener(new MouseAdapter() {
 			public void mouseClicked(MouseEvent e) {
 				// @TODO: implement start game
-				System.out.println("game started");
+				
+				//PanelBuilder.createGame(1);				
+				Logger.write("Game Started via menu");
 			}
 		});