QDialog(parent),
m_producer(NULL),
m_profile(NULL),
- m_clip(clip),
- m_tc(tc),
- m_frameDisplay(KdenliveSettings::frametimecode())
+ m_clip(clip)
{
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());
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:
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));
+ p = QPixmap::fromImage(KThumb::getFrame(m_producer, m_in->getValue(), swidth, width, 100));
break;
case COLOR:
colour = colour.replace(0, 2, "#");
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();
- marker_position->setInputMask("");
- marker_position->setValidator(valid);
+ connect(m_in, SIGNAL(editingFinished()), this, SIGNAL(updateThumb()));
+ } else {
+ clip_thumb->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();
}
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;
+ int swidth = (int) (100.0 * m_profile->width() / m_profile->height() + 0.5);
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));
-}
-
-void MarkerDialog::slotTimeDown()
-{
- 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));
+ 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.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"