- Improved property list delegate

src/PropListDelegate.h

@@ -57,40 +57,13 @@ class PropListDelegate: public QItemDelegate {
     ~PropListDelegate(){}
 
     void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const{
-      QStyleOptionViewItem opt = option;
       char tmp[MAX_CHAR_TMP];
-      // set text color
+      QStyleOptionViewItemV3 opt = QItemDelegate::setOptions(index, option);
-      QVariant value = index.data(Qt::ForegroundRole);
+      QPalette::ColorGroup cg = option.state & QStyle::State_Enabled ? QPalette::Normal : QPalette::Disabled;
-      if (value.isValid() && qvariant_cast<QColor>(value).isValid()){
-          opt.palette.setColor(QPalette::Text, qvariant_cast<QColor>(value));
-      }
-      QPalette::ColorGroup cg = option.state & QStyle::State_Enabled
-                              ? QPalette::Normal : QPalette::Disabled;
-      if (option.state & QStyle::State_Selected){
-        painter->setPen(opt.palette.color(cg, QPalette::HighlightedText));
-      }else{
-        painter->setPen(opt.palette.color(cg, QPalette::Text));
-      }
-      // draw the background color
-      if(index.column() != PROGRESS){
-        if (option.showDecorationSelected && (option.state & QStyle::State_Selected)){
-          if (cg == QPalette::Normal && !(option.state & QStyle::State_Active)){
-              cg = QPalette::Inactive;
-          }
-          painter->fillRect(option.rect, option.palette.brush(cg, QPalette::Highlight));
-        }else{
-          value = index.data(Qt::BackgroundColorRole);
-          if (value.isValid() && qvariant_cast<QColor>(value).isValid()){
-            painter->fillRect(option.rect, qvariant_cast<QColor>(value));
-          }
-        }
-      }
       switch(index.column()){
         case SIZE:
-          painter->drawText(option.rect, Qt::AlignCenter, misc::friendlyUnit(index.data().toLongLong()));
+          QItemDelegate::drawBackground(painter, opt, index);
-          break;
+          QItemDelegate::drawDisplay(painter, opt, option.rect, misc::friendlyUnit(index.data().toLongLong()));
-        case NAME:
-          painter->drawText(option.rect, Qt::AlignLeft, index.data().toString());
           break;
         case PROGRESS:{
           QStyleOptionProgressBarV2 newopt;
@@ -142,7 +115,7 @@ class PropListDelegate: public QItemDelegate {
           break;
         }
         default:
-          painter->drawText(option.rect, Qt::AlignCenter, index.data().toString());
+          QItemDelegate::paint(painter, option, index);
       }
     }