From ffee0868ef1341cfb7622821431cb73c52590962 Mon Sep 17 00:00:00 2001
From: Sebastien Braun
Date: Sun, 3 Oct 2010 16:14:44 +0200
Subject: Assorted Multicast Fixes:

- Upgrade bundled OpenPGM to SVN r1135
- Timing fixes: Make all rate-limited and timer-pending operation wait
  for at least 1ms to avoid busy-waiting
- No distinction between sending and receiving sockets when setting
  up socket options (Receivers need to be able to send anyway when
  using PGMCC).
- Switch from fixed-rate transmission to using PGMCC for congestion
  control.
- Remove some obnoxious debugging outputs
- Some white space fixes
- Introduce a short waiting time before actually starting file transmission
  in order to allow enough SPM messages to be sent so that receivers
  can initialize properly.
- Fix MCASTFTANNOUNCE message to include full file name instead of basename.
- Fix generateMcastTransferID in order to gather more random IDs. PVSGUI
  may become confused if transfer IDs are reused.
- Properly dispose of clientFileReceiveDialog when multicast transfer is
  finished.
- Properly display transfer size in clientFileReceiveDialog
---
 src/gui/clientFileReceiveDialog.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/gui')

diff --git a/src/gui/clientFileReceiveDialog.cpp b/src/gui/clientFileReceiveDialog.cpp
index ff3226a..e457d23 100644
--- a/src/gui/clientFileReceiveDialog.cpp
+++ b/src/gui/clientFileReceiveDialog.cpp
@@ -219,6 +219,9 @@ void ClientFileReceiveDialog::mcastTransferProgress(qulonglong transferID, qulon
 
     progressBar->setRange(0, of);
     progressBar->setValue(bytes);
+
+    labelA->setText(formatSize(bytes));
+    labelB->setText(formatSize(of));
 }
 
 void ClientFileReceiveDialog::mcastTransferFinished(qulonglong transferID)
@@ -233,6 +236,7 @@ void ClientFileReceiveDialog::mcastTransferFinished(qulonglong transferID)
         QMessageBox::warning(this, tr("Could not rename file"), tr("Failed to rename %1 to %2").arg(_filename).arg(filename));
     }
     accept();
+    deleteLater();
 }
 
 void ClientFileReceiveDialog::mcastTransferFailed(qulonglong transferID, QString reason)
@@ -242,6 +246,7 @@ void ClientFileReceiveDialog::mcastTransferFailed(qulonglong transferID, QString
 
     QMessageBox::warning(this, tr("File transfer failed"), tr("File transfer failed for the following reason:\n%1").arg(reason));
     reject();
+    deleteLater();
 }
 
 void ClientFileReceiveDialog::cancelTransfer()
-- 
cgit v1.2.3-55-g7522