Connect edit clip from context menu

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

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index e629649edcca3e05d0760c1d3514604dd406ddc1..495d8e85251114e2f7d53347ad0ca68d3fd7fb23 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -216,8 +216,9 @@ MainWindow::MainWindow(QWidget *parent)
     m_timelineContextClipMenu = new QMenu(this);
     m_timelineContextTransitionMenu = new QMenu(this);
 
-    action = actionCollection()->action("delete_timeline_clip");
-    m_timelineContextClipMenu->addAction(action);
+    m_timelineContextClipMenu->addAction(actionCollection()->action("delete_timeline_clip"));
+    m_timelineContextClipMenu->addAction(actionCollection()->action("cut_timeline_clip"));
+
     QMenu *markersMenu = (QMenu*)(factory()->container("marker_menu", this));
     m_timelineContextClipMenu->addMenu(markersMenu);
     m_timelineContextClipMenu->addMenu(videoEffectsMenu);
@@ -494,7 +495,7 @@ void MainWindow::setupActions() {
     actionCollection()->addAction("cut_timeline_clip", cutTimelineClip);
     connect(cutTimelineClip, SIGNAL(triggered(bool)), this, SLOT(slotCutTimelineClip()));
 
-    KAction* addClipMarker = new KAction(KIcon("edit-delete"), i18n("Add Marker to Clip"), this);
+    KAction* addClipMarker = new KAction(KIcon("bookmark-new"), i18n("Add Marker to Clip"), this);
     actionCollection()->addAction("add_clip_marker", addClipMarker);
     connect(addClipMarker, SIGNAL(triggered(bool)), this, SLOT(slotAddClipMarker()));
 
@@ -502,7 +503,7 @@ void MainWindow::setupActions() {
     actionCollection()->addAction("delete_clip_marker", deleteClipMarker);
     connect(deleteClipMarker, SIGNAL(triggered(bool)), this, SLOT(slotDeleteClipMarker()));
 
-    KAction* editClipMarker = new KAction(KIcon("edit-delete"), i18n("Edit Marker"), this);
+    KAction* editClipMarker = new KAction(KIcon("document-properties"), i18n("Edit Marker"), this);
     actionCollection()->addAction("edit_clip_marker", editClipMarker);
     connect(editClipMarker, SIGNAL(triggered(bool)), this, SLOT(slotEditClipMarker()));
 

diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index e58af2d10884bfa1202d9f580326f6ae1eb34471..8b2633044144763fc4390b311c1c3a120d07ed7e 100644 (file)
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -126,6 +126,13 @@ ProjectList::~ProjectList() {
     delete m_toolbar;
 }
 
+void ProjectList::slotEditClip()
+{
+    ProjectItem *item = static_cast <ProjectItem*>(listView->currentItem());
+    if (item && !item->isGroup()) emit clipSelected(item->toXml());
+    emit showClipProperties(item->referencedClip());
+}
+
 
 
 void ProjectList::setRenderer(Render *projectRender) {

diff --git a/src/projectlist.h b/src/projectlist.h
index a704fe3815928f3daf916915757a130406a5d274..4806cb3223221dea8153d2e184301ea99d5e8bf8 100644 (file)
--- a/src/projectlist.h
+++ b/src/projectlist.h
@@ -140,6 +140,7 @@ private:
 private slots:
     void slotAddClip(QUrl givenUrl = QUrl(), QString group = QString());
     void slotRemoveClip();
+    void slotEditClip();
     void slotClipSelected();
     void slotAddColorClip();
     void slotAddSlideshowClip();