Hacking on the delegate height.

diff --git a/src/GUI/AircraftItemDelegate.cxx b/src/GUI/AircraftItemDelegate.cxx
index 0dceacb3292b96f3e2ad4c34c750800eadb99b6d..e950abf3c87a7cd3d9f071ba377dda9a5706c72d 100644 (file)
--- a/src/GUI/AircraftItemDelegate.cxx
+++ b/src/GUI/AircraftItemDelegate.cxx
@@ -26,6 +26,7 @@
 #include <QLinearGradient>
 #include <QListView>
 #include <QMouseEvent>
+#include <QFontMetrics>
 
 #include "AircraftModel.hxx"
 
@@ -33,6 +34,7 @@ AircraftItemDelegate::AircraftItemDelegate(QListView* view) :
     m_view(view)
 {
     view->viewport()->installEventFilter(this);
+    view->viewport()->setMouseTracking(true);
 
     m_leftArrowIcon.load(":/left-arrow-icon");
     m_rightArrowIcon.load(":/right-arrow-icon");
@@ -41,6 +43,7 @@ AircraftItemDelegate::AircraftItemDelegate(QListView* view) :
 void AircraftItemDelegate::paint(QPainter * painter, const QStyleOptionViewItem & option,
     const QModelIndex & index) const
 {
+    painter->setRenderHint(QPainter::Antialiasing);
     // selection feedback rendering
     if (option.state & QStyle::State_Selected) {
         QLinearGradient grad(option.rect.topLeft(), option.rect.bottomLeft());
@@ -52,18 +55,18 @@ void AircraftItemDelegate::paint(QPainter * painter, const QStyleOptionViewItem
 
         painter->setPen(QColor(90, 107, 131));
         painter->drawLine(option.rect.topLeft(), option.rect.topRight());
-
     }
 
     QRect contentRect = option.rect.adjusted(MARGIN, MARGIN, -MARGIN, -MARGIN);
 
     QPixmap thumbnail = index.data(Qt::DecorationRole).value<QPixmap>();
-    painter->drawPixmap(contentRect.topLeft(), thumbnail);
+    quint32 yPos = contentRect.center().y() - (thumbnail.height() / 2);
+    painter->drawPixmap(contentRect.left(), yPos, thumbnail);
 
     // draw 1px frame
     painter->setPen(QColor(0x7f, 0x7f, 0x7f));
     painter->setBrush(Qt::NoBrush);
-    painter->drawRect(contentRect.left(), contentRect.top(), thumbnail.width(), thumbnail.height());
+    painter->drawRect(contentRect.left(), yPos, thumbnail.width(), thumbnail.height());
 
     int variantCount = index.data(AircraftVariantCountRole).toInt();
     int currentVariant =index.data(AircraftVariantRole).toInt();
@@ -100,15 +103,26 @@ void AircraftItemDelegate::paint(QPainter * painter, const QStyleOptionViewItem
     f.setPointSize(12);
     painter->setFont(f);
 
-    QRect authorsRect = descriptionRect;
-    authorsRect.moveTop(actualBounds.bottom() + MARGIN);
-    painter->drawText(authorsRect, Qt::TextWordWrap,
-                      QString("by: %1").arg(authors),
-                      &actualBounds);
+    if (!authors.isEmpty()) {
+        QRect authorsRect = descriptionRect;
+        authorsRect.moveTop(actualBounds.bottom() + MARGIN);
+        painter->drawText(authorsRect, Qt::TextWordWrap,
+                          QString("by: %1").arg(authors),
+                          &actualBounds);
+    }
+
+    QString longDescription = index.data(AircraftLongDescriptionRole).toString();
+    if (!longDescription.isEmpty()) {
+        QRect longDescriptionRect = descriptionRect;
+        longDescriptionRect.moveTop(actualBounds.bottom() + MARGIN);
+        painter->drawText(longDescriptionRect, Qt::TextWordWrap,
+                          longDescription, &actualBounds);
+    }
 
     QRect r = contentRect;
-    r.setWidth(contentRect.width() / 2);
+    r.setWidth(contentRect.width() / 3);
     r.moveTop(actualBounds.bottom() + MARGIN);
+    r.moveLeft(r.right());
     r.setHeight(24);
 
     drawRating(painter, "Flight model:", r, index.data(AircraftRatingRole).toInt());
@@ -120,11 +134,60 @@ void AircraftItemDelegate::paint(QPainter * painter, const QStyleOptionViewItem
     drawRating(painter, "Cockpit:", r, index.data(AircraftRatingRole + 2).toInt());
     r.moveTop(r.bottom());
     drawRating(painter, "Exterior model:", r, index.data(AircraftRatingRole + 3).toInt());
+
+    QVariant v = index.data(AircraftPackageStatusRole);
+    AircraftItemStatus status = static_cast<AircraftItemStatus>(v.toInt());
+    status = PackageNotInstalled;
+    if (status != PackageInstalled) {
+        painter->setBrush(Qt::NoBrush);
+        QRect buttonRect = packageButtonRect(option.rect, index);
+        painter->setPen(Qt::NoPen);
+        painter->setBrush(QColor(27, 122, 211));
+        painter->drawRoundedRect(buttonRect, 5, 5);
+        painter->setPen(Qt::white);
+
+        if (status == PackageNotInstalled) {
+            painter->drawText(buttonRect, Qt::AlignCenter, "Install");
+        } else if (status == PackageUpdateAvailable) {
+            painter->drawText(buttonRect, Qt::AlignCenter, "Update");
+        }
+    }
 }
 
 QSize AircraftItemDelegate::sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const
 {
-    return QSize(500, 128 + (MARGIN * 2));
+    QRect contentRect = option.rect.adjusted(MARGIN, MARGIN, -MARGIN, -MARGIN);
+    QPixmap thumbnail = index.data(Qt::DecorationRole).value<QPixmap>();
+    contentRect.setLeft(contentRect.left() + MARGIN + thumbnail.width());
+
+    QFont f;
+    f.setPointSize(18);
+    QFontMetrics metrics(f);
+
+    int textHeight = metrics.boundingRect(contentRect, Qt::TextWordWrap,
+                                          index.data().toString()).height();
+
+    f.setPointSize(12);
+    QFontMetrics smallMetrics(f);
+
+    QString authors = index.data(AircraftAuthorsRole).toString();
+    if (!authors.isEmpty()) {
+        textHeight += MARGIN;
+        textHeight += smallMetrics.boundingRect(contentRect, Qt::TextWordWrap, authors).height();
+    }
+
+    QString desc = index.data(AircraftLongDescriptionRole).toString();
+    if (!desc.isEmpty()) {
+        textHeight += MARGIN;
+        textHeight += smallMetrics.boundingRect(contentRect, Qt::TextWordWrap, desc).height();
+    }
+
+    // ratings
+    textHeight += 48; // (24px per rating box)
+
+    textHeight = qMax(textHeight, 128);
+
+    return QSize(option.rect.width(), textHeight + (MARGIN * 2));
 }
 
 bool AircraftItemDelegate::eventFilter( QObject*, QEvent* event )
@@ -152,7 +215,16 @@ bool AircraftItemDelegate::eventFilter( QObject*, QEvent* event )
                 return true;
             }
         }
-    } // of mouse button press or release
+    } else if ( event->type() == QEvent::MouseMove ) {
+        QMouseEvent* me = static_cast< QMouseEvent* >( event );
+        QModelIndex index = m_view->indexAt( me->pos() );
+        QRect vr = m_view->visualRect(index);
+
+        if (packageButtonRect(vr, index).contains(me->pos())) {
+            qDebug() << "mouse inside button";
+        }
+
+    }
     
     return false;
 }
