From: Marco Gittler <marco@gitma.de>
Date: Mon, 18 Feb 2008 23:13:03 +0000 (+0000)
Subject: show effects for the clipin effectstack
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=8e611ffe38c243e720409292dfeabde3ebe4f555;p=kdenlive

show effects for the clipin effectstack

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

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 10ad3363..83202edc 100644
--- 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 14d6bb90..600433d5 100644
--- 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 f8604830..feb89de4 100644
--- 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 21d83169..3ba8ef05 100644
--- 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 3bbf9647..f4010fb1 100644
--- 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 6933afc2..9d93287d 100644
--- 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>