X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmainwindow.cpp;h=fb25443284e49a4c7d52946ee8e0c501ef902af4;hb=3915be02797dcbcefa0c30cfb8ab4595d8ab779b;hp=1d1e01d8431bbc058cfdf784fa1924ba4bd142d4;hpb=8e62fa04ccfc251f3c687253cfcbf979964c0a80;p=kdenlive

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 1d1e01d8..fb254432 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -298,6 +298,7 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent
     }
     connect(transitionsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddTransition(QAction *)));
 
+    m_timelineContextMenu->addAction(actionCollection()->action("insert_space"));
     m_timelineContextMenu->addAction(actionCollection()->action(KStandardAction::name(KStandardAction::Paste)));
 
     m_timelineContextClipMenu->addAction(actionCollection()->action("delete_timeline_clip"));
@@ -541,8 +542,14 @@ void MainWindow::setupActions() {
     m_buttonRazorTool->setCheckable(true);
     m_buttonRazorTool->setChecked(false);
 
+    m_buttonSpacerTool = new KAction(KIcon("kdenlive-spacer-tool"), i18n("Spacer tool"), this);
+    toolbar->addAction(m_buttonSpacerTool);
+    m_buttonSpacerTool->setCheckable(true);
+    m_buttonSpacerTool->setChecked(false);
+
     m_toolGroup->addAction(m_buttonSelectTool);
     m_toolGroup->addAction(m_buttonRazorTool);
+    m_toolGroup->addAction(m_buttonSpacerTool);
     m_toolGroup->setExclusive(true);
     toolbar->setToolButtonStyle(Qt::ToolButtonIconOnly);
 
@@ -555,6 +562,10 @@ void MainWindow::setupActions() {
     actionWidget->setMaximumWidth(24);
     actionWidget->setMinimumHeight(17);
 
+    actionWidget = toolbar->widgetForAction(m_buttonSpacerTool);
+    actionWidget->setMaximumWidth(24);
+    actionWidget->setMinimumHeight(17);
+
     toolbar->setStyleSheet(style1);
     connect(m_toolGroup, SIGNAL(triggered(QAction *)), this, SLOT(slotChangeTool(QAction *)));
 
@@ -643,6 +654,7 @@ void MainWindow::setupActions() {
 
     collection->addAction("select_tool", m_buttonSelectTool);
     collection->addAction("razor_tool", m_buttonRazorTool);
+    collection->addAction("spacer_tool", m_buttonSpacerTool);
 
     collection->addAction("show_video_thumbs", m_buttonVideoThumbs);
     collection->addAction("show_audio_thumbs", m_buttonAudioThumbs);
@@ -782,6 +794,10 @@ void MainWindow::setupActions() {
     collection->addAction("edit_clip_marker", editClipMarker);
     connect(editClipMarker, SIGNAL(triggered(bool)), this, SLOT(slotEditClipMarker()));
 
+    KAction *insertSpace = new KAction(KIcon(), i18n("Insert Space"), this);
+    collection->addAction("insert_space", insertSpace);
+    connect(insertSpace, SIGNAL(triggered()), this, SLOT(slotInsertSpace()));
+
     KAction *addGuide = new KAction(KIcon("document-new"), i18n("Add Guide"), this);
     collection->addAction("add_guide", addGuide);
     connect(addGuide, SIGNAL(triggered()), this, SLOT(slotAddGuide()));
@@ -1482,6 +1498,11 @@ void MainWindow::slotAddGuide() {
         m_activeTimeline->projectView()->slotAddGuide();
 }
 
+void MainWindow::slotInsertSpace() {
+    if (m_activeTimeline)
+        m_activeTimeline->projectView()->slotInsertSpace();
+}
+
 void MainWindow::slotEditGuide() {
     if (m_activeTimeline)
         m_activeTimeline->projectView()->slotEditGuide();
@@ -1624,14 +1645,14 @@ void MainWindow::slotSnapRewind() {
     if (m_projectMonitor->isActive()) {
         if (m_activeTimeline)
             m_activeTimeline->projectView()->slotSeekToPreviousSnap();
-    }
+    } else m_clipMonitor->slotSeekToPreviousSnap();
 }
 
 void MainWindow::slotSnapForward() {
     if (m_projectMonitor->isActive()) {
         if (m_activeTimeline)
             m_activeTimeline->projectView()->slotSeekToNextSnap();
-    }
+    } else m_clipMonitor->slotSeekToNextSnap();
 }
 
 void MainWindow::slotClipStart() {
@@ -1651,6 +1672,7 @@ void MainWindow::slotClipEnd() {
 void MainWindow::slotChangeTool(QAction * action) {
     if (action == m_buttonSelectTool) slotSetTool(SELECTTOOL);
     else if (action == m_buttonRazorTool) slotSetTool(RAZORTOOL);
+    else if (action == m_buttonSpacerTool) slotSetTool(SPACERTOOL);
 }
 
 void MainWindow::slotSetTool(PROJECTTOOL tool) {