QmlDesigner: Move ResourceItemDelegate in own file

Change-Id: Id0408822f4b3dd478bf82434bb9eea7374aec443
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>

src/plugins/qmldesigner/components/itemlibrary/itemlibrary.pri

@@ -7,7 +7,8 @@ HEADERS += itemlibraryview.h \
            itemlibrarycomponents.h \
            itemlibraryimageprovider.h \
            itemlibrarysectionmodel.h \
-           itemlibraryitemmodel.h
+           itemlibraryitemmodel.h \
+           resourceitemdelegate.h
 
 SOURCES += itemlibraryview.cpp \
            itemlibrarywidget.cpp \
@@ -15,7 +16,8 @@ SOURCES += itemlibraryview.cpp \
            itemlibrarycomponents.cpp \
            itemlibraryimageprovider.cpp \
            itemlibrarysectionmodel.cpp \
-           itemlibraryitemmodel.cpp
+           itemlibraryitemmodel.cpp \
+           resourceitemdelegate.cpp
 
 RESOURCES += itemlibrary.qrc
 

src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.cpp

@@ -29,6 +29,8 @@
 
 #include "itemlibrarycomponents.h"
 
+#include "resourceitemdelegate.h"
+
 #include <QMimeData>
 #include <QDebug>
 
@@ -42,7 +44,7 @@ enum { debug = 0 };
 
 namespace QmlDesigner {
 
-static void drawSelectionBackground(QPainter *painter, const QStyleOption &option)
+void ItemLibraryTreeView::drawSelectionBackground(QPainter *painter, const QStyleOption &option)
 {
     painter->save();
     QLinearGradient gradient;
@@ -69,7 +71,7 @@ public:
     {
         if (element == QStyle::PE_PanelItemViewRow) {
             if (option->state & QStyle::State_Selected)
-                drawSelectionBackground(painter, *option);
+                ItemLibraryTreeView::drawSelectionBackground(painter, *option);
         }
     }
     int styleHint(StyleHint hint, const QStyleOption *option = 0, const QWidget *widget = 0, QStyleHintReturn *returnData = 0) const {
@@ -155,46 +157,7 @@ void ItemLibraryTreeView::activateItem( const QModelIndex & /*index*/)
     }
 }
 
-void ResourceItemDelegate::paint(QPainter *painter,
-               const QStyleOptionViewItem &option, const QModelIndex &index) const
-{
-    if (option.state & QStyle::State_Selected)
-        drawSelectionBackground(painter, option);
-
-    painter->save();
-
-    QIcon icon(m_model->fileIcon(index));
-    QPixmap pixmap(icon.pixmap(icon.availableSizes().front()));
-    painter->drawPixmap(option.rect.x(),option.rect.y()+2,pixmap);
-    QString myString(m_model->fileName(index));
-
-    // Check text length does not exceed available space
-    int extraSpace=12+pixmap.width();
-    QFontMetrics fm(option.font);
-    myString = fm.elidedText(myString,Qt::ElideMiddle,option.rect.width()-extraSpace);
-
-    painter->drawText(option.rect.bottomLeft()+QPoint(3+pixmap.width(),-8),myString);
-
-    painter->restore();
-}
-
-QSize ResourceItemDelegate::sizeHint(const QStyleOptionViewItem &/*option*/,
-                                     const QModelIndex &index) const
-{
-    QSize result = QSize(25, 4);
-    const QIcon icon(m_model->fileIcon(index));
-    if (!icon.isNull()) {
-        const QList<QSize> sizes = icon.availableSizes();
-        if (!sizes.isEmpty())
-            result += sizes.front();
-    }
-    return result;
-}
 
-void ResourceItemDelegate::setModel(QFileSystemModel *model)
-{
-    m_model = model;
-}
 
 } // namespace QmlDesigner
 

src/plugins/qmldesigner/components/itemlibrary/itemlibrarycomponents.h

