#596 Keys changed for next unicode

[kdenlive] / src / monitor.cpp

diff --git a/src/monitor.cpp b/src/monitor.cpp
index a4db4461b66d1aea53b33f2a739e6b505e1be176..bc3cd477fef30aeeda426a94079541251311f61d 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -43,16 +43,18 @@
 Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) :
         QWidget(parent),
         render(NULL),
-        m_monitorManager(manager),
         m_name(name),
-        m_isActive(false),
+        m_monitorManager(manager),
         m_currentClip(NULL),
-        m_dragStarted(false),
-        m_overlay(NULL)
+        m_ruler(new SmallRuler()),
+        m_overlay(NULL),
+        m_isActive(false),
+        m_scale(1),
+        m_length(0),
+        m_position(-1),
+        m_dragStarted(false)
 {
     m_ui.setupUi(this);
-    m_scale = 1;
-    m_ruler = new SmallRuler();
     QVBoxLayout *layout = new QVBoxLayout;
     layout->setContentsMargins(0, 0, 0, 0);
     layout->addWidget(m_ruler);
@@ -66,8 +68,10 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) :
     m_playIcon = KIcon("media-playback-start");
     m_pauseIcon = KIcon("media-playback-pause");
 
-    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()));
+    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);
 
     toolbar->addAction(KIcon("media-seek-backward"), i18n("Rewind"), this, SLOT(slotRewind()));
     toolbar->addAction(KIcon("media-skip-backward"), i18n("Rewind 1 frame"), this, SLOT(slotRewindOneFrame()));
@@ -87,12 +91,16 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent) :
 
     playButton->setDefaultAction(m_playAction);
 
-    QToolButton *configButton = new QToolButton(toolbar);
-    m_configMenu = new QMenu(i18n("Misc..."), this);
-    configButton->setIcon(KIcon("system-run"));
-    configButton->setMenu(m_configMenu);
-    configButton->setPopupMode(QToolButton::QToolButton::InstantPopup);
-    toolbar->addWidget(configButton);
+    if (name != "chapter") {
+        QToolButton *configButton = new QToolButton(toolbar);
+        m_configMenu = new QMenu(i18n("Misc..."), this);
+        configButton->setIcon(KIcon("system-run"));
+        configButton->setMenu(m_configMenu);
+        configButton->setPopupMode(QToolButton::QToolButton::InstantPopup);
+        toolbar->addWidget(configButton);
+        m_configMenu->addAction(KIcon("transform-scale"), i18n("Resize (100%)"), this, SLOT(slotSetSizeOneToOne()));
+        m_configMenu->addAction(KIcon("transform-scale"), i18n("Resize (50%)"), this, SLOT(slotSetSizeOneToTwo()));
+    }
 
     QWidget *spacer = new QWidget(this);
     spacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
@@ -123,11 +131,7 @@ 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)));
 
-    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(m_ui.video_frame->winId(), -1);
-    m_length = 0;
 
     if (name != "clip") {
         connect(render, SIGNAL(rendererPosition(int)), this, SIGNAL(renderPosition(int)));
@@ -182,7 +186,14 @@ void Monitor::setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMe
     showTips->setCheckable(true);
     connect(showTips, SIGNAL(toggled(bool)), this, SLOT(slotSwitchMonitorInfo(bool)));
     showTips->setChecked(KdenliveSettings::displayMonitorInfo());
+
+    QAction *dropFrames = m_contextMenu->addAction(KIcon(), i18n("Real time (drop frames)"));
+    dropFrames->setCheckable(true);
+    dropFrames->setChecked(true);
+    connect(dropFrames, SIGNAL(toggled(bool)), this, SLOT(slotSwitchDropFrames(bool)));
+
     m_configMenu->addAction(showTips);
+    m_configMenu->addAction(dropFrames);
 
 }
 
@@ -453,10 +464,8 @@ void Monitor::slotSeek(int pos)
     activateMonitor();
     if (render == NULL) return;
     m_position = pos;
-    checkOverlay();
     render->seekToFrame(pos);
     emit renderPosition(m_position);
-    m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
 }
 
 void Monitor::checkOverlay()
@@ -481,7 +490,6 @@ void Monitor::slotStart()
     m_position = 0;
     render->seekToFrame(m_position);
     emit renderPosition(m_position);
-    m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
 }
 
 void Monitor::slotEnd()
@@ -491,7 +499,6 @@ void Monitor::slotEnd()
     m_position = render->getLength();
     render->seekToFrame(m_position);
     emit renderPosition(m_position);
-    m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
 }
 
 void Monitor::slotZoneStart()
@@ -501,7 +508,6 @@ void Monitor::slotZoneStart()
     m_position = m_ruler->zone().x();
     render->seekToFrame(m_position);
     emit renderPosition(m_position);
-    m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
 }
 
 void Monitor::slotZoneEnd()
@@ -511,7 +517,6 @@ void Monitor::slotZoneEnd()
     m_position = m_ruler->zone().y();
     render->seekToFrame(m_position);
     emit renderPosition(m_position);
-    m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
 }
 
 void Monitor::slotRewind(double speed)
@@ -551,8 +556,6 @@ void Monitor::slotRewindOneFrame(int diff)
     m_position = qMax(position, 0);
     render->seekToFrame(m_position);
     emit renderPosition(m_position);
-    m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
-    checkOverlay();
 }
 
 void Monitor::slotForwardOneFrame(int diff)
@@ -564,8 +567,6 @@ void Monitor::slotForwardOneFrame(int diff)
     m_position = qMin(m_position, m_length);
     render->seekToFrame(m_position);
     emit renderPosition(m_position);
-    m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
-    checkOverlay();
 }
 
 void Monitor::seekCursor(int pos)
@@ -579,10 +580,16 @@ void Monitor::seekCursor(int pos)
 
 void Monitor::rendererStopped(int pos)
 {
-    //int rulerPos = (int)(pos * m_scale);
+    if (m_currentClip != NULL && m_playAction->isChecked()) {
+        // Clip monitor
+        if (pos >= m_length - 1) {
+            slotStart();
+            return;
+        }
+    }
     m_ruler->slotNewValue(pos);
     m_position = pos;
-    //checkOverlay();
+    checkOverlay();
     m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos));
     m_playAction->setChecked(false);
     m_playAction->setIcon(m_playIcon);
@@ -740,6 +747,11 @@ void Monitor::setClipZone(QPoint pos)
     m_currentClip->setZone(pos);
 }
 
+void Monitor::slotSwitchDropFrames(bool show)
+{
+    render->setDropFrames(show);
+}
+
 void Monitor::slotSwitchMonitorInfo(bool show)
 {
     KdenliveSettings::setDisplayMonitorInfo(show);
@@ -754,12 +766,14 @@ void Monitor::slotSwitchMonitorInfo(bool show)
     }
 }
 
+
 MonitorRefresh::MonitorRefresh(QWidget* parent) : \
         QWidget(parent),
         m_renderer(NULL)
 {
     setAttribute(Qt::WA_PaintOnScreen);
-    setAttribute(Qt::WA_OpaquePaintEvent); //setAttribute(Qt::WA_NoSystemBackground);
+    setAttribute(Qt::WA_OpaquePaintEvent);
+    //setAttribute(Qt::WA_NoSystemBackground);
 }
 
 void MonitorRefresh::setRenderer(Render* render)