[client] New main menu design :)

1 files changed, 17 insertions, 26 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java
index 2cd76be7..c1e57e8b 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/MainMenuWindowLayout.java
@@ -1,14 +1,12 @@
 package org.openslx.dozmod.gui.window.layout;
 
-import java.awt.GridLayout;
-
-import javax.swing.BoxLayout;
+import javax.swing.BorderFactory;
 import javax.swing.JButton;
 import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.border.TitledBorder;
 
 import org.openslx.dozmod.gui.helper.CompositePage;
+import org.openslx.dozmod.gui.helper.GridManager;
+import org.openslx.dozmod.util.ResourceLoader;
 
 /*
  * Structure/workflow should be:
@@ -36,9 +34,10 @@ import org.openslx.dozmod.gui.helper.CompositePage;
  * will skip the login screen
  */
 
+@SuppressWarnings("serial")
 public abstract class MainMenuWindowLayout extends CompositePage {
 	// text for info for the vms selection
-	protected String vmInfo = "Infotext VMs.";
+	protected String vmInfo = "... Infotext VMs...";
 
 	// text for the info for the lecture selection
 	protected String lecturesInfo = "Infotext Veranstaltungen.";
@@ -48,30 +47,22 @@ public abstract class MainMenuWindowLayout extends CompositePage {
 	protected JButton lecturesButton;
 
 	public MainMenuWindowLayout() {
-		super(new GridLayout(1, 2));
-
-		// group for the vm selection
-		JPanel vmGroup = new JPanel();
-		vmGroup.setLayout(new BoxLayout(vmGroup, BoxLayout.PAGE_AXIS));
-		vmGroup.setBorder(new TitledBorder("VM"));
+		this.setBorder(BorderFactory.createTitledBorder("bwLehrstuhl Hauptmenü"));
+		GridManager grid = new GridManager(this, 2);
 
-		vmButton = new JButton("VM-Übersicht");
+		vmButton = new JButton(ResourceLoader.getIcon("/img/virtualization.png", "VM-Übersicht"));
 		JLabel vmInfoLabel = new JLabel(vmInfo);
+		lecturesButton = new JButton(ResourceLoader.getIcon("/img/lecture.png", "Veranstaltungen"));
+		JLabel lecturesInfoLabel = new JLabel(lecturesInfo);
 
-		// group for the lecture selection
-		JPanel lecturesGroup = new JPanel();
-		lecturesGroup.setLayout(new BoxLayout(lecturesGroup, BoxLayout.PAGE_AXIS));
-		lecturesGroup.setBorder(new TitledBorder("Veranstaltungen"));
+		grid.add(vmButton).fill(true, false).expand(true, false);
+		grid.add(lecturesButton).fill(true, false).expand(true, false);
+		grid.nextRow();
+		grid.add(vmInfoLabel).fill(true, true).expand(true, true);
+		grid.add(lecturesInfoLabel).fill(true, true).expand(true, true);
+		grid.nextRow();
 
-		lecturesButton = new JButton("Veranstaltungen");
-		JLabel lecturesInfoLabel = new JLabel(lecturesInfo);
-		
-		vmGroup.add(vmButton);
-		vmGroup.add(vmInfoLabel);
-		lecturesGroup.add(lecturesButton);
-		lecturesGroup.add(lecturesInfoLabel);
-		add(vmGroup);
-		add(lecturesGroup);
+		grid.finish(true);
 	}
 
 }