[client] Wizard page layouts now using ne grid manager.

1 files changed, 18 insertions, 13 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java
index 375dc401..6f10f937 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/layout/ImageMetaDataPageLayout.java
@@ -2,7 +2,6 @@ package org.openslx.dozmod.gui.wizard.layout;
 
 import java.awt.Component;
 import java.awt.Dimension;
-import java.awt.GridBagLayout;
 
 import javax.swing.Box;
 import javax.swing.DefaultListCellRenderer;
@@ -16,7 +15,7 @@ import javax.swing.JTextArea;
 import javax.swing.border.TitledBorder;
 
 import org.openslx.bwlp.thrift.iface.OperatingSystem;
-import org.openslx.dozmod.gui.helper.GridPos;
+import org.openslx.dozmod.gui.helper.GridManager;
 import org.openslx.dozmod.gui.wizard.Wizard;
 import org.openslx.dozmod.gui.wizard.WizardPage;
 
@@ -43,7 +42,7 @@ public abstract class ImageMetaDataPageLayout extends WizardPage {
 		super(wizard, "Metadaten");
 		setDescription("Geben Sie bitte einen aussagekräftigen Namen für das neue Image ein.");
 
-		setLayout(new GridBagLayout());
+		GridManager grid = new GridManager(this, 2, false);
 
 		JLabel osCaption = new JLabel("Betriebssystem");
 		osCombo = new JComboBox<>();
@@ -59,25 +58,29 @@ public abstract class ImageMetaDataPageLayout extends WizardPage {
 				return this;
 			}
 		});
-		add(osCaption, GridPos.get(0, 0));
-		add(osCombo, GridPos.get(1, 0));
+		grid.add(osCaption);
+		grid.add(osCombo);
 
 		JLabel descriptionCation = new JLabel("Beschreibung");
-		descriptionText = new JTextArea(3, 50);
-		descriptionText.setMinimumSize(new Dimension(0, 60));
+		descriptionText = new JTextArea(5,50);
+		descriptionText.setMinimumSize(new Dimension(0, 70));
 		descriptionText.setLineWrap(true);
 		descriptionText.setWrapStyleWord(true);
 		JScrollPane descPane = new JScrollPane(descriptionText, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
 				JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
 		descPane.setMinimumSize(descriptionText.getMinimumSize());
-		add(descriptionCation, GridPos.get(0, 1));
-		add(descPane, GridPos.get(1, 1, true, false));
+		grid.add(descriptionCation);
+		grid.add(descPane).fill(true, false).expand(true, false);
+		grid.nextRow();
 
 		setActiveCheck = new JCheckBox("Image aktivieren");
-		add(setActiveCheck, GridPos.get(0, 2));
+		grid.add(setActiveCheck);
+		
 		licencedSoftwareCheck = new JCheckBox("Image enthält lizenzpflichtige Software");
 		licencedSoftwareCheck.setSelected(true);
-		add(setActiveCheck, GridPos.get(0, 3));
+		grid.add(licencedSoftwareCheck);
+		grid.nextRow();
+
 
 		// -- default permissions group --
 		JPanel permissionsGroup = new JPanel();
@@ -93,9 +96,11 @@ public abstract class ImageMetaDataPageLayout extends WizardPage {
 		permissionsGroup.add(readPermissionsCheck);
 		permissionsGroup.add(writePermissionsCheck);
 		permissionsGroup.add(adminPermissionsCheck);
-		add(permissionsGroup, GridPos.get(0, 4, 2, 1, true, false));
-		add(Box.createVerticalGlue(), GridPos.get(0, 5, true, true));
+		grid.add(permissionsGroup, 2, 1).fill(true, false).expand(true, false);
+		grid.nextRow();
 		// -- end permissions group --
+
+		grid.finish(true);
 	}
 
 	public String getImageDescription() {