d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-03-10 12:21:12 +00:00
Code Issues Projects Releases Wiki Activity

- Fixed file priorities

Browse Source
This commit is contained in:
Christophe Dumez 2009-11-09 18:01:54 +00:00
parent d86cb62dc0
commit f9da85ecfe
3 changed files with 154 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

252
src/PropListDelegate.h
View File

@ -49,40 +49,39 @@ enum PropPriority {IGNORED=0, NORMAL=1, HIGH=2, MAXIMUM=7};
class PropListDelegate: public QItemDelegate { class PropListDelegate: public QItemDelegate {
Q_OBJECT Q_OBJECT
signals: signals:
void filteredFilesChanged(); void filteredFilesChanged() const;
public: public:
PropListDelegate(QObject *parent=0) : QItemDelegate(parent){ PropListDelegate(QObject *parent=0) : QItemDelegate(parent){
} }
~PropListDelegate(){} ~PropListDelegate(){}
void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const{ void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const{
QStyleOptionViewItemV2 opt = QItemDelegate::setOptions(index, option); QStyleOptionViewItemV2 opt = QItemDelegate::setOptions(index, option);
QPalette::ColorGroup cg = option.state & QStyle::State_Enabled ? QPalette::Normal : QPalette::Disabled; switch(index.column()){
switch(index.column()){
case SIZE: case SIZE:
QItemDelegate::drawBackground(painter, opt, index); QItemDelegate::drawBackground(painter, opt, index);
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:{
QStyleOptionProgressBarV2 newopt; QStyleOptionProgressBarV2 newopt;
float progress = index.data().toDouble()*100.; float progress = index.data().toDouble()*100.;
newopt.rect = opt.rect; newopt.rect = opt.rect;
newopt.text = QString(QByteArray::number(progress, 'f', 1))+QString::fromUtf8("%"); newopt.text = QString(QByteArray::number(progress, 'f', 1))+QString::fromUtf8("%");
newopt.progress = (int)progress; newopt.progress = (int)progress;
newopt.maximum = 100; newopt.maximum = 100;
newopt.minimum = 0; newopt.minimum = 0;
newopt.state |= QStyle::State_Enabled; newopt.state |= QStyle::State_Enabled;
newopt.textVisible = true; newopt.textVisible = true;
QApplication::style()->drawControl(QStyle::CE_ProgressBar, &newopt, painter); QApplication::style()->drawControl(QStyle::CE_ProgressBar, &newopt, painter);
break; break;
} }
case PRIORITY:{ case PRIORITY:{
QStyleOptionComboBox newopt; QStyleOptionComboBox newopt;
newopt.rect = opt.rect; newopt.rect = opt.rect;
switch(index.data().toInt()){ switch(index.data().toInt()){
case IGNORED: case IGNORED:
newopt.currentText = tr("Ignored"); newopt.currentText = tr("Ignored");
break; break;
@ -98,126 +97,127 @@ class PropListDelegate: public QItemDelegate {
default: default:
qDebug("Unhandled priority, setting NORMAL"); qDebug("Unhandled priority, setting NORMAL");
newopt.currentText = tr("Normal", "Normal (priority)"); newopt.currentText = tr("Normal", "Normal (priority)");
}
newopt.state |= QStyle::State_Enabled;
newopt.subControls = QStyle::SC_All;
//painter->translate(QPoint(opt.rect.x()*-1,opt.rect.y()*-1));
//QApplication::style()->drawComplexControl(QStyle::CC_ComboBox, &newopt, painter);
//painter->translate(QPoint(opt.rect.x(),opt.rect.y()));
QApplication::style()->drawControl(QStyle::CE_ComboBoxLabel, &newopt, painter);
break;
} }
newopt.state |= QStyle::State_Enabled;
QApplication::style()->drawComplexControl(QStyle::CC_ComboBox, &newopt,
painter);
opt.palette.setColor(QPalette::Text, QColor("black"));
painter->setPen(opt.palette.color(cg, QPalette::Text));
painter->drawText(option.rect, Qt::AlignLeft, QString::fromUtf8(" ")+newopt.currentText);
break;
}
default: default:
QItemDelegate::paint(painter, option, index); QItemDelegate::paint(painter, option, index);
} }
} }
QWidget* createEditor(QWidget *parent, const QStyleOptionViewItem &/* option */, const QModelIndex & index) const { QWidget* createEditor(QWidget *parent, const QStyleOptionViewItem &/* option */, const QModelIndex & index) const {
qDebug("CreateEditor called"); qDebug("CreateEditor called");
if(index.column() != PRIORITY) return 0; if(index.column() != PRIORITY) return 0;
QComboBox* editor = new QComboBox(parent); QComboBox* editor = new QComboBox(parent);
editor->setFocusPolicy(Qt::StrongFocus); editor->setFocusPolicy(Qt::StrongFocus);
editor->addItem(tr("Ignored")); editor->addItem(tr("Ignored"));
editor->addItem(tr("Normal", "Normal (priority)")); editor->addItem(tr("Normal", "Normal (priority)"));
editor->addItem(tr("High", "High (priority)")); editor->addItem(tr("High", "High (priority)"));
editor->addItem(tr("Maximum", "Maximum (priority)")); editor->addItem(tr("Maximum", "Maximum (priority)"));
return editor; return editor;
} }
void setEditorData(QWidget *editor, const QModelIndex &index) const { void setEditorData(QWidget *editor, const QModelIndex &index) const {
qDebug("setEditorData called"); qDebug("setEditorData called");
unsigned short val = index.model()->data(index, Qt::DisplayRole).toInt(); unsigned short val = index.model()->data(index, Qt::DisplayRole).toInt();
QComboBox *combobox = static_cast<QComboBox*>(editor); QComboBox *combobox = static_cast<QComboBox*>(editor);
qDebug("Set Editor data: Prio is %d", val); qDebug("Set Editor data: Prio is %d", val);
switch(val){ switch(val){
case IGNORED: case IGNORED:
combobox->setCurrentIndex(0); combobox->setCurrentIndex(0);
break; break;
case NORMAL: case NORMAL:
combobox->setCurrentIndex(1); combobox->setCurrentIndex(1);
break; break;
case HIGH: case HIGH:
combobox->setCurrentIndex(2); combobox->setCurrentIndex(2);
break; break;
case MAXIMUM: case MAXIMUM:
combobox->setCurrentIndex(3); combobox->setCurrentIndex(3);
break; break;
default: default:
qDebug("Unhandled priority, setting to NORMAL"); qDebug("Unhandled priority, setting to NORMAL");
combobox->setCurrentIndex(1); combobox->setCurrentIndex(1);
}
} }
}
QSize sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const{ QSize sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const{
QVariant value = index.data(Qt::FontRole); QVariant value = index.data(Qt::FontRole);
QFont fnt = value.isValid() ? qvariant_cast<QFont>(value) : option.font; QFont fnt = value.isValid() ? qvariant_cast<QFont>(value) : option.font;
QFontMetrics fontMetrics(fnt); QFontMetrics fontMetrics(fnt);
const QString text = index.data(Qt::DisplayRole).toString(); const QString text = index.data(Qt::DisplayRole).toString();
QRect textRect = QRect(0, 0, 0, fontMetrics.lineSpacing() * (text.count(QLatin1Char('\n')) + 1)); QRect textRect = QRect(0, 0, 0, fontMetrics.lineSpacing() * (text.count(QLatin1Char('\n')) + 1));
return textRect.size(); textRect.setHeight(textRect.height()+10);
} return textRect.size();
}
public slots: public slots:
void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) { void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const {
QComboBox *combobox = static_cast<QComboBox*>(editor); QComboBox *combobox = static_cast<QComboBox*>(editor);
int value = combobox->currentIndex(); int value = combobox->currentIndex();
qDebug("Setting combobox value in index: %d", value); qDebug("Setting combobox value in index: %d", value);
unsigned short old_val = index.model()->data(index, Qt::DisplayRole).toInt(); unsigned short old_val = index.model()->data(index, Qt::DisplayRole).toInt();
switch(value){ switch(value){
case 0: case 0:
if(old_val != IGNORED){ if(old_val != IGNORED){
model->setData(index, QVariant(IGNORED)); model->setData(index, QVariant(IGNORED));
emit filteredFilesChanged(); emit filteredFilesChanged();
} else { } else {
// XXX: hack to force the model to send the itemChanged() signal // XXX: hack to force the model to send the itemChanged() signal
model->setData(index, QVariant(NORMAL)); model->setData(index, QVariant(NORMAL));
model->setData(index, QVariant(IGNORED)); model->setData(index, QVariant(IGNORED));
} }
break; break;
case 1: case 1:
// if(old_val != NORMAL){ // if(old_val != NORMAL){
// model->setData(index, QVariant(NORMAL)); // model->setData(index, QVariant(NORMAL));
// if(filteredFilesChanged != 0) // if(filteredFilesChanged != 0)
// *filteredFilesChanged = true; // *filteredFilesChanged = true;
// } else { // } else {
model->setData(index, QVariant(HIGH)); model->setData(index, QVariant(HIGH));
model->setData(index, QVariant(NORMAL)); model->setData(index, QVariant(NORMAL));
emit filteredFilesChanged(); emit filteredFilesChanged();
// } // }
break; break;
case 2: case 2:
if(old_val != HIGH){ if(old_val != HIGH){
model->setData(index, QVariant(HIGH)); model->setData(index, QVariant(HIGH));
emit filteredFilesChanged(); emit filteredFilesChanged();
} else { } else {
model->setData(index, QVariant(NORMAL)); model->setData(index, QVariant(NORMAL));
model->setData(index, QVariant(HIGH)); model->setData(index, QVariant(HIGH));
} }
break; break;
case 3: case 3:
if(old_val != MAXIMUM){ if(old_val != MAXIMUM){
model->setData(index, QVariant(MAXIMUM)); model->setData(index, QVariant(MAXIMUM));
emit filteredFilesChanged(); emit filteredFilesChanged();
} else { } else {
model->setData(index, QVariant(HIGH)); model->setData(index, QVariant(HIGH));
model->setData(index, QVariant(MAXIMUM)); model->setData(index, QVariant(MAXIMUM));
} }
break; break;
default: default:
if(old_val != NORMAL){ if(old_val != NORMAL){
model->setData(index, QVariant(NORMAL)); model->setData(index, QVariant(NORMAL));
emit filteredFilesChanged(); emit filteredFilesChanged();
} else { } else {
model->setData(index, QVariant(HIGH)); model->setData(index, QVariant(HIGH));
model->setData(index, QVariant(NORMAL)); model->setData(index, QVariant(NORMAL));
}
} }
} }
}
void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &/* index */) const { void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &/* index */) const {
qDebug("UpdateEditor Geometry called"); qDebug("UpdateEditor Geometry called");
editor->setGeometry(option.rect); editor->setGeometry(option.rect);
} }
}; };

