mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-21 23:40:26 -04:00
*redesign of dwl queue - dwls will be enqueued and picked from there;
*changes to display the dwl queue in the transfers dialog git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1447 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
fdfc02a1c1
commit
e68d874406
9 changed files with 201 additions and 142 deletions
|
@ -40,6 +40,7 @@
|
|||
#include "rsiface/rsfiles.h"
|
||||
#include "rsiface/rspeers.h"
|
||||
#include "rsiface/rsdisc.h"
|
||||
#include "rsiface/rstypes.h"
|
||||
#include <algorithm>
|
||||
#include "util/misc.h"
|
||||
|
||||
|
@ -648,34 +649,6 @@ void TransfersDialog::insertTransfers()
|
|||
status = tr("Unknown"); break;
|
||||
}
|
||||
|
||||
/* a paused download remains with Downloading status;
|
||||
* check to see if download is in download queue to
|
||||
* update his status properly */
|
||||
int priority;
|
||||
if (rsFiles->getPriority(*it, priority)) {
|
||||
QString spriority;
|
||||
|
||||
switch (priority) {
|
||||
case 0:
|
||||
spriority = tr("Low");
|
||||
break;
|
||||
case 1:
|
||||
spriority = tr("Normal");
|
||||
break;
|
||||
case 2:
|
||||
spriority = tr("High");
|
||||
break;
|
||||
case 3:
|
||||
spriority = tr("Auto");
|
||||
break;
|
||||
default:
|
||||
spriority = tr("");
|
||||
break;
|
||||
}
|
||||
|
||||
status = tr("Queued [") + spriority + tr("]");
|
||||
}
|
||||
|
||||
completed = info.transfered;
|
||||
remaining = (info.size - info.transfered) / (info.tfRate * 1024.0);
|
||||
|
||||
|
@ -751,6 +724,57 @@ void TransfersDialog::insertTransfers()
|
|||
}
|
||||
}
|
||||
|
||||
/* here i will insert files from the download queue - which are
|
||||
* not started yet and can't be find in FileDownloads
|
||||
* */
|
||||
std::list<DwlDetails> details;
|
||||
std::list<DwlDetails>::iterator dit;
|
||||
rsFiles->getDwlDetails(details);
|
||||
for (dit = details.begin(); dit != details.end(); dit ++)
|
||||
{
|
||||
name = QString::fromStdString(dit->fname);
|
||||
coreId = QString::fromStdString(dit->hash);
|
||||
fileSize = dit->count;
|
||||
progress = 0;
|
||||
dlspeed = 0;
|
||||
sources = "";
|
||||
completed = 0;
|
||||
remaining = 0;
|
||||
|
||||
int priority = dit->priority;
|
||||
|
||||
QString spriority;
|
||||
switch (dit->priority) {
|
||||
case 0:
|
||||
spriority = tr("Low");
|
||||
break;
|
||||
case 1:
|
||||
spriority = tr("Normal");
|
||||
break;
|
||||
case 2:
|
||||
spriority = tr("High");
|
||||
break;
|
||||
case 3:
|
||||
spriority = tr("Auto");
|
||||
break;
|
||||
default:
|
||||
spriority = tr("");
|
||||
break;
|
||||
}
|
||||
|
||||
status = tr("Queued [") + spriority + tr("]");
|
||||
|
||||
addItem("", name, coreId, fileSize, progress, dlspeed, sources, status, completed, remaining);
|
||||
|
||||
/* if found in selectedIds -> select again */
|
||||
if (selectedIds.end() != std::find(selectedIds.begin(), selectedIds.end(), dit->hash)) {
|
||||
selection->select(DLListModel->index(dlCount, 0),
|
||||
QItemSelectionModel::Rows | QItemSelectionModel::SelectCurrent);
|
||||
}
|
||||
|
||||
dlCount++;
|
||||
}
|
||||
|
||||
|
||||
for(it = upHashes.begin(); it != upHashes.end(); it++)
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue