Update effect list (show description & author name)

[kdenlive] / src / mainwindow.cpp

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index be6354d9227ecd78612cf11bc98ebc9eb14fb6b9..20f14176f109684c3c04de7c6894f45eb52e638a 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -43,6 +43,7 @@
 #include "mainwindow.h"
 #include "kdenlivesettings.h"
 #include "ui_configmisc_ui.h"
+#include "initeffects.h"
 
 #define ID_STATUS_MSG 1
 #define ID_EDITMODE_MSG 2
@@ -59,7 +60,7 @@ MainWindow::MainWindow(QWidget *parent)
   m_timelineArea->setTabReorderingEnabled(true);
   connect(m_timelineArea, SIGNAL(currentChanged (int)), this, SLOT(activateDocument()));
 
-  Mlt::Factory::init(NULL);
+  initEffects::parseEffectFiles( &m_audioEffects, &m_videoEffects );
   m_monitorManager = new MonitorManager();
 
   projectListDock = new QDockWidget(i18n("Project Tree"), this);
@@ -70,8 +71,10 @@ MainWindow::MainWindow(QWidget *parent)
 
   effectListDock = new QDockWidget(i18n("Effect List"), this);
   effectListDock->setObjectName("effect_list");
-  effectList = new KListWidget(this);
-  effectListDock->setWidget(effectList);
+  m_effectList = new EffectsListView(&m_audioEffects, &m_videoEffects, &m_customEffects);
+
+  //m_effectList = new KListWidget(this);
+  effectListDock->setWidget(m_effectList);
   addDockWidget(Qt::TopDockWidgetArea, effectListDock);
   
   effectStackDock = new QDockWidget(i18n("Effect Stack"), this);
@@ -320,6 +323,7 @@ void MainWindow::slotUpdateMousePosition(int pos)
 void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //changed
 {
   //m_projectMonitor->stop();
+  kDebug()<<"///////////////////   CONNECTING DOC TO PROJECT VIEW ////////////////";
   if (m_activeDocument) {
     if (m_activeDocument == doc) return;
     m_activeDocument->setProducers(m_projectList->producersList());
@@ -328,6 +332,8 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //chang
   connect(trackView, SIGNAL(cursorMoved()), m_projectMonitor, SLOT(activateMonitor()));
   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 *)));
+
   m_projectList->setDocument(doc);
   m_monitorManager->setTimecode(doc->timecode());
   doc->setRenderer(m_projectMonitor->render);