[client] icon revamp

19 files changed, 31 insertions, 34 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImagePublishedWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImagePublishedWindow.java
index d58b5be9..0d4ea2e9 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImagePublishedWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImagePublishedWindow.java
@@ -16,9 +16,6 @@ import javax.swing.SwingUtilities;
 import org.apache.log4j.Logger;
 import org.apache.thrift.TException;
 import org.openslx.bwlp.thrift.iface.ImageSummaryRead;
-import org.openslx.bwlp.thrift.iface.TAuthorizationException;
-import org.openslx.bwlp.thrift.iface.TInvocationException;
-import org.openslx.bwlp.thrift.iface.TNotFoundException;
 import org.openslx.dozmod.gui.Gui;
 import org.openslx.dozmod.gui.MainWindow;
 import org.openslx.dozmod.gui.helper.UiFeedback;
@@ -101,9 +98,13 @@ public class ImagePublishedWindow extends ImagePublishedWindowLayout implements
 					if (item == null || item.getImageBaseId() == null)
 						return;
 					ImageDetailsWindow.open(
-							JOptionPane.getFrameForComponent(ImagePublishedWindow.this),
-							item.getImageBaseId(), null,
-							new ImagePublishedDetailsActions(JOptionPane.getFrameForComponent(ImagePublishedWindow.this)));
+							JOptionPane
+									.getFrameForComponent(ImagePublishedWindow.this),
+							item.getImageBaseId(),
+							null,
+							new ImagePublishedDetailsActions(
+									JOptionPane
+											.getFrameForComponent(ImagePublishedWindow.this)));
 				}
 				processClick(e);
 			}
@@ -122,14 +123,6 @@ public class ImagePublishedWindow extends ImagePublishedWindowLayout implements
 				// TODO popup menu?
 			}
 		});
