Add shortcut to insert zone in project tree

svn path=/trunk/kdenlive/; revision=4146

diff --git a/src/kdenliveui.rc b/src/kdenliveui.rc
index 56b18fc4a13a38209a35842e94f0f6ab4ac9fe95..3fcb2e01186a65c7f33e60dcde0e0bac8bd4638c 100644 (file)
--- a/src/kdenliveui.rc
+++ b/src/kdenliveui.rc
@@ -139,8 +139,10 @@
       <Separator />      
       <Action name="mark_in" />
       <Action name="mark_out" />
-      <Separator />      
+      <Separator />
       <Action name="switch_monitor" />
+      <Action name="insert_project_tree" />
+      <Action name="insert_timeline" />
     </Menu>
     <Menu name="dockwindows" ><text>View</text>
       <Action name="maximize_current" />

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 8ad31a6ff782afa489d50b2e48ad1ddf0679eeab..8907308ec20e711057a2f28a8b1dab37914f754b 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -998,6 +998,16 @@ void MainWindow::setupActions()
     switchMon->setShortcut(Qt::Key_T);
     connect(switchMon, SIGNAL(triggered(bool)), this, SLOT(slotSwitchMonitors()));
 
+    KAction *insertTree = collection->addAction("insert_project_tree");
+    insertTree->setText(i18n("Insert zone in project tree"));
+    insertTree->setShortcut(Qt::CTRL + Qt::Key_I);
+    connect(insertTree, SIGNAL(triggered(bool)), this, SLOT(slotInsertZoneToTree()));
+
+    KAction *insertTimeline = collection->addAction("insert_timeline");
+    insertTimeline->setText(i18n("Insert zone in timeline"));
+    insertTimeline->setShortcut(Qt::SHIFT + Qt::CTRL + Qt::Key_I);
+    connect(insertTimeline, SIGNAL(triggered(bool)), this, SLOT(slotInsertZoneToTimeline()));
+
     KAction *resizeStart =  new KAction(KIcon(), i18n("Resize Item Start"), this);
     collection->addAction("resize_timeline_clip_start", resizeStart);
     resizeStart->setShortcut(Qt::Key_1);
@@ -3221,5 +3231,18 @@ void MainWindow::slotSwitchMonitors()
     else m_projectList->focusTree();
 }
 
+void MainWindow::slotInsertZoneToTree()
+{
+    if (!m_clipMonitor->isActive() || m_clipMonitor->activeClip() == NULL) return;
+    QStringList info = m_clipMonitor->getZoneInfo();
+    m_projectList->slotAddClipCut(info.at(0), info.at(1).toInt(), info.at(2).toInt());
+}
+
+void MainWindow::slotInsertZoneToTimeline()
+{
+    if (!m_clipMonitor->isActive() || m_clipMonitor->activeClip() == NULL) return;
+    // TODO
+}
+
 #include "mainwindow.moc"
 

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 1f18c3a6ba24375fff428366368ad6a3869c9b23..c439c2e4f7afa59e18b20a88e8c9d93f7db05405 100644 (file)
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -337,6 +337,8 @@ private slots:
     /** \brief Change color scheme */
     void slotChangePalette(QAction *action, const QString &themename = QString());
     void slotSwitchMonitors();
+    void slotInsertZoneToTree();
+    void slotInsertZoneToTimeline();
 
 signals:
     Q_SCRIPTABLE void abortRenderJob(const QString &url);

diff --git a/src/projectlist.h b/src/projectlist.h
index 708bcd30fa27ea775b6aa11dcf6443c88180dcac..aa03597d46e64ce91fca462f72b723fed5c5a241 100644 (file)
--- a/src/projectlist.h
+++ b/src/projectlist.h
@@ -169,6 +169,7 @@ public slots:
     void slotAddColorClip();
     void regenerateTemplate(const QString &id);
     void slotUpdateClipCut(QPoint p);
+    void slotAddClipCut(const QString &id, int in, int out);
 
 private:
     ProjectListView *m_listView;
@@ -216,7 +217,6 @@ private slots:
     void slotProcessNextThumbnail();
     void slotCheckForEmptyQueue();
     void slotPauseMonitor();
-    void slotAddClipCut(const QString &id, int in, int out);
     //void slotShowMenu(const QPoint &pos);
 
 signals: