From a56b745429a861280637d3eb2d31cce163cbd99a Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Sun, 24 Jan 2016 17:15:39 +0800 Subject: [PATCH] Follow project coding style. Issue #2192. --- src/gui/transferlistdelegate.cpp | 397 ++++++++++++++++--------------- src/gui/transferlistdelegate.h | 26 +- 2 files changed, 215 insertions(+), 208 deletions(-) diff --git a/src/gui/transferlistdelegate.cpp b/src/gui/transferlistdelegate.cpp index 766ef0391..058ed466a 100644 --- a/src/gui/transferlistdelegate.cpp +++ b/src/gui/transferlistdelegate.cpp @@ -51,232 +51,239 @@ #endif #endif -TransferListDelegate::TransferListDelegate(QObject *parent) : QItemDelegate(parent) {} +TransferListDelegate::TransferListDelegate(QObject *parent) + : QItemDelegate(parent) +{ +} -TransferListDelegate::~TransferListDelegate() {} +TransferListDelegate::~TransferListDelegate() +{ +} -void TransferListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const { - const bool hideValues = Preferences::instance()->getHideZeroValues(); - QStyleOptionViewItemV2 opt = QItemDelegate::setOptions(index, option); - painter->save(); - switch(index.column()) { - case TorrentModel::TR_AMOUNT_DOWNLOADED: - case TorrentModel::TR_AMOUNT_UPLOADED: - case TorrentModel::TR_AMOUNT_DOWNLOADED_SESSION: - case TorrentModel::TR_AMOUNT_UPLOADED_SESSION: - case TorrentModel::TR_AMOUNT_LEFT: - case TorrentModel::TR_COMPLETED: - case TorrentModel::TR_SIZE: - case TorrentModel::TR_TOTAL_SIZE: { - QItemDelegate::drawBackground(painter, opt, index); - qlonglong size = index.data().toLongLong(); - if (hideValues && !size) +void TransferListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const +{ + const bool hideValues = Preferences::instance()->getHideZeroValues(); + QStyleOptionViewItemV2 opt = QItemDelegate::setOptions(index, option); + painter->save(); + switch (index.column()) { + case TorrentModel::TR_AMOUNT_DOWNLOADED: + case TorrentModel::TR_AMOUNT_UPLOADED: + case TorrentModel::TR_AMOUNT_DOWNLOADED_SESSION: + case TorrentModel::TR_AMOUNT_UPLOADED_SESSION: + case TorrentModel::TR_AMOUNT_LEFT: + case TorrentModel::TR_COMPLETED: + case TorrentModel::TR_SIZE: + case TorrentModel::TR_TOTAL_SIZE: { + QItemDelegate::drawBackground(painter, opt, index); + qlonglong size = index.data().toLongLong(); + if (hideValues && !size) + break; + opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter; + QItemDelegate::drawDisplay(painter, opt, option.rect, Utils::Misc::friendlyUnit(size)); break; - opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter; - QItemDelegate::drawDisplay(painter, opt, option.rect, Utils::Misc::friendlyUnit(size)); - break; - } - - case TorrentModel::TR_ETA: { - QItemDelegate::drawBackground(painter, opt, index); - opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter; - QItemDelegate::drawDisplay(painter, opt, option.rect, Utils::Misc::userFriendlyDuration(index.data().toLongLong())); - break; } - case TorrentModel::TR_SEEDS: - case TorrentModel::TR_PEERS: { - QString display = QString::number(index.data().toLongLong()); - qlonglong total = index.data(Qt::UserRole).toLongLong(); - if (total > 0) { - // Scrape was successful, we have total values - display += " ("+QString::number(total)+")"; - } - QItemDelegate::drawBackground(painter, opt, index); - opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter; - QItemDelegate::drawDisplay(painter, opt, opt.rect, display); - break; - } - case TorrentModel::TR_STATUS: { - const int state = index.data().toInt(); - QString display; - switch(state) { - case BitTorrent::TorrentState::Downloading: - display = tr("Downloading"); - break; - case BitTorrent::TorrentState::StalledDownloading: - display = tr("Stalled", "Torrent is waiting for download to begin"); - break; - case BitTorrent::TorrentState::DownloadingMetadata: - display = tr("Downloading metadata", "used when loading a magnet link"); - break; - case BitTorrent::TorrentState::ForcedDownloading: - display = tr("[F] Downloading", "used when the torrent is forced started. You probably shouldn't translate the F."); - break; - case BitTorrent::TorrentState::Allocating: - display = tr("Allocating", "qBittorrent is allocating the files on disk"); - break; - case BitTorrent::TorrentState::Uploading: - case BitTorrent::TorrentState::StalledUploading: - display = tr("Seeding", "Torrent is complete and in upload-only mode"); - break; - case BitTorrent::TorrentState::ForcedUploading: - display = tr("[F] Seeding", "used when the torrent is forced started. You probably shouldn't translate the F."); - break; - case BitTorrent::TorrentState::QueuedDownloading: - case BitTorrent::TorrentState::QueuedUploading: - display = tr("Queued", "i.e. torrent is queued"); - break; - case BitTorrent::TorrentState::CheckingDownloading: - case BitTorrent::TorrentState::CheckingUploading: - display = tr("Checking", "Torrent local data is being checked"); - break; - case BitTorrent::TorrentState::QueuedForChecking: - display = tr("Queued for checking", "i.e. torrent is queued for hash checking"); - break; - case BitTorrent::TorrentState::CheckingResumeData: - display = tr("Checking resume data", "used when loading the torrents from disk after qbt is launched. It checks the correctness of the .fastresume file. Normally it is completed in a fraction of a second, unless loading many many torrents."); + case TorrentModel::TR_ETA: { + QItemDelegate::drawBackground(painter, opt, index); + opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter; + QItemDelegate::drawDisplay(painter, opt, option.rect, Utils::Misc::userFriendlyDuration(index.data().toLongLong())); break; - case BitTorrent::TorrentState::PausedDownloading: - display = tr("Paused"); + } + case TorrentModel::TR_SEEDS: + case TorrentModel::TR_PEERS: { + QString display = QString::number(index.data().toLongLong()); + qlonglong total = index.data(Qt::UserRole).toLongLong(); + if (total > 0) + // Scrape was successful, we have total values + display += " (" + QString::number(total) + ")"; + QItemDelegate::drawBackground(painter, opt, index); + opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter; + QItemDelegate::drawDisplay(painter, opt, opt.rect, display); break; - case BitTorrent::TorrentState::PausedUploading: - display = tr("Completed"); + } + case TorrentModel::TR_STATUS: { + const int state = index.data().toInt(); + QString display; + switch (state) { + case BitTorrent::TorrentState::Downloading: + display = tr("Downloading"); + break; + case BitTorrent::TorrentState::StalledDownloading: + display = tr("Stalled", "Torrent is waiting for download to begin"); + break; + case BitTorrent::TorrentState::DownloadingMetadata: + display = tr("Downloading metadata", "used when loading a magnet link"); + break; + case BitTorrent::TorrentState::ForcedDownloading: + display = tr("[F] Downloading", "used when the torrent is forced started. You probably shouldn't translate the F."); + break; + case BitTorrent::TorrentState::Allocating: + display = tr("Allocating", "qBittorrent is allocating the files on disk"); + break; + case BitTorrent::TorrentState::Uploading: + case BitTorrent::TorrentState::StalledUploading: + display = tr("Seeding", "Torrent is complete and in upload-only mode"); + break; + case BitTorrent::TorrentState::ForcedUploading: + display = tr("[F] Seeding", "used when the torrent is forced started. You probably shouldn't translate the F."); + break; + case BitTorrent::TorrentState::QueuedDownloading: + case BitTorrent::TorrentState::QueuedUploading: + display = tr("Queued", "i.e. torrent is queued"); + break; + case BitTorrent::TorrentState::CheckingDownloading: + case BitTorrent::TorrentState::CheckingUploading: + display = tr("Checking", "Torrent local data is being checked"); + break; + case BitTorrent::TorrentState::QueuedForChecking: + display = tr("Queued for checking", "i.e. torrent is queued for hash checking"); + break; + case BitTorrent::TorrentState::CheckingResumeData: + display = tr("Checking resume data", "used when loading the torrents from disk after qbt is launched. It checks the correctness of the .fastresume file. Normally it is completed in a fraction of a second, unless loading many many torrents."); + break; + case BitTorrent::TorrentState::PausedDownloading: + display = tr("Paused"); + break; + case BitTorrent::TorrentState::PausedUploading: + display = tr("Completed"); + break; + case BitTorrent::TorrentState::MissingFiles: + display = tr("Missing Files"); + break; + case BitTorrent::TorrentState::Error: + display = tr("Errored", "torrent status, the torrent has an error"); + break; + default: + display = ""; + } + QItemDelegate::drawBackground(painter, opt, index); + QItemDelegate::drawDisplay(painter, opt, opt.rect, display); break; - case BitTorrent::TorrentState::MissingFiles: - display = tr("Missing Files"); - break; - case BitTorrent::TorrentState::Error: - display = tr("Errored", "torrent status, the torrent has an error"); + } + case TorrentModel::TR_UPSPEED: + case TorrentModel::TR_DLSPEED: { + QItemDelegate::drawBackground(painter, opt, index); + const qulonglong speed = index.data().toULongLong(); + if (hideValues && !speed) + break; + opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter; + QItemDelegate::drawDisplay(painter, opt, opt.rect, Utils::Misc::friendlyUnit(speed, true)); break; - default: - display = ""; - } - QItemDelegate::drawBackground(painter, opt, index); - QItemDelegate::drawDisplay(painter, opt, opt.rect, display); - break; } - case TorrentModel::TR_UPSPEED: - case TorrentModel::TR_DLSPEED: { - QItemDelegate::drawBackground(painter, opt, index); - const qulonglong speed = index.data().toULongLong(); - if (hideValues && !speed) + case TorrentModel::TR_UPLIMIT: + case TorrentModel::TR_DLLIMIT: { + QItemDelegate::drawBackground(painter, opt, index); + const qlonglong limit = index.data().toLongLong(); + if (hideValues && !limit) + break; + opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter; + QItemDelegate::drawDisplay(painter, opt, opt.rect, limit > 0 ? Utils::Misc::friendlyUnit(limit, true) : QString::fromUtf8(C_INFINITY)); break; - opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter; - QItemDelegate::drawDisplay(painter, opt, opt.rect, Utils::Misc::friendlyUnit(speed, true)); - break; } - case TorrentModel::TR_UPLIMIT: - case TorrentModel::TR_DLLIMIT: { - QItemDelegate::drawBackground(painter, opt, index); - const qlonglong limit = index.data().toLongLong(); - if (hideValues && !limit) - break; - opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter; - QItemDelegate::drawDisplay(painter, opt, opt.rect, limit > 0 ? Utils::Misc::friendlyUnit(limit, true) : QString::fromUtf8(C_INFINITY)); - break; - } - case TorrentModel::TR_TIME_ELAPSED: { - QItemDelegate::drawBackground(painter, opt, index); - qlonglong seeding_time = index.data(Qt::UserRole).toLongLong(); - QString txt; - if (seeding_time > 0) - txt += tr("%1 (seeded for %2)", "e.g. 4m39s (seeded for 3m10s)") - .arg(Utils::Misc::userFriendlyDuration(index.data().toLongLong())) - .arg(Utils::Misc::userFriendlyDuration(seeding_time)); - QItemDelegate::drawDisplay(painter, opt, opt.rect, txt); - break; - } - case TorrentModel::TR_ADD_DATE: - case TorrentModel::TR_SEED_DATE: - QItemDelegate::drawBackground(painter, opt, index); - QItemDelegate::drawDisplay(painter, opt, opt.rect, index.data().toDateTime().toLocalTime().toString(Qt::DefaultLocaleShortDate)); - break; - case TorrentModel::TR_RATIO_LIMIT: - case TorrentModel::TR_RATIO: { - QItemDelegate::drawBackground(painter, opt, index); - opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter; - const qreal ratio = index.data().toDouble(); - if (hideValues && (ratio <= 0)) + case TorrentModel::TR_TIME_ELAPSED: { + QItemDelegate::drawBackground(painter, opt, index); + qlonglong seeding_time = index.data(Qt::UserRole).toLongLong(); + QString txt; + if (seeding_time > 0) + txt += tr("%1 (seeded for %2)", "e.g. 4m39s (seeded for 3m10s)") + .arg(Utils::Misc::userFriendlyDuration(index.data().toLongLong())) + .arg(Utils::Misc::userFriendlyDuration(seeding_time)); + QItemDelegate::drawDisplay(painter, opt, opt.rect, txt); break; - QItemDelegate::drawDisplay(painter, opt, opt.rect, - ((ratio == -1) || (ratio > BitTorrent::TorrentHandle::MAX_RATIO)) ? QString::fromUtf8(C_INFINITY) : Utils::String::fromDouble(ratio, 2)); - break; } - case TorrentModel::TR_PRIORITY: { - const int priority = index.data().toInt(); - opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter; - if (priority > 0) - QItemDelegate::paint(painter, opt, index); - else { + case TorrentModel::TR_ADD_DATE: + case TorrentModel::TR_SEED_DATE: + QItemDelegate::drawBackground(painter, opt, index); + QItemDelegate::drawDisplay(painter, opt, opt.rect, index.data().toDateTime().toLocalTime().toString(Qt::DefaultLocaleShortDate)); + break; + case TorrentModel::TR_RATIO_LIMIT: + case TorrentModel::TR_RATIO: { QItemDelegate::drawBackground(painter, opt, index); - QItemDelegate::drawDisplay(painter, opt, opt.rect, "*"); - } - break; + opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter; + const qreal ratio = index.data().toDouble(); + if (hideValues && (ratio <= 0)) + break; + QItemDelegate::drawDisplay(painter, opt, opt.rect, + ((ratio == -1) || (ratio > BitTorrent::TorrentHandle::MAX_RATIO)) ? QString::fromUtf8(C_INFINITY) : Utils::String::fromDouble(ratio, 2)); + break; + } + case TorrentModel::TR_PRIORITY: { + const int priority = index.data().toInt(); + opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter; + if (priority > 0) { + QItemDelegate::paint(painter, opt, index); + } + else { + QItemDelegate::drawBackground(painter, opt, index); + QItemDelegate::drawDisplay(painter, opt, opt.rect, "*"); + } + break; } - case TorrentModel::TR_PROGRESS: { - QStyleOptionProgressBarV2 newopt; - qreal progress = index.data().toDouble()*100.; - newopt.rect = opt.rect; - newopt.text = ((progress == 100.0) ? QString("100%") : Utils::String::fromDouble(progress, 1) + "%"); - newopt.progress = (int)progress; - newopt.maximum = 100; - newopt.minimum = 0; - newopt.state |= QStyle::State_Enabled; - newopt.textVisible = true; + case TorrentModel::TR_PROGRESS: { + QStyleOptionProgressBarV2 newopt; + qreal progress = index.data().toDouble() * 100.; + newopt.rect = opt.rect; + newopt.text = ((progress == 100.0) ? QString("100%") : Utils::String::fromDouble(progress, 1) + "%"); + newopt.progress = (int)progress; + newopt.maximum = 100; + newopt.minimum = 0; + newopt.state |= QStyle::State_Enabled; + newopt.textVisible = true; #ifndef Q_OS_WIN - QApplication::style()->drawControl(QStyle::CE_ProgressBar, &newopt, painter); + QApplication::style()->drawControl(QStyle::CE_ProgressBar, &newopt, painter); #else - // XXX: To avoid having the progress text on the right of the bar + // XXX: To avoid having the progress text on the right of the bar #ifndef QBT_USES_QT5 QPlastiqueStyle st; #else QProxyStyle st("fusion"); #endif - st.drawControl(QStyle::CE_ProgressBar, &newopt, painter, 0); + st.drawControl(QStyle::CE_ProgressBar, &newopt, painter, 0); #endif - break; - } - case TorrentModel::TR_LAST_ACTIVITY: { - QItemDelegate::drawBackground(painter, opt, index); - qlonglong elapsed = index.data().toLongLong(); - if (hideValues && ((elapsed < 0) || (elapsed >= MAX_ETA))) break; + } + case TorrentModel::TR_LAST_ACTIVITY: { + QItemDelegate::drawBackground(painter, opt, index); + qlonglong elapsed = index.data().toLongLong(); + if (hideValues && ((elapsed < 0) || (elapsed >= MAX_ETA))) + break; - QString elapsedString; - if (elapsed == 0) - // Show '< 1m ago' when elapsed time is 0 - elapsed = 1; - else if (elapsed < 0) - elapsedString = Utils::Misc::userFriendlyDuration(elapsed); - else - elapsedString = tr("%1 ago", "e.g.: 1h 20m ago").arg(Utils::Misc::userFriendlyDuration(elapsed)); - opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter; - QItemDelegate::drawDisplay(painter, opt, option.rect, elapsedString); - break; + QString elapsedString; + if (elapsed == 0) + // Show '< 1m ago' when elapsed time is 0 + elapsed = 1; + else if (elapsed < 0) + elapsedString = Utils::Misc::userFriendlyDuration(elapsed); + else + elapsedString = tr("%1 ago", "e.g.: 1h 20m ago").arg(Utils::Misc::userFriendlyDuration(elapsed)); + opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter; + QItemDelegate::drawDisplay(painter, opt, option.rect, elapsedString); + break; } - default: - QItemDelegate::paint(painter, option, index); - } - painter->restore(); + default: + QItemDelegate::paint(painter, option, index); + } + painter->restore(); } -QWidget* TransferListDelegate::createEditor(QWidget*, const QStyleOptionViewItem &, const QModelIndex &) const { - // No editor here - return 0; +QWidget* TransferListDelegate::createEditor(QWidget*, const QStyleOptionViewItem &, const QModelIndex &) const +{ + // No editor here + return 0; } -QSize TransferListDelegate::sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const { - QSize size = QItemDelegate::sizeHint(option, index); +QSize TransferListDelegate::sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const +{ + QSize size = QItemDelegate::sizeHint(option, index); - static int icon_height = -1; - if (icon_height == -1) { - QIcon icon(":/icons/skin/downloading.png"); - QList ic_sizes(icon.availableSizes()); - icon_height = ic_sizes[0].height(); - } + static int iconHeight = -1; + if (iconHeight == -1) { + QIcon icon(":/icons/skin/downloading.png"); + QList icSizes(icon.availableSizes()); + iconHeight = icSizes[0].height(); + } - if (size.height() < icon_height) - size.setHeight(icon_height); + if (size.height() < iconHeight) + size.setHeight(iconHeight); - return size; + return size; } diff --git a/src/gui/transferlistdelegate.h b/src/gui/transferlistdelegate.h index ce8593241..7e9856c4c 100644 --- a/src/gui/transferlistdelegate.h +++ b/src/gui/transferlistdelegate.h @@ -41,21 +41,21 @@ QT_END_NAMESPACE // Defines for download list list columns -class TransferListDelegate: public QItemDelegate { - Q_OBJECT +class TransferListDelegate: public QItemDelegate +{ + Q_OBJECT public: - TransferListDelegate(QObject *parent); - ~TransferListDelegate(); - void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const; - QWidget* createEditor(QWidget*, const QStyleOptionViewItem &, const QModelIndex &) const; - - // Reimplementing sizeHint() because the 'name' column contains text+icon. - // When that WHOLE column goes out of view(eg user scrolls horizontally) - // the rows shrink if the text's height is smaller than the icon's height. - // This happens because icon from the 'name' column is no longer drawn. - QSize sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const; - + TransferListDelegate(QObject *parent); + ~TransferListDelegate(); + void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const; + QWidget* createEditor(QWidget*, const QStyleOptionViewItem &, const QModelIndex &) const; + + // Reimplementing sizeHint() because the 'name' column contains text+icon. + // When that WHOLE column goes out of view(eg user scrolls horizontally) + // the rows shrink if the text's height is smaller than the icon's height. + // This happens because icon from the 'name' column is no longer drawn. + QSize sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const; }; #endif // TRANSFERLISTDELEGATE_H