Fix recent change that broke rescale on rendering

[kdenlive] / src / projectlist.h

diff --git a/src/projectlist.h b/src/projectlist.h
index 33a0a597c18b965d4c873e0a6143f2467b10c43f..587f8aeb3988521302d98a0b9437702be19d16b1 100644 (file)
--- a/src/projectlist.h
+++ b/src/projectlist.h
@@ -23,6 +23,7 @@
 
 #include <QDomNodeList>
 #include <QToolBar>
+#include <QToolButton>
 #include <QTreeWidget>
 #include <QPainter>
 #include <QItemDelegate>
@@ -31,9 +32,12 @@
 
 #include <KTreeWidgetSearchLine>
 #include <KUrl>
+#include <nepomuk/kratingpainter.h>
+#include <nepomuk/resource.h>
 
 #include "definitions.h"
 #include "timecode.h"
+#include "kdenlivesettings.h"
 
 namespace Mlt {
 class Producer;
@@ -67,14 +71,11 @@ public:
     */
     void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const {
         if (index.column() == 1) {
-            const bool hover = option.state & (QStyle::State_Selected);
             QRect r1 = option.rect;
             painter->save();
-            if (hover) {
+            if (option.state & (QStyle::State_Selected)) {
                 painter->setPen(option.palette.color(QPalette::HighlightedText));
-                QColor backgroundColor = option.palette.color(QPalette::Highlight);
-                painter->setBrush(QBrush(backgroundColor));
-                painter->fillRect(r1, QBrush(backgroundColor));
+                painter->fillRect(r1, option.palette.highlight());
             }
             QFont font = painter->font();
             font.setBold(true);
@@ -93,6 +94,16 @@ public:
             painter->setPen(option.palette.color(QPalette::Mid));
             painter->drawText(r2, Qt::AlignLeft | Qt::AlignVCenter , subText);
             painter->restore();
+        } else if (index.column() == 3 && KdenliveSettings::activate_nepomuk()) {
+            if (index.data().toString().isEmpty()) {
+                QItemDelegate::paint(painter, option, index);
+                return;
+            }
+            QRect r1 = option.rect;
+            if (option.state & (QStyle::State_Selected)) {
+                painter->fillRect(r1, option.palette.highlight());
+            }
+            KRatingPainter::paintRating(painter, r1, Qt::AlignCenter, index.data().toInt());
         } else {
             QItemDelegate::paint(painter, option, index);
         }
@@ -112,10 +123,12 @@ public:
     void updateAllClips();
     QByteArray headerInfo();
     void setHeaderInfo(const QByteArray &state);
+    void setupMenu(QMenu *addMenu, QAction *defaultAction);
+    void setupGeneratorMenu(QMenu *addMenu);
 
 public slots:
     void setDocument(KdenliveDoc *doc);
-    void slotReplyGetImage(const QString &clipId, int pos, const QPixmap &pix, int w, int h);
+    void slotReplyGetImage(const QString &clipId, const QPixmap &pix);
     void slotReplyGetFileProperties(const QString &clipId, Mlt::Producer *producer, const QMap < QString, QString > &properties, const QMap < QString, QString > &metadata);
     void slotAddClip(DocClipBase *clip, bool getProperties);
     void slotDeleteClip(const QString &clipId);
@@ -125,6 +138,9 @@ public slots:
     void slotRemoveInvalidClip(const QString &id);
     void slotSelectClip(const QString &ix);
     void slotRemoveClip();
+    void slotAddClip(KUrl givenUrl = KUrl(), QString group = QString());
+    void slotAddFolder(const QString foldername, const QString &clipId, bool remove, bool edit = false);
+    void slotResetProjectList();
 
 private:
     ProjectListView *listView;
@@ -135,21 +151,23 @@ private:
     QToolBar *m_toolbar;
     QMenu *m_menu;
     QUndoStack *m_commandStack;
-    int m_clipIdCounter;
     void selectItemById(const QString &clipId);
     ProjectItem *getItemById(const QString &id);
+    ProjectItem *getFolderItemById(const QString &id);
     QAction *m_editAction;
     QAction *m_deleteAction;
     KdenliveDoc *m_doc;
     ProjectItem *m_selectedItem;
     bool m_refreshed;
+    QToolButton *m_addButton;
     QMap <QString, QDomElement> m_infoQueue;
     void requestClipInfo(const QDomElement xml, const QString id);
     QList <QString> m_thumbnailQueue;
     void requestClipThumbnail(const QString &id);
+    void deleteProjectFolder(QMap <QString, QString> map);
+    void editFolder(const QString folderName, const QString oldfolderName, const QString &clipId);
 
 private slots:
-    void slotAddClip(QUrl givenUrl = QUrl(), QString group = QString());
     void slotEditClip();
     void slotClipSelected();
     void slotAddColorClip();
@@ -157,7 +175,6 @@ private slots:
     void slotAddTitleClip();
     void slotContextMenu(const QPoint &pos, QTreeWidgetItem *);
     void slotAddFolder();
-    void slotAddFolder(const QString foldername, const QString &clipId, bool remove, bool edit);
     /** This is triggered when a clip description has been modified */
     void slotItemEdited(QTreeWidgetItem *item, int column);
     void slotUpdateClipProperties(ProjectItem *item, QMap <QString, QString> properties);
@@ -174,6 +191,7 @@ signals:
     void showClipProperties(DocClipBase *);
     void projectModified();
     void loadingIsOver();
+    void clipNameChanged(const QString, const QString);
 };
 
 #endif