From 74009c1bc8398767a3323f391f39f0beecdd0ed7 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Sat, 5 Sep 2015 22:40:49 +0200
Subject: [client] Add hints to config dialog

---
 .../dozmod/gui/window/layout/ConfigWindowLayout.java   | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'dozentenmodul/src/main/java')

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 a92b62ec..c364c8bd 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
@@ -2,6 +2,7 @@ package org.openslx.dozmod.gui.window.layout;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
+import java.awt.Font;
 import java.awt.Frame;
 
 import javax.swing.BorderFactory;
@@ -12,12 +13,14 @@ 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 org.openslx.dozmod.Config;
 import org.openslx.dozmod.gui.helper.GridManager;
+import org.openslx.dozmod.thrift.Session;
 
 @SuppressWarnings("serial")
 public class ConfigWindowLayout extends JDialog {
@@ -45,14 +48,18 @@ public class ConfigWindowLayout extends JDialog {
 		
 		// Panel to add everything into, needed for the border.
 		JPanel contentPanel = new JPanel();
-		add(contentPanel, BorderLayout.CENTER);
+		getContentPane().add(contentPanel, BorderLayout.CENTER);
 
 		// -- one panel per option for borders --
 		// mail config panel
 		JPanel mailPanel = new JPanel();
+		mailPanel.setLayout(new BoxLayout(mailPanel, BoxLayout.PAGE_AXIS));
 		mailPanel.setBorder(BorderFactory.createTitledBorder("eMail-Benachrichtigungen"));
 		btnSendMeMail = new JCheckBox("Über Image- und Veranstaltungsänderungen per eMail informiert werden");
 		mailPanel.add(btnSendMeMail);
+		JLabel mailNote = new JLabel("Ihre Adresse ist " + Session.getEMail());
+		mailNote.setFont(mailNote.getFont().deriveFont(Font.ITALIC));
+		mailPanel.add(mailNote);
 
 		// proxy config panel
 		JPanel proxyPanel = new JPanel();
@@ -77,8 +84,12 @@ public class ConfigWindowLayout extends JDialog {
 		
 		// font config panel
 		JPanel fontPanel = new JPanel();
-		fontPanel.setBorder(BorderFactory.createTitledBorder("Schriftgröße"));
+		fontPanel.setBorder(BorderFactory.createTitledBorder("Schriftgröße (%)"));
 		GridManager fontGrid = new GridManager(fontPanel, 1);
+		JLabel fontNote = new JLabel("Diese Funktion ist experimentell. Es kann zu Anzeigefehlern kommen.");
+		fontNote.setFont(fontNote.getFont().deriveFont(Font.ITALIC));
+		fontGrid.add(fontNote);
+		fontGrid.nextRow();
 		btnFontSize = new JSlider(JSlider.HORIZONTAL);
 		btnFontSize.setModel(new DefaultBoundedRangeModel(100, Config.FONT_SCALING_STEP, Config.FONT_SCALING_MIN, Config.FONT_SCALING_MAX));
 		btnFontSize.setMinorTickSpacing(Config.FONT_SCALING_STEP);
@@ -88,6 +99,7 @@ public class ConfigWindowLayout extends JDialog {
 		btnFontSize.setPaintLabels(true);
 		fontGrid.add(btnFontSize).fill(true, false).expand(true, false);
 		fontGrid.nextRow();
+		fontGrid.finish(false);
 
 		// bottom button panel
 		JPanel buttonPanel = new JPanel();
@@ -111,7 +123,7 @@ public class ConfigWindowLayout extends JDialog {
 		grid.nextRow();
 		grid.add(fontPanel).fill(true, false).expand(false, false);
 		grid.nextRow();
-		grid.finish(true);
+		grid.finish(false);
 		
 		add(buttonPanel, BorderLayout.PAGE_END);
 		pack();
-- 
cgit v1.2.3-55-g7522