32
src/propertieswidget.cpp
View File

@ -522,7 +522,7 @@ void PropertiesWidget::ignoreSelection(){
if(index.column() == PRIORITY){ if(index.column() == PRIORITY){
if(PropListModel->data(index) != QVariant(IGNORED)){ if(PropListModel->data(index) != QVariant(IGNORED)){
PropListModel->setData(index, QVariant(IGNORED)); PropListModel->setData(index, QVariant(IGNORED));
transferList->updateTorrentSizeAndProgress(h.hash()); filteredFilesChanged();
setItemColor(index, "red"); setItemColor(index, "red");
} }
} }
@ -535,7 +535,7 @@ void PropertiesWidget::normalSelection(){
if(index.column() == PRIORITY){ if(index.column() == PRIORITY){
if(PropListModel->data(index) != QVariant(NORMAL)){ if(PropListModel->data(index) != QVariant(NORMAL)){
PropListModel->setData(index, QVariant(NORMAL)); PropListModel->setData(index, QVariant(NORMAL));
transferList->updateTorrentSizeAndProgress(h.hash()); filteredFilesChanged();
setItemColor(index, "green"); setItemColor(index, "green");
} }
} }
@ -548,7 +548,7 @@ void PropertiesWidget::highSelection(){
if(index.column() == PRIORITY){ if(index.column() == PRIORITY){
if(PropListModel->data(index) != QVariant(HIGH)){ if(PropListModel->data(index) != QVariant(HIGH)){
PropListModel->setData(index, QVariant(HIGH)); PropListModel->setData(index, QVariant(HIGH));
transferList->updateTorrentSizeAndProgress(h.hash()); filteredFilesChanged();
setItemColor(index, "green"); setItemColor(index, "green");
} }
} }
@ -561,7 +561,7 @@ void PropertiesWidget::maximumSelection(){
if(index.column() == PRIORITY){ if(index.column() == PRIORITY){
if(PropListModel->data(index) != QVariant(MAXIMUM)){ if(PropListModel->data(index) != QVariant(MAXIMUM)){
PropListModel->setData(index, QVariant(MAXIMUM)); PropListModel->setData(index, QVariant(MAXIMUM));
transferList->updateTorrentSizeAndProgress(h.hash()); filteredFilesChanged();
setItemColor(index, "green"); setItemColor(index, "green");
} }
} }
@ -727,6 +727,26 @@ void PropertiesWidget::setItemColor(QModelIndex index, QString color){
} }
} }
bool PropertiesWidget::savePiecesPriorities() {
/*if(!changedFilteredfiles) return true;
if(allFiltered()) {
QMessageBox::warning(0, tr("Priorities error"), tr("Error, you can't filter all the files in a torrent."));
return false;
}*/
qDebug("Saving pieces priorities");
int *priorities = new int[h.get_torrent_info().num_files()];
getPriorities(PropListModel->invisibleRootItem(), priorities);
unsigned int nbFiles = h.get_torrent_info().num_files();
for(unsigned int i=0; i<nbFiles; ++i) {
h.file_priority(i, priorities[i]);
}
delete[] priorities;
TorrentPersistentData::saveFilesPriority(h);
return true;
}
void PropertiesWidget::on_changeSavePathButton_clicked() { void PropertiesWidget::on_changeSavePathButton_clicked() {
QString dir; QString dir;
QDir saveDir(h.save_path()); QDir saveDir(h.save_path());
@ -755,8 +775,10 @@ void PropertiesWidget::on_changeSavePathButton_clicked() {
} }
void PropertiesWidget::filteredFilesChanged() { void PropertiesWidget::filteredFilesChanged() {
if(h.is_valid()) if(h.is_valid()) {
savePiecesPriorities();
transferList->updateTorrentSizeAndProgress(h.hash()); transferList->updateTorrentSizeAndProgress(h.hash());
}
} }
void PropertiesWidget::addFilesToTree(torrent_file *root, QStandardItem *parent) { void PropertiesWidget::addFilesToTree(torrent_file *root, QStandardItem *parent) {

1
src/propertieswidget.h
View File

@ -75,6 +75,7 @@ protected:
QPushButton* getButtonFromIndex(int index); QPushButton* getButtonFromIndex(int index);
std::vector<int> loadFilesPriorities(); std::vector<int> loadFilesPriorities();
bool allFiltered() const; bool allFiltered() const;
bool savePiecesPriorities();
protected slots: protected slots:
void loadTorrentInfos(QTorrentHandle &h); void loadTorrentInfos(QTorrentHandle &h);