From 9168659e90149cffcabc2153ac1e132c4a8a3957 Mon Sep 17 00:00:00 2001
From: Stephan Schwaer
Date: Mon, 24 Aug 2015 17:42:59 +0200
Subject: [client] Included new permission options into lecture details.

---
 .../control/LectureCustomPermissionManager.java    | 26 +++++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

(limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LectureCustomPermissionManager.java')

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LectureCustomPermissionManager.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LectureCustomPermissionManager.java
index 6921ea2e..e081c050 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LectureCustomPermissionManager.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/LectureCustomPermissionManager.java
@@ -1,6 +1,5 @@
 package org.openslx.dozmod.gui.control;
 
-import java.awt.BorderLayout;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
@@ -9,6 +8,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.BoxLayout;
 import javax.swing.JButton;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
@@ -19,6 +20,7 @@ import org.openslx.bwlp.thrift.iface.LecturePermissions;
 import org.openslx.bwlp.thrift.iface.UserInfo;
 import org.openslx.dozmod.gui.control.table.LecturePermissionTable;
 import org.openslx.dozmod.gui.control.table.LecturePermissionTable.UserLecturePermissions;
+import org.openslx.dozmod.gui.helper.GridManager;
 import org.openslx.dozmod.gui.window.UserListWindow;
 import org.openslx.dozmod.gui.window.UserListWindow.UserAddedCallback;
 
@@ -50,16 +52,29 @@ public class LectureCustomPermissionManager extends JPanel{
 		super();
 		me = this;
 
-		setLayout(new BorderLayout());
-		setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+		GridManager grid = new GridManager(this, 1);
+
+
 		permissionTable = new LecturePermissionTable();
-		add(new JScrollPane(permissionTable), BorderLayout.CENTER);
+
+		// Panel for the add- and remove buttons
 		JPanel userButtonPane = new JPanel();
+		userButtonPane.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
+		userButtonPane.setLayout(new BoxLayout(userButtonPane, BoxLayout.LINE_AXIS));
+
 		btnAddUser = new JButton("Benutzer hinzufügern");
 		userButtonPane.add(btnAddUser);
 		btnRemoveUser = new JButton("Benutzer entfernen");
 		userButtonPane.add(btnRemoveUser);
-		add(userButtonPane, BorderLayout.SOUTH);	
+		userButtonPane.add(Box.createGlue());	
+
+		// Put everything into the grid
+		grid.add(new JScrollPane(permissionTable)).fill(true, true).expand(true, true);
+		grid.nextRow();
+		grid.add(userButtonPane).fill(true, false).expand(true, false);
+		grid.nextRow();
+		grid.finish(false);
+
 
 		// add user button listener
 		btnAddUser.addActionListener(new ActionListener() {
@@ -123,7 +138,6 @@ public class LectureCustomPermissionManager extends JPanel{
 	 * @return Map with new custom permissions, null if something went wrong
 	 */
 	public Map<String, LecturePermissions> getMap(){
-		// save the table stuff to our upload wizard state
 		if (permissionList == null)
 			return null;
 
-- 
cgit v1.2.3-55-g7522