From 3ad6faecb131f9cbb8f33b64599b6335b504242e Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Fri, 7 Aug 2015 18:12:32 +0200 Subject: [client] More work in ImageDetailsWindow --- .../org/openslx/dozmod/gui/window/ImageDetailsWindow.java | 13 +------------ .../dozmod/gui/window/layout/ImageDetailsWindowLayout.java | 3 +-- 2 files changed, 2 insertions(+), 14 deletions(-) (limited to 'dozentenmodul/src/main/java') 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 5c36b23a..30e86f37 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 @@ -3,8 +3,6 @@ package org.openslx.dozmod.gui.window; import java.awt.Frame; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.KeyAdapter; -import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.Collections; @@ -46,15 +44,6 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout { super(modalParent); setFocusable(true); - // ESC closes this window - addKeyListener(new KeyAdapter() { - @Override - public void keyPressed(KeyEvent e) { - if (e.getKeyCode() == KeyEvent.VK_ESCAPE) { - dispose(); - } - } - }); // Close button closes window btnClose.addActionListener(new ActionListener() { @Override @@ -177,6 +166,7 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout { lblCreateTime.setText(FormatHelper.longDate(image.getCreateTime())); lblUpdateTime.setText(FormatHelper.longDate(image.getUpdateTime())); txtVersion.setText(image.getLatestVersionId()); + setTitle(image.getImageName()); List osList = MetaDataCache.getOperatingSystems(); // all fine, lets sort it @@ -209,7 +199,6 @@ public class ImageDetailsWindow extends ImageDetailsWindowLayout { pack(); MainWindow.centerShell(this); setVisible(true); - // refreshList(); } /** 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 20d99fe9..23a9e27c 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 @@ -58,8 +58,7 @@ public abstract class ImageDetailsWindowLayout extends JDialog { // TODO: Permissions, ... public ImageDetailsWindowLayout(Frame modalParent) { - super(modalParent, "Platzhalter wärend das Fenster sich noch nicht gefüllt hat", - ModalityType.APPLICATION_MODAL); + super(modalParent, "", ModalityType.APPLICATION_MODAL); setResizable(true); setDefaultCloseOperation(JFrame.HIDE_ON_CLOSE); setLayout(new BorderLayout()); -- cgit v1.2.3-55-g7522