X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitor.cpp;h=d28b905f21776f3e632ef59e5a833719dfe19ec1;hb=b72fb2155efb7cdbbcb57d90c3d908a6a4d1d70a;hp=ef6426f50a52825a96909105615e832041e46b63;hpb=f40783ad873f1b58fdb9dee53f0bb8cf5d5768bf;p=kdenlive diff --git a/src/monitor.cpp b/src/monitor.cpp index ef6426f5..d28b905f 100644 --- a/src/monitor.cpp +++ b/src/monitor.cpp @@ -24,10 +24,13 @@ #include #include #include +#include #include #include #include +#include +#include #include "gentime.h" #include "monitor.h" @@ -61,16 +64,16 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) toolbar->addAction(KIcon("media-skip-backward"), i18n("Rewind 1 frame"), this, SLOT(slotRewindOneFrame())); QToolButton *playButton = new QToolButton(toolbar); - QMenu *playMenu = new QMenu(i18n("Play..."), this); - playButton->setMenu(playMenu); - playButton->setPopupMode(QToolButton::MenuButtonPopup); - toolbar->addWidget(playButton); - - m_playAction = playMenu->addAction(m_playIcon, i18n("Play")); + m_playMenu = new QMenu(i18n("Play..."), this); + m_playAction = m_playMenu->addAction(m_playIcon, i18n("Play")); m_playAction->setCheckable(true); connect(m_playAction, SIGNAL(triggered()), this, SLOT(slotPlay())); - playMenu->addAction(m_playIcon, i18n("Play Section"), this, SLOT(slotPlayZone())); - playMenu->addAction(m_playIcon, i18n("Loop Section"), this, SLOT(slotLoopZone())); + m_playMenu->addAction(m_playIcon, i18n("Play Section"), this, SLOT(slotPlayZone())); + m_playMenu->addAction(m_playIcon, i18n("Loop Section"), this, SLOT(slotLoopZone())); + + playButton->setMenu(m_playMenu); + playButton->setPopupMode(QToolButton::MenuButtonPopup); + toolbar->addWidget(playButton); toolbar->addAction(KIcon("media-skip-forward"), i18n("Forward 1 frame"), this, SLOT(slotForwardOneFrame())); toolbar->addAction(KIcon("media-seek-forward"), i18n("Forward"), this, SLOT(slotForward())); @@ -78,9 +81,9 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) playButton->setDefaultAction(m_playAction); QToolButton *configButton = new QToolButton(toolbar); - QMenu *configMenu = new QMenu(i18n("Misc..."), this); + m_configMenu = new QMenu(i18n("Misc..."), this); configButton->setIcon(KIcon("system-run")); - configButton->setMenu(configMenu); + configButton->setMenu(m_configMenu); configButton->setPopupMode(QToolButton::QToolButton::InstantPopup); toolbar->addWidget(configButton); @@ -92,6 +95,8 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) m_timePos->setInputMask("99:99:99:99"); toolbar->addWidget(m_timePos); + connect(m_timePos, SIGNAL(editingFinished()), this, SLOT(slotSeek())); + layout2->addWidget(toolbar); ui.button_frame->setLayout(layout2); const int toolHeight = toolbar->height(); @@ -99,7 +104,6 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) //m_ruler->setPixelPerMark(3); - QVBoxLayout *rendererBox = new QVBoxLayout(ui.video_frame); rendererBox->setContentsMargins(0, 0, 0, 0); m_monitorRefresh = new MonitorRefresh(ui.video_frame); @@ -107,13 +111,10 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) render = new Render(m_name, (int) m_monitorRefresh->winId(), -1, this); m_monitorRefresh->setRenderer(render); - m_contextMenu = new QMenu(this); - m_contextMenu->addMenu(playMenu); - QMenu *goMenu = new QMenu(i18n("Go to..."), this); - goMenu->addAction(i18n("Start"), this, SLOT(slotStart())); - goMenu->addAction(i18n("End"), this, SLOT(slotEnd())); - goMenu->addAction(i18n("Zone start"), this, SLOT(slotZoneStart())); - goMenu->addAction(i18n("Zone end"), this, SLOT(slotZoneEnd())); + m_overlay = new Overlay(m_monitorRefresh); + m_overlay->raise(); + m_overlay->setHidden(true); + connect(m_ruler, SIGNAL(seekRenderer(int)), this, SLOT(slotSeek(int))); connect(m_ruler, SIGNAL(zoneChanged(QPoint)), this, SIGNAL(zoneUpdated(QPoint))); @@ -121,40 +122,53 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) connect(render, SIGNAL(rendererPosition(int)), this, SLOT(seekCursor(int))); connect(render, SIGNAL(rendererStopped(int)), this, SLOT(rendererStopped(int))); - configMenu->addSeparator(); - configMenu->addAction(KIcon("transform-scale"), i18n("Resize (100%)"), this, SLOT(slotSetSizeOneToOne())); - configMenu->addAction(KIcon("transform-scale"), i18n("Resize (50%)"), this, SLOT(slotSetSizeOneToTwo())); + m_configMenu->addSeparator(); + m_configMenu->addAction(KIcon("transform-scale"), i18n("Resize (100%)"), this, SLOT(slotSetSizeOneToOne())); + m_configMenu->addAction(KIcon("transform-scale"), i18n("Resize (50%)"), this, SLOT(slotSetSizeOneToTwo())); //render->createVideoXWindow(ui.video_frame->winId(), -1); m_length = 0; - m_contextMenu->addMenu(goMenu); - m_contextMenu->addAction(zoneStart); - m_contextMenu->addAction(zoneEnd); - //TODO: add save zone to timeline monitor when fixed - if (name == "clip") m_contextMenu->addAction(KIcon("document-save"), i18n("Save zone"), this, SLOT(slotSaveZone())); - - QAction *extractFrame = m_contextMenu->addAction(KIcon("document-new"), i18n("Extract frame"), this, SLOT(slotExtractCurrentFrame())); - configMenu->addAction(extractFrame); - if (name != "clip") { connect(render, SIGNAL(rendererPosition(int)), this, SIGNAL(renderPosition(int))); connect(render, SIGNAL(durationChanged(int)), this, SIGNAL(durationChanged(int))); - QAction *splitView = m_contextMenu->addAction(KIcon("document-new"), i18n("Split view"), render, SLOT(slotSplitView(bool))); - splitView->setCheckable(true); - configMenu->addAction(splitView); - } else { - QAction *setThumbFrame = m_contextMenu->addAction(KIcon("document-new"), i18n("Set current image as thumbnail"), this, SLOT(slotSetThumbFrame())); - configMenu->addAction(setThumbFrame); } - m_monitorRefresh->show(); kDebug() << "/////// BUILDING MONITOR, ID: " << ui.video_frame->winId(); } +Monitor::~Monitor() { + delete m_ruler; + delete m_timePos; + delete m_overlay; + delete m_monitorRefresh; +} + QString Monitor::name() const { return m_name; } +void Monitor::setupMenu(QMenu *goMenu) { + m_contextMenu = new QMenu(this); + m_contextMenu->addMenu(m_playMenu); + m_contextMenu->addMenu(goMenu); + + //TODO: add save zone to timeline monitor when fixed + if (m_name == "clip") m_contextMenu->addAction(KIcon("document-save"), i18n("Save zone"), this, SLOT(slotSaveZone())); + + QAction *extractFrame = m_configMenu->addAction(KIcon("document-new"), i18n("Extract frame"), this, SLOT(slotExtractCurrentFrame())); + m_contextMenu->addAction(extractFrame); + + if (m_name != "clip") { + QAction *splitView = m_contextMenu->addAction(KIcon("document-new"), i18n("Split view"), render, SLOT(slotSplitView(bool))); + splitView->setCheckable(true); + m_configMenu->addAction(splitView); + } else { + QAction *setThumbFrame = m_contextMenu->addAction(KIcon("document-new"), i18n("Set current image as thumbnail"), this, SLOT(slotSetThumbFrame())); + m_configMenu->addAction(setThumbFrame); + } + +} + void Monitor::slotSetSizeOneToOne() { QRect r = QApplication::desktop()->screenGeometry(); const int maxWidth = r.width() - 20; @@ -199,16 +213,19 @@ void Monitor::resetSize() { void Monitor::slotZoneMoved(int start, int end) { m_ruler->setZone(start, end); + checkOverlay(); } void Monitor::slotSetZoneStart() { m_ruler->setZone(m_position, -1); emit zoneUpdated(m_ruler->zone()); + checkOverlay(); } void Monitor::slotSetZoneEnd() { m_ruler->setZone(-1, m_position); emit zoneUpdated(m_ruler->zone()); + checkOverlay(); } // virtual @@ -234,7 +251,7 @@ void Monitor::mouseReleaseEvent(QMouseEvent * event) { // virtual void Monitor::mouseMoveEvent(QMouseEvent *event) { - kDebug() << "// DRAG STARTED, MOUSE MOVED: "; + // kDebug() << "// DRAG STARTED, MOUSE MOVED: "; if (!m_dragStarted || m_currentClip == NULL) return; if ((event->pos() - m_DragStartPosition).manhattanLength() @@ -291,13 +308,21 @@ QStringList Monitor::mimeTypes() const { // virtual +/** Move to other position on mousewheel + * + * Moves towards end of clip/timeline on mousewheel down/back, + * opposite for mousewheel up/forward. + * + * Ctrl+wheel moves single frame, without Ctrl moves a second. + * + * See also http://www.kdenlive.org/mantis/view.php?id=265 */ void Monitor::wheelEvent(QWheelEvent * event) { if (event->modifiers() == Qt::ControlModifier) { int delta = m_monitorManager->timecode().fps(); if (event->delta() < 0) delta = 0 - delta; - slotSeek(m_position + delta); + slotSeek(m_position - delta); } else { - if (event->delta() > 0) slotForwardOneFrame(); + if (event->delta() <= 0) slotForwardOneFrame(); else slotRewindOneFrame(); } } @@ -313,7 +338,10 @@ void Monitor::slotSetThumbFrame() { void Monitor::slotExtractCurrentFrame() { QPixmap frame = render->extractFrame(m_position); QString outputFile = KFileDialog::getSaveFileName(KUrl(), "image/png"); - if (!outputFile.isEmpty()) frame.save(outputFile); + if (!outputFile.isEmpty()) { + if (QFile::exists(outputFile) && KMessageBox::questionYesNo(this, i18n("File already exists.\nDo you want to overwrite it ?")) == KMessageBox::No) return; + frame.save(outputFile); + } } bool Monitor::isActive() const { @@ -324,6 +352,11 @@ void Monitor::activateMonitor() { if (!m_isActive) m_monitorManager->activateMonitor(m_name); } +void Monitor::slotSeek() { + const int frames = m_monitorManager->timecode().getFrameCount(m_timePos->text(), m_monitorManager->timecode().fps()); + slotSeek(frames); +} + void Monitor::slotSeek(int pos) { if (!m_isActive) m_monitorManager->activateMonitor(m_name); if (render == NULL) return; @@ -331,6 +364,15 @@ void Monitor::slotSeek(int pos) { m_position = pos; emit renderPosition(m_position); m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position)); + checkOverlay(); +} + +void Monitor::checkOverlay() { + QPoint zone = m_ruler->zone(); + //kDebug()<<"RUL: "<setOverlayText(i18n("In Point")); + else if (m_position == zone.y()) m_overlay->setOverlayText(i18n("Out Point")); + else m_overlay->setHidden(true); } void Monitor::slotStart() { @@ -399,6 +441,7 @@ void Monitor::slotRewindOneFrame() { render->seekToFrame(m_position); emit renderPosition(m_position); m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position)); + checkOverlay(); } void Monitor::slotForwardOneFrame() { @@ -409,6 +452,7 @@ void Monitor::slotForwardOneFrame() { render->seekToFrame(m_position); emit renderPosition(m_position); m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position)); + checkOverlay(); } void Monitor::seekCursor(int pos) { @@ -416,6 +460,7 @@ void Monitor::seekCursor(int pos) { m_position = pos; m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos)); m_ruler->slotNewValue(pos); + checkOverlay(); } void Monitor::rendererStopped(int pos) { @@ -463,6 +508,14 @@ void Monitor::refreshMonitor(bool visible) { } } +void Monitor::pause() { + if (render == NULL) return; + if (!m_isActive) m_monitorManager->activateMonitor(m_name); + render->pause(); + //m_playAction->setChecked(true); + //m_playAction->setIcon(m_pauseIcon); +} + void Monitor::slotPlay() { if (render == NULL) return; if (!m_isActive) m_monitorManager->activateMonitor(m_name); @@ -534,6 +587,13 @@ void Monitor::saveSceneList(QString path, QDomElement info) { render->saveSceneList(path, info); } +QDomDocument Monitor::sceneList() { + if (render == NULL) return QDomDocument(); + QDomDocument doc; + doc.setContent(render->sceneList()); + return doc; +} + MonitorRefresh::MonitorRefresh(QWidget* parent): QWidget(parent), m_renderer(NULL) { setAttribute(Qt::WA_PaintOnScreen); setAttribute(Qt::WA_OpaquePaintEvent); //setAttribute(Qt::WA_NoSystemBackground); @@ -547,4 +607,28 @@ void MonitorRefresh::paintEvent(QPaintEvent * event) { if (m_renderer) m_renderer->doRefresh(); } + +Overlay::Overlay(QWidget* parent): QWidget(parent) { + setAttribute(Qt::WA_TransparentForMouseEvents); + //setAttribute(Qt::WA_OpaquePaintEvent); // + //setAttribute(Qt::WA_NoSystemBackground); + setAutoFillBackground(false); +} + +void Overlay::paintEvent(QPaintEvent * event) { + QPainter painter(this); + painter.fillRect(event->rect(), QColor(200, 0, 0)); + painter.drawText(event->rect(), Qt::AlignCenter, m_text); + //if (m_renderer) m_renderer->doRefresh(); +} + +void Overlay::setOverlayText(const QString &text) { + kDebug() << "/////// SET OVERLAY: " << text; + m_text = text; + setHidden(false); + update(); +} + + + #include "monitor.moc"