Browse Source

Do not report any progress for disabled files (Closes #56731485)

adaptive-webui-19844
Christophe Dumez 13 years ago
parent
commit
4ca665eb0c
  1. 5
      src/properties/proplistdelegate.h
  2. 4
      src/torrentfilesmodel.h

5
src/properties/proplistdelegate.h

@ -74,6 +74,7 @@ public:
QItemDelegate::drawDisplay(painter, opt, option.rect, misc::friendlyUnit(index.data().toLongLong())); QItemDelegate::drawDisplay(painter, opt, option.rect, misc::friendlyUnit(index.data().toLongLong()));
break; break;
case PROGRESS:{ case PROGRESS:{
if (index.data().toDouble() >= 0) {
QStyleOptionProgressBarV2 newopt; QStyleOptionProgressBarV2 newopt;
qreal progress = index.data().toDouble()*100.; qreal progress = index.data().toDouble()*100.;
newopt.rect = opt.rect; newopt.rect = opt.rect;
@ -94,6 +95,10 @@ public:
QPlastiqueStyle st; QPlastiqueStyle st;
st.drawControl(QStyle::CE_ProgressBar, &newopt, painter, 0); st.drawControl(QStyle::CE_ProgressBar, &newopt, painter, 0);
#endif #endif
} else {
// Do not display anything if the file is disabled (progress == -1)
QItemDelegate::drawBackground(painter, opt, index);
}
break; break;
} }
case PRIORITY: { case PRIORITY: {

4
src/torrentfilesmodel.h

@ -194,7 +194,7 @@ public:
qreal getProgress() const { qreal getProgress() const {
if(getPriority() == 0) if(getPriority() == 0)
return 0.; return -1;
qulonglong size = getSize(); qulonglong size = getSize();
if(size > 0) if(size > 0)
return total_done/(float)getSize(); return total_done/(float)getSize();
@ -313,6 +313,8 @@ public:
} }
QVariant data(int column) const { QVariant data(int column) const {
if(column == COL_PROGRESS)
return getProgress();
return itemData.value(column); return itemData.value(column);
} }

Loading…
Cancel
Save