diff options
author | Simon Rettberg | 2015-10-05 14:44:55 +0200 |
---|---|---|
committer | Simon Rettberg | 2015-10-05 14:44:55 +0200 |
commit | e322e543950dd2a2c0c0d1e5d05601dfea40c260 (patch) | |
tree | 561f11c301064da0a32b8caee546c27be77fd166 | |
parent | [client] Slower hashing when upload not running yet (diff) | |
download | tutor-module-e322e543950dd2a2c0c0d1e5d05601dfea40c260.tar.gz tutor-module-e322e543950dd2a2c0c0d1e5d05601dfea40c260.tar.xz tutor-module-e322e543950dd2a2c0c0d1e5d05601dfea40c260.zip |
[client] Add raised border to activity panels
3 files changed, 7 insertions, 3 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/ActivityPanel.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/ActivityPanel.java index 768ee82d..62073b85 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/ActivityPanel.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/ActivityPanel.java @@ -1,6 +1,8 @@ package org.openslx.dozmod.gui.activity; +import javax.swing.BorderFactory; import javax.swing.JPanel; +import javax.swing.border.CompoundBorder; import org.openslx.dozmod.gui.MainWindow; @@ -16,6 +18,11 @@ public abstract class ActivityPanel extends JPanel { */ public abstract boolean wantConfirmQuit(); + public ActivityPanel() { + setBorder(new CompoundBorder(BorderFactory.createRaisedSoftBevelBorder(), + BorderFactory.createEmptyBorder(3, 3, 3, 3))); + } + protected final void close() { MainWindow.removeActivity(this); } diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/TransferPanel.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/TransferPanel.java index 85542683..705a2b73 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/TransferPanel.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/TransferPanel.java @@ -52,7 +52,6 @@ public abstract class TransferPanel extends ActivityPanel implements TransferEve public TransferPanel(TransferTask transfer, String displayName, String fileName) { setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS)); - setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); // Header: [status] VM-Name ---- fileName [Button] header = new JPanel(); header.setLayout(new BoxLayout(header, BoxLayout.LINE_AXIS)); @@ -164,7 +163,6 @@ public abstract class TransferPanel extends ActivityPanel implements TransferEve btnClose.setText("Schließen"); footer.setVisible(false); progressWrapper.setVisible(false); - add(new JSeparator()); } } diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/UpdatePanel.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/UpdatePanel.java index 212813f0..8f89bca3 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/UpdatePanel.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/UpdatePanel.java @@ -29,7 +29,6 @@ public class UpdatePanel extends ActivityPanel implements ActionListener { super(); setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS)); - setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); // Header: Neue Version verfügbar: <newVersion> [Button] header = new JPanel(); header.setLayout(new BoxLayout(header, BoxLayout.LINE_AXIS)); |