Merge pull request #6487 from Chocobo1/ui

GUI polish

src/gui/addnewtorrentdialog.cpp

@@ -70,7 +70,10 @@ const QString KEY_SAVEPATHHISTORY = SETTINGS_KEY("SavePathHistory");
 namespace
 {
     // just a shortcut
-    inline SettingsStorage *settings() { return  SettingsStorage::instance(); }
+    inline SettingsStorage *settings()
+    {
+        return SettingsStorage::instance();
+    }
 }
 
 AddNewTorrentDialog::AddNewTorrentDialog(QWidget *parent)
@@ -311,7 +314,6 @@ void AddNewTorrentDialog::showEvent(QShowEvent *event)
     raise();
 }
 
-
 void AddNewTorrentDialog::showAdvancedSettings(bool show)
 {
     const int minimumW = minimumWidth();
@@ -720,7 +722,7 @@ void AddNewTorrentDialog::setupTreeview()
         m_contentModel = new TorrentContentFilterModel(this);
         connect(m_contentModel->model(), SIGNAL(filteredFilesChanged()), SLOT(updateDiskSpaceLabel()));
         ui->contentTreeView->setModel(m_contentModel);
-        m_contentDelegate = new PropListDelegate();
+        m_contentDelegate = new PropListDelegate(nullptr);
         ui->contentTreeView->setItemDelegate(m_contentDelegate);
         connect(ui->contentTreeView, SIGNAL(clicked(const QModelIndex&)), ui->contentTreeView, SLOT(edit(const QModelIndex&)));
         connect(ui->contentTreeView, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayContentTreeMenu(const QPoint&)));

src/gui/properties/peerlistdelegate.h

@@ -38,7 +38,8 @@
 #include "base/utils/misc.h"
 #include "base/utils/string.h"
 
