X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fprojectlist.cpp;h=f632976db3d4bd1432723cb0c4a2945cdb113087;hb=6b6e6ac5af11fb3fd4f0eba0ba95ceea72b5f06e;hp=8cec2bcf47f99005e60add9490551db44ebf4c8a;hpb=ce3a9c15d4f1fb2d8a62e68198811cfd34f3bb7f;p=kdenlive diff --git a/src/projectlist.cpp b/src/projectlist.cpp index 8cec2bcf..f632976d 100644 --- a/src/projectlist.cpp +++ b/src/projectlist.cpp @@ -30,20 +30,19 @@ #include #include #include -#include #include #include -#include -#include +#include +//#include #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" @@ -51,48 +50,25 @@ #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) { + : QWidget(parent), m_render(NULL), m_fps(-1), m_commandStack(NULL), m_selectedItem(NULL), m_infoQueue(QMap ()), m_thumbnailQueue(QList ()), m_refreshed(false), m_editAction(NULL), m_openAction(NULL), m_deleteAction(NULL), m_reloadAction(NULL) { QWidget *vbox = new QWidget; listView = new ProjectListView(this);; QVBoxLayout *layout = new QVBoxLayout; - m_clipIdCounter = 0; + layout->setContentsMargins(0, 0, 0, 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_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); + m_addButton = new QToolButton(m_toolbar); + m_addButton->setPopupMode(QToolButton::MenuButtonPopup); + m_toolbar->addWidget(m_addButton); layout->addWidget(m_toolbar); layout->addWidget(listView); @@ -101,26 +77,25 @@ ProjectList::ProjectList(QWidget *parent) 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); + + if (KdenliveSettings::activate_nepomuk()) { + Nepomuk::ResourceManager::instance()->init(); + if (!Nepomuk::ResourceManager::instance()->initialized()) { + kDebug() << "Cannot communicate with Nepomuk, DISABLING it"; + KdenliveSettings::setActivate_nepomuk(false); + } + } } ProjectList::~ProjectList() { @@ -128,62 +103,195 @@ ProjectList::~ProjectList() { delete m_toolbar; } +void ProjectList::setupMenu(QMenu *addMenu, QAction *defaultAction) { + QList actions = addMenu->actions(); + for (int i = 0; i < actions.count(); i++) { + if (actions.at(i)->data().toString() == "clip_properties") { + m_editAction = actions.at(i); + m_toolbar->addAction(m_editAction); + actions.removeAt(i); + i--; + } else if (actions.at(i)->data().toString() == "delete_clip") { + m_deleteAction = actions.at(i); + m_toolbar->addAction(m_deleteAction); + actions.removeAt(i); + i--; + } else if (actions.at(i)->data().toString() == "edit_clip") { + m_openAction = actions.at(i); + actions.removeAt(i); + i--; + } else if (actions.at(i)->data().toString() == "reload_clip") { + m_reloadAction = actions.at(i); + actions.removeAt(i); + i--; + } + } + + QMenu *m = new QMenu(); + m->addActions(actions); + m_addButton->setMenu(m); + 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_reloadAction); + m_menu->addAction(m_editAction); + m_menu->addAction(m_openAction); + m_menu->addAction(m_deleteAction); + m_menu->insertSeparator(m_deleteAction); +} + + +QByteArray ProjectList::headerInfo() { + return listView->header()->saveState(); +} + +void ProjectList::setHeaderInfo(const QByteArray &state) { + listView->header()->restoreState(state); +} + void ProjectList::slotEditClip() { ProjectItem *item = static_cast (listView->currentItem()); - if (item && !item->isGroup()) emit clipSelected(item->referencedClip()); - emit showClipProperties(item->referencedClip()); + if (item && !item->isGroup()) { + emit clipSelected(item->referencedClip()); + emit showClipProperties(item->referencedClip()); + } } +void ProjectList::slotOpenClip() { + ProjectItem *item = static_cast (listView->currentItem()); + if (item && !item->isGroup()) { + if (item->clipType() == IMAGE) { + if (KdenliveSettings::defaultimageapp().isEmpty()) KMessageBox::sorry(this, i18n("Please set a default application to open images in the Settings dialog")); + else QProcess::startDetached(KdenliveSettings::defaultimageapp(), QStringList() << item->clipUrl().path()); + } + if (item->clipType() == AUDIO) { + if (KdenliveSettings::defaultaudioapp().isEmpty()) KMessageBox::sorry(this, i18n("Please set a default application to open audio files in the Settings dialog")); + else QProcess::startDetached(KdenliveSettings::defaultaudioapp(), QStringList() << item->clipUrl().path()); + } + } +} +void ProjectList::slotReloadClip() { + ProjectItem *item = static_cast (listView->currentItem()); + if (item && !item->isGroup()) { + if (item->clipType() == IMAGE) { + item->referencedClip()->producer()->set("force_reload", 1); + } + emit getFileProperties(item->toXml(), item->clipId(), false); + } +} void ProjectList::setRenderer(Render *projectRender) { m_render = projectRender; + listView->setIconSize(QSize(40 * m_render->dar(), 40)); } void ProjectList::slotClipSelected() { - ProjectItem *item = static_cast (listView->currentItem()); - if (item && !item->isGroup()) { - if (item == m_selectedItem) { - // if user clicked on the active clip item, just focus monitor, don't update it. - emit clipSelected(NULL); - return; + if (listView->currentItem()) { + ProjectItem *clip = static_cast (listView->currentItem()); + if (!clip->isGroup()) { + m_selectedItem = clip; + emit clipSelected(clip->referencedClip()); } - m_selectedItem = item; - emit clipSelected(item->referencedClip()); + m_editAction->setEnabled(true); + m_deleteAction->setEnabled(true); + m_reloadAction->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); + m_deleteAction->setEnabled(false); + m_openAction->setEnabled(false); + m_reloadAction->setEnabled(false); } } -void ProjectList::slotUpdateClipProperties(int id, QMap properties) { +void ProjectList::slotPauseMonitor() { + if (m_render) m_render->pause(); +} + +void ProjectList::slotUpdateClipProperties(const QString &id, QMap properties) { ProjectItem *item = getItemById(id); if (item) { slotUpdateClipProperties(item, properties); - if (properties.contains("colour") || properties.contains("resource")) slotRefreshClipThumbnail(item); + if (properties.contains("colour") || properties.contains("resource") || properties.contains("xmldata")) slotRefreshClipThumbnail(item); if (properties.contains("out")) item->changeDuration(properties.value("out").toInt()); } } void ProjectList::slotUpdateClipProperties(ProjectItem *clip, QMap properties) { if (!clip) return; - clip->setProperties(properties); + 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")); - if (type == AUDIO || type == VIDEO || type == AV || type == IMAGE || type == PLAYLIST) { + 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()); - if (f.isValid()) f.setDescription(properties.value("description")); + f.setDescription(properties.value("description")); } + emit projectModified(); } } void ProjectList::slotItemEdited(QTreeWidgetItem *item, int column) { ProjectItem *clip = static_cast (item); if (column == 2) { - QMap props; - props["description"] = item->text(2); - slotUpdateClipProperties(clip, props); - } else if (column == 1 && clip->clipType() == FOLDER) { - m_doc->slotEditFolder(item->text(1), clip->groupName(), clip->clipId()); + if (clip->referencedClip()) { + QMap oldprops; + QMap 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 (item->child(i)); + child->setProperty("groupname", item->text(1)); + } + } else { + if (clip->referencedClip()) { + QMap oldprops; + QMap 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); + } + } } } @@ -194,148 +302,277 @@ void ProjectList::slotContextMenu(const QPoint &pos, QTreeWidgetItem *item) { } m_editAction->setEnabled(enable); m_deleteAction->setEnabled(enable); - + m_reloadAction->setEnabled(enable); + if (enable) { + ProjectItem *clip = static_cast (item); + 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 m_openAction->setEnabled(false); m_menu->popup(pos); } void ProjectList::slotRemoveClip() { if (!listView->currentItem()) return; - ProjectItem *item = static_cast (listView->currentItem()); - QList ids; - QMap folderids; - if (item->clipType() == FOLDER) folderids[item->groupName()] = item->clipId(); - else ids << item->clipId(); - if (item->numReferences() > 0) { - if (KMessageBox::questionYesNo(this, i18np("Delete clip %2 ?
This will also remove the clip in timeline", "Delete clip %2 ?
This will also remove its %1 clips in timeline", item->numReferences(), item->names().at(1)), i18n("Delete Clip")) != KMessageBox::Yes) return; - } else if (item->clipType() == FOLDER && item->childCount() > 0) { - int children = item->childCount(); - if (KMessageBox::questionYesNo(this, i18n("Delete folder %2 ?
This will also remove the %1 clips in that folder", children, item->names().at(1)), i18n("Delete Folder")) != KMessageBox::Yes) return; - for (int i = 0; i < children; ++i) { - ProjectItem *child = static_cast (item->child(i)); - ids << child->clipId(); + QList ids; + QMap folderids; + QList selected = listView->selectedItems(); + ProjectItem *item; + for (int i = 0; i < selected.count(); i++) { + item = static_cast (selected.at(i)); + if (item->isGroup()) folderids[item->groupName()] = item->clipId(); + else ids << item->clipId(); + if (item->numReferences() > 0) { + if (KMessageBox::questionYesNo(this, i18np("Delete clip %2 ?
This will also remove the clip in timeline", "Delete clip %2 ?
This will also remove its %1 clips in timeline", item->numReferences(), item->names().at(1)), i18n("Delete Clip")) != KMessageBox::Yes) return; + } else if (item->isGroup() && item->childCount() > 0) { + int children = item->childCount(); + if (KMessageBox::questionYesNo(this, i18n("Delete folder %2 ?
This will also remove the %1 clips in that folder", children, item->names().at(1)), i18n("Delete Folder")) != KMessageBox::Yes) return; + for (int i = 0; i < children; ++i) { + ProjectItem *child = static_cast (item->child(i)); + ids << child->clipId(); + } } } 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); + m_openAction->setEnabled(false); + m_reloadAction->setEnabled(false); + } } -void ProjectList::selectItemById(const int clipId) { +void ProjectList::selectItemById(const QString &clipId) { ProjectItem *item = getItemById(clipId); if (item) listView->setCurrentItem(item); } -void ProjectList::slotDeleteClip(int clipId) { +void ProjectList::slotDeleteClip(const QString &clipId) { ProjectItem *item = getItemById(clipId); QTreeWidgetItem *p = item->parent(); if (p) { - kDebug() << "/////// DELETEED CLIP HAS A PARENT... " << p->indexOfChild(item); + kDebug() << "/////// DELETED CLIP HAS A PARENT... " << p->indexOfChild(item); QTreeWidgetItem *clone = p->takeChild(p->indexOfChild(item)); } else if (item) { delete item; } } -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, int clipId, bool remove, bool edit) { +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 (*it); - if (item->clipType() == FOLDER && item->clipId() == clipId) { - delete item; - break; - } - ++it; + ProjectItem *item = getFolderItemById(clipId); + if (item) { + m_doc->clipManager()->deleteFolder(clipId); + delete item; } } else { if (edit) { - disconnect(listView, SIGNAL(itemChanged(QTreeWidgetItem *, int)), this, SLOT(slotUpdateItemDescription(QTreeWidgetItem *, int))); - ProjectItem *item; + ProjectItem *item = getFolderItemById(clipId); QTreeWidgetItemIterator it(listView); - while (*it) { - item = static_cast (*it); - if (item->clipType() == FOLDER && item->clipId() == clipId) { - item->setText(1, 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 (item->child(i)); + child->setProperty("groupname", foldername); } - ++it; } - connect(listView, SIGNAL(itemChanged(QTreeWidgetItem *, int)), this, SLOT(slotUpdateItemDescription(QTreeWidgetItem *, int))); } 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::slotAddClip(DocClipBase *clip) { - const int parent = clip->toXML().attribute("groupid").toInt(); + + +void ProjectList::deleteProjectFolder(QMap map) { + QMapIterator 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 != 0) { - ProjectItem *parentitem = getItemById(parent); + if (!parent.isEmpty()) { + 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; + parentitem = new ProjectItem(listView, text, parent); + } else { + //kDebug() << "Adding clip to existing group: " << parentitem->groupName(); + } if (parentitem) item = new ProjectItem(parentitem, clip); } if (item == NULL) item = new ProjectItem(listView, clip); KUrl url = clip->fileURL(); - if (!url.isEmpty()) { + if (!url.isEmpty() && KdenliveSettings::activate_nepomuk()) { // if file has Nepomuk comment, use it Nepomuk::Resource f(url.path()); - QString annotation; - if (f.isValid()) { - annotation = f.description(); - /* - Nepomuk::Tag tag("test"); - f.addTag(tag);*/ - } else kDebug() << "--- CANNOT CONTACT NEPOMUK"; + QString annotation = f.description(); if (!annotation.isEmpty()) item->setText(2, annotation); + item->setText(3, QString::number(f.rating())); } - emit getFileProperties(clip->toXML(), clip->getId()); + listView->blockSignals(false); } -void ProjectList::slotUpdateClip(int id) { +void ProjectList::slotResetProjectList() { + listView->clear(); + emit clipSelected(NULL); + m_thumbnailQueue.clear(); + m_infoQueue.clear(); + m_refreshed = 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::slotProcessNextClipInQueue() { + if (m_infoQueue.isEmpty()) { + listView->setEnabled(true); + return; + } + QMap::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()); + emit getFileProperties(dom, id, true); + } + if (m_infoQueue.isEmpty()) listView->setEnabled(true); +} + +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() { + QTreeWidgetItemIterator it(listView); + while (*it) { + ProjectItem *item = static_cast (*it); + if (!item->isGroup()) { + 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; + } + requestClipInfo(clip->toXML(), clip->getId()); + } else { + QString cachedPixmap = m_doc->projectFolder().path() + "/thumbs/" + item->getClipHash() + ".png"; + if (QFile::exists(cachedPixmap)) { + //kDebug()<<"// USING CACHED PIX: "<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) { - if (!m_commandStack) kDebug() << "!!!!!!!!!!!!!!!!  NO CMD STK"; +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/vnd.kde.kdenlive application/vnd.westley.scenelist application/flv application/vnd.rn-realmedia video/x-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\n*.m2t *.mts|HDV video\n*.dv|DV video"); + 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/x-matroska 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", this); } else list.append(givenUrl); if (list.isEmpty()) return; - KUrl::List::Iterator it; - int groupId = -1; + + QString groupId; if (group.isEmpty()) { ProjectItem *item = static_cast (listView->currentItem()); - if (item && item->clipType() != FOLDER) { + if (item && !item->isGroup()) { while (item->parent()) { item = static_cast (item->parent()); - if (item->clipType() == FOLDER) break; + if (item->isGroup()) break; } } - if (item && item->clipType() == FOLDER) { + if (item && item->isGroup()) { group = item->groupName(); groupId = item->clipId(); } } - for (it = list.begin(); it != list.end(); it++) { - m_doc->slotAddClipFile(*it, group, groupId); + m_doc->slotAddClipList(list, group, groupId); +} + +void ProjectList::slotRemoveInvalidClip(const QString &id) { + ProjectItem *item = getItemById(id); + if (item) { + const QString path = item->referencedClip()->fileURL().path(); + if (!path.isEmpty()) KMessageBox::sorry(this, i18n("Clip %1
is invalid, will be removed from project.", path)); + QList ids; + ids << id; + m_doc->deleteProjectClip(ids); } + if (!m_infoQueue.isEmpty()) QTimer::singleShot(300, this, SLOT(slotProcessNextClipInQueue())); + else 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 = new Ui::ColorClip_UI(); dia_ui->setupUi(dia); @@ -345,21 +582,22 @@ void ProjectList::slotAddColorClip() { QString color = dia_ui->clip_color->color().name(); color = color.replace(0, 1, "0x") + "ff"; - QString group = QString(); - int groupId = -1; + QString group; + QString groupId; ProjectItem *item = static_cast (listView->currentItem()); - if (item && item->clipType() != FOLDER) { + if (item && !item->isGroup()) { while (item->parent()) { item = static_cast (item->parent()); - if (item->clipType() == FOLDER) break; + if (item->isGroup()) break; } } - if (item && item->clipType() == FOLDER) { + if (item && item->isGroup()) { group = item->groupName(); groupId = item->clipId(); } - m_doc->slotAddColorClipFile(dia_ui->clip_name->text(), color, dia_ui->clip_duration->text(), group, groupId); + m_doc->clipManager()->slotAddColorClipFile(dia_ui->clip_name->text(), color, dia_ui->clip_duration->text(), group, groupId); + m_doc->setModified(true); } delete dia_ui; delete dia; @@ -367,41 +605,42 @@ void ProjectList::slotAddColorClip() { void ProjectList::slotAddSlideshowClip() { - if (!m_commandStack) kDebug() << "!!!!!!!!!!!!!!!!  NO CMD STK"; + if (!m_commandStack) kDebug() << "!!!!!!!!!!!!!!!! NO CMD STK"; SlideshowClip *dia = new SlideshowClip(this); if (dia->exec() == QDialog::Accepted) { - QString group = QString(); - int groupId = -1; + QString group; + QString groupId; ProjectItem *item = static_cast (listView->currentItem()); - if (item && item->clipType() != FOLDER) { + if (item && !item->isGroup()) { while (item->parent()) { item = static_cast (item->parent()); - if (item->clipType() == FOLDER) break; + if (item->isGroup()) break; } } - if (item && item->clipType() == FOLDER) { + if (item && item->isGroup()) { group = item->groupName(); groupId = item->clipId(); } - m_doc->slotAddSlideshowClipFile(dia->clipName(), dia->selectedPath(), dia->imageCount(), dia->clipDuration(), dia->loop(), dia->fade(), dia->lumaDuration(), dia->lumaFile(), dia->softness(),group, groupId); + m_doc->clipManager()->slotAddSlideshowClipFile(dia->clipName(), dia->selectedPath(), dia->imageCount(), dia->clipDuration(), dia->loop(), dia->fade(), dia->lumaDuration(), dia->lumaFile(), dia->softness(), group, groupId); + m_doc->setModified(true); } delete dia; } void ProjectList::slotAddTitleClip() { - QString group = QString(); - int groupId = -1; + QString group; + QString groupId; ProjectItem *item = static_cast (listView->currentItem()); - if (item && item->clipType() != FOLDER) { + if (item && !item->isGroup()) { while (item->parent()) { item = static_cast (item->parent()); - if (item->clipType() == FOLDER) break; + if (item->isGroup()) break; } } - if (item && item->clipType() == FOLDER) { + if (item && item->isGroup()) { group = item->groupName(); groupId = item->clipId(); } @@ -410,10 +649,22 @@ void ProjectList::slotAddTitleClip() { } void ProjectList::setDocument(KdenliveDoc *doc) { + listView->blockSignals(true); listView->clear(); + emit clipSelected(NULL); + m_thumbnailQueue.clear(); + m_infoQueue.clear(); + m_refreshed = false; + QMap flist = doc->clipManager()->documentFolderList(); + QMapIterator f(flist); + while (f.hasNext()) { + f.next(); + (void) new ProjectItem(listView, QStringList() << QString() << f.value(), f.key()); + } + QList list = doc->clipManager()->documentClipList(); for (int i = 0; i < list.count(); i++) { - slotAddClip(list.at(i)); + slotAddClip(list.at(i), false); } m_fps = doc->fps(); @@ -422,6 +673,7 @@ void ProjectList::setDocument(KdenliveDoc *doc) { m_doc = doc; QTreeWidgetItem *first = listView->topLevelItem(0); if (first) listView->setCurrentItem(first); + listView->blockSignals(false); m_toolbar->setEnabled(true); } @@ -439,44 +691,114 @@ QDomElement ProjectList::producersList() { return prods; } -void ProjectList::slotRefreshClipThumbnail(int clipId) { +void ProjectList::slotCheckForEmptyQueue() { + if (!m_refreshed && m_thumbnailQueue.isEmpty() && m_infoQueue.isEmpty()) { + m_refreshed = true; + emit loadingIsOver(); + } else QTimer::singleShot(500, this, SLOT(slotCheckForEmptyQueue())); +} + +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()) { + return; + } + slotRefreshClipThumbnail(m_thumbnailQueue.takeFirst(), false); +} + +void ProjectList::slotRefreshClipThumbnail(const QString &clipId, bool update) { ProjectItem *item = getItemById(clipId); - if (item) slotRefreshClipThumbnail(item); + if (item) slotRefreshClipThumbnail(item, update); + else slotProcessNextThumbnail(); } -void ProjectList::slotRefreshClipThumbnail(ProjectItem *item) { +void ProjectList::slotRefreshClipThumbnail(ProjectItem *item, bool update) { if (item) { + if (!item->referencedClip()) return; int height = 50; int width = (int)(height * m_render->dar()); - QPixmap pix = KThumb::getImage(item->toXml(), 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(int clipId, Mlt::Producer *producer, const QMap < QString, QString > &properties, const QMap < QString, QString > &metadata) { +void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Producer *producer, const QMap < QString, QString > &properties, const QMap < QString, QString > &metadata, bool replace) { ProjectItem *item = getItemById(clipId); - if (item) { + if (item && producer) { + listView->blockSignals(true); item->setProperties(properties, metadata); - item->referencedClip()->setProducer(producer); - listView->setCurrentItem(item); + Q_ASSERT_X(item->referencedClip(), "void ProjectList::slotReplyGetFileProperties", QString("Item with groupName %1 does not have a clip associated").arg(item->groupName()).toLatin1()); + if (replace) 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(int clipId, int pos, const QPixmap &pix, int w, int h) { +void ProjectList::slotReplyGetImage(const QString &clipId, const QPixmap &pix) { 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(int id) { +ProjectItem *ProjectList::getItemById(const QString &id) { + ProjectItem *item; QTreeWidgetItemIterator it(listView); while (*it) { - if (((ProjectItem *)(*it))->clipId() == id) - break; + item = static_cast(*it); + if (item->clipId() == id && item->clipType() != FOLDER) + return item; ++it; } - if (*it) return ((ProjectItem *)(*it)); return NULL; } +ProjectItem *ProjectList::getFolderItemById(const QString &id) { + ProjectItem *item; + QTreeWidgetItemIterator it(listView); + while (*it) { + item = static_cast(*it); + if (item->clipId() == id && item->clipType() == FOLDER) + return item; + ++it; + } + return NULL; +} + +void ProjectList::slotSelectClip(const QString &ix) { + ProjectItem *clip = getItemById(ix); + if (clip) { + listView->setCurrentItem(clip); + listView->scrollToItem(clip); + m_editAction->setEnabled(true); + m_deleteAction->setEnabled(true); + m_reloadAction->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); + } +} + #include "projectlist.moc"