m_deleteAction(NULL),
m_openAction(NULL),
m_reloadAction(NULL),
+ m_transcodeAction(NULL),
m_selectedItem(NULL),
m_refreshed(false),
m_infoQueue(),
layout->addWidget(m_listView);
setLayout(layout);
+ m_queueTimer.setInterval(100);
+ connect(&m_queueTimer, SIGNAL(timeout()), this, SLOT(slotProcessNextClipInQueue()));
+ m_queueTimer.setSingleShot(true);
+
connect(m_listView, SIGNAL(itemSelectionChanged()), this, SLOT(slotClipSelected()));
if (addMenu->isEmpty()) addMenu->setEnabled(false);
m_menu->addMenu(transcodeMenu);
if (transcodeMenu->isEmpty()) transcodeMenu->setEnabled(false);
+ m_transcodeAction = transcodeMenu;
m_menu->addAction(m_reloadAction);
m_menu->addAction(m_editAction);
m_menu->addAction(m_openAction);
}
}
-void ProjectList::slotReloadClip()
+void ProjectList::slotReloadClip(const QString &id)
{
- QList<QTreeWidgetItem *> selected = m_listView->selectedItems();
+ QList<QTreeWidgetItem *> selected;
+ if (id.isEmpty()) selected = m_listView->selectedItems();
+ else selected.append(getItemById(id));
ProjectItem *item;
for (int i = 0; i < selected.count(); i++) {
item = static_cast <ProjectItem *>(selected.at(i));
if (!item->referencedClip()->getProperty("xmltemplate").isEmpty()) regenerateTemplate(item);
}
//requestClipInfo(item->toXml(), item->clipId(), true);
+ // Clear the file_hash value, which will cause a complete reload of the clip
emit getFileProperties(item->toXml(), item->clipId(), true);
}
}
m_editAction->setEnabled(true);
m_deleteAction->setEnabled(true);
m_reloadAction->setEnabled(true);
+ m_transcodeAction->setEnabled(true);
if (clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) {
m_openAction->setIcon(KIcon(KdenliveSettings::defaultimageapp()));
m_openAction->setEnabled(true);
m_deleteAction->setEnabled(false);
m_openAction->setEnabled(false);
m_reloadAction->setEnabled(false);
+ m_transcodeAction->setEnabled(false);
}
}
ProjectItem *item = getItemById(id);
if (item) {
slotUpdateClipProperties(item, properties);
- if (properties.contains("colour") || properties.contains("resource") || properties.contains("xmldata") || properties.contains("force_aspect_ratio")) {
+ if (properties.contains("colour") || properties.contains("resource") || properties.contains("xmldata") || properties.contains("force_aspect_ratio") || properties.contains("templatetext")) {
slotRefreshClipThumbnail(item);
emit refreshClip();
}
{
if (!clip) return;
if (!clip->isGroup()) clip->setProperties(properties);
- if (properties.contains("xmldata")) regenerateTemplateImage(clip);
+ //if (properties.contains("xmldata")) regenerateTemplateImage(clip);
if (properties.contains("name")) {
m_listView->blockSignals(true);
clip->setText(1, properties.value("name"));
oldprops["description"] = clip->referencedClip()->getProperty("description");
newprops["description"] = item->text(2);
- if (clip->clipType() == TEXT && !clip->referencedClip()->getProperty("xmltemplate").isEmpty()) {
+ if (clip->clipType() == TEXT && !clip->referencedClip()->getProperty("xmldata").isEmpty()) {
// This is a text template clip, update the image
- oldprops.insert("xmldata", clip->referencedClip()->getProperty("xmldata"));
- newprops.insert("xmldata", generateTemplateXml(clip->referencedClip()->getProperty("xmltemplate"), item->text(2)).toString());
+ /*oldprops.insert("xmldata", clip->referencedClip()->getProperty("xmldata"));
+ newprops.insert("xmldata", generateTemplateXml(clip->referencedClip()->getProperty("xmltemplate"), item->text(2)).toString());*/
+ oldprops.insert("templatetext", clip->referencedClip()->getProperty("templatetext"));
+ newprops.insert("templatetext", item->text(2));
}
slotUpdateClipProperties(clip->clipId(), newprops);
m_editAction->setEnabled(enable);
m_deleteAction->setEnabled(enable);
m_reloadAction->setEnabled(enable);
+ m_transcodeAction->setEnabled(enable);
if (enable) {
ProjectItem *clip = static_cast <ProjectItem*>(item);
if (clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) {
m_deleteAction->setEnabled(false);
m_openAction->setEnabled(false);
m_reloadAction->setEnabled(false);
+ m_transcodeAction->setEnabled(false);
}
}
kDebug() << "/// Cannot find clip to delete";
return;
}
+ m_listView->blockSignals(true);
delete item;
+ m_doc->clipManager()->deleteClip(clipId);
+ m_listView->blockSignals(false);
+ slotClipSelected();
}
} else {
if (edit) {
ProjectItem *item = getFolderItemById(clipId);
- QTreeWidgetItemIterator it(m_listView);
if (item) {
m_listView->blockSignals(true);
item->setGroupName(foldername);
void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties)
{
- if (getProperties) m_listView->setEnabled(false);
- m_listView->blockSignals(true);
+ if (getProperties) {
+ m_listView->setEnabled(false);
+ m_listView->blockSignals(true);
+ }
const QString parent = clip->getProperty("groupid");
kDebug() << "Adding clip with groupid: " << parent;
ProjectItem *item = NULL;
}
if (item == NULL) item = new ProjectItem(m_listView, clip);
KUrl url = clip->fileURL();
+
+ if (getProperties == false && !clip->getClipHash().isEmpty()) {
+ QString cachedPixmap = m_doc->projectFolder().path(KUrl::AddTrailingSlash) + "thumbs/" + clip->getClipHash() + ".png";
+ if (QFile::exists(cachedPixmap)) {
+ item->setIcon(0, QPixmap(cachedPixmap));
+ }
+ }
+
if (!url.isEmpty() && KdenliveSettings::activate_nepomuk()) {
// if file has Nepomuk comment, use it
Nepomuk::Resource f(url.path());
if (!annotation.isEmpty()) item->setText(2, annotation);
item->setText(3, QString::number(f.rating()));
}
- m_listView->blockSignals(false);
+ if (getProperties) m_listView->blockSignals(false);
}
void ProjectList::slotResetProjectList()
void ProjectList::requestClipInfo(const QDomElement xml, const QString id)
{
- kDebug() << " PRG LISTÂ REQUEST CLP INFO: " << id;
m_infoQueue.insert(id, xml);
m_listView->setEnabled(false);
- if (m_infoQueue.count() == 1) QTimer::singleShot(300, this, SLOT(slotProcessNextClipInQueue()));
+ if (!m_queueTimer.isActive()) m_queueTimer.start();
+ //if (m_infoQueue.count() == 1 || ) QTimer::singleShot(300, this, SLOT(slotProcessNextClipInQueue()));
}
void ProjectList::slotProcessNextClipInQueue()
{
if (m_infoQueue.isEmpty()) {
- m_listView->setEnabled(true);
+ slotProcessNextThumbnail();
return;
}
- QMap<QString, QDomElement>::const_iterator i = m_infoQueue.constBegin();
- if (i != m_infoQueue.constEnd()) {
- const QDomElement dom = i.value();
- const QString id = i.key();
- m_infoQueue.remove(i.key());
+
+ QMap<QString, QDomElement>::const_iterator j = m_infoQueue.constBegin();
+ if (j != m_infoQueue.constEnd()) {
+ const QDomElement dom = j.value();
+ const QString id = j.key();
+ m_infoQueue.remove(j.key());
emit getFileProperties(dom, id, false);
}
- if (m_infoQueue.isEmpty()) m_listView->setEnabled(true);
+ if (!m_infoQueue.isEmpty()) m_queueTimer.start();
}
void ProjectList::slotUpdateClip(const QString &id)
void ProjectList::updateAllClips()
{
+ m_listView->setSortingEnabled(false);
+
QTreeWidgetItemIterator it(m_listView);
+ DocClipBase *clip;
+ ProjectItem *item;
+ m_listView->blockSignals(true);
while (*it) {
-
ProjectItem *item = static_cast <ProjectItem *>(*it);
+ item = static_cast <ProjectItem *>(*it);
if (!item->isGroup()) {
+ clip = item->referencedClip();
+ /*if (clip->clipType() == TEXT && !QFile::exists(clip->fileURL().path())) {
+ // regenerate text clip image if required
+ TitleWidget *dia_ui = new TitleWidget(KUrl(), QString(), m_render, this);
+ QDomDocument doc;
+ doc.setContent(clip->getProperty("xmldata"));
+ dia_ui->setXml(doc);
+ QImage pix = dia_ui->renderedPixmap();
+ pix.save(clip->fileURL().path());
+ delete dia_ui;
+ }*/
if (item->referencedClip()->producer() == NULL) {
- DocClipBase *clip = item->referencedClip();
- if (clip->clipType() == TEXT && !QFile::exists(clip->fileURL().path())) {
- // regenerate text clip image if required
- TitleWidget *dia_ui = new TitleWidget(KUrl(), QString(), m_render, this);
- QDomDocument doc;
- doc.setContent(clip->getProperty("xmldata"));
- dia_ui->setXml(doc);
- QImage pix = dia_ui->renderedPixmap();
- pix.save(clip->fileURL().path());
- delete dia_ui;
- }
- if (clip->isPlaceHolder() == false) requestClipInfo(clip->toXML(), clip->getId());
- else item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+ if (clip->isPlaceHolder() == false) {
+ requestClipInfo(clip->toXML(), clip->getId());
+ } else item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
} else {
- QString cachedPixmap = m_doc->projectFolder().path() + "/thumbs/" + item->getClipHash() + ".png";
- if (QFile::exists(cachedPixmap)) {
- //kDebug()<<"// USING CACHED PIX: "<<cachedPixmap;
- m_listView->blockSignals(true);
- item->setIcon(0, QPixmap(cachedPixmap));
- m_listView->blockSignals(false);
- } else requestClipThumbnail(item->clipId());
-
+ if (item->icon(0).isNull()) {
+ requestClipThumbnail(clip->getId());
+ }
if (item->data(1, DurationRole).toString().isEmpty()) {
- m_listView->blockSignals(true);
item->changeDuration(item->referencedClip()->producer()->get_playtime());
- m_listView->blockSignals(false);
}
}
- m_listView->blockSignals(true);
item->setData(1, UsageRole, QString::number(item->numReferences()));
- m_listView->blockSignals(false);
qApp->processEvents();
}
++it;
}
- QTimer::singleShot(500, this, SLOT(slotCheckForEmptyQueue()));
+
+ m_listView->blockSignals(false);
+ m_listView->setSortingEnabled(true);
+ if (m_infoQueue.isEmpty()) slotProcessNextThumbnail();
}
void ProjectList::slotAddClip(const QList <QUrl> givenList, const QString &groupName, const QString &groupId)
{
- if (!m_commandStack) kDebug() << "!!!!!!!!!!!!!!!! NO CMD STK";
+ if (!m_commandStack) {
+ kDebug() << "!!!!!!!!!!!!!!!! NO CMD STK";
+ }
KUrl::List list;
if (givenList.isEmpty()) {
// Build list of mime types
- QStringList mimeTypes = QStringList() << "application/x-kdenlive" << "video/x-flv" << "application/vnd.rn-realmedia" << "video/x-dv" << "video/dv" << "video/x-msvideo" << "video/mpeg" << "video/x-ms-wmv" << "audio/mpeg" << "audio/x-mp3" << "audio/x-wav" << "application/ogg" << "video/mp4" << "video/quicktime" << "image/gif" << "image/jpeg" << "image/png" << "image/x-tga" << "image/x-bmp" << "image/svg+xml" << "image/tiff" << "image/x-xcf-gimp" << "image/x-vnd.adobe.photoshop" << "image/x-pcx" << "image/x-exr" << "video/mlt-playlist" << "audio/x-flac" << "audio/mp4" << "video/x-matroska" << "audio/x-matroska" << "video/ogg" << "audio/ogg";
+ QStringList mimeTypes = QStringList() << "application/x-kdenlive" << "application/x-kdenlivetitle" << "video/x-flv" << "application/vnd.rn-realmedia" << "video/x-dv" << "video/dv" << "video/x-msvideo" << "video/x-matroska" << "video/mlt-playlist" << "video/mpeg" << "video/ogg" << "video/x-ms-wmv" << "audio/x-flac" << "audio/x-matroska" << "audio/mp4" << "audio/mpeg" << "audio/x-mp3" << "audio/ogg" << "audio/x-wav" << "application/ogg" << "video/mp4" << "video/quicktime" << "image/gif" << "image/jpeg" << "image/png" << "image/x-tga" << "image/x-bmp" << "image/svg+xml" << "image/tiff" << "image/x-xcf-gimp" << "image/x-vnd.adobe.photoshop" << "image/x-pcx" << "image/x-exr";
QString allExtensions;
foreach(const QString& mimeType, mimeTypes) {
void ProjectList::slotRemoveInvalidClip(const QString &id, bool replace)
{
ProjectItem *item = getItemById(id);
+ QTimer::singleShot(300, this, SLOT(slotProcessNextClipInQueue()));
if (item) {
const QString path = item->referencedClip()->fileURL().path();
if (!path.isEmpty()) {
ids << id;
if (replace) m_doc->deleteProjectClip(ids);
}
- if (!m_infoQueue.isEmpty()) QTimer::singleShot(300, this, SLOT(slotProcessNextClipInQueue()));
- else m_listView->setEnabled(true);
}
void ProjectList::slotAddColorClip()
{
- if (!m_commandStack) kDebug() << "!!!!!!!!!!!!!!!! NO CMD STK";
+ if (!m_commandStack) {
+ kDebug() << "!!!!!!!!!!!!!!!! NO CMD STK";
+ }
QDialog *dia = new QDialog(this);
Ui::ColorClip_UI dia_ui;
dia_ui.setupUi(dia);
void ProjectList::slotAddSlideshowClip()
{
- if (!m_commandStack) kDebug() << "!!!!!!!!!!!!!!!! NO CMD STK";
+ if (!m_commandStack) {
+ kDebug() << "!!!!!!!!!!!!!!!! NO CMD STK";
+ }
SlideshowClip *dia = new SlideshowClip(m_timecode, this);
if (dia->exec() == QDialog::Accepted) {
void ProjectList::slotAddTitleTemplateClip()
{
QStringList groupInfo = getGroup();
- if (!m_commandStack) kDebug() << "!!!!!!!!!!!!!!!! NO CMD STK";
+ if (!m_commandStack) {
+ kDebug() << "!!!!!!!!!!!!!!!! NO CMD STK";
+ }
// Get the list of existing templates
QStringList filter;
filter << "*.kdenlivetitle";
- const QString path = m_doc->projectFolder().path() + "/titles/";
+ const QString path = m_doc->projectFolder().path(KUrl::AddTrailingSlash) + "titles/";
QStringList templateFiles = QDir(path).entryList(filter, QDir::Files);
QDialog *dia = new QDialog(this);
{
m_listView->blockSignals(true);
m_listView->clear();
+ m_listView->setSortingEnabled(false);
emit clipSelected(NULL);
m_thumbnailQueue.clear();
m_infoQueue.clear();
m_refreshed = false;
+ m_fps = doc->fps();
+ m_timecode = doc->timecode();
+ m_commandStack = doc->commandStack();
+ m_doc = doc;
+
QMap <QString, QString> flist = doc->clipManager()->documentFolderList();
QMapIterator<QString, QString> f(flist);
while (f.hasNext()) {
slotAddClip(list.at(i), false);
}
- m_fps = doc->fps();
- m_timecode = doc->timecode();
- m_commandStack = doc->commandStack();
- m_doc = doc;
- QTreeWidgetItem *first = m_listView->topLevelItem(0);
- if (first) m_listView->setCurrentItem(first);
m_listView->blockSignals(false);
m_toolbar->setEnabled(true);
+ connect(m_doc->clipManager(), SIGNAL(reloadClip(const QString &)), this, SLOT(slotReloadClip(const QString &)));
+ connect(m_doc->clipManager(), SIGNAL(checkAllClips()), this, SLOT(updateAllClips()));
}
QDomElement ProjectList::producersList()
if (!m_refreshed && m_thumbnailQueue.isEmpty() && m_infoQueue.isEmpty()) {
m_refreshed = true;
emit loadingIsOver();
- } else QTimer::singleShot(500, this, SLOT(slotCheckForEmptyQueue()));
+ } else QTimer::singleShot(300, this, SLOT(slotCheckForEmptyQueue()));
}
void ProjectList::reloadClipThumbnails()
QTimer::singleShot(300, this, SLOT(slotProcessNextThumbnail()));
}
-void ProjectList::requestClipThumbnail(const QString &id)
+void ProjectList::requestClipThumbnail(const QString id)
{
m_thumbnailQueue.append(id);
- if (m_thumbnailQueue.count() == 1) QTimer::singleShot(300, this, SLOT(slotProcessNextThumbnail()));
}
void ProjectList::slotProcessNextThumbnail()
{
- if (m_thumbnailQueue.isEmpty()) {
+ if (m_thumbnailQueue.isEmpty() && m_infoQueue.isEmpty()) {
+ m_listView->setEnabled(true);
+ slotCheckForEmptyQueue();
+ return;
+ }
+ if (!m_infoQueue.isEmpty()) {
+ //QTimer::singleShot(300, this, SLOT(slotProcessNextThumbnail()));
return;
}
slotRefreshClipThumbnail(m_thumbnailQueue.takeFirst(), false);
void ProjectList::slotRefreshClipThumbnail(ProjectItem *item, bool update)
{
if (item) {
- if (!item->referencedClip()) return;
- int height = 50;
- int width = (int)(height * m_render->dar());
DocClipBase *clip = item->referencedClip();
- if (!clip) slotProcessNextThumbnail();
+ if (!clip) {
+ slotProcessNextThumbnail();
+ return;
+ }
QPixmap pix;
+ int height = 50;
+ int width = (int)(height * m_render->dar());
if (clip->clipType() == AUDIO) pix = KIcon("audio-x-generic").pixmap(QSize(width, height));
+ else if (clip->clipType() == TEXT || clip->clipType() == IMAGE) pix = KThumb::getFrame(item->referencedClip()->producer(), 0, width, height);
else pix = item->referencedClip()->thumbProducer()->extractImage(item->referencedClip()->getClipThumbFrame(), width, height);
- m_listView->blockSignals(true);
- item->setIcon(0, pix);
- m_listView->blockSignals(false);
- m_doc->cachePixmap(item->getClipHash(), pix);
+ if (!pix.isNull()) {
+ m_listView->blockSignals(true);
+ item->setIcon(0, pix);
+ m_listView->blockSignals(false);
+ m_doc->cachePixmap(item->getClipHash(), pix);
+ }
if (update) emit projectModified();
- if (!m_thumbnailQueue.isEmpty()) QTimer::singleShot(300, this, SLOT(slotProcessNextThumbnail()));
+ QTimer::singleShot(100, this, SLOT(slotProcessNextThumbnail()));
}
}
delete producer;
}*/
m_listView->blockSignals(false);
+ if (item->icon(0).isNull()) {
+ requestClipThumbnail(clipId);
+ }
} else kDebug() << "//////// COULD NOT FIND CLIP TO UPDATE PRPS...";
- if (!m_infoQueue.isEmpty()) QTimer::singleShot(300, this, SLOT(slotProcessNextClipInQueue()));
- else m_listView->setEnabled(true);
+
+ slotProcessNextClipInQueue();
}
void ProjectList::slotReplyGetImage(const QString &clipId, const QPixmap &pix)
{
ProjectItem *item = getItemById(clipId);
- if (item) {
+ if (item && !pix.isNull()) {
m_listView->blockSignals(true);
item->setIcon(0, pix);
m_doc->cachePixmap(item->getClipHash(), pix);
m_editAction->setEnabled(true);
m_deleteAction->setEnabled(true);
m_reloadAction->setEnabled(true);
+ m_transcodeAction->setEnabled(true);
if (clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) {
m_openAction->setIcon(KIcon(KdenliveSettings::defaultimageapp()));
m_openAction->setEnabled(true);
void ProjectList::regenerateTemplate(ProjectItem *clip)
{
+ //TODO: remove this unused method, only force_reload is necessary
// Generate image for template clip
- const QString comment = clip->referencedClip()->getProperty("description");
- const QString path = clip->referencedClip()->getProperty("xmltemplate");
+ /*const QString comment = clip->referencedClip()->getProperty("description");
+ const QString path = clip->referencedClip()->getProperty("resource");
QDomDocument doc = generateTemplateXml(path, comment);
TitleWidget *dia_ui = new TitleWidget(KUrl(), QString(), m_render, this);
dia_ui->setXml(doc);
QImage pix = dia_ui->renderedPixmap();
pix.save(clip->clipUrl().path());
- delete dia_ui;
+ delete dia_ui;*/
clip->referencedClip()->producer()->set("force_reload", 1);
}
void ProjectList::regenerateTemplateImage(ProjectItem *clip)
{
+ //TODO: remove this unused method
// Generate image for template clip
- TitleWidget *dia_ui = new TitleWidget(KUrl(), QString(), m_render, this);
+ /*TitleWidget *dia_ui = new TitleWidget(KUrl(), QString(), m_render, this);
QDomDocument doc;
doc.setContent(clip->referencedClip()->getProperty("xmldata"));
dia_ui->setXml(doc);
QImage pix = dia_ui->renderedPixmap();
pix.save(clip->clipUrl().path());
- delete dia_ui;
+ delete dia_ui;*/
}
QDomDocument ProjectList::generateTemplateXml(QString path, const QString &replaceString)
projects / kdenlive / blobdiff