-class PeerListDelegate: public QItemDelegate {
+class PeerListDelegate: public QItemDelegate
+{
     Q_OBJECT
 
 public:
@@ -67,14 +68,16 @@ public:
 
     ~PeerListDelegate() {}
 
-    void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const
+    void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override
     {
         painter->save();
+
         const bool hideValues = Preferences::instance()->getHideZeroValues();
         QStyleOptionViewItem opt = QItemDelegate::setOptions(index, option);
+        QItemDelegate::drawBackground(painter, opt, index);
+
         switch (index.column()) {
         case PORT: {
-            QItemDelegate::drawBackground(painter, opt, index);
             opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter;
             QItemDelegate::drawDisplay(painter, opt, option.rect, index.data().toString());
             }
@@ -84,23 +87,21 @@ public:
             qlonglong size = index.data().toLongLong();
             if (hideValues && (size <= 0))
                 break;
-            QItemDelegate::drawBackground(painter, opt, index);
             opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter;
             QItemDelegate::drawDisplay(painter, opt, option.rect, Utils::Misc::friendlyUnit(size));
             }
             break;
         case DOWN_SPEED:
         case UP_SPEED: {
-            QItemDelegate::drawBackground(painter, opt, index);
             qreal speed = index.data().toDouble();
+            if (speed <= 0.0)
+                break;
             opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter;
-            if (speed > 0.0)
             QItemDelegate::drawDisplay(painter, opt, opt.rect, Utils::Misc::friendlyUnit(speed, true));
             }
             break;
         case PROGRESS:
         case RELEVANCE: {
-            QItemDelegate::drawBackground(painter, opt, index);
             qreal progress = index.data().toDouble();
             opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter;
             QItemDelegate::drawDisplay(painter, opt, opt.rect, Utils::String::fromDouble(progress * 100.0, 1) + "%");
@@ -109,15 +110,15 @@ public:
         default:
             QItemDelegate::paint(painter, option, index);
         }
+
         painter->restore();
     }
 
-    QWidget* createEditor(QWidget*, const QStyleOptionViewItem &, const QModelIndex &) const
+    QWidget *createEditor(QWidget *, const QStyleOptionViewItem &, const QModelIndex &) const override
     {
         // No editor here
-        return 0;
+        return nullptr;
     }
-
 };
 
 #endif // PEERLISTDELEGATE_H

src/gui/properties/peerlistwidget.cpp

@@ -69,7 +69,7 @@ PeerListWidget::PeerListWidget(PropertiesWidget *parent)
     setSelectionMode(QAbstractItemView::ExtendedSelection);
     header()->setStretchLastSection(false);
     // List Model
-    m_listModel = new QStandardItemModel(0, PeerListDelegate::COL_COUNT);
+    m_listModel = new QStandardItemModel(0, PeerListDelegate::COL_COUNT, this);
     m_listModel->setHeaderData(PeerListDelegate::COUNTRY, Qt::Horizontal, tr("Country")); // Country flag column
     m_listModel->setHeaderData(PeerListDelegate::IP, Qt::Horizontal, tr("IP"));
     m_listModel->setHeaderData(PeerListDelegate::PORT, Qt::Horizontal, tr("Port"));
@@ -92,7 +92,7 @@ PeerListWidget::PeerListWidget(PropertiesWidget *parent)
     m_listModel->setHeaderData(PeerListDelegate::TOT_UP, Qt::Horizontal, QVariant(Qt::AlignRight | Qt::AlignVCenter), Qt::TextAlignmentRole);
     m_listModel->setHeaderData(PeerListDelegate::RELEVANCE, Qt::Horizontal, QVariant(Qt::AlignRight | Qt::AlignVCenter), Qt::TextAlignmentRole);
     // Proxy model to support sorting without actually altering the underlying model
-    m_proxyModel = new PeerListSortModel();
+    m_proxyModel = new PeerListSortModel(this);
     m_proxyModel->setDynamicSortFilter(true);
     m_proxyModel->setSourceModel(m_listModel);
     m_proxyModel->setSortCaseSensitivity(Qt::CaseInsensitive);
@@ -146,12 +146,8 @@ PeerListWidget::PeerListWidget(PropertiesWidget *parent)
 PeerListWidget::~PeerListWidget()
 {
     saveSettings();
-    delete m_proxyModel;
-    delete m_listModel;
-    delete m_listDelegate;
     if (m_resolver)
         delete m_resolver;
-    delete m_copyHotkey;
 }
 
 void PeerListWidget::displayToggleColumnsMenu(const QPoint &)

src/gui/properties/proplistdelegate.cpp

@@ -47,12 +47,12 @@
 #include "propertieswidget.h"
 #include "torrentcontentmodelitem.h"
 
-namespace {
+namespace
+{
 
     QPalette progressBarDisabledPalette()
     {
-        auto getPalette = []()
+        auto getPalette = []() {
-        {
                               QProgressBar bar;
                               bar.setEnabled(false);
                               QStyleOptionProgressBar opt;
@@ -64,8 +64,8 @@ namespace {
     }
 }
 
-PropListDelegate::PropListDelegate(PropertiesWidget *properties, QObject *parent)
+PropListDelegate::PropListDelegate(PropertiesWidget *properties)
-    : QItemDelegate(parent)
+    : QItemDelegate(properties)
     , m_properties(properties)
 {
 }
@@ -74,23 +74,22 @@ void PropListDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti
 {
     painter->save();
     QStyleOptionViewItem opt = QItemDelegate::setOptions(index, option);
+    QItemDelegate::drawBackground(painter, opt, index);
 
     switch (index.column()) {
     case PCSIZE:
-        QItemDelegate::drawBackground(painter, opt, index);
-        QItemDelegate::drawDisplay(painter, opt, option.rect, Utils::Misc::friendlyUnit(index.data().toLongLong()));
-        break;
     case REMAINING:
-        QItemDelegate::drawBackground(painter, opt, index);
         QItemDelegate::drawDisplay(painter, opt, option.rect, Utils::Misc::friendlyUnit(index.data().toLongLong()));
         break;
-    case PROGRESS:
+    case PROGRESS: {
-        if (index.data().toDouble() >= 0) {
+        if (index.data().toDouble() < 0)
+            break;
+
         QStyleOptionProgressBar 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.progress = int(progress);
         newopt.maximum = 100;
         newopt.minimum = 0;
         newopt.textVisible = true;
@@ -98,23 +97,19 @@ void PropListDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti
             newopt.state &= ~QStyle::State_Enabled;
             newopt.palette = progressBarDisabledPalette();
         }
-            else
+        else {
             newopt.state |= QStyle::State_Enabled;
+        }
+
 #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
-            QProxyStyle st("fusion");
+        QProxyStyle("fusion").drawControl(QStyle::CE_ProgressBar, &newopt, painter, 0);
-            st.drawControl(QStyle::CE_ProgressBar, &newopt, painter, 0);
 #endif
     }
-        else {
-            // Do not display anything if the file is disabled (progress  == 0)
-            QItemDelegate::drawBackground(painter, opt, index);
-        }
     break;
     case PRIORITY: {
-            QItemDelegate::drawBackground(painter, opt, index);
         QString text = "";
         switch (index.data().toInt()) {
         case prio::MIXED:

src/gui/properties/proplistdelegate.h

@@ -54,15 +54,15 @@ class PropListDelegate : public QItemDelegate
     Q_OBJECT
 
 public:
-    PropListDelegate(PropertiesWidget *properties = 0, QObject *parent = 0);
+    PropListDelegate(PropertiesWidget *properties);
 
-    void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
+    void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
-    void setEditorData(QWidget *editor, const QModelIndex &index) const;
+    void setEditorData(QWidget *editor, const QModelIndex &index) const override;
-    QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &/* option */, const QModelIndex &index) const;
+    QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem & /* option */, const QModelIndex &index) const override;
 
 public slots:
-    void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const;
+    void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override;
-    void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &/* index */) const;
+    void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex & /* index */) const override;
 
 signals:
     void filteredFilesChanged() const;

src/gui/search/searchlistdelegate.cpp

@@ -47,19 +47,15 @@ void SearchListDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
     painter->save();
 
     QStyleOptionViewItem opt = QItemDelegate::setOptions(index, option);
+    QItemDelegate::drawBackground(painter, opt, index);
+
     switch (index.column()) {
     case SearchSortModel::SIZE:
-        QItemDelegate::drawBackground(painter, opt, index);
         opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter;
         QItemDelegate::drawDisplay(painter, opt, option.rect, Utils::Misc::friendlyUnit(index.data().toLongLong()));
         break;
     case SearchSortModel::SEEDS:
-        QItemDelegate::drawBackground(painter, opt, index);
-        opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter;
-        QItemDelegate::drawDisplay(painter, opt, option.rect, (index.data().toLongLong() >= 0) ? index.data().toString() : tr("Unknown"));
-        break;
     case SearchSortModel::LEECHES:
-        QItemDelegate::drawBackground(painter, opt, index);
         opt.displayAlignment = Qt::AlignRight | Qt::AlignVCenter;
         QItemDelegate::drawDisplay(painter, opt, option.rect, (index.data().toLongLong() >= 0) ? index.data().toString() : tr("Unknown"));
         break;
@@ -73,5 +69,5 @@ void SearchListDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
 QWidget *SearchListDelegate::createEditor(QWidget *, const QStyleOptionViewItem &, const QModelIndex &) const
 {
     // No editor here
-    return 0;
+    return nullptr;
 }

src/gui/search/searchlistdelegate.h

@@ -36,10 +36,10 @@
 class SearchListDelegate: public QItemDelegate
 {
 public:
-    explicit SearchListDelegate(QObject *parent = 0);
+    explicit SearchListDelegate(QObject *parent);
 
-    void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
+    void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const override;
-    QWidget* createEditor(QWidget*, const QStyleOptionViewItem &, const QModelIndex &) const;
+    QWidget *createEditor(QWidget *, const QStyleOptionViewItem &, const QModelIndex &) const override;
 };
 
 #endif