summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity
diff options
context:
space:
mode:
authorSimon Rettberg2018-05-09 13:53:32 +0200
committerSimon Rettberg2018-05-09 13:53:32 +0200
commitf0c3c1a90c1b93719acaf4730abaab53ec9e0757 (patch)
tree74b4efafee64226412558e144122b191bc2c1b8e /dozentenmodul/src/main/java/org/openslx/dozmod/gui/activity
parent[server] Fix CRC32 generation (diff)
downloadtutor-module-f0c3c1a90c1b93719acaf4730abaab53ec9e0757.tar.gz
tutor-module-f0c3c1a90c1b93719acaf4730abaab53ec9e0757.tar.xz
tutor-module-f0c3c1a90c1b93719acaf4730abaab53ec9e0757.zip
[client] Show server side progress and estimated virtual speed
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.java6
1 files changed, 5 insertions, 1 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 9b11f0d5..4d3155e2 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
@@ -150,7 +150,11 @@ public abstract class TransferPanel extends ActivityPanel implements TransferEve
lblRemaining.setText(event.remaining);
}
if (event.speedRaw != 0) {
- lblSpeed.setText(event.speed);
+ if (event.virtualSpeedRaw != 0) {
+ lblSpeed.setText(event.speed + " (" + event.virtualSpeed + ")");
+ } else {
+ lblSpeed.setText(event.speed);
+ }
}
// Progress bar
if (event.progress != null) {