X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitor.cpp;h=25e5808c513bf05482013ba9bd83f11532a91c5a;hb=400dd0e0ea1c71c0d391cf75de69811f06aa6ce3;hp=ba4e8f53d1e46849956fd727866a94d075f45be3;hpb=f20225e0078b03502709b4bee99563cd5593ee75;p=kdenlive diff --git a/src/monitor.cpp b/src/monitor.cpp index ba4e8f53..25e5808c 100644 --- a/src/monitor.cpp +++ b/src/monitor.cpp @@ -71,7 +71,9 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget if (name != "chapter") { toolbar->addAction(KIcon("kdenlive-zone-start"), i18n("Set zone start"), this, SLOT(slotSetZoneStart())); toolbar->addAction(KIcon("kdenlive-zone-end"), i18n("Set zone end"), this, SLOT(slotSetZoneEnd())); - } else m_ruler->setZone(-3, -2); + } else { + m_ruler->setZone(-3, -2); + } toolbar->addAction(KIcon("media-seek-backward"), i18n("Rewind"), this, SLOT(slotRewind())); toolbar->addAction(KIcon("media-skip-backward"), i18n("Rewind 1 frame"), this, SLOT(slotRewindOneFrame())); @@ -112,15 +114,8 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget QWidget *spacer = new QWidget(this); spacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); toolbar->addWidget(spacer); - m_timePos = new KRestrictedLine(this); - m_timePos->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::MinimumExpanding); - m_frametimecode = KdenliveSettings::frametimecode(); - if (m_frametimecode) { - m_timePos->setInputMask(QString()); - m_timePos->setValidator(new QIntValidator(this)); - } else m_timePos->setInputMask("99:99:99:99"); + m_timePos = new TimecodeDisplay(m_monitorManager->timecode(), this); toolbar->addWidget(m_timePos); - connect(m_timePos, SIGNAL(editingFinished()), this, SLOT(slotSeek())); layout2->addWidget(toolbar); @@ -345,8 +340,6 @@ GenTime Monitor::getSnapForPos(bool previous) return GenTime(); } - - void Monitor::slotZoneMoved(int start, int end) { m_ruler->setZone(start, end); @@ -393,7 +386,6 @@ void Monitor::mouseReleaseEvent(QMouseEvent * event) } } - // virtual void Monitor::mouseMoveEvent(QMouseEvent *event) { @@ -452,16 +444,7 @@ QStringList Monitor::mimeTypes() const return qstrList; } - // 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) { @@ -509,26 +492,19 @@ bool Monitor::isActive() const void Monitor::activateMonitor() { if (!m_isActive) { - m_monitorManager->slotSwitchMonitors(); + m_monitorManager->slotSwitchMonitors(m_name == "clip"); } } void Monitor::setTimePos(const QString &pos) { - if (m_frametimecode) { - int frames = m_monitorManager->timecode().getFrameCount(pos); - m_timePos->setText(QString::number(frames)); - } else m_timePos->setText(pos); + m_timePos->setValue(pos); slotSeek(); } void Monitor::slotSeek() { - int frames; - if (m_frametimecode) frames = m_timePos->text().toInt(); - else frames = m_monitorManager->timecode().getFrameCount(m_timePos->text()); - //kDebug() << "// / / SEEK TO: " << frames; - slotSeek(frames); + slotSeek(m_timePos->value()); } void Monitor::slotSeek(int pos) @@ -544,13 +520,17 @@ void Monitor::checkOverlay() if (m_overlay == NULL) return; int pos = render->seekFramePosition(); QPoint zone = m_ruler->zone(); - if (pos == zone.x()) m_overlay->setOverlayText(i18n("In Point")); - else if (pos == zone.y()) m_overlay->setOverlayText(i18n("Out Point")); + if (pos == zone.x()) + m_overlay->setOverlayText(i18n("In Point")); + else if (pos == zone.y()) + m_overlay->setOverlayText(i18n("Out Point")); else { if (m_currentClip) { QString markerComment = m_currentClip->markerComment(GenTime(pos, m_monitorManager->timecode().fps())); - if (markerComment.isEmpty()) m_overlay->setHidden(true); - else m_overlay->setOverlayText(markerComment, false); + if (markerComment.isEmpty()) + m_overlay->setHidden(true); + else + m_overlay->setOverlayText(markerComment, false); } else m_overlay->setHidden(true); } } @@ -632,24 +612,15 @@ void Monitor::seekCursor(int pos) activateMonitor(); if (m_ruler->slotNewValue(pos)) { checkOverlay(); - if (m_frametimecode) m_timePos->setText(QString::number(pos)); - else m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos)); + m_timePos->setValue(pos); } } void Monitor::rendererStopped(int pos) { - if (m_currentClip != NULL && m_playAction->isChecked()) { - // Clip monitor - if (m_isActive && pos >= m_length - 1) { - slotStart(); - return; - } - } if (m_ruler->slotNewValue(pos)) { checkOverlay(); - if (m_frametimecode) m_timePos->setText(QString::number(pos)); - else m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos)); + m_timePos->setValue(pos); } disconnect(m_playAction, SIGNAL(triggered()), this, SLOT(slotPlay())); m_playAction->setChecked(false); @@ -750,7 +721,7 @@ void Monitor::slotSetXml(DocClipBase *clip, QPoint zone, const int position) if (render == NULL) return; if (clip == NULL && m_currentClip != NULL) { m_currentClip = NULL; - m_length = -1; + m_length = -1; render->setProducer(NULL, -1); return; } @@ -791,9 +762,9 @@ void Monitor::slotSaveZone() //render->setSceneList(doc, 0); } - void Monitor::resetProfile(const QString profile) { + m_timePos->updateTimeCode(m_monitorManager->timecode()); if (render == NULL) return; render->resetProfile(profile); } @@ -810,7 +781,6 @@ const QString Monitor::sceneList() return render->sceneList(); } - void Monitor::setClipZone(QPoint pos) { if (m_currentClip == NULL) return; @@ -842,18 +812,7 @@ void Monitor::slotSwitchMonitorInfo(bool show) void Monitor::updateTimecodeFormat() { - m_frametimecode = KdenliveSettings::frametimecode(); - if (m_frametimecode) { - int frames = m_monitorManager->timecode().getFrameCount(m_timePos->text()); - m_timePos->setValidator(new QIntValidator(this)); - m_timePos->setInputMask(QString()); - m_timePos->setText(QString::number(frames)); - } else { - int pos = m_timePos->text().toInt(); - m_timePos->setValidator(0); - m_timePos->setInputMask("99:99:99:99"); - m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos)); - } + m_timePos->slotUpdateTimeCodeFormat(); } QStringList Monitor::getZoneInfo() const @@ -866,7 +825,6 @@ QStringList Monitor::getZoneInfo() const return result; } - MonitorRefresh::MonitorRefresh(QWidget* parent) : \ QWidget(parent), m_renderer(NULL) @@ -886,33 +844,25 @@ void MonitorRefresh::paintEvent(QPaintEvent * /*event*/) if (m_renderer) m_renderer->doRefresh(); } - Overlay::Overlay(QWidget* parent) : QLabel(parent) { setAttribute(Qt::WA_TransparentForMouseEvents); - setAttribute(Qt::WA_OpaquePaintEvent); + //setAttribute(Qt::WA_OpaquePaintEvent); //setAttribute(Qt::WA_NoSystemBackground); - setAutoFillBackground(false); + setAutoFillBackground(true); + setBackgroundRole(QPalette::Base); } -void Overlay::paintEvent(QPaintEvent * /*event*/) -{ - QPainter painter(this); - QColor col; - painter.setPen(Qt::white); - if (m_isZone) col = QColor(200, 0, 0); - else col = QColor(0, 0, 200); - painter.fillRect(rect(), col); - painter.drawText(rect(), Qt::AlignCenter, text()); -} - - - void Overlay::setOverlayText(const QString &text, bool isZone) { setHidden(true); m_isZone = isZone; + QPalette p; + p.setColor(QPalette::Text, Qt::white); + if (m_isZone) p.setColor(QPalette::Base, QColor(200, 0, 0)); + else p.setColor(QPalette::Base, QColor(0, 0, 200)); + setPalette(p); setText(' ' + text + ' '); setHidden(false); update();