ok

2015-04-07 14:58:47 +02:00
parent 0535d98427
commit c29ccec789
25 changed files with 1946 additions and 873 deletions
@@ -1,38 +1,50 @@
 package Applicatie;
+
 import java.awt.BorderLayout;
+import java.awt.Dimension;

 import javax.swing.JFrame;
 import javax.swing.JPanel;

+import Listeners.Keyboard;

-public class Window extends JFrame {
+public class Window extends JFrame
+{
 	private static final long serialVersionUID = -1324363758675184283L;
-	
-	Panel fp;

-	Window()
-	{
+	private Panel fp;
+	
+	Window() {
 		super("Festival Plannner");
 		setDefaultCloseOperation(EXIT_ON_CLOSE);
-		setSize(500,600);
-		setExtendedState( getExtendedState()|JFrame.MAXIMIZED_BOTH );
-		
-		//CONTENT PANELS
+		//setSize(500, 600);
+		setMinimumSize(new Dimension(1160, 680));
+		setExtendedState(getExtendedState() | JFrame.MAXIMIZED_BOTH);
+
+		// CONTENT PANELS
 		JPanel contentPanel = new JPanel(new BorderLayout());
 		PropertiesPanel pp = new PropertiesPanel();
 		fp = new Panel(pp);
 		contentPanel.add(fp, BorderLayout.CENTER);
+		ControlPanel cp = new ControlPanel(fp);
+		contentPanel.add(cp, BorderLayout.SOUTH);
 		contentPanel.add(pp, BorderLayout.EAST);
+		contentPanel.add(fp, BorderLayout.CENTER);
 		
+
+		addKeyListener(new Keyboard(fp));
 		setContentPane(contentPanel);
-		//END CONTENT PANELS
-		
-		
-		//MENUBAR
+		// END CONTENT PANELS
+
+		// MENUBAR
 		setJMenuBar(new MenuBar(this));
-		//END MENUBAR
-		
+		// END MENUBAR
+
 		setFocusable(true);
 		setVisible(true);
 	}
-}
+	
+	public Panel getPanel() {
+		return fp;
+	}
+}