Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-15 10:54:22 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed to work Status icons on all languages and moved Pause/Resume to the correct context menu place

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2551 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2010-03-15 16:22:21 +00:00
parent f422756176
commit 1a7f4a4760
1 changed files with 47 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
retroshare-gui/src/gui/TransfersDialog.cpp
View File

@ -384,6 +384,13 @@ void TransfersDialog::downloadListCostumPopupMenu( QPoint point )
if(all_downloading) if(all_downloading)
contextMnu.addMenu( chunkMenu); contextMnu.addMenu( chunkMenu);
if(single)
{
if(info.downloadStatus == FT_STATE_PAUSED)
contextMnu.addAction( resumeAct);
else if(info.downloadStatus != FT_STATE_COMPLETE)
contextMnu.addAction( pauseAct);
}
if(info.downloadStatus != FT_STATE_COMPLETE) if(info.downloadStatus != FT_STATE_COMPLETE)
contextMnu.addAction( cancelAct); contextMnu.addAction( cancelAct);
@ -403,10 +410,6 @@ void TransfersDialog::downloadListCostumPopupMenu( QPoint point )
contextMnu.addAction( detailsfileAct); contextMnu.addAction( detailsfileAct);
contextMnu.addSeparator(); contextMnu.addSeparator();
if(info.downloadStatus == FT_STATE_PAUSED)
contextMnu.addAction( resumeAct);
else if(info.downloadStatus != FT_STATE_COMPLETE)
contextMnu.addAction( pauseAct);
} }
contextMnu.addAction( clearcompletedAct); contextMnu.addAction( clearcompletedAct);
@ -456,7 +459,6 @@ int TransfersDialog::addItem(const QString&, const QString& name, const QString&
DLListModel->setData(DLListModel->index(row, DOWNLOADTIME), QVariant((qlonglong)downloadtime)); DLListModel->setData(DLListModel->index(row, DOWNLOADTIME), QVariant((qlonglong)downloadtime));
DLListModel->setData(DLListModel->index(row, ID), QVariant((QString)coreID)); DLListModel->setData(DLListModel->index(row, ID), QVariant((QString)coreID));
QString ext = QFileInfo(name).suffix(); QString ext = QFileInfo(name).suffix();
if (ext == "jpg" || ext == "jpeg" || ext == "tif" || ext == "tiff" || ext == "JPG"|| ext == "png" || ext == "gif" if (ext == "jpg" || ext == "jpeg" || ext == "tif" || ext == "tiff" || ext == "JPG"|| ext == "png" || ext == "gif"
|| ext == "bmp" || ext == "ico" || ext == "svg") { || ext == "bmp" || ext == "ico" || ext == "svg") {
@ -558,8 +560,45 @@ int TransfersDialog::addPeerToItem(int row, const QString& name, const QString&
dlItem->child(childRow, DLSPEED)->setData(QVariant((double)dlspeed), Qt::DisplayRole); dlItem->child(childRow, DLSPEED)->setData(QVariant((double)dlspeed), Qt::DisplayRole);
dlItem->child(childRow, STATUS)->setData(QVariant((QString)status), Qt::DisplayRole); dlItem->child(childRow, STATUS)->setData(QVariant((QString)status), Qt::DisplayRole);
dlItem->child(childRow, PROGRESS)->setData(QVariant::fromValue(peerInfo), Qt::DisplayRole); dlItem->child(childRow, PROGRESS)->setData(QVariant::fromValue(peerInfo), Qt::DisplayRole);
std::set<QStandardItem *> dlitems;
std::set<QStandardItem *>::iterator it;
getIdOfSelectedItems(dlitems);
FileInfo info;
for (it = dlitems.begin(); it != dlitems.end(); it ++) {
if (!rsFiles->FileDetails((*it)->data(Qt::DisplayRole).toString().toStdString(), RS_FILE_HINTS_DOWNLOAD, info)) continue;
break;
}
/* set status icon in the name field */ /* set status icon in the name field */
if (status == "Downloading") { if ( info.downloadStatus == FT_STATE_DOWNLOADING)
{
dlItem->child(childRow, NAME)->setData(QIcon(QString::fromUtf8(":/images/Client0.png")), Qt::DecorationRole);
}
else if ( info.downloadStatus == FT_STATE_FAILED)
{
dlItem->child(childRow, NAME)->setData(QIcon(QString::fromUtf8(":/images/Client1.png")), Qt::DecorationRole);
}
else if ( info.downloadStatus == FT_STATE_OKAY)
{
dlItem->child(childRow, NAME)->setData(QIcon(QString::fromUtf8(":/images/Client2.png")), Qt::DecorationRole);
}
else if ( info.downloadStatus == FT_STATE_WAITING)
{
dlItem->child(childRow, NAME)->setData(QIcon(QString::fromUtf8(":/images/Client3.png")), Qt::DecorationRole);
}
else if ( info.downloadStatus == FT_STATE_COMPLETE)
{
dlItem->child(childRow, NAME)->setData(QIcon(QString::fromUtf8(":/images/Client0.png")), Qt::DecorationRole);
}
else
{
//dlItem->child(childRow, NAME)->setData(QIcon(QString::fromUtf8(":/images/Client4.png")), Qt::DecorationRole);
}
/* set status icon in the name field */
/*if (status == "Downloading") {
dlItem->child(childRow, NAME)->setData(QIcon(QString::fromUtf8(":/images/Client0.png")), Qt::DecorationRole); dlItem->child(childRow, NAME)->setData(QIcon(QString::fromUtf8(":/images/Client0.png")), Qt::DecorationRole);
} else if (status == "Failed") { } else if (status == "Failed") {
dlItem->child(childRow, NAME)->setData(QIcon(QString::fromUtf8(":/images/Client1.png")), Qt::DecorationRole); dlItem->child(childRow, NAME)->setData(QIcon(QString::fromUtf8(":/images/Client1.png")), Qt::DecorationRole);
@ -570,7 +609,7 @@ int TransfersDialog::addPeerToItem(int row, const QString& name, const QString&
} else if (status == "Unknown") { } else if (status == "Unknown") {
dlItem->child(childRow, NAME)->setData(QIcon(QString::fromUtf8(":/images/Client4.png")), Qt::DecorationRole); dlItem->child(childRow, NAME)->setData(QIcon(QString::fromUtf8(":/images/Client4.png")), Qt::DecorationRole);
} else if (status == "Complete") { } else if (status == "Complete") {
} }*/
} }
return childRow; return childRow;