Wheel on project timeline ruler to seek, ctrl+wheel seeks 1 second instead of 1 frame

[kdenlive] / src / monitor.cpp

diff --git a/src/monitor.cpp b/src/monitor.cpp
index be3cdcf726ff4b76cfbdaecfe451fc035c24cd02..3454e442fb7ccedf93f434541f35584d65d96c92 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -26,6 +26,7 @@
 
 #include <KDebug>
 #include <KLocale>
+#include <KFileDialog>
 
 #include "gentime.h"
 #include "monitor.h"
@@ -54,7 +55,7 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent)
     connect(m_rew1Action, SIGNAL(triggered()), this, SLOT(slotRewindOneFrame()));
 
     QToolButton *playButton = new QToolButton(toolbar);
-    QMenu *playMenu = new QMenu(this);
+    QMenu *playMenu = new QMenu(i18n("Play..."), this);
     playButton->setMenu(playMenu);
     playButton->setPopupMode(QToolButton::MenuButtonPopup);
     toolbar->addWidget(playButton);
@@ -87,7 +88,7 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent)
     QVBoxLayout *rendererBox = new QVBoxLayout(ui.video_frame);
     m_monitorRefresh = new MonitorRefresh(ui.video_frame);
     rendererBox->addWidget(m_monitorRefresh);
-    m_monitorRefresh->setAttribute(Qt::WA_PaintOnScreen);
+    //m_monitorRefresh->setAttribute(Qt::WA_PaintOnScreen);
     render = new Render(m_name, (int) m_monitorRefresh->winId(), -1, this);
     m_monitorRefresh->setRenderer(render);
 
@@ -104,6 +105,11 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent)
     m_ruler->setMaximum(width);
     m_length = 0;
 
+    m_contextMenu = new QMenu(this);
+    m_contextMenu->addMenu(playMenu);
+    QAction *extractFrame = m_contextMenu->addAction(KIcon("document-new"), i18n("Extract frame"));
+    connect(extractFrame, SIGNAL(triggered()), this, SLOT(slotExtractCurrentFrame()));
+
     kDebug() << "/////// BUILDING MONITOR, ID: " << ui.video_frame->winId();
 }
 
@@ -113,13 +119,26 @@ QString Monitor::name() const {
 
 // virtual
 void Monitor::mousePressEvent(QMouseEvent * event) {
-    slotPlay();
+    if (event->button() != Qt::RightButton) slotPlay();
+    else m_contextMenu->popup(event->globalPos());
 }
 
 // virtual
 void Monitor::wheelEvent(QWheelEvent * event) {
-    if (event->delta() > 0) slotForwardOneFrame();
-    else slotRewindOneFrame();
+    if (event->modifiers() == Qt::ControlModifier) {
+        int delta = m_monitorManager->timecode().fps();
+        if (event->delta() < 0) delta = 0 - delta;
+        slotSeek(m_position + delta);
+    } else {
+        if (event->delta() > 0) slotForwardOneFrame();
+        else slotRewindOneFrame();
+    }
+}
+
+void Monitor::slotExtractCurrentFrame() {
+    QPixmap frame = render->extractFrame(m_position);
+    QString outputFile = KFileDialog::getSaveFileName(KUrl(), "image/png");
+    if (!outputFile.isEmpty()) frame.save(outputFile);
 }
 
 void Monitor::activateMonitor() {
@@ -129,9 +148,8 @@ void Monitor::activateMonitor() {
 void Monitor::slotSeek(int pos) {
     if (!m_isActive) m_monitorManager->activateMonitor(m_name);
     if (render == NULL) return;
-    int realPos = ((double) pos) / m_scale;
-    render->seekToFrame(realPos);
-    m_position = realPos;
+    render->seekToFrame(pos);
+    m_position = pos;
     emit renderPosition(m_position);
     m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
 }