[client] Overhaul LoginWindowLayout; add "open log dir" button to LoginWindow

1 files changed, 27 insertions, 11 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
index 30c5c6a9..6705ac20 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
@@ -1,7 +1,6 @@
 package org.openslx.dozmod.gui.window.layout;
 
 import java.awt.Frame;
-import java.awt.GridBagConstraints;
 import java.awt.Rectangle;
 
 import javax.swing.Box;
@@ -51,10 +50,10 @@ public abstract class LoginWindowLayout extends JDialog {
 	private static final String TITLE = "bwLehrpool-Suite - Login";
 	private static final String AUTH_TYPE_LABEL = "Authentifizierungsart";
 	private static final String LOGIN_FORM_LABEL = "Zugangsdaten";
+	private static final String ADVANCED_LABEL = "Erweitert";
 
 	// login type panel
 	protected final JRadioButton[] rdoLoginType = new JRadioButton[3];
-	protected final JButton btnSettings;
 
 	// login form panel
 	protected final JComboBox<Organization> cboOrganization;
@@ -65,6 +64,11 @@ public abstract class LoginWindowLayout extends JDialog {
 	protected final JButton btnLogin;
 	protected final JPanel pnlLoginType;
 	protected final JPanel pnlLoginForm;
+	protected final JPanel pnlAdvanced;
+	
+	// advanced panel
+	protected final JButton btnSettings;
+	protected final JButton btnLogDir;
 
 	/**
 	 * Create a new login composite
@@ -85,6 +89,7 @@ public abstract class LoginWindowLayout extends JDialog {
 		rdoLoginType[1] = new JRadioButton("Test-Zugang mit festem Benutzer");
 		rdoLoginType[2] = new JRadioButton("Direkter Zugang zum Satelliten");
 		btnSettings = new JButton("Einstellungen");
+		btnLogDir = new JButton("Logverzeichnis");
 
 		cboOrganization = new ComboBox<>(new ComboBoxRenderer<Organization>() {
 			@Override
@@ -108,8 +113,11 @@ public abstract class LoginWindowLayout extends JDialog {
 		pnlLoginType = makeLoginTypePanel();
 		grid.add(pnlLoginType).expand(0.25, 1).fill(true, true);
 		pnlLoginForm = makeLoginFormPanel();
-		grid.add(pnlLoginForm).expand(0.75, 1).fill(true, true);
+		grid.add(pnlLoginForm,1,2).expand(0.75, 1).fill(true, true);
 		grid.nextRow();
+		
+		pnlAdvanced = makeAdvancedPanel();
+		grid.add(pnlAdvanced).expand(true, true).fill(true, true);
 
 		grid.finish(false);
 
@@ -120,25 +128,26 @@ public abstract class LoginWindowLayout extends JDialog {
 		// login form panel
 		JPanel loginFormPanel = new JPanel();
 		loginFormPanel.setBorder(new TitledBorder(LOGIN_FORM_LABEL));
-		GridManager grid = new GridManager(loginFormPanel, 3);
+		GridManager grid = new GridManager(loginFormPanel, 4);
 
 		grid.add(new QLabel("Identity Provider"));
-		grid.add(cboOrganization, 2).expand(true, false).fill(true, false);
+		grid.add(cboOrganization, 3).expand(true, false).fill(true, false);
 		grid.nextRow();
 
 		// label + field for username
 		grid.add(new QLabel("Benutzername"));
-		grid.add(txtUsername, 2).expand(true, false).fill(true, false);
+		grid.add(txtUsername, 3).expand(true, false).fill(true, false);
 		grid.nextRow();
 
 		// label + field for password
 		grid.add(new QLabel("Passwort"));
-		grid.add(txtPassword, 2).expand(true, false).fill(true, false);
+		grid.add(txtPassword, 3).expand(true, false).fill(true, false);
 		grid.nextRow();
 
+		grid.add(Box.createGlue());
+		grid.add(chkSaveUsername).expand(true, false);
+		grid.add(btnOpenRegistration);
 		grid.add(btnLogin);
-		grid.add(chkSaveUsername);
-		grid.add(btnOpenRegistration).anchor(GridBagConstraints.EAST);
 		grid.nextRow();
 		grid.finish(true);
 		return loginFormPanel;
@@ -153,11 +162,18 @@ public abstract class LoginWindowLayout extends JDialog {
 			loginTypeButtonGroup.add(rdoLoginType[i]);
 			loginTypePanel.add(rdoLoginType[i]);
 		}
-		loginTypePanel.add(Box.createVerticalGlue());
-		loginTypePanel.add(btnSettings);
 
 		return loginTypePanel;
 	}
+	
+	private JPanel makeAdvancedPanel() {
+		JPanel p = new JPanel();
+		p.setLayout(new BoxLayout(p, BoxLayout.LINE_AXIS));
+		p.setBorder(new TitledBorder(ADVANCED_LABEL));
+		p.add(btnSettings);
+		p.add(btnLogDir);
+		return p;
+	}
 
 	/**
 	 * @return ImageIcon of the standard bwLehrpool logo scaled to the login