Merge branch 'v1.1' of git.openslx.org:openslx-ng/tutor-module into v1.1

1 files changed, 47 insertions, 0 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
index b4bbbc35..d79c109a 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageMetaDataPage.java
@@ -1,11 +1,58 @@
 package org.openslx.dozmod.gui.wizard.page;
 
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.apache.thrift.TException;
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.KeyListener;
+import org.eclipse.swt.widgets.Composite;
+import org.openslx.bwlp.thrift.iface.OperatingSystem;
+import org.openslx.dozmod.gui.MainWindow;
+import org.openslx.dozmod.gui.helper.MessageType;
 import org.openslx.dozmod.gui.wizard.layout.ImageMetaDataPageLayout;
+import org.openslx.thrifthelper.ThriftManager;
 
 public class ImageMetaDataPage extends ImageMetaDataPageLayout {
 
+	private final static Logger LOGGER = Logger.getLogger(ImageMetaDataPage.class);
+
 	public ImageMetaDataPage() {
 		super();
 		setPageComplete(false);
 	}
+
+	@Override
+	public void createControl(Composite parent) {
+		super.createControl(parent);
+
+		// fetch the OS list
+		List<OperatingSystem> osList = null;
+		try {
+			osList = ThriftManager.getSatClient().getOperatingSystems();
+		} catch (TException e) {
+			MainWindow.showMessageBox("Konnte die Liste der Betriebsysteme nicht holen!", MessageType.ERROR, LOGGER, e);
+			return;
+		}
+
+		for (OperatingSystem os : osList) {
+			if (os.isSetOsName()) {
+				osCombo.add(os.getOsName());
+				osCombo.setData(os.osName, os);
+			}
+		}
+		// select the first one by default
+		osCombo.select(0);
+
+		descriptionText.addKeyListener(new KeyListener() {
+			@Override
+			public void keyPressed(KeyEvent e) {
+			}
+
+			@Override
+			public void keyReleased(KeyEvent e) {
+				setPageComplete(!descriptionText.getText().isEmpty());
+			}
+		});
+	}
 }