#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"
m_queueTimer.setSingleShot(true);
-
+ connect(m_listView, SIGNAL(projectModified()), this, SIGNAL(projectModified()));
connect(m_listView, SIGNAL(itemSelectionChanged()), this, SLOT(slotClipSelected()));
connect(m_listView, SIGNAL(focusMonitor()), this, SLOT(slotClipSelected()));
connect(m_listView, SIGNAL(pauseMonitor()), this, SLOT(slotPauseMonitor()));
void ProjectList::slotEditClip()
{
+ QList<QTreeWidgetItem *> list = m_listView->selectedItems();
+ if (list.count() > 1) {
+ editClipSelection(list);
+ return;
+ }
ProjectItem *item;
if (!m_listView->currentItem() || m_listView->currentItem()->type() == PROJECTFOLDERTYPE) return;
if (m_listView->currentItem()->type() == PROJECTSUBCLIPTYPE) {
}
}
+void ProjectList::editClipSelection(QList<QTreeWidgetItem *> list)
+{
+ // Gather all common properties
+ QMap <QString, QString> commonproperties;
+ QList <DocClipBase *> clipList;
+ commonproperties.insert("force_aspect_ratio", "-");
+ commonproperties.insert("force_fps", "-");
+ commonproperties.insert("force_progressive", "-");
+ commonproperties.insert("threads", "-");
+ commonproperties.insert("video_index", "-");
+ commonproperties.insert("audio_index", "-");
+
+ bool allowDurationChange = true;
+ int commonDuration = -1;
+ ProjectItem *item;
+ for (int i = 0; i < list.count(); i++) {
+ item = NULL;
+ if (list.at(i)->type() == PROJECTFOLDERTYPE) continue;
+ if (list.at(i)->type() == PROJECTSUBCLIPTYPE) {
+ item = static_cast <ProjectItem*>(list.at(i)->parent());
+ } else item = static_cast <ProjectItem*>(list.at(i));
+ if (!(item->flags() & Qt::ItemIsDragEnabled)) continue;
+ if (item) {
+ // check properties
+ DocClipBase *clip = item->referencedClip();
+ if (clipList.contains(clip)) continue;
+ if (clip->clipType() != COLOR && clip->clipType() != IMAGE && clip->clipType() != TEXT) {
+ allowDurationChange = false;
+ }
+ if (allowDurationChange && commonDuration != 0) {
+ if (commonDuration == -1) {
+ commonDuration = clip->duration().frames(m_fps);
+ } else if (commonDuration != clip->duration().frames(m_fps)) {
+ commonDuration = 0;
+ }
+ }
+ clipList.append(clip);
+ QMap <QString, QString> clipprops = clip->properties();
+ QMapIterator<QString, QString> p(commonproperties);
+ while (p.hasNext()) {
+ p.next();
+ if (p.value().isEmpty()) continue;
+ if (clipprops.contains(p.key())) {
+ if (p.value() == "-") commonproperties.insert(p.key(), clipprops.value(p.key()));
+ else if (p.value() != clipprops.value(p.key())) commonproperties.insert(p.key(), QString());
+ } else commonproperties.insert(p.key(), QString());
+ }
+ }
+ }
+ if (allowDurationChange) commonproperties.insert("out", QString::number(commonDuration));
+ QMapIterator<QString, QString> p(commonproperties);
+ while (p.hasNext()) {
+ p.next();
+ kDebug() << "Result: " << p.key() << " = " << p.value();
+ }
+ emit showClipProperties(clipList, commonproperties);
+}
+
void ProjectList::slotOpenClip()
{
ProjectItem *item;
it2++;
}
- m_doc->deleteProjectClip(ids);
+ emit deleteProjectClips(ids, QMap <QString, QString>());
for (int i = 0; i < urls.count(); i++) {
KIO::NetAccess::del(KUrl(urls.at(i)), this);
}
}
//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);
}
}
}
ProjectItem *clip;
if (m_listView->currentItem()->type() == PROJECTSUBCLIPTYPE) {
// this is a sub item, use base clip
+ m_deleteAction->setEnabled(true);
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());
+ m_transcodeAction->setEnabled(false);
return;
}
clip = static_cast <ProjectItem*>(m_listView->currentItem());
- emit clipSelected(clip->referencedClip());
+ if (clip) 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()) {
+ if (clip && clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) {
m_openAction->setIcon(KIcon(KdenliveSettings::defaultimageapp()));
m_openAction->setEnabled(true);
- } else if (clip->clipType() == AUDIO && !KdenliveSettings::defaultaudioapp().isEmpty()) {
+ } else if (clip && clip->clipType() == AUDIO && !KdenliveSettings::defaultaudioapp().isEmpty()) {
m_openAction->setIcon(KIcon(KdenliveSettings::defaultaudioapp()));
m_openAction->setEnabled(true);
} else m_openAction->setEnabled(false);
+ // Display relevant transcoding actions only
+ adjustTranscodeActions(clip);
}
} else {
emit clipSelected(NULL);
}
}
+void ProjectList::adjustTranscodeActions(ProjectItem *clip) const
+{
+ if (clip == NULL || clip->type() != PROJECTCLIPTYPE || clip->clipType() == COLOR || clip->clipType() == TEXT || clip->clipType() == PLAYLIST) {
+ m_transcodeAction->setEnabled(false);
+ return;
+ }
+ m_transcodeAction->setEnabled(true);
+ QList<QAction *> transcodeActions = m_transcodeAction->actions();
+ QStringList data;
+ QString condition;
+ for (int i = 0; i < transcodeActions.count(); i++) {
+ data = transcodeActions.at(i)->data().toStringList();
+ if (data.count() > 2) {
+ condition = data.at(2);
+ if (condition.startsWith("vcodec")) transcodeActions.at(i)->setEnabled(clip->referencedClip()->hasVideoCodec(condition.section("=", 1, 1)));
+ else if (condition.startsWith("acodec")) transcodeActions.at(i)->setEnabled(clip->referencedClip()->hasVideoCodec(condition.section("=", 1, 1)));
+ }
+ }
+
+}
+
void ProjectList::slotPauseMonitor()
{
if (m_render) m_render->pause();
ProjectItem *item = getItemById(id);
if (item) {
slotUpdateClipProperties(item, properties);
- if (properties.contains("out")) {
+ if (properties.contains("out") || properties.contains("force_fps")) {
slotReloadClip(id);
} else if (properties.contains("colour") || properties.contains("resource") || properties.contains("xmldata") || properties.contains("force_aspect_ratio") || properties.contains("templatetext")) {
slotRefreshClipThumbnail(item);
{
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) {
ProjectItem *clip = NULL;
if (m_listView->currentItem()->type() == PROJECTSUBCLIPTYPE) {
clip = static_cast <ProjectItem*>(item->parent());
- } else if (m_listView->currentItem()->type() == PROJECTCLIPTYPE) clip = static_cast <ProjectItem*>(item);
+ m_transcodeAction->setEnabled(false);
+ } else if (m_listView->currentItem()->type() == PROJECTCLIPTYPE) {
+ clip = static_cast <ProjectItem*>(item);
+ // Display relevant transcoding actions only
+ adjustTranscodeActions(clip);
+ } else m_transcodeAction->setEnabled(false);
if (clip && clip->clipType() == IMAGE && !KdenliveSettings::defaultimageapp().isEmpty()) {
m_openAction->setIcon(KIcon(KdenliveSettings::defaultimageapp()));
m_openAction->setEnabled(true);
m_openAction->setIcon(KIcon(KdenliveSettings::defaultaudioapp()));
m_openAction->setEnabled(true);
} else m_openAction->setEnabled(false);
+
} else m_openAction->setEnabled(false);
m_menu->popup(pos);
}
// 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(), false, 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);
- if (!folderids.isEmpty()) deleteProjectFolder(folderids);
+ emit deleteProjectClips(ids, folderids);
+}
+
+void ProjectList::updateButtons() const
+{
if (m_listView->topLevelItemCount() == 0) {
- m_editAction->setEnabled(false);
m_deleteAction->setEnabled(false);
- m_openAction->setEnabled(false);
- m_reloadAction->setEnabled(false);
- m_transcodeAction->setEnabled(false);
+ } else {
+ m_deleteAction->setEnabled(true);
+ if (!m_listView->currentItem()) m_listView->setCurrentItem(m_listView->topLevelItem(0));
+ QTreeWidgetItem *item = m_listView->currentItem();
+ if (item && item->type() == PROJECTCLIPTYPE) {
+ m_editAction->setEnabled(true);
+ m_openAction->setEnabled(true);
+ m_reloadAction->setEnabled(true);
+ m_transcodeAction->setEnabled(true);
+ return;
+ }
}
+
+ m_editAction->setEnabled(false);
+ m_openAction->setEnabled(false);
+ m_reloadAction->setEnabled(false);
+ m_transcodeAction->setEnabled(false);
}
void ProjectList::selectItemById(const QString &clipId)
return;
}
m_listView->blockSignals(true);
+ QTreeWidgetItem *newSelectedItem = m_listView->itemAbove(item);
+ if (!newSelectedItem) newSelectedItem = m_listView->itemBelow(item);
delete item;
m_doc->clipManager()->deleteClip(clipId);
m_listView->blockSignals(false);
- slotClipSelected();
+ if (newSelectedItem) m_listView->setCurrentItem(newSelectedItem);
+ else updateButtons();
}
FolderProjectItem *item = getFolderItemById(clipId);
if (item) {
m_doc->clipManager()->deleteFolder(clipId);
+ QTreeWidgetItem *newSelectedItem = m_listView->itemAbove(item);
+ if (!newSelectedItem) newSelectedItem = m_listView->itemBelow(item);
delete item;
+ if (newSelectedItem) m_listView->setCurrentItem(newSelectedItem);
+ else updateButtons();
}
} else {
if (edit) {
m_doc->clipManager()->addFolder(clipId, foldername);
m_listView->blockSignals(false);
}
+ updateButtons();
}
m_doc->setModified(true);
}
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));
+ QPixmap pix(cachedPixmap);
+ if (pix.isNull()) KIO::NetAccess::del(KUrl(cachedPixmap), this);
+ item->setData(0, Qt::DecorationRole, pix);
}
}
#ifdef NEPOMUK
}
#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));
+ QPixmap pix(cachedPixmap);
+ if (pix.isNull()) KIO::NetAccess::del(KUrl(cachedPixmap), this);
+ sub->setData(0, Qt::DecorationRole, pix);
}
}
}
}
-
- if (getProperties && m_listView->isEnabled()) m_listView->blockSignals(false);
+ if (m_listView->isEnabled()) {
+ updateButtons();
+ if (getProperties) m_listView->blockSignals(false);
+ }
if (getProperties && !m_queueTimer.isActive()) m_queueTimer.start();
}
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);
}
}
{
ProjectItem *item = getItemById(id);
m_listView->blockSignals(true);
- if (item) item->setData(1, UsageRole, QString::number(item->numReferences()));
+ if (item) item->setData(0, UsageRole, QString::number(item->numReferences()));
m_listView->blockSignals(false);
}
void ProjectList::updateAllClips()
{
m_listView->setSortingEnabled(false);
+ kDebug() << "// UPDATE ALL CLPY";
QTreeWidgetItemIterator it(m_listView);
DocClipBase *clip;
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()));
}
// folder
++it;
continue;
- }
- item = static_cast <ProjectItem *>(*it);
- clip = item->referencedClip();
- if (item->referencedClip()->producer() == NULL) {
- if (clip->isPlaceHolder() == false) {
- requestClipInfo(clip->toXML(), clip->getId());
- } else item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
} else {
- if (item->icon(0).isNull()) {
- requestClipThumbnail(clip->getId());
- }
- if (item->data(0, DurationRole).toString().isEmpty()) {
- item->changeDuration(item->referencedClip()->producer()->get_playtime());
+ item = static_cast <ProjectItem *>(*it);
+ clip = item->referencedClip();
+ if (item->referencedClip()->producer() == NULL) {
+ if (clip->isPlaceHolder() == false) {
+ requestClipInfo(clip->toXML(), clip->getId());
+ } else if (!clip->isPlaceHolder()) item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+ } else {
+ if (item->data(0, Qt::DecorationRole).isNull()) {
+ requestClipThumbnail(clip->getId());
+ }
+ if (item->data(0, DurationRole).toString().isEmpty()) {
+ item->changeDuration(item->referencedClip()->producer()->get_playtime());
+ }
}
+ item->setData(0, UsageRole, QString::number(item->numReferences()));
}
- item->setData(1, UsageRole, QString::number(item->numReferences()));
//qApp->processEvents();
++it;
}
- qApp->processEvents();
if (!m_queueTimer.isActive()) m_queueTimer.start();
-
if (m_listView->isEnabled()) m_listView->blockSignals(false);
m_listView->setSortingEnabled(true);
if (m_infoQueue.isEmpty()) slotProcessNextThumbnail();
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()) {
QTimer::singleShot(300, this, SLOT(slotProcessNextClipInQueue()));
if (item) {
const QString path = item->referencedClip()->fileURL().path();
+ if (item->referencedClip()->isPlaceHolder()) replace = false;
if (!path.isEmpty()) {
if (replace) KMessageBox::sorry(this, i18n("Clip <b>%1</b><br>is invalid, will be removed from project.", path));
else {
}
QStringList ids;
ids << id;
- if (replace) m_doc->deleteProjectClip(ids);
+ if (replace) emit deleteProjectClips(ids, QMap <QString, QString>());
}
}
QDialog *dia = new QDialog(this);
Ui::ColorClip_UI dia_ui;
dia_ui.setupUi(dia);
+ dia->setWindowTitle(i18n("Color Clip"));
dia_ui.clip_name->setText(i18n("Color Clip"));
dia_ui.clip_duration->setText(KdenliveSettings::color_duration());
if (dia->exec() == QDialog::Accepted) {
emit displayMessage(QString(), -1);
m_listView->blockSignals(false);
m_listView->setEnabled(true);
+ updateButtons();
} else if (!m_refreshed) QTimer::singleShot(300, this, SLOT(slotCheckForEmptyQueue()));
}
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);
void ProjectList::slotReplyGetFileProperties(const QString &clipId, Mlt::Producer *producer, const QMap < QString, QString > &properties, const QMap < QString, QString > &metadata, bool replace)
{
+ QString toReload;
ProjectItem *item = getItemById(clipId);
if (item && producer) {
m_listView->blockSignals(true);
item->setProperties(properties, metadata);
+ if (item->referencedClip()->isPlaceHolder() && producer->is_valid()) {
+ item->referencedClip()->setValid();
+ item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable);
+ toReload = clipId;
+ }
//Q_ASSERT_X(item->referencedClip(), "void ProjectList::slotReplyGetFileProperties", QString("Item with groupName %1 does not have a clip associated").arg(item->groupName()).toLatin1());
item->referencedClip()->setProducer(producer, replace);
+ if (!replace && item->data(0, Qt::DecorationRole).isNull()) {
+ requestClipThumbnail(clipId);
+ }
//emit receivedClipDuration(clipId);
if (m_listView->isEnabled() && replace) {
// update clip in clip monitor
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));
m_listView->setCurrentItem(item);
emit clipSelected(item->referencedClip());
}
+ if (!toReload.isEmpty()) emit clipNeedsReload(toReload, true);
QTimer::singleShot(30, this, SLOT(slotProcessNextClipInQueue()));
}
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);
}
return item->clipUrl().path();
}
+KUrl::List ProjectList::getConditionalUrls(const QString &condition) const
+{
+ KUrl::List result;
+ ProjectItem *item;
+ QList<QTreeWidgetItem *> list = m_listView->selectedItems();
+ for (int i = 0; i < list.count(); i++) {
+ if (list.at(i)->type() == PROJECTFOLDERTYPE) continue;
+ if (list.at(i)->type() == PROJECTSUBCLIPTYPE) {
+ // subitem
+ item = static_cast <ProjectItem*>(list.at(i)->parent());
+ } else item = static_cast <ProjectItem*>(list.at(i));
+ if (item == NULL) continue;
+ if (item->type() == COLOR || item->type() == SLIDESHOW || item->type() == TEXT) continue;
+ DocClipBase *clip = item->referencedClip();
+ if (!condition.isEmpty()) {
+ if (condition.startsWith("vcodec") && !clip->hasVideoCodec(condition.section("=", 1, 1))) continue;
+ else if (condition.startsWith("acodec") && !clip->hasAudioCodec(condition.section("=", 1, 1))) continue;
+ }
+ result.append(item->clipUrl());
+ }
+ return result;
+}
+
void ProjectList::regenerateTemplate(const QString &id)
{
ProjectItem *clip = getItemById(id);
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(), true, 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, bool newItem)
{
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);
-
+ SubProjectItem *sub = new SubProjectItem(clip, in, out, desc);
+ if (newItem && desc.isEmpty() && !m_listView->isColumnHidden(1)) {
+ if (!clip->isExpanded()) clip->setExpanded(true);
+ m_listView->editItem(sub, 1);
+ }
QPixmap p = clip->referencedClip()->thumbProducer()->extractImage(in, (int)(sub->sizeHint(0).height() * m_render->dar()), sub->sizeHint(0).height() - 2);
- sub->setIcon(0, p);
+ 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"
projects / kdenlive / blobdiff