@@ -184,6 +256,15 @@ QRect AircraftItemDelegate::rightCycleArrowRect(const QRect& visualRect, const Q
 
 }
 
+QRect AircraftItemDelegate::packageButtonRect(const QRect& visualRect, const QModelIndex& index) const
+{
+    QRect contentRect = visualRect.adjusted(MARGIN, MARGIN, -MARGIN, -MARGIN);
+    QPixmap thumbnail = index.data(Qt::DecorationRole).value<QPixmap>();
+    contentRect.setLeft(contentRect.left() + MARGIN + thumbnail.width());
+
+    return QRect(contentRect.left() + ARROW_SIZE, contentRect.bottom() - 24, 60, 24);
+}
+
 void AircraftItemDelegate::drawRating(QPainter* painter, QString label, const QRect& box, int value) const
 {
     const int DOT_SIZE = 10;

diff --git a/src/GUI/AircraftItemDelegate.hxx b/src/GUI/AircraftItemDelegate.hxx
index e52603b155d29935286aea6816743c5c49ae9eed..0a5f3f609b0a03d3fac476067a5627504cecc9eb 100644 (file)
--- a/src/GUI/AircraftItemDelegate.hxx
+++ b/src/GUI/AircraftItemDelegate.hxx
@@ -47,6 +47,8 @@ private:
     QRect leftCycleArrowRect(const QRect& visualRect, const QModelIndex& index) const;
     QRect rightCycleArrowRect(const QRect& visualRect, const QModelIndex& index) const;
 
+    QRect packageButtonRect(const QRect& visualRect, const QModelIndex& index) const;
+
     void drawRating(QPainter* painter, QString label, const QRect& box, int value) const;
 
     QListView* m_view;

diff --git a/src/GUI/AircraftModel.cxx b/src/GUI/AircraftModel.cxx
index 4fd0a08df0bbed1b024aa6eeb1a28812138b0b86..a7e2b00cdf33813b2b0d91047ea2204742833505 100644 (file)
--- a/src/GUI/AircraftModel.cxx
+++ b/src/GUI/AircraftModel.cxx
@@ -394,6 +394,11 @@ QVariant AircraftItemModel::dataFromItem(const AircraftItem* item, quint32 varia
         return PackageInstalled; // always the case
     } else if (role == Qt::ToolTipRole) {
         return item->path;
+    } else if (role == AircraftLongDescriptionRole) {
+        return "Lorum Ipsum, etc. Is this the real life? Is this just fantasy? Caught in a land-slide, "
+            "no escape from reality. Open your eyes, like up to the skies and see. "
+            "I'm just a poor boy, I need no sympathy because I'm easy come, easy go."
+            "Litte high, little low. Anywhere the wind blows.";
     }
 
     return QVariant();
@@ -402,7 +407,7 @@ QVariant AircraftItemModel::dataFromItem(const AircraftItem* item, quint32 varia
 QVariant AircraftItemModel::dataFromPackage(const PackageRef& item, quint32 variantIndex, int role) const
 {
     if (role == Qt::DisplayRole) {
-        return QString::fromStdString(item->description());
+        return QString::fromStdString(item->name());
     } else if (role == AircraftPathRole) {
         // can we return the theoretical path?
     } else if (role == AircraftPackageIdRole) {
@@ -422,6 +427,8 @@ QVariant AircraftItemModel::dataFromPackage(const PackageRef& item, quint32 vari
         } else {
             return PackageNotInstalled;
         }
+    } else if (role == AircraftLongDescriptionRole) {
+        return QString::fromStdString(item->description());
     }
 
     return QVariant();

diff --git a/src/GUI/AircraftModel.hxx b/src/GUI/AircraftModel.hxx
index 6771cf665d3504a10941fec0836997b1e3c11fcb..6ce2583338567965da94a567910795f5ecd0b738 100644 (file)
--- a/src/GUI/AircraftModel.hxx
+++ b/src/GUI/AircraftModel.hxx
@@ -37,6 +37,7 @@ const int AircraftThumbnailCountRole = Qt::UserRole + 5;
 const int AircraftPackageIdRole = Qt::UserRole + 6;
 const int AircraftPackageStatusRole = Qt::UserRole + 7;
 const int AircraftPackageProgressRole = Qt::UserRole + 8;
+const int AircraftLongDescriptionRole = Qt::UserRole + 9;
 
 const int AircraftRatingRole = Qt::UserRole + 100;
 const int AircraftVariantDescriptionRole = Qt::UserRole + 200;
@@ -72,6 +73,14 @@ private:
     mutable QPixmap m_thumbnail;
 };
 
+
+enum AircraftItemStatus {
+    PackageNotInstalled,
+    PackageInstalled,
+    PackageUpdateAvailable,
+    PackageDownloading
+};
+
 class AircraftItemModel : public QAbstractListModel
 {
     Q_OBJECT
@@ -99,12 +108,6 @@ public:
      */
     QModelIndex indexOfAircraftPath(QString path) const;
 
-    enum {
-        PackageNotInstalled,
-        PackageInstalled,
-        PackageUpdateAvailable,
-        PackageDownloading
-    };
 private slots:
     void onScanResults();