diff options
author | Simon Rettberg | 2015-10-02 17:31:03 +0200 |
---|---|---|
committer | Simon Rettberg | 2015-10-02 17:31:03 +0200 |
commit | 67be07520cd82ec4fd88be2a2a9ac29697069468 (patch) | |
tree | 80f4b90888c3406f71d39f444ac0c936982942f7 /dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity | |
parent | [server] Dynamic calculation of "max free space bytes" safety size (diff) | |
download | tutor-module-67be07520cd82ec4fd88be2a2a9ac29697069468.tar.gz tutor-module-67be07520cd82ec4fd88be2a2a9ac29697069468.tar.xz tutor-module-67be07520cd82ec4fd88be2a2a9ac29697069468.zip |
[client] Shrink transfer panel when completed successfully
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity')
-rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity/TransferPanel.java | 29 |
1 files changed, 21 insertions, 8 deletions
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 8dbd4ae0..85542683 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 @@ -9,6 +9,7 @@ import javax.swing.Box; import javax.swing.BoxLayout; import javax.swing.JButton; import javax.swing.JPanel; +import javax.swing.JSeparator; import org.apache.log4j.Logger; import org.openslx.dozmod.filetransfer.TransferEvent; @@ -44,7 +45,11 @@ public abstract class TransferPanel extends ActivityPanel implements TransferEve private int errorCountdown = 0; private final static Logger LOGGER = Logger.getLogger(TransferPanel.class); - + + private JPanel progressWrapper; + + private JPanel footer; + public TransferPanel(TransferTask transfer, String displayName, String fileName) { setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS)); setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4)); @@ -63,16 +68,14 @@ public abstract class TransferPanel extends ActivityPanel implements TransferEve btnClose = new JButton("Abbrechen"); header.add(btnClose); add(header); - // ProgressBar - JPanel progressWrapper = new JPanel(); + progressWrapper = new JPanel(); progressWrapper.setLayout(new GridLayout(1, 1)); progressWrapper.setMinimumSize(Gui.getScaledDimension(0, 50)); progressWrapper.setPreferredSize(progressWrapper.getMinimumSize()); progress = new BlockProgressBar(null); progressWrapper.add(progress); add(progressWrapper); - // Speed & error - JPanel footer = new JPanel(); + footer = new JPanel(); footer.setLayout(new BoxLayout(footer, BoxLayout.LINE_AXIS)); lblError = new QLabel(); lblSpeed = new QLabel("-"); @@ -119,11 +122,12 @@ public abstract class TransferPanel extends ActivityPanel implements TransferEve case ERROR: errorCountdown = 20; status = "Fehler"; + if (transfer.isCanceled()) { + transfer.removeListener(panel); + } break; case FINISHED: - btnClose.setText("Schließen"); - lblRemaining.setText("-"); - transfer.removeListener(panel); + transferDone(); status = "Beendet"; break; case IDLE: @@ -154,4 +158,13 @@ public abstract class TransferPanel extends ActivityPanel implements TransferEve }); } + private void transferDone() { + transfer.removeListener(panel); + lblRemaining.setText("-"); + btnClose.setText("Schließen"); + footer.setVisible(false); + progressWrapper.setVisible(false); + add(new JSeparator()); + } + } |