Clip markers can now have a category that is shown as a color.

[kdenlive] / src / markerdialog.cpp

diff --git a/src/markerdialog.cpp b/src/markerdialog.cpp
index 7fd788439be7808e0b8e8f1ba32df06908c7e445..5846662f56104bf8e62765a4779d4659516032a3 100644 (file)
--- a/src/markerdialog.cpp
+++ b/src/markerdialog.cpp
@@ -30,16 +30,27 @@ MarkerDialog::MarkerDialog(DocClipBase *clip, CommentedTime t, Timecode tc, cons
         QDialog(parent),
         m_producer(NULL),
         m_profile(NULL),
-        m_clip(clip),
-        m_tc(tc)
+        m_clip(clip)
 {
     setFont(KGlobalSettings::toolBarFont());
-    m_fps = m_tc.fps();
-    m_view.setupUi(this);
+    setupUi(this);
     setWindowTitle(caption);
+
+    // Set  up categories
+    for (int i = 0; i < 5; ++i) {
+         marker_type->insertItem(i, i18n("Category %1", i));
+         marker_type->setItemData(i, CommentedTime::markerColor(i), Qt::DecorationRole);
+     }
+    marker_type->setCurrentIndex(t.markerType());
+
+    m_in = new TimecodeDisplay(tc, this);
+    inputLayout->addWidget(m_in);
+    m_in->setValue(t.time());
+
     m_previewTimer = new QTimer(this);
 
     if (m_clip != NULL) {
+        m_in->setRange(0, m_clip->duration().frames(tc.fps()));
         m_previewTimer->setInterval(500);
         connect(m_previewTimer, SIGNAL(timeout()), this, SLOT(slotUpdateThumb()));
         m_profile = new Mlt::Profile((char*) KdenliveSettings::current_profile().data());
@@ -57,6 +68,8 @@ MarkerDialog::MarkerDialog(DocClipBase *clip, CommentedTime t, Timecode tc, cons
         if (width % 2 == 1) width++;
         QPixmap p(width, 100);
         QString colour = clip->getProperty("colour");
+        int swidth = (int) (100.0 * m_profile->width() / m_profile->height() + 0.5);
+
         switch (m_clip->clipType()) {
         case VIDEO:
         case AV:
@@ -65,7 +78,7 @@ MarkerDialog::MarkerDialog(DocClipBase *clip, CommentedTime t, Timecode tc, cons
             connect(this, SIGNAL(updateThumb()), m_previewTimer, SLOT(start()));
         case IMAGE:
         case TEXT:
-            p = KThumb::getFrame(m_producer, t.time().frames(m_fps), width, 100);
+            p = QPixmap::fromImage(KThumb::getFrame(m_producer, m_in->getValue(), swidth, width, 100));
             break;
         case COLOR:
             colour = colour.replace(0, 2, "#");
@@ -74,22 +87,20 @@ MarkerDialog::MarkerDialog(DocClipBase *clip, CommentedTime t, Timecode tc, cons
         default:
             p.fill(Qt::black);
         }
+
         if (!p.isNull()) {
-            m_view.clip_thumb->setFixedWidth(p.width());
-            m_view.clip_thumb->setFixedHeight(p.height());
-            m_view.clip_thumb->setPixmap(p);
+            clip_thumb->setFixedWidth(p.width());
+            clip_thumb->setFixedHeight(p.height());
+            clip_thumb->setPixmap(p);
         }
-        connect(m_view.marker_position, SIGNAL(textChanged(const QString &)), this, SIGNAL(updateThumb()));
-    } else m_view.clip_thumb->setHidden(true);
-
-    m_view.marker_position->setText(tc.getTimecode(t.time(), m_fps));
-
-    m_view.marker_comment->setText(t.comment());
-    m_view.marker_comment->selectAll();
-    m_view.marker_comment->setFocus();
+        connect(m_in, SIGNAL(editingFinished()), this, SIGNAL(updateThumb()));
+    } else {
+        clip_thumb->setHidden(true);
+    }
 
-    connect(m_view.position_up, SIGNAL(clicked()), this, SLOT(slotTimeUp()));
-    connect(m_view.position_down, SIGNAL(clicked()), this, SLOT(slotTimeDown()));
+    marker_comment->setText(t.comment());
+    marker_comment->selectAll();
+    marker_comment->setFocus();
 
     adjustSize();
 }
@@ -104,43 +115,20 @@ MarkerDialog::~MarkerDialog()
 void MarkerDialog::slotUpdateThumb()
 {
     m_previewTimer->stop();
-    int pos = m_tc.getFrameCount(m_view.marker_position->text(), m_fps);
+    int pos = m_in->getValue();
     int width = 100.0 * m_dar;
+    int swidth = (int) (100.0 * m_profile->width() / m_profile->height() + 0.5);
     if (width % 2 == 1) width++;
-    QPixmap p = KThumb::getFrame(m_producer, pos, width, 100);
-    if (!p.isNull()) m_view.clip_thumb->setPixmap(p);
-    else kDebug() << "!!!!!!!!!!!  ERROR CREATING THUMB";
-}
-
-void MarkerDialog::slotTimeUp()
-{
-    int duration = m_tc.getFrameCount(m_view.marker_position->text(), m_fps);
-    if (m_clip && duration >= m_clip->duration().frames(m_fps)) return;
-    duration ++;
-    m_view.marker_position->setText(m_tc.getTimecode(GenTime(duration, m_fps), m_fps));
-}
-
-void MarkerDialog::slotTimeDown()
-{
-    int duration = m_tc.getFrameCount(m_view.marker_position->text(), m_fps);
-    if (duration <= 0) return;
-    duration --;
-    m_view.marker_position->setText(m_tc.getTimecode(GenTime(duration, m_fps), m_fps));
+    QPixmap p = QPixmap::fromImage(KThumb::getFrame(m_producer, pos, swidth, width, 100));
+    if (!p.isNull())
+        clip_thumb->setPixmap(p);
+    else
+        kDebug() << "!!!!!!!!!!!  ERROR CREATING THUMB";
 }
 
 CommentedTime MarkerDialog::newMarker()
 {
-    return CommentedTime(GenTime(m_tc.getFrameCount(m_view.marker_position->text(), m_fps), m_fps), m_view.marker_comment->text());
-}
-
-void MarkerDialog::wheelEvent(QWheelEvent * event)
-{
-    if (m_view.marker_position->underMouse() || m_view.clip_thumb->underMouse()) {
-        if (event->delta() > 0)
-            slotTimeUp();
-        else
-            slotTimeDown();
-    }
+    return CommentedTime(m_in->gentime(), marker_comment->text(), marker_type->currentIndex());
 }
 
 #include "markerdialog.moc"