-		LOGGER.debug(Session.getSatelliteAddress());
-		try {
-			
-			ThriftManager.getMasterClient().downloadImage("asd", "123");
-		} catch (TException e1) {
-			ThriftError.showMessage(this, LOGGER, e1, "fail");
-		}
-
 
 		// init data
 		refreshList(true, 0);
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 5f521394..03dc3566 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
@@ -209,7 +209,7 @@ public abstract class ImageDetailsWindowLayout extends JDialog {
 		btnClose = new JButton("Schließen");
 		btnUpdateImage = new JButton("Neue VM-Version hochladen", Gui.getScaledIconResource("/img/upload-icon.png", "New VM", ICON_SIZE_Y, buttonPanel));
 		buttonPanel.add(btnUpdateImage);
-		btnUploadToMaster = new JButton("Landesweit veröffentlichen", Gui.getScaledIconResource("/img/publish.png",	"Publish VM", ICON_SIZE_Y, buttonPanel));
+		btnUploadToMaster = new JButton("Landesweit veröffentlichen", Gui.getScaledIconResource("/img/publish-icon.png", "Publish VM", ICON_SIZE_Y, buttonPanel));
 		buttonPanel.add(btnUploadToMaster);
 		buttonPanel.add(Box.createGlue());
 		// user feedback slot
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 c4e76566..5c8f9f10 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
@@ -28,11 +28,11 @@ public abstract class ImageListWindowLayout extends CompositePage {
 	protected final static String infoTitleString = "Übersicht Virtuelle Maschinen";
 	protected final static String newButtonLabel = "Neue VM";
 	protected final static String newLectureButtonLabel = "Neue Veranstaltung";
-	protected final static String editButtonLabel = "Detailansicht / Bearbeiten";
+	protected final static String editButtonLabel = "Bearbeiten";
 	protected final static String downloadButtonLabel = "Download";
 	protected final static String deleteButtonLabel = "Löschen";
 	protected final static String switchViewButtonLabel = "Veranstaltungen zeigen";
-	protected final static String showPublishedImagesLabel = "Öffentliche VMs anzeigen"; 
+	protected final static String showPublishedImagesLabel = "Öffentliche VMs"; 
 
 	// --------------------------------------
 	// search field, table and buttons
@@ -65,17 +65,18 @@ public abstract class ImageListWindowLayout extends CompositePage {
 		JPanel buttonPanel = new JPanel();
 		buttonPanel.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0));
 		buttonPanel.setLayout(new BoxLayout(buttonPanel, BoxLayout.LINE_AXIS));
-		btnNewVm = new JButton(newButtonLabel, Gui.getScaledIconResource("/img/new-icon.png", "New VM",
+		btnNewVm = new JButton(newButtonLabel, Gui.getScaledIconResource("/img/new-vm-icon.png", "New VM",
 				ICON_SIZE_Y, buttonPanel));
 		btnEditDetails = new JButton(editButtonLabel, Gui.getScaledIconResource("/img/edit-icon.png",
 				"Edit VM", ICON_SIZE_Y, buttonPanel));
-		btnDelete = new JButton(deleteButtonLabel, Gui.getScaledIconResource("/img/red-cross.png",
+		btnDelete = new JButton(deleteButtonLabel, Gui.getScaledIconResource("/img/delete-icon.png",
 				"Delete VM", ICON_SIZE_Y, buttonPanel));
 		btnDownload = new JButton(downloadButtonLabel, Gui.getScaledIconResource("/img/download-icon.png",
 				"New VM", ICON_SIZE_Y, buttonPanel));
 		btnNewLecture = new JButton(newLectureButtonLabel, Gui.getScaledIconResource("/img/new-lecture-icon.png",
 				"New Lecture", ICON_SIZE_Y, buttonPanel));
-		btnShowPublishedImages = new JButton(showPublishedImagesLabel, null);
+		btnShowPublishedImages = new JButton(showPublishedImagesLabel, Gui.getScaledIconResource("/img/published-vm-icon.png",
+				"Published Lectures", ICON_SIZE_Y, buttonPanel));
 		btnSwitchView = new JButton(switchViewButtonLabel, Gui.getScaledIconResource("/img/switch-icon.png",
 				"Switch", ICON_SIZE_Y, buttonPanel));
 		buttonPanel.add(btnNewVm);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImagePublishedWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImagePublishedWindowLayout.java
index 26f53220..256d763f 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImagePublishedWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImagePublishedWindowLayout.java
@@ -22,12 +22,13 @@ public class ImagePublishedWindowLayout extends JDialog {
 
 	protected final ImagePublishedTable imagePublishedTable;
 
+	private static final int ICON_SIZE_Y = 24;
 	protected final JButton btnDownload;
 	protected final JButton btnSatDownload;
 	protected final JButton btnClose;
 	protected final JTextField txtSearch;
 
-	private static String title = "Öffentliche Images";
+	private static String title = "Öffentliche VMs";
 
 	protected ImagePublishedWindowLayout(Window modalParent) {
 		super(modalParent, title, modalParent != null ? ModalityType.APPLICATION_MODAL
@@ -55,16 +56,18 @@ public class ImagePublishedWindowLayout extends JDialog {
 		// --------------- end user table ------------------------------------
 
 		// --------------- button panel --------------------------------------
-		JPanel buttonPane = new JPanel();
-		buttonPane.setLayout(new BoxLayout(buttonPane, BoxLayout.LINE_AXIS));
-		buttonPane.setBorder(BorderFactory.createEmptyBorder(0, 10, 10, 10));
-		btnDownload = new JButton("Herunterladen");
-		buttonPane.add(btnDownload);
-		btnSatDownload = new JButton("Auf Satellit herunterladen");
-		buttonPane.add(btnSatDownload);
-		buttonPane.add(Box.createHorizontalGlue());
+		JPanel buttonPanel = new JPanel();
+		buttonPanel.setLayout(new BoxLayout(buttonPanel, BoxLayout.LINE_AXIS));
+		buttonPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 10, 10));
+		btnDownload = new JButton("Herunterladen", Gui.getScaledIconResource("/img/download-icon.png",
+				"Herunterladen", ICON_SIZE_Y, buttonPanel));
+		buttonPanel.add(btnDownload);
+		btnSatDownload = new JButton("Auf Satellit herunterladen", Gui.getScaledIconResource("/img/download-to-sat-icon.png",
+				"Auf Satellit herunterladen", ICON_SIZE_Y, buttonPanel));
+		buttonPanel.add(btnSatDownload);
+		buttonPanel.add(Box.createHorizontalGlue());
 		btnClose = new JButton("Schließen");
-		buttonPane.add(btnClose);
+		buttonPanel.add(btnClose);
 		// --------------- end button panel ----------------------------------
 
 		// pack it all
@@ -72,7 +75,7 @@ public class ImagePublishedWindowLayout extends JDialog {
 //		grid.nextRow(); // TODO working search box
 		grid.add(listPane).fill(true, true).expand(true, true);
 		grid.nextRow();
-		grid.add(buttonPane).fill(true, false).expand(true, false);
+		grid.add(buttonPanel).fill(true, false).expand(true, false);
 		grid.nextRow();
 		grid.finish(false);
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureListWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureListWindowLayout.java
index bf602c9d..8caa6b83 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureListWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LectureListWindowLayout.java
@@ -31,7 +31,7 @@ public abstract class LectureListWindowLayout extends CompositePage {
 
 	private static final String infoTitleString = "Übersicht Veranstaltungen";
 	private static final String newButtonLabel = "Neue Veranstaltung";
-	private static final String editButtonLabel = "Detailansicht / Bearbeiten";
+	private static final String editButtonLabel = "Bearbeiten";
 	private static final String deleteButtonLabel = "Löschen";
 	private static final String switchViewButtonLabel = "VMs zeigen";
 	private static final String filterPanelLabel = "Suchen";
@@ -107,7 +107,7 @@ public abstract class LectureListWindowLayout extends CompositePage {
 
 		btnNewLecture = new JButton(newButtonLabel, Gui.getScaledIconResource("/img/new-lecture-icon.png", "New Lecture", ICON_SIZE_Y, buttonPanel));
 		btnEditLecture = new JButton(editButtonLabel, Gui.getScaledIconResource("/img/edit-icon.png", "Edit Lecture", ICON_SIZE_Y, buttonPanel));
-		btnDeleteLecture = new JButton(deleteButtonLabel, Gui.getScaledIconResource("/img/red-cross.png", "Delete Lecture", ICON_SIZE_Y, buttonPanel));
+		btnDeleteLecture = new JButton(deleteButtonLabel, Gui.getScaledIconResource("/img/delete-icon.png", "Delete Lecture", ICON_SIZE_Y, buttonPanel));
 		btnSwitchView = new JButton(switchViewButtonLabel, Gui.getScaledIconResource("/img/switch-icon.png", "Switch", ICON_SIZE_Y, buttonPanel));
 		buttonPanel.add(btnNewLecture);
 		buttonPanel.add(btnEditLecture);
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
index aadced38..60390999 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LoginWindowLayout.java
@@ -161,7 +161,7 @@ public abstract class LoginWindowLayout extends JDialog {
 	 */
 	private ImageIcon getScaledLogo() {
 		try {
-			ImageIcon image = ResourceLoader.getIcon("/img/Logo_bwLehrpool.png");
+			ImageIcon image = ResourceLoader.getIcon("/img/bwLehrpool-logo.png");
 			Rectangle screenSize = Gui.getMonitorFromRectangle(getBounds(), true)
 					.getDefaultConfiguration()
 					.getBounds();
diff --git a/dozentenmodul/src/main/resources/img/Logo_bwLehrpool.png b/dozentenmodul/src/main/resources/img/Logo_bwLehrpool.png
deleted file mode 100644
index f99c60e1..00000000
--- a/dozentenmodul/src/main/resources/img/Logo_bwLehrpool.png
+++ /dev/null
diff --git a/dozentenmodul/src/main/resources/img/bwLehrpool-logo.png b/dozentenmodul/src/main/resources/img/bwLehrpool-logo.png
new file mode 100644
index 00000000..cdc4617e
--- /dev/null
+++ b/dozentenmodul/src/main/resources/img/bwLehrpool-logo.png
diff --git a/dozentenmodul/src/main/resources/img/delete-icon.png b/dozentenmodul/src/main/resources/img/delete-icon.png
new file mode 100644
index 00000000..db682961
--- /dev/null
+++ b/dozentenmodul/src/main/resources/img/delete-icon.png
diff --git a/dozentenmodul/src/main/resources/img/download-to-sat-icon.png b/dozentenmodul/src/main/resources/img/download-to-sat-icon.png
new file mode 100644
index 00000000..86f732bb
--- /dev/null
+++ b/dozentenmodul/src/main/resources/img/download-to-sat-icon.png
diff --git a/dozentenmodul/src/main/resources/img/edit-icon.png b/dozentenmodul/src/main/resources/img/edit-icon.png
index 737b6385..ebc17bd7 100644
--- a/dozentenmodul/src/main/resources/img/edit-icon.png
+++ b/dozentenmodul/src/main/resources/img/edit-icon.png
diff --git a/dozentenmodul/src/main/resources/img/lecture-icon.png b/dozentenmodul/src/main/resources/img/lecture-icon.png
deleted file mode 100644
index 8bb942ae..00000000
--- a/dozentenmodul/src/main/resources/img/lecture-icon.png
+++ /dev/null
diff --git a/dozentenmodul/src/main/resources/img/new-icon.png b/dozentenmodul/src/main/resources/img/new-icon.png
deleted file mode 100644
index 0e76b5a9..00000000
--- a/dozentenmodul/src/main/resources/img/new-icon.png
+++ /dev/null
diff --git a/dozentenmodul/src/main/resources/img/new-lecture-icon.png b/dozentenmodul/src/main/resources/img/new-lecture-icon.png
index 99f2b10c..63661f22 100644
--- a/dozentenmodul/src/main/resources/img/new-lecture-icon.png
+++ b/dozentenmodul/src/main/resources/img/new-lecture-icon.png
diff --git a/dozentenmodul/src/main/resources/img/new-vm-icon.png b/dozentenmodul/src/main/resources/img/new-vm-icon.png
new file mode 100644
index 00000000..cdceda88
--- /dev/null
+++ b/dozentenmodul/src/main/resources/img/new-vm-icon.png
diff --git a/dozentenmodul/src/main/resources/img/publish.png b/dozentenmodul/src/main/resources/img/publish-icon.png
index 1dfa03c6..1dfa03c6 100644
--- a/dozentenmodul/src/main/resources/img/publish.png
+++ b/dozentenmodul/src/main/resources/img/publish-icon.png
diff --git a/dozentenmodul/src/main/resources/img/published-vm-icon.png b/dozentenmodul/src/main/resources/img/published-vm-icon.png
new file mode 100644
index 00000000..9c93c63b
--- /dev/null
+++ b/dozentenmodul/src/main/resources/img/published-vm-icon.png
diff --git a/dozentenmodul/src/main/resources/img/red-cross.png b/dozentenmodul/src/main/resources/img/red-cross.png
deleted file mode 100644
index dbb8e191..00000000
--- a/dozentenmodul/src/main/resources/img/red-cross.png
+++ /dev/null
diff --git a/dozentenmodul/src/main/resources/img/switch-icon.png b/dozentenmodul/src/main/resources/img/switch-icon.png
index 9a5696f9..ea0f9de7 100644
--- a/dozentenmodul/src/main/resources/img/switch-icon.png
+++ b/dozentenmodul/src/main/resources/img/switch-icon.png