[client] Moved default permissions from ImageDetails to ImageCustomPermissions and fixed some Layout.

1 files changed, 23 insertions, 10 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageCustomPermissionManager.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageCustomPermissionManager.java
index 0c6d1837..39524fcc 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageCustomPermissionManager.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/control/ImageCustomPermissionManager.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.ImagePermissions;
 import org.openslx.bwlp.thrift.iface.UserInfo;
 import org.openslx.dozmod.gui.control.table.ImagePermissionTable;
 import org.openslx.dozmod.gui.control.table.ImagePermissionTable.UserImagePermissions;
+import org.openslx.dozmod.gui.helper.GridManager;
 import org.openslx.dozmod.gui.window.UserListWindow;
 import org.openslx.dozmod.gui.window.UserListWindow.UserAddedCallback;
 
@@ -28,11 +30,11 @@ import org.openslx.dozmod.gui.window.UserListWindow.UserAddedCallback;
  */
 public class ImageCustomPermissionManager extends JPanel {
 
-protected ImagePermissionTable permissionTable;	
-	
+	protected ImagePermissionTable permissionTable;	
+
 	protected JButton btnAddUser;
 	protected JButton btnRemoveUser;
-	
+
 	private ImageCustomPermissionManager me;
 
 	private ArrayList<UserImagePermissions> permissionList = new ArrayList<UserImagePermissions>();
@@ -46,17 +48,28 @@ protected ImagePermissionTable permissionTable;
 	public ImageCustomPermissionManager(){
 		super();
 		me = this;
-		setLayout(new BorderLayout());
-		setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+		GridManager grid = new GridManager(this, 1);
+
 		permissionTable = new ImagePermissionTable();
-		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() {
 			@Override
@@ -82,7 +95,7 @@ protected ImagePermissionTable permissionTable;
 				}, "Hinzufügen");
 			}
 		});
-		
+
 		// delete user button listener
 		btnRemoveUser.addActionListener(new ActionListener() {