[client] DisclaimerWindow now without agreebox and only with "Close" Button. Do not show virt notice by default.

& various cosmetic fixes

5 files changed, 44 insertions, 53 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ConfigWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ConfigWindow.java
index 849b6520..8fde091c 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ConfigWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ConfigWindow.java
@@ -118,7 +118,7 @@ public class ConfigWindow extends ConfigWindowLayout implements UiFeedback {
 		try {
 			userConfig = ThriftManager.getSatClient().getUserConfig(Session.getSatelliteToken());
 		} catch (TException e) {
-			ThriftError.showMessage(this, LOGGER, e, "Konnte die benutzerspeizifische Konfiguration nicht vom Satelliten holen!");
+			ThriftError.showMessage(this, LOGGER, e, "Konnte die benutzerspezifische Konfiguration nicht vom Satelliten holen!");
 		}
 		return userConfig;
 	}
@@ -129,7 +129,7 @@ public class ConfigWindow extends ConfigWindowLayout implements UiFeedback {
 		try {
 			ThriftManager.getSatClient().setUserConfig(Session.getSatelliteToken(), config);
 		} catch (TException e) {
-			ThriftError.showMessage(this, LOGGER, e, "Konnte die benutzerspeizifische Konfiguration nicht vom Satelliten holen!");
+			ThriftError.showMessage(this, LOGGER, e, "Konnte die benutzerspezifische Konfiguration nicht vom Satelliten holen!");
 			return false;
 		}
 		return true;
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 c6cf7526..efa000ba 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
@@ -6,7 +6,7 @@ import java.awt.event.ActionListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 
-import javax.swing.WindowConstants;
+import javax.swing.JFrame;
 
 import org.apache.log4j.Logger;
 import org.openslx.dozmod.Config;
@@ -32,14 +32,7 @@ public class DisclaimerWindow extends DisclaimerWindowLayout implements UiFeedba
 
 	public DisclaimerWindow(Frame modalParent) {
 		super(modalParent);
-
-		// function for agreement checkbox
-		chkAgreeBox.addActionListener(new ActionListener() {
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				btnContinue.setEnabled(!btnContinue.isEnabled());
-			}
-		});
+		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
 
 		// function for continue button
 		btnContinue.addActionListener(new ActionListener() {
@@ -51,20 +44,12 @@ public class DisclaimerWindow extends DisclaimerWindowLayout implements UiFeedba
 			}
 		});
 
-		setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent e) {
 				closeWindow();
 			}
 		});
-
-		// Don't show the agree checkbox, if user already accepted the disclaimer.
-		if (!shouldBeShown()){
-			chkAgreeBox.setVisible(false);
-			btnContinue.setEnabled(true);
-		}
-
 	}
 
 	public static boolean shouldBeShown() {
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 bd38b175..98fdec40 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
@@ -10,12 +10,13 @@ import javax.swing.JFrame;
 
 import org.apache.log4j.Logger;
 import org.openslx.dozmod.Config;
+import org.openslx.dozmod.gui.helper.UiFeedback;
 import org.openslx.dozmod.gui.window.layout.VirtualizerNoticeWindowLayout;
 import org.openslx.dozmod.util.OpenLinks;
 import org.openslx.dozmod.util.OpenLinks.Link;
 
 @SuppressWarnings("serial")
-public class VirtualizerNoticeWindow extends VirtualizerNoticeWindowLayout {
+public class VirtualizerNoticeWindow extends VirtualizerNoticeWindowLayout implements UiFeedback {
 
 	private final static Logger LOGGER = Logger.getLogger(VirtualizerNoticeWindow.class);
 
@@ -47,17 +48,19 @@ public class VirtualizerNoticeWindow extends VirtualizerNoticeWindowLayout {
 				OpenLinks.openWebpage(Link.VMWARE);
 			}
 		});
-//
-//		windowsDLButton.addActionListener(new ActionListener() {
-//			@Override
-//			public void actionPerformed(ActionEvent e) {
-//				//clickedWindowsDLButton();
-//			}
-//		});
-
 	}
 
 	public static void open(Frame modalParent) {
 		new VirtualizerNoticeWindow(modalParent).setVisible(true);
 	}
