#include "projectlist.h"
#include "projectitem.h"
-#include "subprojectitem.h"
#include "addfoldercommand.h"
#include "kdenlivesettings.h"
#include "slideshowclip.h"
#include "kthumb.h"
#include "projectlistview.h"
#include "editclipcommand.h"
+#include "editclipcutcommand.h"
#include "editfoldercommand.h"
#include "addclipcutcommand.h"
#include <KMessageBox>
#include <KIO/NetAccess>
#include <KFileItem>
-
+#ifdef NEPOMUK
#include <nepomuk/global.h>
#include <nepomuk/resourcemanager.h>
//#include <nepomuk/tag.h>
+#endif
#include <QMouseEvent>
#include <QStylePainter>
KTreeWidgetSearchLine *searchView = new KTreeWidgetSearchLine(this);
m_toolbar = new QToolBar("projectToolBar", this);
m_toolbar->addWidget(searchView);
+ int s = style()->pixelMetric(QStyle::PM_SmallIconSize);
+ m_toolbar->setIconSize(QSize(s, s));
searchView->setTreeWidget(m_listView);
m_addButton = new QToolButton(m_toolbar);
m_listViewDelegate = new ItemDelegate(m_listView);
m_listView->setItemDelegate(m_listViewDelegate);
-
+#ifdef NEPOMUK
if (KdenliveSettings::activate_nepomuk()) {
Nepomuk::ResourceManager::instance()->init();
if (!Nepomuk::ResourceManager::instance()->initialized()) {
KdenliveSettings::setActivate_nepomuk(false);
}
}
+#endif
}
ProjectList::~ProjectList()
}
//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(), m_listView->iconSize().height(), true);
}
}
}
void ProjectList::setRenderer(Render *projectRender)
{
m_render = projectRender;
- m_listView->setIconSize(QSize(40 * m_render->dar(), 40));
+ m_listView->setIconSize(QSize((ProjectItem::itemDefaultHeight() - 2) * m_render->dar(), ProjectItem::itemDefaultHeight() - 2));
}
void ProjectList::slotClipSelected()
{
- if (m_listView->currentItem() && m_listView->currentItem()->type() != PROJECTFOLDERTYPE) {
- ProjectItem *clip;
- if (m_listView->currentItem()->type() == PROJECTSUBCLIPTYPE) {
- // this is a sub item, use base clip
- clip = static_cast <ProjectItem*>(m_listView->currentItem()->parent());
- if (clip == NULL) kDebug() << "-----------ERROR";
- SubProjectItem *sub = static_cast <SubProjectItem*>(m_listView->currentItem());
- emit clipSelected(clip->referencedClip(), sub->zone());
- return;
+ if (m_listView->currentItem()) {
+ if (m_listView->currentItem()->type() == PROJECTFOLDERTYPE) {
+ emit clipSelected(NULL);
+ m_editAction->setEnabled(false);
+ m_deleteAction->setEnabled(true);
+ m_openAction->setEnabled(false);
+ m_reloadAction->setEnabled(false);
+ m_transcodeAction->setEnabled(false);
+ } else {
+ ProjectItem *clip;
+ if (m_listView->currentItem()->type() == PROJECTSUBCLIPTYPE) {
+ // this is a sub item, use base clip
+ clip = static_cast <ProjectItem*>(m_listView->currentItem()->parent());
+ if (clip == NULL) kDebug() << "-----------ERROR";
+ SubProjectItem *sub = static_cast <SubProjectItem*>(m_listView->currentItem());
+ emit clipSelected(clip->referencedClip(), sub->zone());
+ return;
+ }
+ clip = static_cast <ProjectItem*>(m_listView->currentItem());
+ emit clipSelected(clip->referencedClip());
+ 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);
+ } else if (clip->clipType() == AUDIO && !KdenliveSettings::defaultaudioapp().isEmpty()) {
+ m_openAction->setIcon(KIcon(KdenliveSettings::defaultaudioapp()));
+ m_openAction->setEnabled(true);
+ } else m_openAction->setEnabled(false);
}
- clip = static_cast <ProjectItem*>(m_listView->currentItem());
- emit clipSelected(clip->referencedClip());
- 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);
- } else if (clip->clipType() == AUDIO && !KdenliveSettings::defaultaudioapp().isEmpty()) {
- m_openAction->setIcon(KIcon(KdenliveSettings::defaultaudioapp()));
- m_openAction->setEnabled(true);
- } else m_openAction->setEnabled(false);
} else {
emit clipSelected(NULL);
m_editAction->setEnabled(false);
clip->setProperties(properties);
if (properties.contains("name")) {
m_listView->blockSignals(true);
- clip->setText(1, properties.value("name"));
+ clip->setText(0, properties.value("name"));
m_listView->blockSignals(false);
emit clipNameChanged(clip->clipId(), properties.value("name"));
}
if (properties.contains("description")) {
CLIPTYPE type = clip->clipType();
m_listView->blockSignals(true);
- clip->setText(2, properties.value("description"));
+ clip->setText(1, properties.value("description"));
m_listView->blockSignals(false);
+#ifdef NEPOMUK
if (KdenliveSettings::activate_nepomuk() && (type == AUDIO || type == VIDEO || type == AV || type == IMAGE || type == PLAYLIST)) {
// Use Nepomuk system to store clip description
Nepomuk::Resource f(clip->clipUrl().path());
f.setDescription(properties.value("description"));
}
+#endif
emit projectModified();
}
}
{
if (item->type() == PROJECTSUBCLIPTYPE) {
// this is a sub-item
+ if (column == 1) {
+ // user edited description
+ SubProjectItem *sub = static_cast <SubProjectItem*>(item);
+ ProjectItem *item = static_cast <ProjectItem *>(sub->parent());
+ EditClipCutCommand *command = new EditClipCutCommand(this, item->clipId(), sub->zone(), sub->zone(), sub->description(), sub->text(1), true);
+ m_commandStack->push(command);
+ //slotUpdateCutClipProperties(sub->clipId(), sub->zone(), sub->text(1), sub->text(1));
+ }
return;
}
if (item->type() == PROJECTFOLDERTYPE) {
- if (column != 1) return;
+ if (column != 0) return;
FolderProjectItem *folder = static_cast <FolderProjectItem*>(item);
- editFolder(item->text(1), folder->groupName(), folder->clipId());
- folder->setGroupName(item->text(1));
- m_doc->clipManager()->addFolder(folder->clipId(), item->text(1));
+ editFolder(item->text(0), folder->groupName(), folder->clipId());
+ folder->setGroupName(item->text(0));
+ m_doc->clipManager()->addFolder(folder->clipId(), item->text(0));
const int children = item->childCount();
for (int i = 0; i < children; i++) {
ProjectItem *child = static_cast <ProjectItem *>(item->child(i));
- child->setProperty("groupname", item->text(1));
+ child->setProperty("groupname", item->text(0));
}
return;
}
ProjectItem *clip = static_cast <ProjectItem*>(item);
- if (column == 2) {
+ if (column == 1) {
if (clip->referencedClip()) {
QMap <QString, QString> oldprops;
QMap <QString, QString> newprops;
oldprops["description"] = clip->referencedClip()->getProperty("description");
- newprops["description"] = item->text(2);
+ newprops["description"] = item->text(1);
if (clip->clipType() == TEXT) {
// 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("templatetext", clip->referencedClip()->getProperty("templatetext"));
- newprops.insert("templatetext", item->text(2));
+ newprops.insert("templatetext", item->text(1));
}
slotUpdateClipProperties(clip->clipId(), newprops);
EditClipCommand *command = new EditClipCommand(this, clip->clipId(), oldprops, newprops, false);
m_commandStack->push(command);
}
- } else if (column == 1) {
+ } else if (column == 0) {
if (clip->referencedClip()) {
QMap <QString, QString> oldprops;
QMap <QString, QString> newprops;
oldprops["name"] = clip->referencedClip()->getProperty("name");
- newprops["name"] = item->text(1);
+ newprops["name"] = item->text(0);
slotUpdateClipProperties(clip, newprops);
emit projectModified();
EditClipCommand *command = new EditClipCommand(this, clip->clipId(), oldprops, newprops, false);
// subitem
SubProjectItem *sub = static_cast <SubProjectItem *>(selected.at(i));
ProjectItem *item = static_cast <ProjectItem *>(sub->parent());
- new AddClipCutCommand(this, item->clipId(), sub->zone().x(), sub->zone().y(), true, delCommand);
- continue;
- }
-
- if (selected.at(i)->type() == PROJECTFOLDERTYPE) {
+ new AddClipCutCommand(this, item->clipId(), sub->zone().x(), sub->zone().y(), sub->description(), true, delCommand);
+ } else if (selected.at(i)->type() == PROJECTFOLDERTYPE) {
// folder
FolderProjectItem *folder = static_cast <FolderProjectItem *>(selected.at(i));
folderids[folder->groupName()] = folder->clipId();
ProjectItem *child = static_cast <ProjectItem *>(folder->child(i));
ids << child->clipId();
}
- continue;
- }
-
- ProjectItem *item = static_cast <ProjectItem *>(selected.at(i));
- ids << item->clipId();
- if (item->numReferences() > 0) {
- if (KMessageBox::questionYesNo(this, i18np("Delete clip <b>%2</b>?<br>This will also remove the clip in timeline", "Delete clip <b>%2</b>?<br>This will also remove its %1 clips in timeline", item->numReferences(), item->names().at(1)), i18n("Delete Clip")) != KMessageBox::Yes) return;
+ } else {
+ ProjectItem *item = static_cast <ProjectItem *>(selected.at(i));
+ ids << item->clipId();
+ if (item->numReferences() > 0) {
+ if (KMessageBox::questionYesNo(this, i18np("Delete clip <b>%2</b>?<br>This will also remove the clip in timeline", "Delete clip <b>%2</b>?<br>This will also remove its %1 clips in timeline", item->numReferences(), item->names().at(1)), i18n("Delete Clip")) != KMessageBox::Yes) return;
+ }
}
}
+
if (delCommand->childCount() == 0) delete delCommand;
else m_commandStack->push(delCommand);
if (!ids.isEmpty()) m_doc->deleteProjectClip(ids);
}
} else {
QStringList text;
- text << QString() << foldername;
+ text << foldername;
m_listView->blockSignals(true);
m_listView->setCurrentItem(new FolderProjectItem(m_listView, text, clipId));
m_doc->clipManager()->addFolder(clipId, foldername);
m_listView->blockSignals(false);
}
}
+ m_doc->setModified(true);
}
new AddFolderCommand(this, i.key(), i.value(), false, delCommand);
}
m_commandStack->push(delCommand);
- m_doc->setModified(true);
}
void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties)
QString groupName = clip->getProperty("groupname");
//kDebug() << "Adding clip to new group: " << groupName;
if (groupName.isEmpty()) groupName = i18n("Folder");
- text << QString() << groupName;
+ text << groupName;
parentitem = new FolderProjectItem(m_listView, text, parent);
} else {
//kDebug() << "Adding clip to existing group: " << parentitem->groupName();
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));
+ item->setData(0, Qt::DecorationRole, QPixmap(cachedPixmap));
}
}
-
+#ifdef NEPOMUK
if (!url.isEmpty() && KdenliveSettings::activate_nepomuk()) {
// if file has Nepomuk comment, use it
Nepomuk::Resource f(url.path());
QString annotation = f.description();
- if (!annotation.isEmpty()) item->setText(2, annotation);
- item->setText(3, QString::number(f.rating()));
+ if (!annotation.isEmpty()) item->setText(1, annotation);
+ item->setText(2, QString::number(f.rating()));
}
-
+#endif
// Add cut zones
- QList <QPoint> cuts = clip->cutZones();
+ QList <CutZoneInfo> cuts = clip->cutZones();
if (!cuts.isEmpty()) {
for (int i = 0; i < cuts.count(); i++) {
- SubProjectItem *sub = new SubProjectItem(item, cuts.at(i).x(), cuts.at(i).y());
+ SubProjectItem *sub = new SubProjectItem(item, cuts.at(i).zone.x(), cuts.at(i).zone.y(), cuts.at(i).description);
if (!clip->getClipHash().isEmpty()) {
- QString cachedPixmap = m_doc->projectFolder().path(KUrl::AddTrailingSlash) + "thumbs/" + clip->getClipHash() + '#' + QString::number(cuts.at(i).x()) + ".png";
+ QString cachedPixmap = m_doc->projectFolder().path(KUrl::AddTrailingSlash) + "thumbs/" + clip->getClipHash() + '#' + QString::number(cuts.at(i).zone.x()) + ".png";
if (QFile::exists(cachedPixmap)) {
- sub->setIcon(0, QPixmap(cachedPixmap));
+ sub->setData(0, Qt::DecorationRole, QPixmap(cachedPixmap));
}
}
}
const QDomElement dom = j.value();
const QString id = j.key();
m_infoQueue.remove(j.key());
- emit getFileProperties(dom, id, false);
+ emit getFileProperties(dom, id, m_listView->iconSize().height(), false);
}
}
if ((*it)->type() == PROJECTSUBCLIPTYPE) {
// subitem
SubProjectItem *sub = static_cast <SubProjectItem *>(*it);
- if (sub->icon(0).isNull()) {
+ if (sub->data(0, Qt::DecorationRole).isNull()) {
item = static_cast <ProjectItem *>((*it)->parent());
requestClipThumbnail(item->clipId() + '#' + QString::number(sub->zone().x()));
}
requestClipInfo(clip->toXML(), clip->getId());
} else item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
} else {
- if (item->icon(0).isNull()) {
+ if (item->data(0, Qt::DecorationRole).isNull()) {
requestClipThumbnail(clip->getId());
}
- if (item->data(1, DurationRole).toString().isEmpty()) {
+ if (item->data(0, DurationRole).toString().isEmpty()) {
item->changeDuration(item->referencedClip()->producer()->get_playtime());
}
}
for (int i = 0; i < givenList.count(); i++)
list << givenList.at(i);
}
+
+ foreach(const KUrl &file, list) {
+ // Check there is no folder here
+ KMimeType::Ptr type = KMimeType::findByUrl(file);
+ if (type->is("inode/directory")) {
+ // user dropped a folder
+ list.removeAll(file);
+ }
+ }
+
if (list.isEmpty()) return;
if (givenList.isEmpty()) {
QMapIterator<QString, QString> f(flist);
while (f.hasNext()) {
f.next();
- (void) new FolderProjectItem(m_listView, QStringList() << QString() << f.value(), f.key());
+ (void) new FolderProjectItem(m_listView, QStringList() << f.value(), f.key());
}
QList <DocClipBase*> list = doc->clipManager()->documentClipList();
}
if (m_thumbnailQueue.count() > 1) {
int max = m_doc->clipManager()->clipsCount();
- emit displayMessage(i18n("Loading thumbnails"), (int)(100 * (max - m_thumbnailQueue.count()) / max));
+ emit displayMessage(i18n("Loading thumbnails"), (int)(100 *(max - m_thumbnailQueue.count()) / max));
}
slotRefreshClipThumbnail(m_thumbnailQueue.takeFirst(), false);
}
return;
}
QPixmap pix;
- int height = it->sizeHint(0).height();
+ int height = m_listView->iconSize().height();
int width = (int)(height * m_render->dar());
if (clip->clipType() == AUDIO) pix = KIcon("audio-x-generic").pixmap(QSize(width, height));
else if (clip->clipType() == IMAGE) pix = QPixmap::fromImage(KThumb::getFrame(item->referencedClip()->producer(), 0, width, height));
if (!pix.isNull()) {
m_listView->blockSignals(true);
- it->setIcon(0, pix);
+ it->setData(0, Qt::DecorationRole, pix);
if (m_listView->isEnabled()) m_listView->blockSignals(false);
if (!isSubItem) m_doc->cachePixmap(item->getClipHash(), pix);
else m_doc->cachePixmap(item->getClipHash() + '#' + QString::number(frame), pix);
delete producer;
}*/
if (m_listView->isEnabled()) m_listView->blockSignals(false);
- if (item->icon(0).isNull()) {
+ /*if (item->icon(0).isNull()) {
requestClipThumbnail(clipId);
- }
+ }*/
} else kDebug() << "//////// COULD NOT FIND CLIP TO UPDATE PRPS...";
int max = m_doc->clipManager()->clipsCount();
- emit displayMessage(i18n("Loading clips"), (int)(100 * (max - m_infoQueue.count()) / max));
+ emit displayMessage(i18n("Loading clips"), (int)(100 *(max - m_infoQueue.count()) / max));
// small delay so that the app can display the progress info
if (item && m_infoQueue.isEmpty() && m_thumbnailQueue.isEmpty()) {
m_listView->setCurrentItem(item);
ProjectItem *item = getItemById(clipId);
if (item && !pix.isNull()) {
m_listView->blockSignals(true);
- item->setIcon(0, pix);
+ item->setData(0, Qt::DecorationRole, pix);
m_doc->cachePixmap(item->getClipHash(), pix);
if (m_listView->isEnabled()) m_listView->blockSignals(false);
}
while (*it) {
if ((*it)->type() == PROJECTFOLDERTYPE) {
item = static_cast<FolderProjectItem *>(*it);
- return item;
+ if (item->clipId() == id) return item;
}
++it;
}
ProjectItem *clip = getItemById(id);
if (clip == NULL) return;
if (clip->referencedClip()->hasCutZone(QPoint(in, out))) return;
- AddClipCutCommand *command = new AddClipCutCommand(this, id, in, out, false);
+ AddClipCutCommand *command = new AddClipCutCommand(this, id, in, out, QString(), false);
m_commandStack->push(command);
}
-void ProjectList::addClipCut(const QString &id, int in, int out)
+void ProjectList::addClipCut(const QString &id, int in, int out, const QString desc)
{
ProjectItem *clip = getItemById(id);
if (clip) {
DocClipBase *base = clip->referencedClip();
base->addCutZone(in, out);
m_listView->blockSignals(true);
- SubProjectItem *sub = new SubProjectItem(clip, in, out);
-
- QPixmap p = clip->referencedClip()->thumbProducer()->extractImage(in, (int)(sub->sizeHint(0).height() * m_render->dar()), sub->sizeHint(0).height());
- sub->setIcon(0, p);
+ SubProjectItem *sub = new SubProjectItem(clip, in, out, desc);
+ QPixmap p = clip->referencedClip()->thumbProducer()->extractImage(in, (int)(sub->sizeHint(0).height() * m_render->dar()), sub->sizeHint(0).height() - 2);
+ sub->setData(0, Qt::DecorationRole, p);
m_doc->cachePixmap(clip->getClipHash() + '#' + QString::number(in), p);
m_listView->blockSignals(false);
}
+ emit projectModified();
}
void ProjectList::removeClipCut(const QString &id, int in, int out)
if (clip) {
DocClipBase *base = clip->referencedClip();
base->removeCutZone(in, out);
+ SubProjectItem *sub = getSubItem(clip, QPoint(in, out));
+ if (sub) {
+ m_listView->blockSignals(true);
+ delete sub;
+ m_listView->blockSignals(false);
+ }
+ }
+ emit projectModified();
+}
+
+SubProjectItem *ProjectList::getSubItem(ProjectItem *clip, QPoint zone)
+{
+ SubProjectItem *sub = NULL;
+ if (clip) {
for (int i = 0; i < clip->childCount(); i++) {
QTreeWidgetItem *it = clip->child(i);
- if (it->type() != PROJECTSUBCLIPTYPE) continue;
- SubProjectItem *sub = static_cast <SubProjectItem*>(it);
- if (sub->zone() == QPoint(in, out)) {
- m_listView->blockSignals(true);
- delete it;
- m_listView->blockSignals(false);
- break;
+ if (it->type() == PROJECTSUBCLIPTYPE) {
+ sub = static_cast <SubProjectItem*>(it);
+ if (sub->zone() == zone) break;
+ else sub = NULL;
}
}
}
+ return sub;
+}
+
+void ProjectList::slotUpdateClipCut(QPoint p)
+{
+ if (!m_listView->currentItem() || m_listView->currentItem()->type() != PROJECTSUBCLIPTYPE) return;
+ SubProjectItem *sub = static_cast <SubProjectItem*>(m_listView->currentItem());
+ ProjectItem *item = static_cast <ProjectItem *>(sub->parent());
+ EditClipCutCommand *command = new EditClipCutCommand(this, item->clipId(), sub->zone(), p, sub->text(1), sub->text(1), true);
+ m_commandStack->push(command);
+}
+
+void ProjectList::doUpdateClipCut(const QString &id, const QPoint oldzone, const QPoint zone, const QString &comment)
+{
+ ProjectItem *clip = getItemById(id);
+ SubProjectItem *sub = getSubItem(clip, oldzone);
+ if (sub == NULL || clip == NULL) return;
+ DocClipBase *base = clip->referencedClip();
+ base->updateCutZone(oldzone.x(), oldzone.y(), zone.x(), zone.y(), comment);
+ m_listView->blockSignals(true);
+ sub->setZone(zone);
+ sub->setDescription(comment);
+ m_listView->blockSignals(false);
+ emit projectModified();
}
#include "projectlist.moc"