#include <QDir>
+#include <QPainter>
+
static const int VIDEOTAB = 0;
static const int AUDIOTAB = 1;
int width = 180.0 * KdenliveSettings::project_display_ratio();
if (width % 2 == 1) width++;
QPixmap pix = m_clip->thumbProducer()->getImage(url, m_clip->getClipThumbFrame(), width, 180);
- m_view.clip_thumb->setPixmap(pix);
+ QPixmap framedPix(pix.width(), pix.height());
+ framedPix.fill(Qt::transparent);
+ QPainter p(&framedPix);
+ p.setRenderHint(QPainter::Antialiasing, true);
+ QPainterPath path;
+ path.addRoundedRect(0.5, 0.5, framedPix.width() - 1, framedPix.height() - 1, 4, 4);
+ p.setClipPath(path);
+ p.drawPixmap(0, 0, pix);
+ p.end();
+
+ m_view.clip_thumb->setPixmap(framedPix);
if (t == IMAGE || t == VIDEO || t == PLAYLIST) m_view.tabWidget->removeTab(AUDIOTAB);
} else {
m_view.tabWidget->removeTab(IMAGETAB);
for (int count = 0; count < marks.count(); ++count) {
QString time = m_tc.getTimecode(marks[count].time());
QStringList itemtext;
- itemtext << time << marks[count].comment();
- (void) new QTreeWidgetItem(m_view.markers_list, itemtext);
+ itemtext << time << marks.at(count).comment();
+ QTreeWidgetItem *item = new QTreeWidgetItem(m_view.markers_list, itemtext);
+ item->setData(0, Qt::DecorationRole, CommentedTime::markerColor(marks.at(count).markerType()));
}
}
QPointer<MarkerDialog> d = new MarkerDialog(m_clip, marker,
m_tc, i18n("Add Marker"), this);
if (d->exec() == QDialog::Accepted) {
- emit addMarker(m_clip->getId(), d->newMarker().time(), d->newMarker().comment());
+ emit addMarker(m_clip->getId(), d->newMarker());
}
delete d;
}
if (pos < 0 || pos > marks.count() - 1) return;
MarkerDialog d(m_clip, marks.at(pos), m_tc, i18n("Edit Marker"), this);
if (d.exec() == QDialog::Accepted) {
- emit addMarker(m_clip->getId(), d.newMarker().time(), d.newMarker().comment());
+ emit addMarker(m_clip->getId(), d.newMarker());
}
}
void ClipProperties::slotDeleteMarker()
{
QList < CommentedTime > marks = m_clip->commentedSnapMarkers();
- int pos = m_view.markers_list->currentIndex().row();
- if (pos < 0 || pos > marks.count() - 1) return;
- emit addMarker(m_clip->getId(), marks.at(pos).time(), QString());
+ QList < CommentedTime > toDelete;
+ for (int i = 0; i < marks.count(); i++) {
+ if (m_view.markers_list->topLevelItem(i)->isSelected()) {
+ CommentedTime marker = marks.at(i);
+ marker.setMarkerType(-1);
+ toDelete << marker;
+ }
+ }
+ for (int i = 0; i < toDelete.count(); i++)
+ emit addMarker(m_clip->getId(), toDelete.at(i));
}
const QString &ClipProperties::clipId() const