+
+	@Override
+	public boolean wantConfirmQuit() {
+		return false;
+	}
+
+	@Override
+	public void escapePressed() {
+		dispose();
+	}
 }
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ConfigWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ConfigWindowLayout.java
index 21838ca0..96aad929 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ConfigWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ConfigWindowLayout.java
@@ -47,12 +47,26 @@ public class ConfigWindowLayout extends JDialog {
 		add(contentPanel, BorderLayout.CENTER);
 
 		// -- one panel per option for borders --
+		// mail config panel
+		JPanel mailPanel = new JPanel();
+		mailPanel.setBorder(BorderFactory.createTitledBorder("eMail Benachrichtigung"));
+		GridManager mailGrid = new GridManager(mailPanel, 3);
+		mailGrid.add(new JLabel("Invalide Versionen, auslaufende Veranstaltungen, Updates, ..."), 2).fill(false, false).expand(false, false);
+		mailGrid.skip().fill(true, false).expand(true, false);
+		mailGrid.nextRow();
+		
+		btnSendMeMail = new JCheckBox("Über Image- und Veranstaltungsänderungen per eMail informiert werden");
+		mailGrid.add(btnSendMeMail, 2).fill(false, false).expand(false, false);
+		mailGrid.skip();
+		mailGrid.nextRow();
+		mailGrid.finish(false);
+
 		// proxy config panel
 		JPanel proxyPanel = new JPanel();
-		proxyPanel.setBorder(BorderFactory.createTitledBorder("Proxy-Einstellungen"));
+		proxyPanel.setBorder(BorderFactory.createTitledBorder("Proxy"));
 		GridManager proxyGrid = new GridManager(proxyPanel, 2);
 
-		proxyGrid.add(new JLabel("Hier können Sie Einstellungen bezüglich Proxies vornehmen")).fill(false, false).expand(false, false);
+		proxyGrid.add(new JLabel("Hier können Sie Ihre Proxy-Einstellungen vornehmen")).fill(false, false).expand(false, false);
 		proxyGrid.skip().fill(true, false).expand(true, false);
 		proxyGrid.nextRow();
 
@@ -69,23 +83,10 @@ public class ConfigWindowLayout extends JDialog {
 		proxyGrid.add(radioGroupPanel, 2);
 		proxyGrid.nextRow();
 		proxyGrid.finish(false);
-
-		// mail config panel
-		JPanel mailPanel = new JPanel();
-		mailPanel.setBorder(BorderFactory.createTitledBorder("E-Mail Benachrichtigung"));
-		GridManager mailGrid = new GridManager(mailPanel, 3);
-		mailGrid.add(new JLabel("Invalide Versionen, auslaufende Veranstaltungen, Updates, ..."), 2).fill(false, false).expand(false, false);
-		mailGrid.skip().fill(true, false).expand(true, false);
-		mailGrid.nextRow();
 		
-		btnSendMeMail = new JCheckBox("Image- und Veranstaltungsänderungen per E-Mail erhalten");
-		mailGrid.add(btnSendMeMail, 2).fill(false, false).expand(false, false);
-		mailGrid.skip();
-		mailGrid.nextRow();
-		mailGrid.finish(false);
-
+		// font config panel
 		JPanel fontPanel = new JPanel();
-		fontPanel.setBorder(BorderFactory.createTitledBorder("Schriftart-Einstellungen"));
+		fontPanel.setBorder(BorderFactory.createTitledBorder("Schriftgröße"));
 		GridManager fontGrid = new GridManager(fontPanel, 3);
 		btnFontSize = new JSlider(JSlider.HORIZONTAL, 50, 200, 100);
 		fontGrid.skip();
@@ -98,7 +99,7 @@ public class ConfigWindowLayout extends JDialog {
 		// bottom button panel
 		JPanel buttonPanel = new JPanel();
 		btnSave = new JButton("Speichern");
-		btnClose = new JButton("Schliessen");
+		btnClose = new JButton("Schließen");
 		buttonPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
 		buttonPanel.setLayout(new BoxLayout(buttonPanel, BoxLayout.LINE_AXIS));
 		buttonPanel.add(Box.createGlue());
@@ -107,11 +108,11 @@ public class ConfigWindowLayout extends JDialog {
 
 		// Start the grid stuff
 		GridManager grid = new GridManager(contentPanel, 1);
-		grid.add(proxyPanel).fill(true, false).expand(false, false);
+		grid.add(mailPanel).fill(true, false).expand(false, false);
 		grid.nextRow();
 		grid.add(Box.createRigidArea(new Dimension(0, 10)));
 		grid.nextRow();
-		grid.add(mailPanel).fill(true, false).expand(false, false);
+		grid.add(proxyPanel).fill(true, false).expand(false, false);
 		grid.nextRow();
 		grid.add(Box.createRigidArea(new Dimension(0, 10)));
 		grid.nextRow();
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 8d06e2ec..5a6b6b07 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
@@ -2,14 +2,17 @@ package org.openslx.dozmod.gui.window.layout;
 
 import java.awt.BorderLayout;
 import java.awt.Frame;
+
 import javax.swing.BorderFactory;
 import javax.swing.Box;
+import javax.swing.BoxLayout;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JDialog;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
+
 import org.openslx.dozmod.gui.control.QLabel;
 import org.openslx.dozmod.gui.helper.GridManager;
 
@@ -34,7 +37,7 @@ public abstract class DisclaimerWindowLayout extends JDialog {
 
 	private static String title = "bwLehrpool Suite";
 	private static String noticeLabel = "Hinweis";
-	private static String continueButtonLabel = "Weiter";
+	private static String continueButtonLabel = "Schließen";
 
 	// Buttons
 	protected JCheckBox chkAgreeBox;
@@ -63,13 +66,12 @@ public abstract class DisclaimerWindowLayout extends JDialog {
 
 		// checkbox for acknowledging the disclaimer
 		JPanel buttonPanel = new JPanel();
-		chkAgreeBox = new JCheckBox(checkboxText);
-		buttonPanel.add(chkAgreeBox);
+		buttonPanel.setLayout(new BoxLayout(buttonPanel, BoxLayout.LINE_AXIS));
 		// spacer
-		buttonPanel.add(Box.createGlue());
+		buttonPanel.add(Box.createHorizontalGlue());
 		// the continue button
 		btnContinue = new JButton(continueButtonLabel);
-		btnContinue.setEnabled(false);
+		btnContinue.setEnabled(true);
 		buttonPanel.add(btnContinue);
 
 		// put everything together