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

5 files changed, 37 insertions, 28 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
index 36cde4a2..b8ea83d2 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
@@ -231,14 +231,14 @@ public abstract class MainWindow {
 		disclaimerItem.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				DisclaimerWindow.open(false);
+				DisclaimerWindow.open(mainWindow);
 			}
 		});
 
 		virtualizerNoticeItem.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				VirtualizerNoticeWindow.open(false);
+				VirtualizerNoticeWindow.open(mainWindow);
 			}
 		});
 	}
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/DisclaimerWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/DisclaimerWindow.java
index d39144a0..70598f43 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/DisclaimerWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/DisclaimerWindow.java
@@ -1,5 +1,6 @@
 package org.openslx.dozmod.gui.window;
 
+import java.awt.Frame;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -16,8 +17,8 @@ public class DisclaimerWindow extends DisclaimerWindowLayout {
 
 	private final static Logger LOGGER = Logger.getLogger(DisclaimerWindow.class);
 
-	public DisclaimerWindow(boolean modal) {
-		super(modal);
+	public DisclaimerWindow(Frame modalParent) {
+		super(modalParent);
 
 		final DisclaimerWindow me = this;
 		// function for agreement checkbox
@@ -43,8 +44,8 @@ public class DisclaimerWindow extends DisclaimerWindowLayout {
 		return Config.getDisclaimerAgreement() < DISCLAIMER_VERSION;
 	}
 
-	public static void open(boolean modal) {
-		new DisclaimerWindow(modal).setVisible(true);
+	public static void open(Frame modalParent) {
+		new DisclaimerWindow(modalParent).setVisible(true);
 	}
 
 }
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtualizerNoticeWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtualizerNoticeWindow.java
index 5358ceec..caf0ccba 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtualizerNoticeWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtualizerNoticeWindow.java
@@ -1,7 +1,12 @@
 package org.openslx.dozmod.gui.window;
 
+import java.awt.Frame;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
+import javax.swing.JFrame;
 
 import org.apache.log4j.Logger;
 import org.openslx.dozmod.Config;
@@ -12,12 +17,16 @@ public class VirtualizerNoticeWindow extends VirtualizerNoticeWindowLayout {
 
 	private final static Logger LOGGER = Logger.getLogger(VirtualizerNoticeWindow.class);
 
-	public VirtualizerNoticeWindow(boolean modal) {
-		super(modal);
+	public VirtualizerNoticeWindow(Frame modalParent) {
+		super(modalParent);
 
 		final VirtualizerNoticeWindow me = this;
+		setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+
+		// Resore state of "don't show again" option
+		readCheck.setSelected(Config.getVirtualizerRead());
 
-		// function for agreement checkbox
+		// function for close button
 		continueButton.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
@@ -26,34 +35,31 @@ public class VirtualizerNoticeWindow extends VirtualizerNoticeWindowLayout {
 			}
 		});
 
-		// actions of the login button
-		linuxDLButton.addActionListener(new ActionListener() {
+		this.addWindowListener(new WindowAdapter() {
 			@Override
-			public void actionPerformed(ActionEvent e) {
-				//clickedLinuxDLButton();
+			public void windowClosing(WindowEvent e) {
+				Config.setVirtualizerRead(readCheck.isSelected());
 			}
 		});
 
-		// actions of the login button
-		windowsDLButton.addActionListener(new ActionListener() {
+		linuxDLButton.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				//clickedWindowsDLButton();
+				//clickedLinuxDLButton();
 			}
 		});
 
-		// actions of the login button
-		readCheck.addActionListener(new ActionListener() {
+		windowsDLButton.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				//clickedReadCheckButton();
+				//clickedWindowsDLButton();
 			}
 		});
 
 	}
 
-	public static void open(boolean modal) {
-		VirtualizerNoticeWindow win = new VirtualizerNoticeWindow(modal);
+	public static void open(Frame modalParent) {
+		VirtualizerNoticeWindow win = new VirtualizerNoticeWindow(modalParent);
 		MainWindow.centerShell(win);
 		win.setVisible(true);
 	}
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java
index 382fb091..e8f79ab3 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/DisclaimerWindowLayout.java
@@ -1,6 +1,7 @@
 package org.openslx.dozmod.gui.window.layout;
 
 import java.awt.Composite;
+import java.awt.Frame;
 import java.awt.GridLayout;
 
 import javax.swing.BoxLayout;
@@ -33,8 +34,8 @@ public abstract class DisclaimerWindowLayout extends JDialog {
 	protected JButton agreeBox;
 	protected JButton continueButton;
 
-	public DisclaimerWindowLayout(boolean modal) {
-		super(null, title, modal ? ModalityType.APPLICATION_MODAL : ModalityType.MODELESS);
+	public DisclaimerWindowLayout(Frame modalParent) {
+		super(modalParent, title, modalParent != null ? ModalityType.APPLICATION_MODAL : ModalityType.MODELESS);
 		this.setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS));
 
 		// information before the disclaimer
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java
index f85b1dbc..07a55ba4 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java
@@ -1,10 +1,10 @@
 package org.openslx.dozmod.gui.window.layout;
 
 import java.awt.BorderLayout;
-import java.awt.Button;
 import java.awt.Container;
 import java.awt.Dimension;
 import java.awt.Font;
+import java.awt.Frame;
 
 import javax.swing.Box;
 import javax.swing.BoxLayout;
@@ -29,10 +29,9 @@ public abstract class VirtualizerNoticeWindowLayout extends JDialog {
 	protected JCheckBox readCheck;
 	protected JButton continueButton;
 
-	public VirtualizerNoticeWindowLayout(boolean modal) {
-		super(null, title, modal ? ModalityType.APPLICATION_MODAL : ModalityType.MODELESS);
+	public VirtualizerNoticeWindowLayout(Frame modalParent) {
+		super(modalParent, title, modalParent != null ? ModalityType.APPLICATION_MODAL : ModalityType.MODELESS);
 		
-
 		JPanel infoPane = new JPanel();
 		infoPane.setLayout(new BoxLayout(infoPane, BoxLayout.PAGE_AXIS));
 
@@ -70,7 +69,9 @@ public abstract class VirtualizerNoticeWindowLayout extends JDialog {
 		final Container content = getContentPane();
 		content.add(infoPane, BorderLayout.CENTER);
 		content.add(bottomPane, BorderLayout.PAGE_END);
-		pack();
+
+		setSize(new Dimension(600, 700));
+		validate();
 	}
 
 }
\ No newline at end of file