[client] improve NetshareConfigurator layout

1 files changed, 12 insertions, 22 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetshareConfigurator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetshareConfigurator.java
index 18efe906..fcac8dfc 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetshareConfigurator.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/configurator/NetshareConfigurator.java
@@ -1,7 +1,7 @@
 package org.openslx.dozmod.gui.configurator;
 
-import java.awt.BorderLayout;
 import java.awt.Color;
+import java.awt.GridBagConstraints;
 import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -30,8 +30,8 @@ import org.openslx.bwlp.thrift.iface.NetShareAuth;
 import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.changemonitor.DialogChangeMonitor;
 import org.openslx.dozmod.gui.control.ComboBox;
-import org.openslx.dozmod.gui.control.QLabel;
 import org.openslx.dozmod.gui.control.ComboBox.ComboBoxRenderer;
+import org.openslx.dozmod.gui.control.QLabel;
 import org.openslx.dozmod.gui.control.table.NetshareTable;
 import org.openslx.dozmod.gui.control.table.QScrollPane;
 import org.openslx.dozmod.gui.helper.GridManager;
@@ -321,21 +321,20 @@ class NetshareConfiguratorLayout extends JPanel {
 	});
 
 	public NetshareConfiguratorLayout() {
-		GridManager grid = new GridManager(this, 1, true, new Insets(3, 3, 3, 3));
+		GridManager grid = new GridManager(this, 3, true, new Insets(3, 3, 3, 3));
 		// top info panel
-		grid.add(new JLabel(txtNetshareDesc)).fill(true, false).expand(true, false);
+		grid.add(new JLabel(txtNetshareDesc), 3).fill(true, false).expand(true, false);
 		grid.nextRow();
 		// middle netshare list
-		grid.add(new QScrollPane(tblNetshare)).fill(true, true).expand(true, true);
+		grid.add(new QScrollPane(tblNetshare), 3).fill(true, true).expand(true, true);
 		grid.nextRow();
 
 		JPanel pnlNewShare = new JPanel();
-		GridManager gridNewShare = new GridManager(pnlNewShare, 6, true);
+		GridManager gridNewShare = new GridManager(pnlNewShare, 6, true, new Insets(0, 3, 0, 3));
 		pnlNewShare.setBorder(BorderFactory.createTitledBorder("Details"));
 
 		JPanel pnlSharePath = new JPanel();
 		pnlSharePath.setLayout(new BoxLayout(pnlSharePath, BoxLayout.LINE_AXIS));
-
 		lblSharePath = new QLabel("Pfad");
 		gridNewShare.add(lblSharePath);
 
@@ -355,7 +354,6 @@ class NetshareConfiguratorLayout extends JPanel {
 		// extra panel for fancy layout purposes...
 		JPanel pnlShareName = new JPanel();
 		pnlShareName.setLayout(new BoxLayout(pnlShareName, BoxLayout.LINE_AXIS));
-		pnlShareName.add(lblShareName);
 		pnlShareName.add(tfShareName);
 		pnlShareName.add(Box.createHorizontalStrut(3));
 		pnlShareName.add(lblMountPoint);
@@ -378,26 +376,18 @@ class NetshareConfiguratorLayout extends JPanel {
 		gridNewShare.add(tfPassword, 2).fill(true, false).expand(true, false);
 		gridNewShare.nextRow();
 		chkShowPass = new JCheckBox("Passwort anzeigen");
-		JPanel pnlShowPass = new JPanel();
-		pnlShowPass.setLayout(new BoxLayout(pnlShowPass, BoxLayout.LINE_AXIS));
-		pnlShowPass.add(Box.createGlue());
-		pnlShowPass.add(chkShowPass, BorderLayout.LINE_END);
-		gridNewShare.add(pnlShowPass, 6).fill(true, false).expand(true, false);
+		gridNewShare.add(Box.createGlue(), 5);
+		gridNewShare.add(chkShowPass).anchor(GridBagConstraints.EAST);
 		gridNewShare.nextRow();
-		grid.add(pnlNewShare).fill(true, false).expand(true, false);
+		grid.add(pnlNewShare, 3).fill(true, false).expand(true, false);
 		grid.nextRow();
-		// bottom panel for right-aligned button...
-		JPanel pnlButtonAdd = new JPanel();
-		pnlButtonAdd.setLayout(new BoxLayout(pnlButtonAdd, BoxLayout.LINE_AXIS));
 		btnAdd = new JButton("Hinzufügen");
 		btnDel = new JButton("Entfernen");
 		lblError = new QLabel("");
 		lblError.setForeground(Color.RED);
-		pnlButtonAdd.add(lblError);
-		pnlButtonAdd.add(Box.createGlue());
-		pnlButtonAdd.add(btnAdd, BorderLayout.LINE_END);
-		pnlButtonAdd.add(btnDel, BorderLayout.LINE_END);
-		grid.add(pnlButtonAdd).fill(true, false).expand(true, false);
+		grid.add(lblError).fill(true, false).expand(true, false);
+		grid.add(btnAdd).anchor(GridBagConstraints.EAST);
+		grid.add(btnDel).anchor(GridBagConstraints.EAST);
 		grid.finish(false);
 	}
 }