diff options
| author | Simon Rettberg | 2015-09-10 18:51:33 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2015-09-10 18:51:33 +0200 |
| commit | 1aa0a8a5dfe0f483b05a8c17d00c0abb2df01241 (patch) | |
| tree | 2d2fbadd4e75847153f42fe59f1de55752971234 | |
| parent | [server] Schema changes, distinct delete flag for images (diff) | |
| parent | [client] ImageDetails: move error message to the bottom button panel (diff) | |
| download | tutor-module-1aa0a8a5dfe0f483b05a8c17d00c0abb2df01241.tar.gz tutor-module-1aa0a8a5dfe0f483b05a8c17d00c0abb2df01241.tar.xz tutor-module-1aa0a8a5dfe0f483b05a8c17d00c0abb2df01241.zip | |
Merge branch 'v1.1' of git.openslx.org:openslx-ng/tutor-module into v1.1
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/ImageDetailsWindowLayout.java | 10 |
1 files changed, 5 insertions, 5 deletions
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 b81474f2..a74d3bdb 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 @@ -180,11 +180,6 @@ public abstract class ImageDetailsWindowLayout extends JDialog { grid.nextRow(); grid.add(Box.createVerticalStrut(10), 3); grid.nextRow(); - // user feedback slot - lblError = new QLabel(""); - lblError.setForeground(Color.RED); - grid.skip(); - grid.add(lblError, 2); grid.finish(true); infoPanel.setPreferredSize(Gui.getScaledDimension(500, 400)); @@ -200,6 +195,11 @@ public abstract class ImageDetailsWindowLayout extends JDialog { btnUpdateImage = new JButton("Neue Imageversion hochladen"); buttonPanel.add(btnUpdateImage); buttonPanel.add(Box.createGlue()); + // user feedback slot + lblError = new QLabel(""); + lblError.setForeground(Color.RED); + buttonPanel.add(lblError); + buttonPanel.add(Box.createGlue()); buttonPanel.add(btnClose); buttonPanel.add(btnSaveChanges); |