Split src/transferlistdelegate into .h and .cpp

src/src.pro

@@ -159,6 +159,7 @@ nox {
   SOURCES += mainwindow.cpp \
              ico.cpp \
              transferlistwidget.cpp \
+             transferlistdelegate.cpp \
              torrentcontentmodel.cpp \
              torrentcontentmodelitem.cpp \
              torrentcontentmodelfolder.cpp \

src/transferlistdelegate.cpp

@@ -0,0 +1,229 @@
+/*
+ * Bittorrent Client using Qt4 and libtorrent.
+ * Copyright (C) 2006  Christophe Dumez
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * In addition, as a special exception, the copyright holders give permission to
+ * link this program with the OpenSSL project's "OpenSSL" library (or with
+ * modified versions of it that use the same license as the "OpenSSL" library),
+ * and distribute the linked executables. You must obey the GNU General Public
+ * License in all respects for all of the code used other than "OpenSSL".  If you
+ * modify file(s), you may extend this exception to your version of the file(s),
+ * but you are not obligated to do so. If you do not wish to do so, delete this
+ * exception statement from your version.
+ *
+ * Contact : chris@qbittorrent.org
+ */
+
+#include "transferlistdelegate.h"
+
+#include <QModelIndex>
+#include <QStyleOptionViewItemV2>
+#include <QApplication>
+#include <QPainter>
+#include "misc.h"
+#include "torrentmodel.h"
+#include "qbtsession.h"
+
+#ifdef Q_OS_WIN
+#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+#include <QPlastiqueStyle>
+#else
+#include <QProxyStyle>
+#endif
+#endif
+
+TransferListDelegate::TransferListDelegate(QObject *parent) : QItemDelegate(parent) {}
+
+TransferListDelegate::~TransferListDelegate() {}
+
+void TransferListDelegate::paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const {
+  QStyleOptionViewItemV2 opt = QItemDelegate::setOptions(index, option);
+  painter->save();
+  switch(index.column()) {
+  case TorrentModelItem::TR_AMOUNT_DOWNLOADED:
+  case TorrentModelItem::TR_AMOUNT_UPLOADED:
+  case TorrentModelItem::TR_AMOUNT_LEFT:
+  case TorrentModelItem::TR_COMPLETED:
+  case TorrentModelItem::TR_SIZE: {
+      QItemDelegate::drawBackground(painter, opt, index);
+      opt.displayAlignment = Qt::AlignRight;
+      QItemDelegate::drawDisplay(painter, opt, option.rect, misc::friendlyUnit(index.data().toLongLong()));
+      break;
+    }
+  case TorrentModelItem::TR_ETA: {
+      QItemDelegate::drawBackground(painter, opt, index);
+      opt.displayAlignment = Qt::AlignRight;
+      QItemDelegate::drawDisplay(painter, opt, option.rect, misc::userFriendlyDuration(index.data().toLongLong()));
+      break;
+    }
+  case TorrentModelItem::TR_SEEDS:
+  case TorrentModelItem::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;
+      QItemDelegate::drawDisplay(painter, opt, opt.rect, display);
+      break;
+    }
+  case TorrentModelItem::TR_STATUS: {
+      const int state = index.data().toInt();
+      QString display;
+      switch(state) {
+      case TorrentModelItem::STATE_DOWNLOADING:
+        display = tr("Downloading");
+        break;
+      case TorrentModelItem::STATE_DOWNLOADING_META:
+        display = tr("Downloading metadata", "used when loading a magnet link");
+        break;
+      case TorrentModelItem::STATE_ALLOCATING:
+        display = tr("Allocating", "qBittorrent is allocating the files on disk");
+        break;
+      case TorrentModelItem::STATE_PAUSED_DL:
+      case TorrentModelItem::STATE_PAUSED_UP:
+        display = tr("Paused");
+        break;
+      case TorrentModelItem::STATE_QUEUED_DL:
+      case TorrentModelItem::STATE_QUEUED_UP:
+        display = tr("Queued", "i.e. torrent is queued");
+        break;
+      case TorrentModelItem::STATE_SEEDING:
+      case TorrentModelItem::STATE_STALLED_UP:
+        display = tr("Seeding", "Torrent is complete and in upload-only mode");
+        break;
+      case TorrentModelItem::STATE_STALLED_DL:
+        display = tr("Stalled", "Torrent is waiting for download to begin");
+        break;
+      case TorrentModelItem::STATE_CHECKING_DL:
+      case TorrentModelItem::STATE_CHECKING_UP:
+        display = tr("Checking", "Torrent local data is being checked");
+        break;
+      case TorrentModelItem::STATE_QUEUED_CHECK:
+        display = tr("Queued for checking", "i.e. torrent is queued for hash checking");
+        break;
+      case TorrentModelItem::STATE_QUEUED_FASTCHECK:
+        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;
+      default:
+         display = "";
+      }
+      QItemDelegate::drawBackground(painter, opt, index);
+      QItemDelegate::drawDisplay(painter, opt, opt.rect, display);
+      break;
+    }
+  case TorrentModelItem::TR_UPSPEED:
+  case TorrentModelItem::TR_DLSPEED: {
+      QItemDelegate::drawBackground(painter, opt, index);
+      const qulonglong speed = index.data().toULongLong();
+      opt.displayAlignment = Qt::AlignRight;
+      QItemDelegate::drawDisplay(painter, opt, opt.rect, misc::friendlyUnit(speed)+tr("/s", "/second (.i.e per second)"));
+      break;
+    }
+  case TorrentModelItem::TR_UPLIMIT:
+  case TorrentModelItem::TR_DLLIMIT: {
+    QItemDelegate::drawBackground(painter, opt, index);
+    const qlonglong limit = index.data().toLongLong();
+    opt.displayAlignment = Qt::AlignRight;
+    QItemDelegate::drawDisplay(painter, opt, opt.rect, limit > 0 ? misc::accurateDoubleToString(limit/1024., 1) + " " + tr("KiB/s", "KiB/second (.i.e per second)") : QString::fromUtf8("∞"));
+    break;
+  }
+  case TorrentModelItem::TR_TIME_ELAPSED: {
+    QItemDelegate::drawBackground(painter, opt, index);
+    QString txt = misc::userFriendlyDuration(index.data().toLongLong());
+    qlonglong seeding_time = index.data(Qt::UserRole).toLongLong();
+    if (seeding_time > 0)
+      txt += " ("+tr("Seeded for %1", "e.g. Seeded for 3m10s").arg(misc::userFriendlyDuration(seeding_time))+")";
+    QItemDelegate::drawDisplay(painter, opt, opt.rect, txt);
+    break;
+  }
+  case TorrentModelItem::TR_ADD_DATE:
+  case TorrentModelItem::TR_SEED_DATE:
+    QItemDelegate::drawBackground(painter, opt, index);
+    QItemDelegate::drawDisplay(painter, opt, opt.rect, index.data().toDateTime().toLocalTime().toString(Qt::DefaultLocaleShortDate));
+    break;
+  case TorrentModelItem::TR_RATIO_LIMIT:
+  case TorrentModelItem::TR_RATIO: {
+      QItemDelegate::drawBackground(painter, opt, index);
+      opt.displayAlignment = Qt::AlignRight;
+      const qreal ratio = index.data().toDouble();
+      QItemDelegate::drawDisplay(painter, opt, opt.rect,
+                                 (ratio == -1 || ratio > QBtSession::MAX_RATIO) ? QString::fromUtf8("∞") : misc::accurateDoubleToString(ratio, 2));
+      break;
+    }
+  case TorrentModelItem::TR_PRIORITY: {
+      const int priority = index.data().toInt();
+      opt.displayAlignment = Qt::AlignRight;
+      if (priority >= 0)
+        QItemDelegate::paint(painter, opt, index);
+      else {
+        QItemDelegate::drawBackground(painter, opt, index);
+        QItemDelegate::drawDisplay(painter, opt, opt.rect, "*");
+      }
+      break;
+    }
+  case TorrentModelItem::TR_PROGRESS: {
+      QStyleOptionProgressBarV2 newopt;
+      qreal progress = index.data().toDouble()*100.;
+      newopt.rect = opt.rect;
+      newopt.text = misc::accurateDoubleToString(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);
+#else
+      // XXX: To avoid having the progress text on the right of the bar
+#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+        QPlastiqueStyle st;
+#else
+        QProxyStyle st("fusion");
+#endif
+      st.drawControl(QStyle::CE_ProgressBar, &newopt, painter, 0);
+#endif
+      break;
+    }
+  default:
+    QItemDelegate::paint(painter, option, index);
+  }
+  painter->restore();
+}
+
+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);
+
+  static int icon_height = -1;
+  if (icon_height == -1) {
+    QIcon icon(":/Icons/skin/downloading.png");
+    QList<QSize> ic_sizes(icon.availableSizes());
+    icon_height = ic_sizes[0].height();
+  }
+
+  if (size.height() < icon_height)
+    size.setHeight(icon_height);
+
+  return size;
+}

