[client] Changed keylisteners in loginWindow to keyBindings. Added some Keybindings to lecture- and image tables.

1 files changed, 26 insertions, 6 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java
index 9488a5ef..86f6468b 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/ImageListWindow.java
@@ -7,9 +7,12 @@ import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 
+import javax.swing.AbstractAction;
+import javax.swing.JComponent;
 import javax.swing.JFrame;
 import javax.swing.JMenuItem;
 import javax.swing.JOptionPane;
+import javax.swing.KeyStroke;
 import javax.swing.SwingUtilities;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
@@ -30,7 +33,6 @@ import org.openslx.dozmod.thrift.ThriftActions;
 import org.openslx.dozmod.thrift.ThriftActions.DeleteCallback;
 import org.openslx.dozmod.thrift.ThriftActions.DownloadCallback;
 
-
 /**
  * Window with the list of available images.
  * Has filters for the images and buttons to create, edit and delete buttons.
@@ -54,7 +56,7 @@ public class ImageListWindow extends ImageListWindowLayout implements DownloadCa
 	 * Popup menu items
 	 */
 	private final JMenuItem popupItemNewLecture = new JMenuItem("Neue Veranstaltung");
-	private final JMenuItem popupItemEdit = new JMenuItem("Bearbeiten");
+	private final JMenuItem popupItemEdit = new JMenuItem("Detailansicht");
 	private final JMenuItem popupItemDelete = new JMenuItem("Löschen");
 	private final JMenuItem popupItemDownload = new JMenuItem("Download");
 
@@ -185,6 +187,24 @@ public class ImageListWindow extends ImageListWindowLayout implements DownloadCa
 			}
 		});
 
+		// Some keyboard shortcuts
+		imageTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
+				KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "details");
+		imageTable.getActionMap().put("details", new AbstractAction() {
+			@Override
+			public void actionPerformed(ActionEvent ae) {
+				editButton.doClick();
+			}
+		});
+		imageTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
+				KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), "delete");
+		imageTable.getActionMap().put("delete", new AbstractAction() {
+			@Override
+			public void actionPerformed(ActionEvent ae) {
+				deleteButton.doClick();
+			}
+		});
+
 		updateAvailableOptions(null);
 	}
 
@@ -256,10 +276,10 @@ public class ImageListWindow extends ImageListWindowLayout implements DownloadCa
 			return;
 		ImageDetailsWindow.open((JFrame) SwingUtilities.getWindowAncestor(me), image.getImageBaseId(),
 				new ImageUpdatedCallback() {
-			public void updated() {
-				imageListViewer.refreshList(true, 100);
-			}
-		});
+					public void updated() {
+						imageListViewer.refreshList(true, 100);
+					}
+				});
 	}
 
 	/**