Fix undo add clip to project

svn path=/branches/KDE4/; revision=1857

diff --git a/src/kdenlivedoc.cpp b/src/kdenlivedoc.cpp
index 93eb9d2fc79c2d5261f3a0969ea53aff19c82143..47ce43e58c3f344c1a176ce8ccac8c33f6807939 100644 (file)
--- a/src/kdenlivedoc.cpp
+++ b/src/kdenlivedoc.cpp
@@ -264,6 +264,7 @@ void KdenliveDoc::addClip(const QDomElement &elem, const int clipId)
 
 void KdenliveDoc::deleteClip(const uint clipId)
 {
+  emit deleteProjectClip(clipId);
   m_clipManager->deleteClip(clipId);
 }
 

diff --git a/src/kdenlivedoc.h b/src/kdenlivedoc.h
index be5c8331bba6851a1f4612e7482d14775ed239db..36aa33a55c1e5a9e6d56b9220dbef6372c0283c8 100644 (file)
--- a/src/kdenlivedoc.h
+++ b/src/kdenlivedoc.h
@@ -81,6 +81,7 @@ class KdenliveDoc:public QObject {
     
   signals:
     void addProjectClip(DocClipBase *);
+    void deleteProjectClip(int);
     void updateClipDisplay(int);
 };
 

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 59cfe52160dbc427366cb111cf873af0e7c3dd9b..7ab87fe40df2c9652064e446889d82b2787b39ef 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -333,6 +333,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //chang
   connect(trackView, SIGNAL(mousePosition(int)), this, SLOT(slotUpdateMousePosition(int)));
   connect(m_projectMonitor, SIGNAL(renderPosition(int)), trackView, SLOT(moveCursorPos(int)));
   connect(doc, SIGNAL(addProjectClip(DocClipBase *)), m_projectList, SLOT(slotAddClip(DocClipBase *)));
+  connect(doc, SIGNAL(deleteProjectClip(int)), m_projectList, SLOT(slotDeleteClip(int)));
   connect(doc, SIGNAL(updateClipDisplay(int)), m_projectList, SLOT(slotUpdateClip(int)));
 
 

diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index 466e73dc682827817334b1c264da9708732b84ce..362d853833aa035a67065855c725c0a3cf988da2 100644 (file)
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -272,7 +272,7 @@ void ProjectList::addClip(const QStringList &name, const QDomElement &elem, cons
   selectItemById(clipId);
 }
 
-void ProjectList::deleteClip(const int clipId)
+void ProjectList::slotDeleteClip( int clipId)
 {
   ProjectItem *item = getItemById(clipId);
   if (item) delete item;

diff --git a/src/projectlist.h b/src/projectlist.h
index 3ab74f2624ba6d614e75918fd0ce70b1cdde7094..c54c69b3c17d5a9a0d68fe68e39a5558af210eb8 100644 (file)
--- a/src/projectlist.h
+++ b/src/projectlist.h
@@ -85,8 +85,8 @@ void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIn
     font.setBold(false);
     painter->setFont(font);
     QString subText = index.data(DurationRole).toString();
-    QString usage = index.data(UsageRole).toString();
-    if (!usage.isEmpty()) subText.append(QString(" (%1)").arg(usage));
+    int usage = index.data(UsageRole).toInt();
+    if (usage != 0) subText.append(QString(" (%1)").arg(usage));
     painter->drawText(r2, Qt::AlignLeft | Qt::AlignVCenter , subText);
     painter->restore();
   }
@@ -109,7 +109,6 @@ class ProjectList : public QWidget
     void setRenderer(Render *projectRender);
 
     void addClip(const QStringList &name, const QDomElement &elem, const int clipId, const KUrl &url = KUrl(), const QString &group = QString::null, int parentId = -1);
-    void deleteClip(const int clipId);
 
   public slots:
     void setDocument(KdenliveDoc *doc);
@@ -117,6 +116,7 @@ class ProjectList : public QWidget
     void slotReplyGetImage(int clipId, int pos, const QPixmap &pix, int w, int h);
     void slotReplyGetFileProperties(int clipId, const QMap < QString, QString > &properties, const QMap < QString, QString > &metadata);
     void slotAddClip(DocClipBase *clip);
+    void slotDeleteClip(int clipId);
     void slotUpdateClip(int id);