src/transferlistdelegate.h

@@ -32,21 +32,12 @@
 #define TRANSFERLISTDELEGATE_H
 
 #include <QItemDelegate>
-#include <QModelIndex>
-#include <QStyleOptionViewItemV2>
-#include <QApplication>
-#include <QPainter>
-#include "misc.h"
-#include "torrentmodel.h"
-#include "qbtsession.h"
 
-#ifdef Q_OS_WIN
+QT_BEGIN_NAMESPACE
-#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+class QPainter;
-#include <QPlastiqueStyle>
+class QStyleOptionViewItem;
-#else
+class QModelIndex;
-#include <QProxyStyle>
+QT_END_NAMESPACE
-#endif
-#endif
 
 // Defines for download list list columns
 
@@ -54,191 +45,16 @@ class TransferListDelegate: public QItemDelegate {
   Q_OBJECT
 
 public:
-  TransferListDelegate(QObject *parent) : QItemDelegate(parent) {}
+  TransferListDelegate(QObject *parent);
-
+  ~TransferListDelegate();
-  ~TransferListDelegate() {}
+  void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const;
-
+  QWidget* createEditor(QWidget*, const QStyleOptionViewItem &, const QModelIndex &) const;
-  void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const {
-    QStyleOptionViewItemV2 opt = QItemDelegate::setOptions(index, option);
-    painter->save();
-    switch(index.column()) {
-    case TorrentModelItem::TR_AMOUNT_DOWNLOADED:
-    case TorrentModelItem::TR_AMOUNT_UPLOADED:
-    case TorrentModelItem::TR_AMOUNT_LEFT:
-    case TorrentModelItem::TR_COMPLETED:
-    case TorrentModelItem::TR_SIZE: {
-        QItemDelegate::drawBackground(painter, opt, index);
-        opt.displayAlignment = Qt::AlignRight;
-        QItemDelegate::drawDisplay(painter, opt, option.rect, misc::friendlyUnit(index.data().toLongLong()));
-        break;
-      }
-    case TorrentModelItem::TR_ETA: {
-        QItemDelegate::drawBackground(painter, opt, index);
-        opt.displayAlignment = Qt::AlignRight;
-        QItemDelegate::drawDisplay(painter, opt, option.rect, misc::userFriendlyDuration(index.data().toLongLong()));
-        break;
-      }
-    case TorrentModelItem::TR_SEEDS:
-    case TorrentModelItem::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;
-        QItemDelegate::drawDisplay(painter, opt, opt.rect, display);
-        break;
-      }
-    case TorrentModelItem::TR_STATUS: {
-        const int state = index.data().toInt();
-        QString display;
-        switch(state) {
-        case TorrentModelItem::STATE_DOWNLOADING:
-          display = tr("Downloading");
-          break;
-        case TorrentModelItem::STATE_DOWNLOADING_META:
-          display = tr("Downloading metadata", "used when loading a magnet link");
-          break;
-        case TorrentModelItem::STATE_ALLOCATING:
-          display = tr("Allocating", "qBittorrent is allocating the files on disk");
-          break;
-        case TorrentModelItem::STATE_PAUSED_DL:
-        case TorrentModelItem::STATE_PAUSED_UP:
-          display = tr("Paused");
-          break;
-        case TorrentModelItem::STATE_QUEUED_DL:
-        case TorrentModelItem::STATE_QUEUED_UP:
-          display = tr("Queued", "i.e. torrent is queued");
-          break;
-        case TorrentModelItem::STATE_SEEDING:
-        case TorrentModelItem::STATE_STALLED_UP:
-          display = tr("Seeding", "Torrent is complete and in upload-only mode");
-          break;
-        case TorrentModelItem::STATE_STALLED_DL:
-          display = tr("Stalled", "Torrent is waiting for download to begin");
-          break;
-        case TorrentModelItem::STATE_CHECKING_DL:
-        case TorrentModelItem::STATE_CHECKING_UP:
-          display = tr("Checking", "Torrent local data is being checked");
-          break;
-        case TorrentModelItem::STATE_QUEUED_CHECK:
-          display = tr("Queued for checking", "i.e. torrent is queued for hash checking");
-          break;
-        case TorrentModelItem::STATE_QUEUED_FASTCHECK:
-          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;
-        default:
-           display = "";
-        }
-        QItemDelegate::drawBackground(painter, opt, index);
-        QItemDelegate::drawDisplay(painter, opt, opt.rect, display);
-        break;
-      }
-    case TorrentModelItem::TR_UPSPEED:
-    case TorrentModelItem::TR_DLSPEED: {
-        QItemDelegate::drawBackground(painter, opt, index);
-        const qulonglong speed = index.data().toULongLong();
-        opt.displayAlignment = Qt::AlignRight;
-        QItemDelegate::drawDisplay(painter, opt, opt.rect, misc::friendlyUnit(speed)+tr("/s", "/second (.i.e per second)"));
-        break;
-      }
-    case TorrentModelItem::TR_UPLIMIT:
-    case TorrentModelItem::TR_DLLIMIT: {
-      QItemDelegate::drawBackground(painter, opt, index);
-      const qlonglong limit = index.data().toLongLong();
-      opt.displayAlignment = Qt::AlignRight;
-      QItemDelegate::drawDisplay(painter, opt, opt.rect, limit > 0 ? misc::accurateDoubleToString(limit/1024., 1) + " " + tr("KiB/s", "KiB/second (.i.e per second)") : QString::fromUtf8("∞"));
-      break;
-    }
-    case TorrentModelItem::TR_TIME_ELAPSED: {
-      QItemDelegate::drawBackground(painter, opt, index);
-      QString txt = misc::userFriendlyDuration(index.data().toLongLong());
-      qlonglong seeding_time = index.data(Qt::UserRole).toLongLong();
-      if (seeding_time > 0)
-        txt += " ("+tr("Seeded for %1", "e.g. Seeded for 3m10s").arg(misc::userFriendlyDuration(seeding_time))+")";
-      QItemDelegate::drawDisplay(painter, opt, opt.rect, txt);
-      break;
-    }
-    case TorrentModelItem::TR_ADD_DATE:
-    case TorrentModelItem::TR_SEED_DATE:
-      QItemDelegate::drawBackground(painter, opt, index);
-      QItemDelegate::drawDisplay(painter, opt, opt.rect, index.data().toDateTime().toLocalTime().toString(Qt::DefaultLocaleShortDate));
-      break;
-    case TorrentModelItem::TR_RATIO_LIMIT:
-    case TorrentModelItem::TR_RATIO: {
-        QItemDelegate::drawBackground(painter, opt, index);
-        opt.displayAlignment = Qt::AlignRight;
-        const qreal ratio = index.data().toDouble();
-        QItemDelegate::drawDisplay(painter, opt, opt.rect,
-                                   (ratio == -1 || ratio > QBtSession::MAX_RATIO) ? QString::fromUtf8("∞") : misc::accurateDoubleToString(ratio, 2));
-        break;
-      }
-    case TorrentModelItem::TR_PRIORITY: {
-        const int priority = index.data().toInt();
-        opt.displayAlignment = Qt::AlignRight;
-        if (priority >= 0)
-          QItemDelegate::paint(painter, opt, index);
-        else {
-          QItemDelegate::drawBackground(painter, opt, index);
-          QItemDelegate::drawDisplay(painter, opt, opt.rect, "*");
-        }
-        break;
-      }
-    case TorrentModelItem::TR_PROGRESS: {
-        QStyleOptionProgressBarV2 newopt;
-        qreal progress = index.data().toDouble()*100.;        
-        newopt.rect = opt.rect;
-        newopt.text = misc::accurateDoubleToString(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);
-#else
-        // XXX: To avoid having the progress text on the right of the bar
-#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
-          QPlastiqueStyle st;
-#else
-          QProxyStyle st("fusion");
-#endif
-        st.drawControl(QStyle::CE_ProgressBar, &newopt, painter, 0);
-#endif
-        break;
-      }
-    default:
-      QItemDelegate::paint(painter, option, index);
-    }
-    painter->restore();
-  }
-
-  QWidget* createEditor(QWidget*, const QStyleOptionViewItem &, const QModelIndex &) const {
-    // No editor here
-    return 0;
-  }
 
   // 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 {
+  QSize 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<QSize> ic_sizes(icon.availableSizes());
-      icon_height = ic_sizes[0].height();
-    }
-
-    if (size.height() < icon_height)
-      size.setHeight(icon_height);
-
-    return size;
-  }
 
 };