X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fclipmanager.cpp;h=2baa42e01b6a39dea64ed80225c284a86cc99d55;hb=4d59dfaf4dc0b4702365ec4a2d8c86ba42a10fb9;hp=dcd935a2de4650b97b6ef9d5a82be31e10cce060;hpb=7d708fd156c646b36c91cffaed60e5cf777f95d9;p=kdenlive diff --git a/src/clipmanager.cpp b/src/clipmanager.cpp index dcd935a2..2baa42e0 100644 --- a/src/clipmanager.cpp +++ b/src/clipmanager.cpp @@ -460,12 +460,11 @@ void ClipManager::resetProducersList(const QList prods, bool d emit checkAllClips(displayRatioChanged, fpsChanged, brokenClips); } -void ClipManager::slotAddClipList(const KUrl::List urls, const QString &group, const QString &groupId) +void ClipManager::slotAddClipList(const KUrl::List urls, const QString &group, const QString &groupId, const QString &comment) { QUndoCommand *addClips = new QUndoCommand(); - foreach(const KUrl & file, urls) { - if (KIO::NetAccess::exists(file, KIO::NetAccess::SourceSide, NULL)) { + if (QFile::exists(file.path())) {//KIO::NetAccess::exists(file, KIO::NetAccess::SourceSide, NULL)) { if (!getClipByResource(file.path()).empty()) { if (KMessageBox::warningContinueCancel(kapp->activeWindow(), i18n("Clip %1
already exists in project, what do you want to do?", file.path()), i18n("Clip already exists")) == KMessageBox::Cancel) continue; @@ -477,6 +476,7 @@ void ClipManager::slotAddClipList(const KUrl::List urls, const QString &group, c prod.setAttribute("resource", file.path()); uint id = m_clipIdCounter++; prod.setAttribute("id", QString::number(id)); + if (!comment.isEmpty()) prod.setAttribute("description", comment); if (!group.isEmpty()) { prod.setAttribute("groupname", group); prod.setAttribute("groupid", groupId); @@ -529,6 +529,7 @@ void ClipManager::slotAddClipList(const KUrl::List urls, const QString &group, c } new AddClipCommand(m_doc, doc.documentElement(), QString::number(id), true, addClips); } + else kDebug()<<"// CANNOT READ FILE: "<childCount() > 0) { addClips->setText(i18np("Add clip", "Add clips", addClips->childCount())); @@ -536,9 +537,9 @@ void ClipManager::slotAddClipList(const KUrl::List urls, const QString &group, c } } -void ClipManager::slotAddClipFile(const KUrl &url, const QString &group, const QString &groupId) +void ClipManager::slotAddClipFile(const KUrl &url, const QString &group, const QString &groupId, const QString &comment) { - slotAddClipList(KUrl::List(url), group, groupId); + slotAddClipList(KUrl::List(url), group, groupId, comment); } void ClipManager::slotAddXmlClipFile(const QString &name, const QDomElement &xml, const QString &group, const QString &groupId)