X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fprojectlist.cpp;h=86eb2396cf21ec2ba1203d08c3db4a589550ec27;hb=c3302003093710ee247ad84c0fe2ef3c579d417f;hp=51488ee130336513055786184f4b418422a9f333;hpb=c60be9461720b1f48a0aa3b9d284d2df2abff82a;p=kdenlive diff --git a/src/projectlist.cpp b/src/projectlist.cpp index 51488ee1..86eb2396 100644 --- a/src/projectlist.cpp +++ b/src/projectlist.cpp @@ -69,6 +69,11 @@ //#include #endif +#ifdef USE_NEPOMUKCORE +#include +#include +#endif + #include #include #include @@ -341,6 +346,16 @@ ProjectList::ProjectList(QWidget *parent) : } } #endif +#ifdef USE_NEPOMUKCORE + if (KdenliveSettings::activate_nepomuk()) { + Nepomuk2::ResourceManager::instance()->init(); + if (!Nepomuk2::ResourceManager::instance()->initialized()) { + kDebug() << "Cannot communicate with Nepomuk, DISABLING it"; + KdenliveSettings::setActivate_nepomuk(false); + } + } +#endif + } ProjectList::~ProjectList() @@ -1251,7 +1266,7 @@ void ProjectList::slotAddFolder(const QString &name) m_commandStack->push(command); } -void ProjectList::slotAddFolder(const QString foldername, const QString &clipId, bool remove, bool edit) +void ProjectList::slotAddFolder(const QString &foldername, const QString &clipId, bool remove, bool edit) { if (remove) { FolderProjectItem *item = getFolderItemById(clipId); @@ -1544,7 +1559,7 @@ void ProjectList::getCachedThumbnail(SubProjectItem *item) else requestClipThumbnail(parentItem->clipId() + '#' + QString::number(pos)); } -void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged, QStringList brokenClips) +void ProjectList::updateAllClips(bool displayRatioChanged, bool fpsChanged, const QStringList &brokenClips) { if (!m_allClipsProcessed) m_listView->setEnabled(false); m_listView->setSortingEnabled(false); @@ -1692,7 +1707,7 @@ QString ProjectList::getExtensions() return allExtensions.simplified(); } -void ProjectList::slotAddClip(const QString url, const QString &groupName, const QString &groupId) +void ProjectList::slotAddClip(const QString &url, const QString &groupName, const QString &groupId) { kDebug()<<"// Adding clip: "< list; @@ -1700,7 +1715,7 @@ void ProjectList::slotAddClip(const QString url, const QString &groupName, const slotAddClip(list, groupName, groupId); } -void ProjectList::slotAddClip(const QList givenList, const QString &groupName, const QString &groupId) +void ProjectList::slotAddClip(const QList &givenList, const QString &groupName, const QString &groupId) { if (!m_commandStack) kDebug() << "!!!!!!!!!!!!!!!! NO CMD STK"; @@ -1720,45 +1735,46 @@ void ProjectList::slotAddClip(const QList givenList, const QString &group l->addWidget(c); l->addStretch(5); f->setLayout(l); + QPointer d = new KFileDialog(KUrl("kfiledialog:///clipfolder"), dialogFilter, kapp->activeWindow(), f); d->setOperationMode(KFileDialog::Opening); d->setMode(KFile::Files); if (d->exec() == QDialog::Accepted) { KdenliveSettings::setAutoimagetransparency(c->isChecked()); - } - list = d->selectedUrls(); - if (b->isChecked() && list.count() == 1) { - // Check for image sequence - KUrl url = list.at(0); - QString fileName = url.fileName().section('.', 0, -2); - if (fileName.at(fileName.size() - 1).isDigit()) { - KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url); - if (item.mimetype().startsWith("image")) { - // import as sequence if we found more than one image in the sequence - QStringList list; - QString pattern = SlideshowClip::selectedPath(url.path(), false, QString(), &list); - int count = list.count(); - if (count > 1) { - delete d; - QStringList groupInfo = getGroup(); - - // get image sequence base name - while (fileName.at(fileName.size() - 1).isDigit()) { - fileName.chop(1); + list = d->selectedUrls(); + if (b->isChecked() && list.count() == 1) { + // Check for image sequence + KUrl url = list.at(0); + QString fileName = url.fileName().section('.', 0, -2); + if (fileName.at(fileName.size() - 1).isDigit()) { + KFileItem item(KFileItem::Unknown, KFileItem::Unknown, url); + if (item.mimetype().startsWith("image")) { + // import as sequence if we found more than one image in the sequence + QStringList list; + QString pattern = SlideshowClip::selectedPath(url.path(), false, QString(), &list); + int count = list.count(); + if (count > 1) { + delete d; + QStringList groupInfo = getGroup(); + + // get image sequence base name + while (fileName.at(fileName.size() - 1).isDigit()) { + fileName.chop(1); + } + QMap properties; + properties.insert("name", fileName); + properties.insert("resource", pattern); + properties.insert("in", "0"); + QString duration = m_timecode.reformatSeparators(KdenliveSettings::sequence_duration()); + properties.insert("out", QString::number(m_doc->getFramePos(duration) * count)); + properties.insert("ttl", QString::number(m_doc->getFramePos(duration))); + properties.insert("loop", QString::number(false)); + properties.insert("crop", QString::number(false)); + properties.insert("fade", QString::number(false)); + properties.insert("luma_duration", QString::number(m_doc->getFramePos(m_timecode.getTimecodeFromFrames(int(ceil(m_timecode.fps())))))); + m_doc->slotCreateSlideshowClipFile(properties, groupInfo.at(0), groupInfo.at(1)); + return; } - QMap properties; - properties.insert("name", fileName); - properties.insert("resource", pattern); - properties.insert("in", "0"); - QString duration = m_timecode.reformatSeparators(KdenliveSettings::sequence_duration()); - properties.insert("out", QString::number(m_doc->getFramePos(duration) * count)); - properties.insert("ttl", QString::number(m_doc->getFramePos(duration))); - properties.insert("loop", QString::number(false)); - properties.insert("crop", QString::number(false)); - properties.insert("fade", QString::number(false)); - properties.insert("luma_duration", QString::number(m_doc->getFramePos(m_timecode.getTimecodeFromFrames(int(ceil(m_timecode.fps())))))); - m_doc->slotCreateSlideshowClipFile(properties, groupInfo.at(0), groupInfo.at(1)); - return; } } }