@@ -44,6 +44,7 @@ class ResourceItemDelegate;
 
 // ItemLibraryTreeView with Drag implementation
 class ItemLibraryTreeView : public QTreeView {
+
     Q_OBJECT
 public:
     explicit ItemLibraryTreeView(QWidget *parent = 0);
@@ -51,6 +52,8 @@ public:
     virtual void startDrag(Qt::DropActions supportedActions);
     virtual void setModel(QAbstractItemModel *model);
 
+    static void drawSelectionBackground(QPainter *painter, const QStyleOption &option);
+
 signals:
     void itemActivated(const QString &itemName);
 
@@ -61,24 +64,6 @@ private:
     ResourceItemDelegate *m_delegate;
 };
 
-class ResourceItemDelegate : public QStyledItemDelegate
-{
-public:
-    explicit ResourceItemDelegate(QObject *parent=0) :
-        QStyledItemDelegate(parent),m_model(0) {}
-
-    void paint(QPainter *painter,
-               const QStyleOptionViewItem &option, const QModelIndex &index) const;
-
-    QSize sizeHint(const QStyleOptionViewItem &option,
-                   const QModelIndex &index) const;
-
-    void setModel(QFileSystemModel *model);
-
-private:
-    QFileSystemModel *m_model;
-};
-
 } // namespace QmlDesigner
 
 #endif // ITEMLIBRARYCOMPONENTS_H

src/plugins/qmldesigner/components/itemlibrary/resourceitemdelegate.cpp

+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#include "resourceitemdelegate.h"
+
+#include "itemlibrarycomponents.h"
+
+#include <QPainter>
+
+namespace QmlDesigner {
+
+ResourceItemDelegate::ResourceItemDelegate(QObject *parent)
+    : QStyledItemDelegate(parent),
+      m_model(0) {}
+
+void ResourceItemDelegate::paint(QPainter *painter,
+                                 const QStyleOptionViewItem &option,
+                                 const QModelIndex &index) const
+{
+    if (option.state & QStyle::State_Selected)
+        ItemLibraryTreeView::drawSelectionBackground(painter, option);
+
+    painter->save();
+
+    QIcon icon(m_model->fileIcon(index));
+    QPixmap pixmap(icon.pixmap(icon.availableSizes().front()));
+    painter->drawPixmap(option.rect.x(),option.rect.y()+2,pixmap);
+    QString myString(m_model->fileName(index));
+
+    // Check text length does not exceed available space
+    int extraSpace=12+pixmap.width();
+    QFontMetrics fm(option.font);
+    myString = fm.elidedText(myString,Qt::ElideMiddle,option.rect.width()-extraSpace);
+
+    painter->drawText(option.rect.bottomLeft()+QPoint(3+pixmap.width(),-8),myString);
+
+    painter->restore();
+}
+
+QSize ResourceItemDelegate::sizeHint(const QStyleOptionViewItem &/*option*/,
+                                     const QModelIndex &index) const
+{
+    QSize result = QSize(25, 4);
+    const QIcon icon(m_model->fileIcon(index));
+    if (!icon.isNull()) {
+        const QList<QSize> sizes = icon.availableSizes();
+        if (!sizes.isEmpty())
+            result += sizes.front();
+    }
+    return result;
+}
+
+void ResourceItemDelegate::setModel(QFileSystemModel *model)
+{
+    m_model = model;
+}
+
+} // namespace QmlDesigner

src/plugins/qmldesigner/components/itemlibrary/resourceitemdelegate.h

+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#ifndef QMLDESIGNER_RESOURCEITEMDELEGATE_H
+#define QMLDESIGNER_RESOURCEITEMDELEGATE_H
+
+#include <QStyledItemDelegate>
+#include <QFileSystemModel>
+
+namespace QmlDesigner {
+
+class ResourceItemDelegate : public QStyledItemDelegate
+{
+public:
+    explicit ResourceItemDelegate(QObject *parent=0);
+
+    void paint(QPainter *painter,
+               const QStyleOptionViewItem &option,
+               const QModelIndex &index) const;
+
+    QSize sizeHint(const QStyleOptionViewItem &option,
+                   const QModelIndex &index) const;
+
+    void setModel(QFileSystemModel *model);
+
+private:
+    QFileSystemModel *m_model;
+};
+
+} // namespace QmlDesigner
+
+#endif // QMLDESIGNER_RESOURCEITEMDELEGATE_H