[Details mode] Allow to fill the column size of directories with actual size

[dolphin.git] / src / settings / serviceitemdelegate.cpp

diff --git a/src/settings/serviceitemdelegate.cpp b/src/settings/serviceitemdelegate.cpp
index 62ab60fd9ceed4b8b3b0bd711479ba23811b3c2b..fa0b306c1d600ac38fecef4943518ea99af9b31e 100644 (file)
--- a/src/settings/serviceitemdelegate.cpp
+++ b/src/settings/serviceitemdelegate.cpp
@@ -19,16 +19,12 @@
 
 #include "serviceitemdelegate.h"
 
 
 #include "serviceitemdelegate.h"
 

-#include <KDebug>
-#include <QPushButton>
-#include <QIcon>
-

 #include "servicemodel.h"
 
 #include <QAbstractItemView>
 #include <QCheckBox>
 #include "servicemodel.h"
 
 #include <QAbstractItemView>
 #include <QCheckBox>

-#include <QModelIndex>

 #include <QPainter>
 #include <QPainter>

+#include <QPushButton>

 
 ServiceItemDelegate::ServiceItemDelegate(QAbstractItemView* itemView, QObject* parent) :
     KWidgetItemDelegate(itemView, parent)
 
 ServiceItemDelegate::ServiceItemDelegate(QAbstractItemView* itemView, QObject* parent) :
     KWidgetItemDelegate(itemView, parent)


@@ -42,7 +38,7 @@ ServiceItemDelegate::~ServiceItemDelegate()
 QSize ServiceItemDelegate::sizeHint(const QStyleOptionViewItem &option,
                                     const QModelIndex &index) const
 {
 QSize ServiceItemDelegate::sizeHint(const QStyleOptionViewItem &option,
                                     const QModelIndex &index) const
 {

-    Q_UNUSED(index);
+    Q_UNUSED(index)

 
     const QStyle *style = itemView()->style();
     const int buttonHeight = style->pixelMetric(QStyle::PM_ButtonMargin) * 2 +
 
     const QStyle *style = itemView()->style();
     const int buttonHeight = style->pixelMetric(QStyle::PM_ButtonMargin) * 2 +


@@ -54,7 +50,7 @@ QSize ServiceItemDelegate::sizeHint(const QStyleOptionViewItem &option,
 void ServiceItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option,
                                   const QModelIndex& index) const
 {
 void ServiceItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option,
                                   const QModelIndex& index) const
 {

-    Q_UNUSED(index);
+    Q_UNUSED(index)

     painter->save();
 
     itemView()->style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &option, painter);
     painter->save();
 
     itemView()->style()->drawPrimitive(QStyle::PE_PanelItemViewItem, &option, painter);


@@ -77,7 +73,7 @@ QList<QWidget*> ServiceItemDelegate::createItemWidgets(const QModelIndex&) const
     QPushButton* configureButton = new QPushButton();
     connect(configureButton, &QPushButton::clicked, this, &ServiceItemDelegate::slotConfigureButtonClicked);
 
     QPushButton* configureButton = new QPushButton();
     connect(configureButton, &QPushButton::clicked, this, &ServiceItemDelegate::slotConfigureButtonClicked);
 

-    return QList<QWidget*>() << checkBox << configureButton;
+    return {checkBox, configureButton};

 }
 
 void ServiceItemDelegate::updateItemWidgets(const QList<QWidget*> widgets,
 }
 
 void ServiceItemDelegate::updateItemWidgets(const QList<QWidget*> widgets,


@@ -110,7 +106,7 @@ void ServiceItemDelegate::updateItemWidgets(const QList<QWidget*> widgets,
     // Update the configuration button
     if (configurable) {
         configureButton->setEnabled(checkBox->isChecked());
     // Update the configuration button
     if (configurable) {
         configureButton->setEnabled(checkBox->isChecked());

-        configureButton->setIcon(QIcon::fromTheme("configure"));
+        configureButton->setIcon(QIcon::fromTheme(QStringLiteral("configure")));

         configureButton->resize(configureButton->sizeHint());
         configureButton->move(option.rect.right() - configureButton->width(),
                               (itemHeight - configureButton->height()) / 2);
         configureButton->resize(configureButton->sizeHint());
         configureButton->move(option.rect.right() - configureButton->width(),
                               (itemHeight - configureButton->height()) / 2);