effectstack start

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

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 78365aebc2b33e4523170eeadb8498cc16d8ddc7..10ad33635e033fc4a10f46ab74e5239bbd43a8d6 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -285,6 +285,7 @@ void CustomTrackView::mousePressEvent ( QMouseEvent * event )
          update();
        }
        m_dragItem = (ClipItem *) item;
+       emit clipItemSelected(m_dragItem);
        m_clickPoint = mapToScene(event->pos()).x() - m_dragItem->startPos() * m_scale;
        m_operationMode = m_dragItem->operationMode(item->mapFromScene(mapToScene(event->pos())), m_scale);
        if (m_operationMode == MOVE || m_operationMode == RESIZESTART) 

diff --git a/src/customtrackview.h b/src/customtrackview.h
index 340ef11ca385c9c9ee2187b26c6c5529b589f9a0..59d536508db7e5969aa3629ec6576f7e02350c78 100644 (file)
--- a/src/customtrackview.h
+++ b/src/customtrackview.h
@@ -98,6 +98,7 @@ class CustomTrackView : public QGraphicsView
     void zoomIn();
     void zoomOut();
     void mousePosition(int);
+    void clipItemSelected(ClipItem*);
 
 };
 

diff --git a/src/effectstackview.cpp b/src/effectstackview.cpp
new file mode 100644 (file)
index 0000000..14d6bb9
--- /dev/null
+++ b/src/effectstackview.cpp
@@ -0,0 +1,20 @@
+#include <KDebug>
+#include <KLocale>
+
+#include "effectstackview.h"
+#include "clipitem.h"
+
+EffectStackView::EffectStackView( QWidget *parent)
+: QWidget(parent)
+{
+       ui.setupUi(this);
+       
+}
+
+void EffectStackView::slotClipItemSelected(ClipItem*)
+{
+       kDebug() << "selected" ;
+       kDebug() << "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
+}
+
+#include "effectstackview.moc"
\ No newline at end of file

diff --git a/src/effectstackview.h b/src/effectstackview.h
new file mode 100644 (file)
index 0000000..f860483
--- /dev/null
+++ b/src/effectstackview.h
@@ -0,0 +1,24 @@
+#ifndef EFFECTSTACKVIEW_H
+#define EFFECTSTACKVIEW_H
+
+#include <KIcon>
+
+#include "ui_effectstack_ui.h"
+#include "clipitem.h"
+class EffectStackView : public QWidget
+{
+       Q_OBJECT
+               
+       public:
+               EffectStackView( QWidget *parent=0);
+       
+private:
+       Ui::EffectStack_UI ui;
+
+public slots:
+       void slotClipItemSelected(ClipItem*);
+
+       
+};
+
+#endif

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index ac3f6f325de011463e9efeb39144b377bc9d8b97..88ec0842c39d089c40974584151c5cdac8cf365c 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -22,6 +22,8 @@
 #include <QTextStream>
 #include <QTimer>
 #include <QAction>
+#include <QtTest>
+#include <QtCore>
 
 #include <KApplication>
 #include <KAction>
@@ -79,7 +81,7 @@ MainWindow::MainWindow(QWidget *parent)
   
   effectStackDock = new QDockWidget(i18n("Effect Stack"), this);
   effectStackDock->setObjectName("effect_stack");
-  effectStack = new KListWidget(this);
+  effectStack = new EffectStackView(this);
   effectStackDock->setWidget(effectStack);
   addDockWidget(Qt::TopDockWidgetArea, effectStackDock);
   
@@ -140,7 +142,7 @@ MainWindow::MainWindow(QWidget *parent)
   connect(m_monitorManager, SIGNAL(raiseClipMonitor (bool)), this, SLOT(slotRaiseMonitor(bool)));
   connect(m_effectList, SIGNAL(addEffect(int, const QString&)), this, SLOT(slotAddEffect(int, const QString &)));
   m_monitorManager->initMonitors(m_clipMonitor, m_projectMonitor);
-
+       
   setAutoSaveSettings();
   newFile();
 }
@@ -351,7 +353,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //chang
   connect(doc, SIGNAL(signalDeleteProjectClip(int)), m_projectList, SLOT(slotDeleteClip(int)));
   connect(doc, SIGNAL(updateClipDisplay(int)), m_projectList, SLOT(slotUpdateClip(int)));
   connect(doc, SIGNAL(deletTimelineClip(int)), trackView, SLOT(slotDeleteClip(int)));
-
+       
   m_projectList->setDocument(doc);
   m_monitorManager->setTimecode(doc->timecode());
   doc->setRenderer(m_projectMonitor->render);
@@ -380,7 +382,6 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //chang
   m_activeDocument = doc;
 }
 
-
 void MainWindow::slotPreferences()
 {
   //An instance of your dialog could be already created and could be

diff --git a/src/mainwindow.h b/src/mainwindow.h
index cdd8869044c045876ac4b0d80f7e2cb9f242d2b0..d63851266172c90a0c2a51266067db775085981f 100644 (file)
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -41,6 +41,7 @@
 #include "customtrackview.h"
 #include "effectslist.h"
 #include "effectslistview.h"
+#include "effectstackview.h"
 
 class MainWindow : public KXmlGuiWindow
 {
@@ -67,7 +68,7 @@ class MainWindow : public KXmlGuiWindow
     //KListWidget *m_effectList;
 
     QDockWidget *effectStackDock;
-    KListWidget *effectStack;
+    EffectStackView *effectStack;
 
     QDockWidget *transitionConfigDock;
     KListWidget *transitionConfig;
@@ -100,7 +101,6 @@ class MainWindow : public KXmlGuiWindow
   public slots:
     void openFile(const KUrl &url);
 
-
   private slots:
     void newFile();
     void activateDocument();

diff --git a/src/widgets/effectstack_ui.ui b/src/widgets/effectstack_ui.ui
new file mode 100644 (file)
index 0000000..6933afc
--- /dev/null
+++ b/src/widgets/effectstack_ui.ui
@@ -0,0 +1,51 @@
+<ui version="4.0" >
+ <class>EffectStack_UI</class>
+ <widget class="QWidget" name="EffectStack_UI" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>716</width>
+    <height>430</height>
+   </rect>
+  </property>
+  <property name="windowTitle" >
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" >
+   <item row="0" column="0" >
+    <layout class="QHBoxLayout" >
+     <item>
+      <widget class="QListView" name="listView" />
+     </item>
+     <item>
+      <layout class="QVBoxLayout" >
+       <item>
+        <widget class="QGraphicsView" name="graphicsView" >
+         <property name="autoFillBackground" >
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="groupBox" >
+         <property name="minimumSize" >
+          <size>
+           <width>0</width>
+           <height>74</height>
+          </size>
+         </property>
+         <property name="title" >
+          <string>Parameter-Setup</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>