#include "projectlistview.h"
#include "editclipcommand.h"
#include "editfoldercommand.h"
-
+#include "ui_templateclip_ui.h"
#include <KDebug>
#include <KAction>
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()));
connect(m_listView, SIGNAL(pauseMonitor()), this, SLOT(slotPauseMonitor()));
connect(m_listView, SIGNAL(requestMenu(const QPoint &, QTreeWidgetItem *)), this, SLOT(slotContextMenu(const QPoint &, QTreeWidgetItem *)));
connect(m_listView, SIGNAL(addClip()), this, SLOT(slotAddClip()));
- connect(m_listView, SIGNAL(addClip(const QList <QUrl>, const QString &)), this, SLOT(slotAddClip(const QList <QUrl>, const QString &)));
+ connect(m_listView, SIGNAL(addClip(const QList <QUrl>, const QString &, const QString &)), this, SLOT(slotAddClip(const QList <QUrl>, const QString &, const QString &)));
connect(m_listView, SIGNAL(itemChanged(QTreeWidgetItem *, int)), this, SLOT(slotItemEdited(QTreeWidgetItem *, int)));
connect(m_listView, SIGNAL(showProperties(DocClipBase *)), this, SIGNAL(showClipProperties(DocClipBase *)));
}
}
-
-
void ProjectList::slotReloadClip()
{
- ProjectItem *item = static_cast <ProjectItem*>(m_listView->currentItem());
- if (item && !item->isGroup()) {
- if (item->clipType() == IMAGE) {
- item->referencedClip()->producer()->set("force_reload", 1);
+ QList<QTreeWidgetItem *> selected = m_listView->selectedItems();
+ ProjectItem *item;
+ for (int i = 0; i < selected.count(); i++) {
+ item = static_cast <ProjectItem *>(selected.at(i));
+ if (item && !item->isGroup()) {
+ if (item->clipType() == IMAGE) {
+ item->referencedClip()->producer()->set("force_reload", 1);
+ } else if (item->clipType() == TEXT) {
+ 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);
}
- emit getFileProperties(item->toXml(), item->clipId(), true);
}
}
ProjectItem *item = getItemById(id);
if (item) {
slotUpdateClipProperties(item, properties);
- if (properties.contains("colour") || properties.contains("resource") || properties.contains("xmldata") || properties.contains("force_aspect_ratio")) slotRefreshClipThumbnail(item);
+ if (properties.contains("colour") || properties.contains("resource") || properties.contains("xmldata") || properties.contains("force_aspect_ratio")) {
+ slotRefreshClipThumbnail(item);
+ emit refreshClip();
+ }
if (properties.contains("out")) item->changeDuration(properties.value("out").toInt());
}
}
{
if (!clip) return;
if (!clip->isGroup()) clip->setProperties(properties);
+ if (properties.contains("xmldata")) regenerateTemplateImage(clip);
if (properties.contains("name")) {
m_listView->blockSignals(true);
clip->setText(1, properties.value("name"));
QMap <QString, QString> newprops;
oldprops["description"] = clip->referencedClip()->getProperty("description");
newprops["description"] = item->text(2);
- slotUpdateClipProperties(clip, newprops);
- EditClipCommand *command = new EditClipCommand(this, clip->clipId(), oldprops, newprops, false);
- m_commandStack->push(command);
- if (!clip->referencedClip()->getProperty("xmltemplate").isEmpty()) {
+
+ if (clip->clipType() == TEXT && !clip->referencedClip()->getProperty("xmltemplate").isEmpty()) {
// This is a text template clip, update the image
- regenerateTemplate(clip);
+ oldprops.insert("xmldata", clip->referencedClip()->getProperty("xmldata"));
+ newprops.insert("xmldata", generateTemplateXml(clip->referencedClip()->getProperty("xmltemplate"), item->text(2)).toString());
}
+
+ slotUpdateClipProperties(clip->clipId(), newprops);
+ EditClipCommand *command = new EditClipCommand(this, clip->clipId(), oldprops, newprops, false);
+ m_commandStack->push(command);
}
} else if (column == 1) {
if (clip->isGroup()) {
QStringList text;
text << QString() << foldername;
m_listView->blockSignals(true);
- (void) new ProjectItem(m_listView, text, clipId);
+ m_listView->setCurrentItem(new ProjectItem(m_listView, text, clipId));
m_doc->clipManager()->addFolder(clipId, foldername);
m_listView->blockSignals(false);
}
if (parentitem) item = new ProjectItem(parentitem, clip);
}
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());
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);
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)
while (*it) {
ProjectItem *item = static_cast <ProjectItem *>(*it);
if (!item->isGroup()) {
+ 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 (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);
} 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());
}
++it;
}
- QTimer::singleShot(500, this, SLOT(slotCheckForEmptyQueue()));
+ if (m_infoQueue.isEmpty()) slotProcessNextThumbnail();
}
-void ProjectList::slotAddClip(const QList <QUrl> givenList, QString group)
+void ProjectList::slotAddClip(const QList <QUrl> givenList, const QString &groupName, const QString &groupId)
{
if (!m_commandStack) kDebug() << "!!!!!!!!!!!!!!!! NO CMD STK";
KUrl::List list;
}
if (list.isEmpty()) return;
- if (group.isEmpty()) {
+ if (givenList.isEmpty()) {
QStringList groupInfo = getGroup();
m_doc->slotAddClipList(list, groupInfo.at(0), groupInfo.at(1));
- } else m_doc->slotAddClipList(list, group, QString());
+ } else m_doc->slotAddClipList(list, groupName, groupId);
}
void ProjectList::slotRemoveInvalidClip(const QString &id, bool replace)
ids << id;
if (replace) m_doc->deleteProjectClip(ids);
}
- if (!m_infoQueue.isEmpty()) QTimer::singleShot(300, this, SLOT(slotProcessNextClipInQueue()));
- else m_listView->setEnabled(true);
+ QTimer::singleShot(300, this, SLOT(slotProcessNextClipInQueue()));
}
void ProjectList::slotAddColorClip()
{
if (!m_commandStack) kDebug() << "!!!!!!!!!!!!!!!! NO CMD STK";
QDialog *dia = new QDialog(this);
- Ui::ColorClip_UI *dia_ui = new Ui::ColorClip_UI();
- dia_ui->setupUi(dia);
- dia_ui->clip_name->setText(i18n("Color Clip"));
- dia_ui->clip_duration->setText(KdenliveSettings::color_duration());
+ Ui::ColorClip_UI dia_ui;
+ dia_ui.setupUi(dia);
+ dia_ui.clip_name->setText(i18n("Color Clip"));
+ dia_ui.clip_duration->setText(KdenliveSettings::color_duration());
if (dia->exec() == QDialog::Accepted) {
- QString color = dia_ui->clip_color->color().name();
+ QString color = dia_ui.clip_color->color().name();
color = color.replace(0, 1, "0x") + "ff";
QStringList groupInfo = getGroup();
- m_doc->clipManager()->slotAddColorClipFile(dia_ui->clip_name->text(), color, dia_ui->clip_duration->text(), groupInfo.at(0), groupInfo.at(1));
- m_doc->setModified(true);
+ m_doc->slotCreateColorClip(dia_ui.clip_name->text(), color, dia_ui.clip_duration->text(), groupInfo.at(0), groupInfo.at(1));
}
- delete dia_ui;
delete dia;
}
if (dia->exec() == QDialog::Accepted) {
QStringList groupInfo = getGroup();
- m_doc->clipManager()->slotAddSlideshowClipFile(dia->clipName(), dia->selectedPath(), dia->imageCount(), dia->clipDuration(), dia->loop(), dia->fade(), dia->lumaDuration(), dia->lumaFile(), dia->softness(), groupInfo.at(0), groupInfo.at(1));
- m_doc->setModified(true);
+ m_doc->slotCreateSlideshowClipFile(dia->clipName(), dia->selectedPath(), dia->imageCount(), dia->clipDuration(), dia->loop(), dia->fade(), dia->lumaDuration(), dia->lumaFile(), dia->softness(), groupInfo.at(0), groupInfo.at(1));
}
delete dia;
}
void ProjectList::slotAddTitleTemplateClip()
{
QStringList groupInfo = getGroup();
- m_doc->slotCreateTextTemplateClip(groupInfo.at(0), groupInfo.at(1));
+ if (!m_commandStack) kDebug() << "!!!!!!!!!!!!!!!! NO CMD STK";
+
+ // Get the list of existing templates
+ QStringList filter;
+ filter << "*.kdenlivetitle";
+ const QString path = m_doc->projectFolder().path(KUrl::AddTrailingSlash) + "titles/";
+ QStringList templateFiles = QDir(path).entryList(filter, QDir::Files);
+
+ QDialog *dia = new QDialog(this);
+ Ui::TemplateClip_UI dia_ui;
+ dia_ui.setupUi(dia);
+ for (int i = 0; i < templateFiles.size(); ++i) {
+ dia_ui.template_list->comboBox()->addItem(templateFiles.at(i), path + templateFiles.at(i));
+ }
+ dia_ui.template_list->fileDialog()->setFilter("*.kdenlivetitle");
+ //warning: setting base directory doesn't work??
+ KUrl startDir(path);
+ dia_ui.template_list->fileDialog()->setUrl(startDir);
+ dia_ui.description->setHidden(true);
+ if (dia->exec() == QDialog::Accepted) {
+ QString textTemplate = dia_ui.template_list->comboBox()->itemData(dia_ui.template_list->comboBox()->currentIndex()).toString();
+ if (textTemplate.isEmpty()) textTemplate = dia_ui.template_list->comboBox()->currentText();
+ if (dia_ui.normal_clip->isChecked()) {
+ // Create a normal title clip
+ m_doc->slotCreateTextClip(groupInfo.at(0), groupInfo.at(1), textTemplate);
+ } else {
+ // Create a cloned template clip
+ m_doc->slotCreateTextTemplateClip(groupInfo.at(0), groupInfo.at(1), KUrl(textTemplate));
+ }
+ }
+ delete dia;
}
QStringList ProjectList::getGroup() const
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);
void ProjectList::slotCheckForEmptyQueue()
{
if (!m_refreshed && m_thumbnailQueue.isEmpty() && m_infoQueue.isEmpty()) {
+ m_listView->setEnabled(true);
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()) {
+ 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();
QPixmap pix;
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);
+
+ if (m_infoQueue.isEmpty()) {
+ slotProcessNextThumbnail();
+ }
}
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);
void ProjectList::regenerateTemplate(const QString &id)
{
- ProjectItem *clip = getItemById(ix);
+ ProjectItem *clip = getItemById(id);
if (clip) regenerateTemplate(clip);
}
// Generate image for template clip
const QString comment = clip->referencedClip()->getProperty("description");
const QString path = clip->referencedClip()->getProperty("xmltemplate");
+ 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;
+ clip->referencedClip()->producer()->set("force_reload", 1);
+}
+
+void ProjectList::regenerateTemplateImage(ProjectItem *clip)
+{
+ // Generate image for template clip
+ 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;
+}
+
+QDomDocument ProjectList::generateTemplateXml(QString path, const QString &replaceString)
+{
QDomDocument doc;
QFile file(path);
- if (!file.open(QIODevice::ReadOnly))
- return;
+ if (!file.open(QIODevice::ReadOnly)) {
+ kWarning() << "ERROR, CANNOT READ: " << path;
+ return doc;
+ }
if (!doc.setContent(&file)) {
+ kWarning() << "ERROR, CANNOT READ: " << path;
file.close();
- return;
+ return doc;
}
file.close();
QDomNodeList texts = doc.elementsByTagName("content");
for (int i = 0; i < texts.count(); i++) {
QString data = texts.item(i).firstChild().nodeValue();
- data.replace("%s", comment);
+ data.replace("%s", replaceString);
texts.item(i).firstChild().setNodeValue(data);
}
- 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;
- clip->referencedClip()->producer()->set("force_reload", 1);
+ return doc;
}
#include "projectlist.moc"
projects / kdenlive / blobdiff