diff options
| author | me_desk <me_desk@fb96df88-216d-11de-830c-f3023f12d8ac> | 2014-06-29 17:56:19 +0000 |
|---|---|---|
| committer | me_desk <me_desk@fb96df88-216d-11de-830c-f3023f12d8ac> | 2014-06-29 17:56:19 +0000 |
| commit | af3c479447078c889b1bbb7a5e405c6f61620e82 (patch) | |
| tree | 172d4c5d152b40d27399e4d6f2f3fe882ead2fd7 /pica-client/dialogs/filetransferdialog.cpp | |
| parent | 2ca40dbee2a3d7bb320d03395e51297af5d481fb (diff) | |
| download | pica-pica-af3c479447078c889b1bbb7a5e405c6f61620e82.tar.gz pica-pica-af3c479447078c889b1bbb7a5e405c6f61620e82.zip | |
fixed pause/resume bugs, moved callbacks.file_progress() call for outgoing transfer inside send_file_fragment to make it always be called before finished_callback
git-svn-id: svn://localhost/project_picapica/trunk@314 fb96df88-216d-11de-830c-f3023f12d8ac
Diffstat (limited to 'pica-client/dialogs/filetransferdialog.cpp')
| -rw-r--r-- | pica-client/dialogs/filetransferdialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pica-client/dialogs/filetransferdialog.cpp b/pica-client/dialogs/filetransferdialog.cpp index c87ed89..bd442c8 100644 --- a/pica-client/dialogs/filetransferdialog.cpp +++ b/pica-client/dialogs/filetransferdialog.cpp @@ -243,9 +243,9 @@ QString FileTransferDialog::timeLeft(quint64 seconds) return QString(tr("%1 days")).arg(days, 6, 'f', 1); if (hours > 0) - return QString("%1:%2").arg(hours).arg(minutes % 60); + return QString("%1h:%2m").arg(hours).arg(minutes % 60); - return QString("%1:%2").arg(minutes).arg(seconds % 60); + return QString("%1:%2").arg(minutes).arg((double)(seconds % 60), 2, 'f', 0, '0'); } void FileTransferDialog::timeout() |