mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-22 15:51:29 -04:00
clear downloads which are in queue directly from custom menu cancel action (until now they were remaining in queue when for ex all list was selected for a clear and a separate action was needed for them)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1537 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
0f5e003f18
commit
8f0c7fbdfe
2 changed files with 27 additions and 13 deletions
|
@ -911,13 +911,22 @@ void TransfersDialog::cancel()
|
||||||
|
|
||||||
if ((QMessageBox::question(this, tr("RetroShare"),queryWrn2,QMessageBox::Ok|QMessageBox::No, QMessageBox::Ok))== QMessageBox::Ok)
|
if ((QMessageBox::question(this, tr("RetroShare"),queryWrn2,QMessageBox::Ok|QMessageBox::No, QMessageBox::Ok))== QMessageBox::Ok)
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
for(int i = 0; i <= DLListModel->rowCount(); i++)
|
for(int i = 0; i <= DLListModel->rowCount(); i++)
|
||||||
{
|
{
|
||||||
if(selection->isRowSelected(i, QModelIndex()))
|
if(selection->isRowSelected(i, QModelIndex()))
|
||||||
{
|
{
|
||||||
|
QVector<QString> pri;
|
||||||
|
pri << "Low" << "Normal" << "High" << "Auto";
|
||||||
|
QString priority = getPriority(i, DLListModel).trimmed();
|
||||||
std::string id = getID(i, DLListModel).toStdString();
|
std::string id = getID(i, DLListModel).toStdString();
|
||||||
|
|
||||||
|
if (pri.indexOf(priority) >= 0)
|
||||||
|
{
|
||||||
|
/* for file that is just in dwl queue */
|
||||||
|
rsFiles->clearDownload(id);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
#ifdef UNUSED
|
#ifdef UNUSED
|
||||||
QString qname = getFileName(i, DLListModel);
|
QString qname = getFileName(i, DLListModel);
|
||||||
/* XXX -> Should not have to 'trim' filename ... something wrong here..
|
/* XXX -> Should not have to 'trim' filename ... something wrong here..
|
||||||
|
@ -926,10 +935,9 @@ void TransfersDialog::cancel()
|
||||||
std::string name = (qname.trimmed()).toStdString();
|
std::string name = (qname.trimmed()).toStdString();
|
||||||
#endif
|
#endif
|
||||||
rsFiles->FileCancel(id); /* hash */
|
rsFiles->FileCancel(id); /* hash */
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
return;
|
return;
|
||||||
|
@ -1276,6 +1284,11 @@ QString TransfersDialog::getID(int row, QStandardItemModel *model)
|
||||||
return model->data(model->index(row, ID), Qt::DisplayRole).toString();
|
return model->data(model->index(row, ID), Qt::DisplayRole).toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
QString TransfersDialog::getPriority(int row, QStandardItemModel *model)
|
||||||
|
{
|
||||||
|
return model->data(model->index(row, PRIORITY), Qt::DisplayRole).toString();
|
||||||
|
}
|
||||||
|
|
||||||
qlonglong TransfersDialog::getFileSize(int row, QStandardItemModel *model)
|
qlonglong TransfersDialog::getFileSize(int row, QStandardItemModel *model)
|
||||||
{
|
{
|
||||||
bool ok = false;
|
bool ok = false;
|
||||||
|
|
|
@ -161,6 +161,7 @@ class TransfersDialog : public MainPage
|
||||||
QString getFileName(int row, QStandardItemModel *model);
|
QString getFileName(int row, QStandardItemModel *model);
|
||||||
QString getStatus(int row, QStandardItemModel *model);
|
QString getStatus(int row, QStandardItemModel *model);
|
||||||
QString getID(int row, QStandardItemModel *model);
|
QString getID(int row, QStandardItemModel *model);
|
||||||
|
QString getPriority(int row, QStandardItemModel *model);
|
||||||
qlonglong getFileSize(int row, QStandardItemModel *model);
|
qlonglong getFileSize(int row, QStandardItemModel *model);
|
||||||
qlonglong getTransfered(int row, QStandardItemModel *model);
|
qlonglong getTransfered(int row, QStandardItemModel *model);
|
||||||
qlonglong getRemainingTime(int row, QStandardItemModel *model);
|
qlonglong getRemainingTime(int row, QStandardItemModel *model);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue