#include "projectlist.h"
#include "projectitem.h"
+#include "addfoldercommand.h"
#include "kdenlivesettings.h"
#include "slideshowclip.h"
#include "ui_colorclip_ui.h"
#include "titlewidget.h"
-
-
#include "definitions.h"
#include "clipmanager.h"
#include "docclipbase.h"
#include "renderer.h"
#include "kthumb.h"
#include "projectlistview.h"
+#include "editclipcommand.h"
+#include "editfoldercommand.h"
ProjectList::ProjectList(QWidget *parent)
: QWidget(parent), m_render(NULL), m_fps(-1), m_commandStack(NULL), m_selectedItem(NULL), m_infoQueue(QMap <QString, QDomElement> ()), m_thumbnailQueue(QList <QString> ()), m_refreshed(false) {
QWidget *vbox = new QWidget;
listView = new ProjectListView(this);;
QVBoxLayout *layout = new QVBoxLayout;
+ layout->setContentsMargins(0, 0, 0, 0);
m_clipIdCounter = 0;
// setup toolbar
searchView = new KTreeWidgetSearchLine(this);
m_toolbar = new QToolBar("projectToolBar", this);
m_toolbar->addWidget(searchView);
- QToolButton *addButton = new QToolButton(m_toolbar);
- QMenu *addMenu = new QMenu(this);
- addButton->setMenu(addMenu);
- addButton->setPopupMode(QToolButton::MenuButtonPopup);
- m_toolbar->addWidget(addButton);
-
- QAction *addClipButton = addMenu->addAction(KIcon("kdenlive-add-clip"), i18n("Add Clip"));
- connect(addClipButton, SIGNAL(triggered()), this, SLOT(slotAddClip()));
-
- QAction *addColorClip = addMenu->addAction(KIcon("kdenlive-add-color-clip"), i18n("Add Color Clip"));
- connect(addColorClip, SIGNAL(triggered()), this, SLOT(slotAddColorClip()));
-
- QAction *addSlideClip = addMenu->addAction(KIcon("kdenlive-add-slide-clip"), i18n("Add Slideshow Clip"));
- connect(addSlideClip, SIGNAL(triggered()), this, SLOT(slotAddSlideshowClip()));
-
- QAction *addTitleClip = addMenu->addAction(KIcon("kdenlive-add-text-clip"), i18n("Add Title Clip"));
- connect(addTitleClip, SIGNAL(triggered()), this, SLOT(slotAddTitleClip()));
+ m_addButton = new QToolButton(m_toolbar);
+ m_addButton->setPopupMode(QToolButton::MenuButtonPopup);
+ m_toolbar->addWidget(m_addButton);
m_deleteAction = m_toolbar->addAction(KIcon("edit-delete"), i18n("Delete Clip"));
connect(m_deleteAction, SIGNAL(triggered()), this, SLOT(slotRemoveClip()));
m_editAction = m_toolbar->addAction(KIcon("document-properties"), i18n("Edit Clip"));
connect(m_editAction, SIGNAL(triggered()), this, SLOT(slotEditClip()));
- QAction *addFolderButton = addMenu->addAction(KIcon("folder-new"), i18n("Create Folder"));
- connect(addFolderButton, SIGNAL(triggered()), this, SLOT(slotAddFolder()));
-
- addButton->setDefaultAction(addClipButton);
-
layout->addWidget(m_toolbar);
layout->addWidget(listView);
setLayout(layout);
searchView->setTreeWidget(listView);
- m_menu = new QMenu();
- m_menu->addAction(addClipButton);
- m_menu->addAction(addColorClip);
- m_menu->addAction(addSlideClip);
- m_menu->addAction(addTitleClip);
- m_menu->addAction(m_editAction);
- m_menu->addAction(m_deleteAction);
- m_menu->addAction(addFolderButton);
- m_menu->insertSeparator(m_deleteAction);
-
connect(listView, SIGNAL(itemSelectionChanged()), this, SLOT(slotClipSelected()));
connect(listView, SIGNAL(focusMonitor()), this, SLOT(slotClipSelected()));
+ connect(listView, SIGNAL(pauseMonitor()), this, SLOT(slotPauseMonitor()));
connect(listView, SIGNAL(requestMenu(const QPoint &, QTreeWidgetItem *)), this, SLOT(slotContextMenu(const QPoint &, QTreeWidgetItem *)));
connect(listView, SIGNAL(addClip()), this, SLOT(slotAddClip()));
- connect(listView, SIGNAL(addClip(QUrl, const QString &)), this, SLOT(slotAddClip(QUrl, const QString &)));
+ connect(listView, SIGNAL(addClip(KUrl, const QString &)), this, SLOT(slotAddClip(KUrl, const QString &)));
connect(listView, SIGNAL(itemChanged(QTreeWidgetItem *, int)), this, SLOT(slotItemEdited(QTreeWidgetItem *, int)));
connect(listView, SIGNAL(showProperties(DocClipBase *)), this, SIGNAL(showClipProperties(DocClipBase *)));
- m_listViewDelegate = new ItemDelegate(listView);
- listView->setItemDelegate(m_listViewDelegate);
+ ItemDelegate *listViewDelegate = new ItemDelegate(listView);
+ listView->setItemDelegate(listViewDelegate);
}
ProjectList::~ProjectList() {
delete m_toolbar;
}
+void ProjectList::setupMenu(QMenu *addMenu, QAction *defaultAction) {
+ m_addButton->setMenu(addMenu);
+ m_addButton->setDefaultAction(defaultAction);
+ m_menu = new QMenu();
+ m_menu->addActions(addMenu->actions());
+}
+
+void ProjectList::setupGeneratorMenu(QMenu *addMenu) {
+ if (!addMenu) return;
+ QMenu *menu = m_addButton->menu();
+ menu->addMenu(addMenu);
+ m_addButton->setMenu(menu);
+
+ m_menu->addMenu(addMenu);
+ if (addMenu->isEmpty()) addMenu->setEnabled(false);
+ m_menu->addAction(m_editAction);
+ m_menu->addAction(m_deleteAction);
+ m_menu->insertSeparator(m_deleteAction);
+}
+
+
QByteArray ProjectList::headerInfo() {
return listView->header()->saveState();
}
m_editAction->setEnabled(true);
m_deleteAction->setEnabled(true);
} else {
+ emit clipSelected(NULL);
m_editAction->setEnabled(false);
m_deleteAction->setEnabled(false);
}
}
+void ProjectList::slotPauseMonitor() {
+ if (m_render) m_render->pause();
+}
+
void ProjectList::slotUpdateClipProperties(const QString &id, QMap <QString, QString> properties) {
ProjectItem *item = getItemById(id);
if (item) {
void ProjectList::slotUpdateClipProperties(ProjectItem *clip, QMap <QString, QString> properties) {
if (!clip) return;
if (!clip->isGroup()) clip->setProperties(properties);
+ if (properties.contains("name")) {
+ listView->blockSignals(true);
+ clip->setText(1, properties.value("name"));
+ listView->blockSignals(false);
+ emit clipNameChanged(clip->clipId(), properties.value("name"));
+ }
if (properties.contains("description")) {
CLIPTYPE type = clip->clipType();
+ listView->blockSignals(true);
clip->setText(2, properties.value("description"));
+ listView->blockSignals(false);
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());
void ProjectList::slotItemEdited(QTreeWidgetItem *item, int column) {
ProjectItem *clip = static_cast <ProjectItem*>(item);
if (column == 2) {
- QMap <QString, QString> props;
- props["description"] = item->text(2);
- slotUpdateClipProperties(clip, props);
- } else if (column == 1 && clip->isGroup()) {
- m_doc->slotEditFolder(item->text(1), clip->groupName(), clip->clipId());
- clip->setGroupName(item->text(1));
- 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));
+ if (clip->referencedClip()) {
+ QMap <QString, QString> oldprops;
+ 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);
+ }
+ } else if (column == 1) {
+ if (clip->isGroup()) {
+ editFolder(item->text(1), clip->groupName(), clip->clipId());
+ clip->setGroupName(item->text(1));
+ m_doc->clipManager()->addFolder(clip->clipId(), item->text(1));
+ 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));
+ }
+ } else {
+ if (clip->referencedClip()) {
+ QMap <QString, QString> oldprops;
+ QMap <QString, QString> newprops;
+ oldprops["name"] = clip->referencedClip()->getProperty("name");
+ newprops["name"] = item->text(1);
+ slotUpdateClipProperties(clip, newprops);
+ emit projectModified();
+ EditClipCommand *command = new EditClipCommand(this, clip->clipId(), oldprops, newprops, false);
+ m_commandStack->push(command);
+ }
}
}
}
}
}
if (!ids.isEmpty()) m_doc->deleteProjectClip(ids);
- if (!folderids.isEmpty()) m_doc->deleteProjectFolder(folderids);
+ if (!folderids.isEmpty()) deleteProjectFolder(folderids);
if (listView->topLevelItemCount() == 0) {
m_editAction->setEnabled(false);
m_deleteAction->setEnabled(false);
}
}
-void ProjectList::slotAddFolder() {
- // QString folderName = KInputDialog::getText(i18n("New Folder"), i18n("Enter new folder name: "));
- // if (folderName.isEmpty()) return;
- m_doc->slotAddFolder(i18n("Folder")); //folderName);
+void ProjectList::editFolder(const QString folderName, const QString oldfolderName, const QString &clipId) {
+ EditFolderCommand *command = new EditFolderCommand(this, folderName, oldfolderName, clipId, false);
+ m_commandStack->push(command);
+ m_doc->setModified(true);
+}
+
+void ProjectList::slotAddFolder() {
+ AddFolderCommand *command = new AddFolderCommand(this, i18n("Folder"), QString::number(m_doc->clipManager()->getFreeFolderId()), true);
+ m_commandStack->push(command);
}
void ProjectList::slotAddFolder(const QString foldername, const QString &clipId, bool remove, bool edit) {
if (remove) {
- ProjectItem *item;
- QTreeWidgetItemIterator it(listView);
- while (*it) {
- item = static_cast <ProjectItem *>(*it);
- if (item->isGroup() && item->clipId() == clipId) {
- delete item;
- break;
- }
- ++it;
+ ProjectItem *item = getFolderItemById(clipId);
+ if (item) {
+ m_doc->clipManager()->deleteFolder(clipId);
+ delete item;
}
} else {
if (edit) {
- listView->blockSignals(true);
- ProjectItem *item;
+ ProjectItem *item = getFolderItemById(clipId);
QTreeWidgetItemIterator it(listView);
- while (*it) {
- item = static_cast <ProjectItem *>(*it);
- if (item->isGroup() && item->clipId() == clipId) {
- item->setGroupName(foldername);
- const int children = item->childCount();
- for (int i = 0; i < children; i++) {
- ProjectItem *child = static_cast <ProjectItem *>(item->child(i));
- child->setProperty("groupname", foldername);
- }
- break;
+ if (item) {
+ listView->blockSignals(true);
+ item->setGroupName(foldername);
+ listView->blockSignals(false);
+ m_doc->clipManager()->addFolder(clipId, foldername);
+ const int children = item->childCount();
+ for (int i = 0; i < children; i++) {
+ ProjectItem *child = static_cast <ProjectItem *>(item->child(i));
+ child->setProperty("groupname", foldername);
}
- ++it;
}
- listView->blockSignals(false);
} else {
QStringList text;
text << QString() << foldername;
+ listView->blockSignals(true);
(void) new ProjectItem(listView, text, clipId);
+ m_doc->clipManager()->addFolder(clipId, foldername);
+ listView->blockSignals(false);
}
}
}
+
+
+void ProjectList::deleteProjectFolder(QMap <QString, QString> map) {
+ QMapIterator<QString, QString> i(map);
+ QUndoCommand *delCommand = new QUndoCommand();
+ delCommand->setText(i18n("Delete Folder"));
+ while (i.hasNext()) {
+ i.next();
+ new AddFolderCommand(this, i.key(), i.value(), false, delCommand);
+ }
+ m_commandStack->push(delCommand);
+ m_doc->setModified(true);
+}
+
void ProjectList::slotAddClip(DocClipBase *clip, bool getProperties) {
+ if (getProperties) listView->setEnabled(false);
+ listView->blockSignals(true);
const QString parent = clip->getProperty("groupid");
//kDebug() << "Adding clip with groupid: " << parent;
ProjectItem *item = NULL;
if (!parent.isEmpty()) {
- ProjectItem *parentitem = getItemById(parent);
+ ProjectItem *parentitem = getFolderItemById(parent);
if (!parentitem) {
QStringList text;
QString groupName = clip->getProperty("groupname");
//kDebug() << "Adding clip to new group: " << groupName;
if (groupName.isEmpty()) groupName = i18n("Folder");
text << QString() << groupName;
- listView->blockSignals(true);
parentitem = new ProjectItem(listView, text, parent);
- listView->blockSignals(false);
} else {
//kDebug() << "Adding clip to existing group: " << parentitem->groupName();
}
}
if (!annotation.isEmpty()) item->setText(2, annotation);
}
- if (getProperties) requestClipInfo(clip->toXML(), clip->getId());
+ listView->blockSignals(false);
}
void ProjectList::requestClipInfo(const QDomElement xml, const QString id) {
+ kDebug() << " PRG LISTÂ REQUEST CLP INFO: " << id;
m_infoQueue.insert(id, xml);
listView->setEnabled(false);
if (m_infoQueue.count() == 1) QTimer::singleShot(300, this, SLOT(slotProcessNextClipInQueue()));
void ProjectList::slotUpdateClip(const QString &id) {
ProjectItem *item = getItemById(id);
- item->setData(1, UsageRole, QString::number(item->numReferences()));
+ listView->blockSignals(true);
+ if (item) item->setData(1, UsageRole, QString::number(item->numReferences()));
+ listView->blockSignals(false);
}
void ProjectList::updateAllClips() {
QDomDocument doc;
doc.setContent(clip->getProperty("xmldata"));
dia_ui->setXml(doc);
- QPixmap pix = dia_ui->renderedPixmap();
+ QImage pix = dia_ui->renderedPixmap();
pix.save(clip->fileURL().path());
delete dia_ui;
}
requestClipInfo(clip->toXML(), clip->getId());
} else {
- requestClipThumbnail(item->clipId());
+ QString cachedPixmap = m_doc->projectFolder().path() + "/thumbs/" + item->getClipHash() + ".png";
+ if (QFile::exists(cachedPixmap)) {
+ //kDebug()<<"// USING CACHED PIX: "<<cachedPixmap;
+ listView->blockSignals(true);
+ item->setIcon(0, QPixmap(cachedPixmap));
+ listView->blockSignals(false);
+ } else requestClipThumbnail(item->clipId());
+ listView->blockSignals(true);
item->changeDuration(item->referencedClip()->producer()->get_playtime());
+ listView->blockSignals(false);
}
+ listView->blockSignals(true);
item->setData(1, UsageRole, QString::number(item->numReferences()));
+ listView->blockSignals(false);
qApp->processEvents();
}
++it;
QTimer::singleShot(500, this, SLOT(slotCheckForEmptyQueue()));
}
-void ProjectList::slotAddClip(QUrl givenUrl, QString group) {
+void ProjectList::slotAddClip(KUrl givenUrl, QString group) {
if (!m_commandStack) kDebug() << "!!!!!!!!!!!!!!!! NO CMD STK";
KUrl::List list;
if (givenUrl.isEmpty()) {
- list = KFileDialog::getOpenUrls(KUrl("kfiledialog:///clipfolder"), "application/x-kdenlive application/x-flash-video 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-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", this);
+ list = KFileDialog::getOpenUrls(KUrl("kfiledialog:///clipfolder"), "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-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", this);
} else list.append(givenUrl);
if (list.isEmpty()) return;
void ProjectList::slotRemoveInvalidClip(const QString &id) {
ProjectItem *item = getItemById(id);
if (item) {
- QString path = item->referencedClip()->fileURL().path();
- if (!path.isEmpty()) KMessageBox::sorry(this, i18n("<qt>Clip <b>%1</b><br>is invalid, will be removed from project.", path));
-
+ const QString path = item->referencedClip()->fileURL().path();
+ if (!path.isEmpty()) KMessageBox::sorry(this, i18n("Clip <b>%1</b><br>is invalid, will be removed from project.", path));
+ QList <QString> ids;
+ ids << id;
+ m_doc->deleteProjectClip(ids);
}
- QList <QString> ids;
- ids << id;
- m_doc->deleteProjectClip(ids);
if (!m_infoQueue.isEmpty()) QTimer::singleShot(300, this, SLOT(slotProcessNextClipInQueue()));
}
m_thumbnailQueue.clear();
m_infoQueue.clear();
m_refreshed = false;
+ QMap <QString, QString> flist = doc->clipManager()->documentFolderList();
+ QMapIterator<QString, QString> f(flist);
+ while (f.hasNext()) {
+ f.next();
+ (void) new ProjectItem(listView, QStringList() << QString() << f.value(), f.key());
+ }
+
QList <DocClipBase*> list = doc->clipManager()->documentClipList();
for (int i = 0; i < list.count(); i++) {
slotAddClip(list.at(i), false);
if (!item->referencedClip()) return;
int height = 50;
int width = (int)(height * m_render->dar());
- QPixmap pix = item->referencedClip()->thumbProducer()->extractImage(item->referencedClip()->getClipThumbFrame(), width, height);
+ DocClipBase *clip = item->referencedClip();
+ if (!clip) slotProcessNextThumbnail();
+ QPixmap pix;
+ if (clip->clipType() == AUDIO) pix = KIcon("audio-x-generic").pixmap(QSize(width, height));
+ else pix = item->referencedClip()->thumbProducer()->extractImage(item->referencedClip()->getClipThumbFrame(), width, height);
+ listView->blockSignals(true);
item->setIcon(0, pix);
+ listView->blockSignals(false);
+ m_doc->cachePixmap(item->getClipHash(), pix);
if (update) emit projectModified();
if (!m_thumbnailQueue.isEmpty()) QTimer::singleShot(300, this, SLOT(slotProcessNextThumbnail()));
}
void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Producer *producer, const QMap < QString, QString > &properties, const QMap < QString, QString > &metadata) {
ProjectItem *item = getItemById(clipId);
if (item && producer) {
+ listView->blockSignals(true);
item->setProperties(properties, metadata);
item->referencedClip()->setProducer(producer);
emit receivedClipDuration(clipId, item->clipMaxDuration());
+ listView->blockSignals(false);
} else kDebug() << "//////// COULD NOT FIND CLIP TO UPDATE PRPS...";
if (!m_infoQueue.isEmpty()) QTimer::singleShot(300, this, SLOT(slotProcessNextClipInQueue()));
+ else listView->setEnabled(true);
}
void ProjectList::slotReplyGetImage(const QString &clipId, int pos, const QPixmap &pix, int w, int h) {
ProjectItem *item = getItemById(clipId);
- if (item) item->setIcon(0, pix);
+ if (item) {
+ listView->blockSignals(true);
+ item->setIcon(0, pix);
+ m_doc->cachePixmap(item->getClipHash(), pix);
+ listView->blockSignals(false);
+ }
}
ProjectItem *ProjectList::getItemById(const QString &id) {
+ ProjectItem *item;
QTreeWidgetItemIterator it(listView);
while (*it) {
- if (((ProjectItem *)(*it))->clipId() == id)
- return static_cast<ProjectItem *>(*it);
+ item = static_cast<ProjectItem *>(*it);
+ if (item->clipId() == id && item->clipType() != FOLDER)
+ return item;
++it;
}
return NULL;
-#ifdef USED_TO_BE_THIS
+}
+
+ProjectItem *ProjectList::getFolderItemById(const QString &id) {
+ ProjectItem *item;
+ QTreeWidgetItemIterator it(listView);
while (*it) {
- if (((ProjectItem *)(*it))->clipId() == id)
- break;
+ item = static_cast<ProjectItem *>(*it);
+ if (item->clipId() == id && item->clipType() == FOLDER)
+ return item;
++it;
}
- if (*it) return ((ProjectItem *)(*it));
return NULL;
-#endif
}
void ProjectList::slotSelectClip(const QString &ix) {