[client] ConfigWindow: font in steps of 5, removed redundant labels

2 files changed, 28 insertions, 30 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 8fde091c..49c756af 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
@@ -106,7 +106,7 @@ public class ConfigWindow extends ConfigWindowLayout implements UiFeedback {
 			changed = true;
 		else if (btnSendMeMail.isSelected() != userConfig.emailNotifications)
 			changed = true;
-		else if (btnFontSize.getValue() != fontScaling)
+		else if ((Integer)btnFontSize.getValue() != fontScaling)
 			changed = true;
 
 		// en/disable the save button
@@ -145,17 +145,20 @@ public class ConfigWindow extends ConfigWindowLayout implements UiFeedback {
 		if (selectedMode != null) {
 			Config.setProxyMode(selectedMode);
 		}
+
+		// save font scaling to config
+		Config.setFontScaling((Integer)btnFontSize.getValue());
+
+		// NOTE this can fail!
 		// save mail notification stuff to sat
 		if (!setSatUserConfig(new SatelliteUserConfig(btnSendMeMail.isSelected()))) {
 			Gui.showMessageBox(this, "Konnte die Änderung nicht am Satelliten speichern!", MessageType.ERROR, LOGGER, null);
 			btnSave.setEnabled(true);
-			return;
 		}
-		// save font scaling to config
-		Config.setFontScaling(btnFontSize.getValue());
+		// let the user know he needs to restart for the changes to apply
+		Gui.showMessageBox(this, "Die Änderungen werden erst nach einem Programmneustart wirksam.", MessageType.INFO, LOGGER, null);
 	}
 	public static boolean shouldBeShown() {
-		// TODO query Config
 		return true;
 	}
 
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 96aad929..daf39555 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
@@ -5,16 +5,19 @@ import java.awt.Dimension;
 import java.awt.Frame;
 
 import javax.swing.BorderFactory;
+import javax.swing.BoundedRangeModel;
 import javax.swing.Box;
 import javax.swing.BoxLayout;
 import javax.swing.ButtonGroup;
+import javax.swing.DefaultBoundedRangeModel;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JDialog;
-import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JRadioButton;
 import javax.swing.JSlider;
+import javax.swing.JSpinner;
+import javax.swing.event.ChangeListener;
 
 import org.openslx.dozmod.gui.helper.GridManager;
 
@@ -49,32 +52,22 @@ public class ConfigWindowLayout extends JDialog {
 		// -- 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();
-		
+		mailPanel.setBorder(BorderFactory.createTitledBorder("eMail-Benachrichtigungen"));
 		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);
+		mailPanel.add(btnSendMeMail);
 
 		// proxy config panel
 		JPanel proxyPanel = new JPanel();
 		proxyPanel.setBorder(BorderFactory.createTitledBorder("Proxy"));
 		GridManager proxyGrid = new GridManager(proxyPanel, 2);
-
-		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.skip(2).fill(true, false).expand(true, false);
 		proxyGrid.nextRow();
 
 		// radio button for proxy mode
 		JPanel radioGroupPanel = new JPanel();
 		radioGroup = new ButtonGroup();
-		btnProxyNone = new JRadioButton("Keine");
-		btnProxyAuto = new JRadioButton("Automatisch");
+		btnProxyNone = new JRadioButton("Keinen Proxy verwenden");
+		btnProxyAuto = new JRadioButton("Automatisch nach Proxy suchen");
 		radioGroup.add(btnProxyNone);
 		radioGroup.add(btnProxyAuto);
 
@@ -87,24 +80,26 @@ public class ConfigWindowLayout extends JDialog {
 		// font config panel
 		JPanel fontPanel = new JPanel();
 		fontPanel.setBorder(BorderFactory.createTitledBorder("Schriftgröße"));
-		GridManager fontGrid = new GridManager(fontPanel, 3);
-		btnFontSize = new JSlider(JSlider.HORIZONTAL, 50, 200, 100);
-		fontGrid.skip();
-		fontGrid.add(new JLabel("Hier können Sie die Größe der Schriftart festlegen"), 2).fill(false, false).expand(false, false);
-		fontGrid.nextRow();
-		fontGrid.skip();
-		fontGrid.add(btnFontSize, 2).fill(true, false).expand(true, false);
+		GridManager fontGrid = new GridManager(fontPanel, 1);
+		btnFontSize = new JSlider(JSlider.HORIZONTAL);
+		btnFontSize.setModel(new DefaultBoundedRangeModel(100, 5, 75, 175));
+		btnFontSize.setMinorTickSpacing(5);
+		btnFontSize.setMajorTickSpacing(25);
+		btnFontSize.setSnapToTicks(true);
+		btnFontSize.setPaintTicks(true);
+		btnFontSize.setPaintLabels(true);
+		fontGrid.add(btnFontSize).fill(true, false).expand(true, false);
 		fontGrid.nextRow();
 
 		// bottom button panel
 		JPanel buttonPanel = new JPanel();
+		btnClose = new JButton("Abbrechen");
 		btnSave = new JButton("Speichern");
-		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());
-		buttonPanel.add(btnSave);
 		buttonPanel.add(btnClose);
+		buttonPanel.add(btnSave);
 
 		// Start the grid stuff
 		GridManager grid = new GridManager(contentPanel, 1);