X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmarkerdialog.cpp;h=1eb48042acb6d621f2ec2de653b21c9f8f4c9218;hb=c24658bd34221d735f0641c924b890e1a6be7101;hp=64bc1ee9eeeb8eca84cc4f30a57c62f1bb2f83fc;hpb=63433b8ce3e47971403b2dda3185744898555389;p=kdenlive

diff --git a/src/markerdialog.cpp b/src/markerdialog.cpp
index 64bc1ee9..1eb48042 100644
--- a/src/markerdialog.cpp
+++ b/src/markerdialog.cpp
@@ -26,21 +26,32 @@
 #include <KDebug>
 
 
-MarkerDialog::MarkerDialog(DocClipBase *clip, CommentedTime t, Timecode tc, const QString &caption, QWidget * parent) :
-        QDialog(parent),
-        m_producer(NULL),
-        m_profile(NULL),
-        m_clip(clip),
-        m_tc(tc),
-        m_frameDisplay(KdenliveSettings::frametimecode())
+MarkerDialog::MarkerDialog(DocClipBase *clip, const CommentedTime &t, const Timecode &tc, const QString &caption, QWidget * parent)
+    : QDialog(parent)
+    , m_producer(NULL)
+    , m_profile(NULL)
+    , m_clip(clip)
+    , m_dar(4.0 / 3.0)
 {
     setFont(KGlobalSettings::toolBarFont());
-    m_fps = m_tc.fps();
     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());
@@ -54,49 +65,49 @@ MarkerDialog::MarkerDialog(DocClipBase *clip, CommentedTime t, Timecode tc, cons
         //char *tmp = doc.toString().toUtf8().data();
         m_producer = new Mlt::Producer(*m_profile, "xml-string", doc.toString().toUtf8().data());
         //delete[] tmp;
-        int width = 100.0 * m_dar;
+        int width = Kdenlive::DefaultThumbHeight * m_dar;
         if (width % 2 == 1) width++;
         QPixmap p(width, 100);
         QString colour = clip->getProperty("colour");
+        int swidth = (int) (Kdenlive::DefaultThumbHeight * m_profile->width() / m_profile->height() + 0.5);
+
         switch (m_clip->clipType()) {
-        case VIDEO:
+        case Video:
         case AV:
-        case SLIDESHOW:
-        case PLAYLIST:
+        case SlideShow:
+        case Playlist:
             connect(this, SIGNAL(updateThumb()), m_previewTimer, SLOT(start()));
-        case IMAGE:
-        case TEXT:
-            p = QPixmap::fromImage(KThumb::getFrame(m_producer, t.time().frames(m_fps), width, 100));
             break;
-        case COLOR:
+        case Image:
+        case Text:
+            m_image = KThumb::getFrame(m_producer, m_in->getValue(), swidth, width, Kdenlive::DefaultThumbHeight);
+            p = QPixmap::fromImage(m_image);
+            break;
+        case Color:
             colour = colour.replace(0, 2, "#");
             p.fill(QColor(colour.left(7)));
             break;
+        //UNKNOWN, AUDIO, VIRTUAL:
         default:
             p.fill(Qt::black);
         }
+
         if (!p.isNull()) {
             clip_thumb->setFixedWidth(p.width());
             clip_thumb->setFixedHeight(p.height());
             clip_thumb->setPixmap(p);
         }
-        connect(marker_position, SIGNAL(textChanged(const QString &)), this, SIGNAL(updateThumb()));
-    } else clip_thumb->setHidden(true);
-
-    if (m_frameDisplay) {
-        QValidator *valid = new QIntValidator(this);
-        marker_position->setInputMask("");
-        marker_position->setValidator(valid);
+        connect(m_in, SIGNAL(timeCodeEditingFinished()), this, SIGNAL(updateThumb()));
+    } else {
+        clip_thumb->setHidden(true);
+        label_category->setHidden(true);
+        marker_type->setHidden(true);
     }
-    marker_position->setText(tc.getDisplayTimecode(t.time(), m_frameDisplay));
 
     marker_comment->setText(t.comment());
     marker_comment->selectAll();
     marker_comment->setFocus();
 
-    connect(position_up, SIGNAL(clicked()), this, SLOT(slotTimeUp()));
-    connect(position_down, SIGNAL(clicked()), this, SLOT(slotTimeDown()));
-
     adjustSize();
 }
 
@@ -110,43 +121,29 @@ MarkerDialog::~MarkerDialog()
 void MarkerDialog::slotUpdateThumb()
 {
     m_previewTimer->stop();
-    int pos = m_tc.getDisplayFrameCount(marker_position->text(), m_frameDisplay);
+    int pos = m_in->getValue();
     int width = 100.0 * m_dar;
-    if (width % 2 == 1) width++;
-    QPixmap p = QPixmap::fromImage(KThumb::getFrame(m_producer, pos, width, 100));
-    if (!p.isNull()) clip_thumb->setPixmap(p);
-    else kDebug() << "!!!!!!!!!!!  ERROR CREATING THUMB";
-}
-
-void MarkerDialog::slotTimeUp()
-{
-    int duration = m_tc.getDisplayFrameCount(marker_position->text(), m_frameDisplay);
-    if (m_clip && duration >= m_clip->duration().frames(m_fps)) return;
-    duration ++;
-    marker_position->setText(m_tc.getDisplayTimecode(GenTime(duration, m_fps), m_frameDisplay));
+    int swidth = (int) (100.0 * m_profile->width() / m_profile->height() + 0.5);
+    if (width % 2 == 1)
+        width++;
+
+    m_image = KThumb::getFrame(m_producer, pos, swidth, width, 100);
+    const QPixmap p = QPixmap::fromImage(m_image);
+    if (!p.isNull())
+        clip_thumb->setPixmap(p);
+    else
+        kDebug() << "!!!!!!!!!!!  ERROR CREATING THUMB";
 }
 
-void MarkerDialog::slotTimeDown()
+QImage MarkerDialog::markerImage() const
 {
-    int duration = m_tc.getDisplayFrameCount(marker_position->text(), m_frameDisplay);
-    if (duration <= 0) return;
-    duration --;
-    marker_position->setText(m_tc.getDisplayTimecode(GenTime(duration, m_fps), m_frameDisplay));
+    return m_image;
 }
 
 CommentedTime MarkerDialog::newMarker()
 {
-    return CommentedTime(GenTime(m_tc.getDisplayFrameCount(marker_position->text(), m_frameDisplay), m_fps), marker_comment->text());
-}
-
-void MarkerDialog::wheelEvent(QWheelEvent * event)
-{
-    if (marker_position->underMouse() || clip_thumb->underMouse()) {
-        if (event->delta() > 0)
-            slotTimeUp();
-        else
-            slotTimeDown();
-    }
+    KdenliveSettings::setDefault_marker_type(marker_type->currentIndex());
+    return CommentedTime(m_in->gentime(), marker_comment->text(), marker_type->currentIndex());
 }
 
 #include "markerdialog.moc"