[client] image details: Move share/update button to overview tab

Also tweak some minor UI issues

3 files changed, 24 insertions, 19 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
index 7045673a..842e7953 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageDetailsWindow.java
@@ -184,6 +184,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 		btnUpdateImage.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
+				// FIXME: This will always discard all changes even if you cancel right away
 				new ImageUpdateWizard(me, image).setVisible(true);
 				refresh(true);
 			}
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java
index e86121d1..3e823cf5 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java
@@ -85,7 +85,7 @@ public abstract class ImageDetailsWindowLayout extends JDialog {
 		super(modalParent, "<init>", ModalityType.APPLICATION_MODAL);
 		setResizable(true);
 		setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE);
-		setPreferredSize(Gui.getScaledDimension(650, 600));
+		setPreferredSize(Gui.getScaledDimension(630, 610));
 		((JPanel) getContentPane()).setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
 
 		/* *******************************************************************************
@@ -97,7 +97,8 @@ public abstract class ImageDetailsWindowLayout extends JDialog {
 		GridManager grid = new GridManager(pnlTabOverview, 3, true, new Insets(2, 2, 2, 2));
 		// name
 		txtTitle = new JTextField();
-		txtTitle.setFont(txtTitle.getFont().deriveFont(Font.BOLD, txtTitle.getFont().getSize2D() * 2));
+		txtTitle.setFont(txtTitle.getFont().deriveFont(Font.BOLD, txtTitle.getFont().getSize2D() * 1.4f));
+		//txtTitle.setMinimumSize(Gui.getScaledDimension(0, 24));
 		grid.add(txtTitle, 3).expand(true, false).fill(true, false);
 		grid.nextRow();
 
@@ -108,8 +109,8 @@ public abstract class ImageDetailsWindowLayout extends JDialog {
 		grid.add(new QLabel("Beschreibung")).anchor = GridBagConstraints.FIRST_LINE_START;
 		JScrollPane jsp = new JScrollPane(txtDescription, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
 				JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
-		jsp.setMinimumSize(Gui.getScaledDimension(0, 120));
-		jsp.setPreferredSize(Gui.getScaledDimension(0, 120));
+		jsp.setMinimumSize(Gui.getScaledDimension(0, 110));
+		jsp.setPreferredSize(Gui.getScaledDimension(0, 110));
 		grid.add(jsp, 2).expand(true, true).fill(true, true);
 		grid.nextRow();
 
@@ -201,12 +202,22 @@ public abstract class ImageDetailsWindowLayout extends JDialog {
 		btnShowLinkingLectures = new JButton("Anzeigen");
 		grid.add(btnShowLinkingLectures).fill(true, false);
 		grid.nextRow();
-		grid.add(Box.createVerticalStrut(10), 3);
+		grid.add(Box.createVerticalGlue(), 3).expand(true, true).fill(true, true);
 		grid.nextRow();
-		grid.finish(true);
 
-		pnlTabOverview.setPreferredSize(Gui.getScaledDimension(500, 400));
-		pnlTabOverview.setMinimumSize(Gui.getScaledDimension(350, 300));
+		JPanel buttonBar = new JPanel();
+		BoxLayout buttons = new BoxLayout(buttonBar, BoxLayout.LINE_AXIS);
+		buttonBar.setLayout(buttons);
+		btnUpdateImage = new JButton("Neue VM-Version hochladen",
+				Gui.getScaledIconResource("/img/upload-icon.png", "New VM", ICON_SIZE_Y, buttonBar));
+		buttonBar.add(btnUpdateImage);
+		btnUploadToMaster = new JButton("Landesweit veröffentlichen",
+				Gui.getScaledIconResource("/img/publish-icon.png", "Publish VM", ICON_SIZE_Y, buttonBar));
+		buttonBar.add(btnUploadToMaster);
+		grid.add(buttonBar, 3).fill(true, false).expand(true, false);
+		grid.nextRow();
+		
+		grid.finish(false);
 
 		/* *******************************************************************************
 		 *
@@ -263,17 +274,10 @@ public abstract class ImageDetailsWindowLayout extends JDialog {
 		 *
 		 ********************************************************************************/
 		JPanel pnlButtons = new JPanel();
-		pnlButtons.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
+		pnlButtons.setBorder(BorderFactory.createEmptyBorder(1, 1, 1, 1));
 		pnlButtons.setLayout(new BoxLayout(pnlButtons, BoxLayout.LINE_AXIS));
 		btnSaveChanges = new JButton("Speichern");
 		btnClose = new JButton("Schließen");
-		btnUpdateImage = new JButton("Neue VM-Version hochladen",
-				Gui.getScaledIconResource("/img/upload-icon.png", "New VM", ICON_SIZE_Y, pnlButtons));
-		pnlButtons.add(btnUpdateImage);
-		btnUploadToMaster = new JButton("Landesweit veröffentlichen",
-				Gui.getScaledIconResource("/img/publish-icon.png", "Publish VM", ICON_SIZE_Y, pnlButtons));
-		pnlButtons.add(btnUploadToMaster);
-		pnlButtons.add(Box.createGlue());
 		// user feedback slot
 		lblError = new QLabel("");
 		lblError.setForeground(Color.RED);
@@ -291,7 +295,7 @@ public abstract class ImageDetailsWindowLayout extends JDialog {
 		pnlTabs.addTab("Übersicht", pnlTabOverview);
 		pnlTabs.addTab("VM-Versions", pnlTabVersions);
 		pnlTabs.addTab("Berechtigungen", pnlTabPermissions);
-
+		
 		add(pnlTabs, BorderLayout.CENTER);
 		add(pnlButtons, BorderLayout.PAGE_END);
 	}
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java
index 091c1133..0f2d040c 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureDetailsWindowLayout.java
@@ -418,12 +418,12 @@ public abstract class LectureDetailsWindowLayout extends JDialog {
 		add(pnlTabs, BorderLayout.CENTER);
 		// usage counter + button panel on the bottom
 		JPanel buttonPanel = new JPanel();
-		buttonPanel.setLayout(new BoxLayout(buttonPanel, BoxLayout.X_AXIS));
+		buttonPanel.setLayout(new BoxLayout(buttonPanel, BoxLayout.LINE_AXIS));
+		buttonPanel.setBorder(BorderFactory.createEmptyBorder(1, 1, 1, 1));
 		btnClose = new JButton("Schließen");
 		btnSaveChanges = new JButton("Speichern");
 		lblError = new QLabel("");
 		lblError.setForeground(Color.RED);
-		buttonPanel.add(Box.createGlue());
 		buttonPanel.add(lblError);
 		buttonPanel.add(Box.createGlue());
 		buttonPanel.add(btnClose);