[client] "download" button in popupmenu, fine tune buttons on image list

2 files changed, 13 insertions, 3 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 042824f3..10c3e8fd 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
@@ -45,6 +45,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 	private ImageDetailsRead image = null;
 
 	private JMenuItem popupItemNew = new JMenuItem("Neue Veranstaltung");
+	private JMenuItem popupItemDownload = new JMenuItem("Download");
 	private JMenuItem popupItemDelete = new JMenuItem("Löschen");
 
 	public ImageDetailsWindow(Frame modalParent) {
@@ -83,6 +84,10 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 					// TODO new lecture wizard with this image preset
 					LOGGER.debug("New lecture clicked");
 				}
+				if (e.getSource().equals(popupItemDownload)) {
+					// TODO delete that image
+					LOGGER.debug("Download image clicked");
+				}
 				if (e.getSource().equals(popupItemDelete)) {
 					// TODO delete that image
 					LOGGER.debug("Delete image clicked");
@@ -92,6 +97,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout implements UiFe
 		});
 		// add them to the popup menu
 		pop.addMenuItem(popupItemNew);
+		pop.addMenuItem(popupItemDownload);
 		pop.addSeparator();
 		pop.addMenuItem(popupItemDelete);
 		// TODO check permissions and disable them if needed
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java
index 7174d4d0..56f38c98 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageListWindowLayout.java
@@ -1,8 +1,10 @@
 package org.openslx.dozmod.gui.window.layout;
 
 import java.awt.BorderLayout;
+import java.awt.Dimension;
 import java.awt.Font;
 
+import javax.swing.Box;
 import javax.swing.BoxLayout;
 import javax.swing.JButton;
 import javax.swing.JLabel;
@@ -25,8 +27,8 @@ public abstract class ImageListWindowLayout extends CompositePage {
 	protected final static String newButtonLabel = "Neu";
 	protected final static String newLectureButtonLabel = "Neue Veranstaltung";
 	protected final static String editButtonLabel = "Bearbeiten";
-	protected final static String deleteButtonLabel = "Löschen";
 	protected final static String downloadButtonLabel = "Download";
+	protected final static String deleteButtonLabel = "Löschen";
 	protected final static String backButtonLabel = "Zurück";
 	protected final static String tableGroupLabel = "Images";
 	protected final static String filterGroupLabel = "Filter";
@@ -37,8 +39,8 @@ public abstract class ImageListWindowLayout extends CompositePage {
 	protected ImageTable imageTable;
 	protected JButton newButton;
 	protected JButton newLectureButton;
-	protected JButton deleteButton;
 	protected JButton downloadButton;
+	protected JButton deleteButton;
 	protected JButton backButton;
 
 
@@ -77,8 +79,10 @@ public abstract class ImageListWindowLayout extends CompositePage {
 		backButton = new JButton(backButtonLabel);
 		buttonPanel.add(newButton);
 		buttonPanel.add(newLectureButton);
-		buttonPanel.add(deleteButton);
 		buttonPanel.add(downloadButton);
+		buttonPanel.add(Box.createRigidArea(new Dimension(5,  0)));
+		buttonPanel.add(deleteButton);
+		buttonPanel.add(Box.createHorizontalGlue());
 		buttonPanel.add(backButton);
 		listPanel.add(buttonPanel, BorderLayout.PAGE_END);
 	}