More descriptive About Us dialogue.

src/ui/view/AboutUsPopUp.java

@@ -3,7 +3,10 @@ package ui.view;
 import java.awt.BorderLayout;
 import java.awt.Font;
 import java.awt.Image;
+import java.awt.Dimension;
 
+import javax.swing.Box;
+import javax.swing.BoxLayout;
 import javax.swing.ImageIcon;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
@@ -23,8 +26,15 @@ public class AboutUsPopUp extends JFrame {
 	private final JPanel contentPanel2 = new JPanel();
 	private final JPanel contentPanel3 = new JPanel();
 	private JLabel titel = new JLabel("Cyber Physical Systems");
-	private JLabel text = new JLabel("Something nice for the user :D");
-	private JLabel namesDevelopers = new JLabel("K. Trometer, D. Rieder, T. Zheng, J. Widhalm and E. Palza");
+    private JLabel h1 = new JLabel("Project Management & Architect");
+    private JLabel h2 = new JLabel("Software Developers");
+    private JLabel h3 = new JLabel("Documentation");
+    private JLabel h4 = new JLabel("Additional Collaborators");
+	private JLabel description = new JLabel("A discrete-time simulator for modeling Smart Grids that follow a Holon-based model.");
+    private JLabel namesManagement = new JLabel("C. Garcia Cordero");
+	private JLabel namesDevelopers = new JLabel("K. Trometer, D. Rieder, T. Zheng, J. Widhalm, E. Palza and I. Dix");
+    private JLabel namesDocumentation = new JLabel("E. Palza, C. Garcia Cordero");
+    private JLabel namesCollaborators = new JLabel("R. Egert and F. Volk");
 	private JLabel credits = new JLabel();
 
 	/**
@@ -32,21 +42,55 @@ public class AboutUsPopUp extends JFrame {
 	 */
 	public AboutUsPopUp() {
 		super(Languages.getLanguage()[14]);
+
+        // Set fonts
+		Font fontTitle = new Font("Titel", 2, 35);
+		titel.setFont(fontTitle);
+		titel.setBounds(150, 30, 100, 20);
+        Font headerFont = new Font("Header", 2, 20);
+        h1.setFont(headerFont);
+        h2.setFont(headerFont);
+        h3.setFont(headerFont);
+        h4.setFont(headerFont);
+
+        // Set labels
+        titel.setHorizontalAlignment(JLabel.CENTER);
+
+        // Set layout
+        contentPanel.setLayout(new BoxLayout(contentPanel, BoxLayout.Y_AXIS));
+        contentPanel2.setLayout(new BoxLayout(contentPanel2, BoxLayout.Y_AXIS));
+        contentPanel3.setLayout(new BoxLayout(contentPanel3, BoxLayout.Y_AXIS));
+
 		this.setIconImage(new ImageIcon(this.getClass().getResource("/Images/Dummy_House.png")).getImage()
 				.getScaledInstance(30, 30, Image.SCALE_SMOOTH));
 		setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
 		setBounds(100, 100, 500, 800);
 		setLocationRelativeTo(this.getParent());
-		getContentPane().setLayout(new BorderLayout());
-		titel.setBounds(150, 30, 100, 20);
-		Font fontTitle = new Font("Titel", 2, 35);
-		titel.setFont(fontTitle);
+
+        contentPanel.add(Box.createRigidArea(new Dimension(0,15)));
 		contentPanel.add(titel);
+        contentPanel.add(Box.createRigidArea(new Dimension(0,15)));
+		contentPanel.add(description);
+        contentPanel.add(Box.createRigidArea(new Dimension(0,60)));
 		getContentPane().add(contentPanel, BorderLayout.NORTH);
-		contentPanel2.add(text);
+
+        contentPanel2.add(h1);
+        contentPanel2.add(namesManagement);
+        contentPanel2.add(Box.createRigidArea(new Dimension(0,50)));
+        contentPanel2.add(h2);
+        contentPanel2.add(namesDevelopers);
+        contentPanel2.add(Box.createRigidArea(new Dimension(0,50)));
+        contentPanel2.add(h3);
+        contentPanel2.add(namesDocumentation);
+        contentPanel2.add(Box.createRigidArea(new Dimension(0,50)));
+        contentPanel2.add(h4);
+        contentPanel2.add(namesCollaborators);
+        contentPanel2.add(Box.createRigidArea(new Dimension(0,50)));
 		contentPanel2.add(credits);
 		getContentPane().add(contentPanel2, BorderLayout.CENTER);
-		contentPanel3.add(namesDevelopers);
+
+        contentPanel3.add(Box.createRigidArea(new Dimension(0,50)));
+		//contentPanel3.add(namesDevelopers);
 		getContentPane().add(contentPanel3, BorderLayout.SOUTH);
 	}
 }