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());
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:
connect(this, SIGNAL(updateThumb()), m_previewTimer, SLOT(start()));
case IMAGE:
case TEXT:
- p = QPixmap::fromImage(KThumb::getFrame(m_producer, m_in->value(), width, 100));
+ p = QPixmap::fromImage(KThumb::getFrame(m_producer, m_in->getValue(), swidth, width, 100));
break;
case COLOR:
colour = colour.replace(0, 2, "#");
void MarkerDialog::slotUpdateThumb()
{
m_previewTimer->stop();
- int pos = m_in->value();
+ 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));
+ QPixmap p = QPixmap::fromImage(KThumb::getFrame(m_producer, pos, swidth, width, 100));
if (!p.isNull())
clip_thumb->setPixmap(p);
else
CommentedTime MarkerDialog::newMarker()
{
- return CommentedTime(m_in->gentime(), marker_comment->text());
+ KdenliveSettings::setDefault_marker_type(marker_type->currentIndex());
+ return CommentedTime(m_in->gentime(), marker_comment->text(), marker_type->currentIndex());
}
#include "markerdialog.moc"