show effects for the clipin effectstack

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

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 10ad33635e033fc4a10f46ab74e5239bbd43a8d6..83202edc58c7e951e3ca88652a900b77b65dbc87 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -329,14 +329,20 @@ void CustomTrackView::addEffect(int track, GenTime pos, QString tag, QMap <QStri
 {
   m_document->renderer()->mltAddEffect(track, pos, tag, args);
   ClipItem *clip = getClipItemAt(pos.frames(m_document->fps()) + 1, m_tracksCount - track);
-  if (clip) clip->addEffect(args);
+       if (clip){ 
+               clip->addEffect(args);
+               emit clipItemSelected(clip);
+       }
 }
 
 void CustomTrackView::deleteEffect(int track, GenTime pos, QString tag)
 {
   m_document->renderer()->mltRemoveEffect(track, pos, tag, -1);  
   ClipItem *clip = getClipItemAt(pos.frames(m_document->fps()) + 1, m_tracksCount - track);
-  if (clip) clip->deleteEffect(tag);
+       if (clip){
+               clip->deleteEffect(tag);
+               emit clipItemSelected(clip);
+       }
 }
 
 void CustomTrackView::slotAddEffect(QMap <QString, QString> filter)

diff --git a/src/effectstackview.cpp b/src/effectstackview.cpp
index 14d6bb90be06f58d88ecf9aa0c6b66d5ec7158c7..600433d53f6ba08bbac3df0a234182e16c0e4154 100644 (file)
--- a/src/effectstackview.cpp
+++ b/src/effectstackview.cpp
@@ -8,13 +8,20 @@ EffectStackView::EffectStackView( QWidget *parent)
 : QWidget(parent)
 {
        ui.setupUi(this);
-       
+       clipref=NULL;
 }
 
-void EffectStackView::slotClipItemSelected(ClipItem*)
+void EffectStackView::slotClipItemSelected(ClipItem* c)
 {
-       kDebug() << "selected" ;
-       kDebug() << "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
+       clipref=c;
+       if (clipref==NULL)
+               return;
+       
+       ui.effectlist->clear();
+
+       ui.effectlist->addItems(clipref->effectNames());
+       
+       
 }
 
 #include "effectstackview.moc"
\ No newline at end of file

diff --git a/src/effectstackview.h b/src/effectstackview.h
index f86048306dba4065ed7267fc22b0049bb3ecc186..feb89de41f86d71ba86cef02b4b7579a3a3875e6 100644 (file)
--- a/src/effectstackview.h
+++ b/src/effectstackview.h
@@ -14,7 +14,7 @@ class EffectStackView : public QWidget
        
 private:
        Ui::EffectStack_UI ui;
-
+       ClipItem* clipref;
 public slots:
        void slotClipItemSelected(ClipItem*);
 

diff --git a/src/trackview.cpp b/src/trackview.cpp
index 21d8316919e80d7462cc32c4daaa6607a2ff93c0..3ba8ef05430ea8d67dc238b9428373f75fff43ca 100644 (file)
--- a/src/trackview.cpp
+++ b/src/trackview.cpp
@@ -71,7 +71,7 @@ TrackView::TrackView(KdenliveDoc *doc, QWidget *parent)
   connect(m_trackview, SIGNAL(zoomOut ()), this, SLOT(slotZoomOut()));
   connect(m_trackview->horizontalScrollBar(), SIGNAL(sliderMoved( int )), m_ruler, SLOT(slotMoveRuler( int )));
   connect(m_trackview, SIGNAL(mousePosition(int)), this, SIGNAL(mousePosition(int)));
-
+  connect(m_trackview, SIGNAL(clipItemSelected(ClipItem*)),this,SLOT(slotClipItemSelected(ClipItem*)));
   view->horizontalSlider->setValue(4);
   m_currentZoom = view->horizontalSlider->value();
   m_trackview->initView();
@@ -92,6 +92,10 @@ int TrackView::tracksNumber()
   return m_projectTracks;
 }
 
+void TrackView::slotClipItemSelected(ClipItem*c){
+       emit clipItemSelected(c);
+}
+
 void TrackView::parseDocument(QDomDocument doc)
 {
   int cursorPos = 0;

diff --git a/src/trackview.h b/src/trackview.h
index 3bbf96472ca2c00ade3f4505f922aaf240878f43..f4010fb1aa424ba24325ce7f4142df2756fb935f 100644 (file)
--- a/src/trackview.h
+++ b/src/trackview.h
@@ -37,6 +37,7 @@
 #include "trackpanelfunctionfactory.h"
 #include "trackpanelfunction.h"
 #include "customtrackview.h"
+class ClipItem;
 
 class TrackView : public QWidget
 {
@@ -98,10 +99,11 @@ class TrackView : public QWidget
     void slotZoomOut();
     void setCursorPos(int pos);
     void moveCursorPos(int pos);
-
+    void slotClipItemSelected(ClipItem*);
   signals:
     void mousePosition(int);
     void cursorMoved();
+    void clipItemSelected(ClipItem*);
 };
 
 #endif

diff --git a/src/widgets/effectstack_ui.ui b/src/widgets/effectstack_ui.ui
index 6933afc2d921a2bae2505b5146ca4dc333a7f02e..9d93287daa3295a3b2a39f64160ece5d56160b1c 100644 (file)
--- a/src/widgets/effectstack_ui.ui
+++ b/src/widgets/effectstack_ui.ui
@@ -16,7 +16,7 @@
    <item row="0" column="0" >
     <layout class="QHBoxLayout" >
      <item>
-      <widget class="QListView" name="listView" />
+      <widget class="KListWidget" name="effectlist" />
      </item>
      <item>
       <layout class="QVBoxLayout" >
@@ -46,6 +46,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>KListWidget</class>
+   <extends>QListWidget</extends>
+   <header>klistwidget.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>