X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fkdenlivedoc.cpp;h=03a1d3bdf73f208aeedd27cc30155db1236cb24f;hb=4664de14c0240086ced95c4ff9e4c1101a60051d;hp=0ab198684d8d05fc08d9be58f7fac93ce5a0dca6;hpb=30576fe47b20435915a9782e4e017b6f904e7414;p=kdenlive diff --git a/src/kdenlivedoc.cpp b/src/kdenlivedoc.cpp index 0ab19868..03a1d3bd 100644 --- a/src/kdenlivedoc.cpp +++ b/src/kdenlivedoc.cpp @@ -17,8 +17,15 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include -#include + +#include "kdenlivedoc.h" +#include "docclipbase.h" +#include "profilesdialog.h" +#include "kdenlivesettings.h" +#include "renderer.h" +#include "clipmanager.h" +#include "titlewidget.h" +#include "mainwindow.h" #include #include @@ -29,21 +36,13 @@ #include #include +#include +#include #include -#include "kdenlivedoc.h" -#include "docclipbase.h" -#include "profilesdialog.h" -#include "kdenlivesettings.h" -#include "renderer.h" -#include "clipmanager.h" -#include "addfoldercommand.h" -#include "editfoldercommand.h" -#include "titlewidget.h" -#include "mainwindow.h" -KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup *undoGroup, const QString &profileName, const QPoint tracks, Render *render, MainWindow *parent): QObject(parent), m_render(render), m_url(url), m_projectFolder(projectFolder), m_commandStack(new QUndoStack(undoGroup)), m_modified(false), m_documentLoadingProgress(0), m_documentLoadingStep(0.0), m_startPos(0), m_zoom(7), m_autosave(NULL), m_zoneStart(0), m_zoneEnd(100) { +KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup *undoGroup, const QString &profileName, const QPoint tracks, Render *render, MainWindow *parent): QObject(parent), m_render(render), m_url(url), m_projectFolder(projectFolder), m_commandStack(new QUndoStack(undoGroup)), m_modified(false), m_documentLoadingProgress(0), m_documentLoadingStep(0.0), m_startPos(0), m_zoom(7), m_autosave(NULL), m_zoneStart(0), m_zoneEnd(100), m_abortLoading(false) { m_clipManager = new ClipManager(this); m_autoSaveTimer = new QTimer(this); m_autoSaveTimer->setSingleShot(true); @@ -78,44 +77,61 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup QString profilePath = infoXml.attribute("profile"); QString projectFolderPath = infoXml.attribute("projectfolder"); if (!projectFolderPath.isEmpty()) m_projectFolder = KUrl(projectFolderPath); - if (m_projectFolder.isEmpty()) m_projectFolder = KUrl(KdenliveSettings::defaultprojectfolder()); + + if (m_projectFolder.isEmpty() || !KIO::NetAccess::exists(m_projectFolder.path(), KIO::NetAccess::DestinationSide, parent)) { + // Make sure the project folder is usable + KMessageBox::information(parent, i18n("Document project folder is invalid, setting it to the default one: %1", KdenliveSettings::defaultprojectfolder())); + m_projectFolder = KUrl(KdenliveSettings::defaultprojectfolder()); + } m_startPos = infoXml.attribute("position").toInt(); m_zoom = infoXml.attribute("zoom", "7").toInt(); - m_zoneStart = infoXml.attribute("zonein", "0").toInt(); + + + + m_zoneEnd = infoXml.attribute("zoneout", "100").toInt(); setProfilePath(profilePath); // Build tracks - QString tracks = infoXml.attribute("tracks"); - TrackInfo videoTrack; - videoTrack.type = VIDEOTRACK; - videoTrack.isMute = false; - videoTrack.isBlind = false; - - TrackInfo audioTrack; - audioTrack.type = AUDIOTRACK; - audioTrack.isMute = false; - audioTrack.isBlind = true; - for (int i = 0; i < tracks.size(); i++) { - if (tracks.data()[i] == 'v') m_tracksList.append(videoTrack); - else m_tracksList.append(audioTrack); + QDomElement e; + QDomNode tracksinfo = m_document.elementsByTagName("tracksinfo").at(0); + TrackInfo projectTrack; + if (!tracksinfo.isNull()) { + QDomNodeList trackslist = tracksinfo.childNodes(); + int maxchild = trackslist.count(); + for (int k = 0; k < maxchild; k++) { + e = trackslist.at(k).toElement(); + if (e.tagName() == "trackinfo") { + if (e.attribute("type") == "audio") projectTrack.type = AUDIOTRACK; + else projectTrack.type = VIDEOTRACK; + projectTrack.isMute = e.attribute("mute").toInt(); + projectTrack.isBlind = e.attribute("blind").toInt(); + projectTrack.isLocked = e.attribute("locked").toInt(); + m_tracksList.append(projectTrack); + } + } + westley.removeChild(tracksinfo); } - - QDomElement e; QDomElement orig; QDomNodeList producers = m_document.elementsByTagName("producer"); QDomNodeList infoproducers = m_document.elementsByTagName("kdenlive_producer"); const int max = producers.count(); const int infomax = infoproducers.count(); + QDomNodeList folders = m_document.elementsByTagName("folder"); + for (int i = 0; i < folders.count(); i++) { + e = folders.item(i).cloneNode().toElement(); + m_clipManager->addFolder(e.attribute("id"), e.attribute("name")); + } + if (max > 0) { m_documentLoadingStep = 100.0 / (max + infomax + m_document.elementsByTagName("entry").count()); parent->slotGotProgressInfo(i18n("Loading project clips"), (int) m_documentLoadingProgress); } - for (int i = 0; i < infomax; i++) { + for (int i = 0; i < infomax && !m_abortLoading; i++) { e = infoproducers.item(i).cloneNode().toElement(); if (m_documentLoadingStep > 0) { m_documentLoadingProgress += m_documentLoadingStep; @@ -123,7 +139,7 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup //qApp->processEvents(); } QString prodId = e.attribute("id"); - if (!e.isNull() && prodId != "black" && !prodId.startsWith("slowmotion")) { + if (!e.isNull() && prodId != "black" && !prodId.startsWith("slowmotion") && !m_abortLoading) { e.setTagName("producer"); // Get MLT's original producer properties @@ -139,35 +155,47 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup kDebug() << "// NLIVE PROD: " << prodId; } } - - QDomNode markers = m_document.elementsByTagName("markers").at(0); - if (!markers.isNull()) { - QDomNodeList markerslist = markers.childNodes(); - int maxchild = markerslist.count(); - for (int k = 0; k < maxchild; k++) { - e = markerslist.at(k).toElement(); - if (e.tagName() == "marker") { - m_clipManager->getClipById(e.attribute("id"))->addSnapMarker(GenTime(e.attribute("time").toDouble()), e.attribute("comment")); + if (m_abortLoading) { + //parent->slotGotProgressInfo(i18n("File %1 is not a Kdenlive project file."), 100); + emit resetProjectList(); + m_startPos = 0; + m_url = KUrl(); + m_tracksList.clear(); + kWarning() << "Aborted loading of: " << url.path(); + m_document = createEmptyDocument(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks()); + setProfilePath(KdenliveSettings::default_profile()); + m_clipManager->clear(); + } else { + QDomNode markers = m_document.elementsByTagName("markers").at(0); + if (!markers.isNull()) { + QDomNodeList markerslist = markers.childNodes(); + int maxchild = markerslist.count(); + for (int k = 0; k < maxchild; k++) { + e = markerslist.at(k).toElement(); + if (e.tagName() == "marker") { + m_clipManager->getClipById(e.attribute("id"))->addSnapMarker(GenTime(e.attribute("time").toDouble()), e.attribute("comment")); + } } + westley.removeChild(markers); } - westley.removeChild(markers); + m_document.removeChild(infoXmlNode); + kDebug() << "Reading file: " << url.path() << ", found clips: " << producers.count(); } - m_document.removeChild(infoXmlNode); - - kDebug() << "Reading file: " << url.path() << ", found clips: " << producers.count(); } } else { parent->slotGotProgressInfo(i18n("File %1 is not a Kdenlive project file."), 100); kWarning() << " NO KDENLIVE INFO FOUND IN FILE: " << url.path(); - m_document = createEmptyDocument(tracks.x(), tracks.y()); - setProfilePath(profileName); + m_document = createEmptyDocument(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks()); + m_url = KUrl(); + setProfilePath(KdenliveSettings::default_profile()); } KIO::NetAccess::removeTempFile(tmpFile); } else { KMessageBox::error(parent, KIO::NetAccess::lastErrorString()); parent->slotGotProgressInfo(i18n("File %1 is not a Kdenlive project file."), 100); - m_document = createEmptyDocument(tracks.x(), tracks.y()); - setProfilePath(profileName); + m_url = KUrl(); + m_document = createEmptyDocument(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks()); + setProfilePath(KdenliveSettings::default_profile()); } } else { m_document = createEmptyDocument(tracks.x(), tracks.y()); @@ -180,8 +208,7 @@ KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup KStandardDirs::makeDir(m_projectFolder.path() + "/thumbs/"); KStandardDirs::makeDir(m_projectFolder.path() + "/ladspa/"); - m_scenelist = m_document.toString(); - kDebug() << "KDEnnlive document, init timecode: " << m_fps; + kDebug() << "KDEnlive document, init timecode: " << m_fps; if (m_fps == 30000.0 / 1001.0) m_timecode.setFormat(30, true); else m_timecode.setFormat((int) m_fps); @@ -216,11 +243,13 @@ QDomDocument KdenliveDoc::createEmptyDocument(const int videotracks, const int a videoTrack.type = VIDEOTRACK; videoTrack.isMute = false; videoTrack.isBlind = false; + videoTrack.isLocked = false; TrackInfo audioTrack; audioTrack.type = AUDIOTRACK; audioTrack.isMute = false; audioTrack.isBlind = true; + audioTrack.isLocked = false; QDomElement tractor = doc.createElement("tractor"); tractor.setAttribute("id", "maintractor"); @@ -326,14 +355,14 @@ void KdenliveDoc::slotAutoSave() { kDebug() << "ERROR; CANNOT CREATE AUTOSAVE FILE"; } kDebug() << "// AUTOSAVE FILE: " << m_autosave->fileName(); - QDomDocument doc; + QString doc; if (KdenliveSettings::dropbframes()) { KdenliveSettings::setDropbframes(false); m_clipManager->updatePreviewSettings(); - doc.setContent(m_render->sceneList()); + doc = m_render->sceneList(); KdenliveSettings::setDropbframes(true); m_clipManager->updatePreviewSettings(); - } else doc.setContent(m_render->sceneList()); + } else doc = m_render->sceneList(); saveSceneList(m_autosave->fileName(), doc); } } @@ -349,33 +378,57 @@ int KdenliveDoc::zoom() const { bool KdenliveDoc::convertDocument(double version) { kDebug() << "Opening a document with version " << version; - if (version == 0.81) return true; + if (version == 0.82) return true; + + if (version == 0.81) { + // Add correct tracks info + QDomNode kdenlivedoc = m_document.elementsByTagName("kdenlivedoc").at(0); + QDomElement infoXml = kdenlivedoc.toElement(); + QString currentTrackOrder = infoXml.attribute("tracks"); + QDomElement tracksinfo = m_document.createElement("tracksinfo"); + for (int i = 0; i < currentTrackOrder.size(); i++) { + QDomElement trackinfo = m_document.createElement("trackinfo"); + if (currentTrackOrder.data()[i] == 'a') { + trackinfo.setAttribute("type", "audio"); + trackinfo.setAttribute("blind", true); + } else trackinfo.setAttribute("blind", false); + trackinfo.setAttribute("mute", false); + trackinfo.setAttribute("locked", false); + tracksinfo.appendChild(trackinfo); + } + infoXml.appendChild(tracksinfo); + return true; + } // Opening a old Kdenlive document if (version == 0.5 || version == 0.7 || version > 0.81) { kDebug() << "Unable to open document with version " << version; // TODO: convert 0.7 (0.5?) files to the new document format. - return FALSE; + return false; } if (version == 0.8) { // Add the tracks information - QString tracksOrder; QDomNodeList tracks = m_document.elementsByTagName("track"); int max = tracks.count(); - for (int i = 0; i < max; i++) { - QDomElement t = tracks.at(i).toElement(); - if (t.attribute("hide") == "video") - tracksOrder.append('a'); - else if (t.attribute("producer") != "black_track") - tracksOrder.append('v'); - } + QDomNode kdenlivedoc = m_document.elementsByTagName("kdenlivedoc").at(0); QDomElement infoXml = kdenlivedoc.toElement(); - QString currentTrackOrder = infoXml.attribute("tracks"); - if (currentTrackOrder.isEmpty()) infoXml.setAttribute("tracks", tracksOrder); + QDomElement tracksinfo = m_document.createElement("tracksinfo"); - return TRUE; + for (int i = 0; i < max; i++) { + QDomElement trackinfo = m_document.createElement("trackinfo"); + QDomElement t = tracks.at(i).toElement(); + if (t.attribute("hide") == "video") { + trackinfo.setAttribute("type", "audio"); + trackinfo.setAttribute("blind", true); + } else trackinfo.setAttribute("blind", false); + trackinfo.setAttribute("mute", false); + trackinfo.setAttribute("locked", false); + if (t.attribute("producer") != "black_track") tracksinfo.appendChild(trackinfo); + } + infoXml.appendChild(tracksinfo); + return true; } QDomNode westley = m_document.elementsByTagName("westley").at(1); @@ -450,17 +503,6 @@ bool KdenliveDoc::convertDocument(double version) { } tractor.removeChild(multitrack); - // write tracks order now that they've been sorted - QString tracksOrder; - QDomNodeList tracks = m_document.elementsByTagName("track"); - for (int i = 0; i < tracks.count(); ++i) { - QDomElement track = tracks.at(i).toElement(); - if (track.attribute("hide") == "video") - tracksOrder.append('a'); - else if (track.attribute("producer") != "black_track") - tracksOrder.append('v'); - } - // audio track mixing transitions should not be added to track view, so add required attribute QDomNodeList transitions = m_document.elementsByTagName("transition"); max = transitions.count(); @@ -695,7 +737,24 @@ bool KdenliveDoc::convertDocument(double version) { westley0.removeChild(kdenlivedoc); QDomElement kdenlivedoc_new = m_document.createElement("kdenlivedoc"); kdenlivedoc_new.setAttribute("profile", profile); - kdenlivedoc_new.setAttribute("tracks", tracksOrder); + + // Add tracks info + QDomNodeList tracks = m_document.elementsByTagName("track"); + max = tracks.count(); + QDomElement tracksinfo = m_document.createElement("tracksinfo"); + for (int i = 0; i < max; i++) { + QDomElement trackinfo = m_document.createElement("trackinfo"); + QDomElement t = tracks.at(i).toElement(); + if (t.attribute("hide") == "video") { + trackinfo.setAttribute("type", "audio"); + trackinfo.setAttribute("blind", true); + } else trackinfo.setAttribute("blind", false); + trackinfo.setAttribute("mute", false); + trackinfo.setAttribute("locked", false); + if (t.attribute("producer") != "black_track") tracksinfo.appendChild(trackinfo); + } + kdenlivedoc_new.appendChild(tracksinfo); + // Add all the producers that has a ressource in westley QDomElement westley_element = westley0.toElement(); if (westley_element.isNull()) { @@ -819,7 +878,7 @@ bool KdenliveDoc::convertDocument(double version) { //kDebug() << "ready to set additional 's attributes (id =" << id << ")"; kproducer.setAttribute("channels", avfile.attribute("channels")); kproducer.setAttribute("duration", avfile.attribute("duration")); - kproducer.setAttribute("frame_size", avfile.attribute("width") + "x" + avfile.attribute("height")); + kproducer.setAttribute("frame_size", avfile.attribute("width") + 'x' + avfile.attribute("height")); kproducer.setAttribute("frequency", avfile.attribute("frequency")); if (kproducer.attribute("description").isEmpty() && !avfile.attribute("description").isEmpty()) kproducer.setAttribute("description", avfile.attribute("description")); @@ -841,7 +900,7 @@ bool KdenliveDoc::convertDocument(double version) { */ //kDebug() << "///////////////// END CONVERTED DOC:"; - return TRUE; + return true; } QString KdenliveDoc::colorToString(const QColor& c) { @@ -859,20 +918,47 @@ QPoint KdenliveDoc::zone() const { return QPoint(m_zoneStart, m_zoneEnd); } -bool KdenliveDoc::saveSceneList(const QString &path, QDomDocument sceneList) { +bool KdenliveDoc::saveSceneList(const QString &path, const QString &scene) { + QDomDocument sceneList; + sceneList.setContent(scene, true); QDomNode wes = sceneList.elementsByTagName("westley").at(0); - QDomElement addedXml = sceneList.createElement("kdenlivedoc"); + wes.appendChild(addedXml); + QDomElement markers = sceneList.createElement("markers"); - addedXml.setAttribute("version", "0.81"); + addedXml.setAttribute("version", "0.82"); addedXml.setAttribute("profile", profilePath()); addedXml.setAttribute("position", m_render->seekPosition().frames(m_fps)); addedXml.setAttribute("zonein", m_zoneStart); addedXml.setAttribute("zoneout", m_zoneEnd); addedXml.setAttribute("projectfolder", m_projectFolder.path()); - addedXml.setAttribute("tracks", getTracksInfo()); addedXml.setAttribute("zoom", m_zoom); + // tracks info + QDomElement tracksinfo = sceneList.createElement("tracksinfo"); + foreach(const TrackInfo &info, m_tracksList) { + QDomElement trackinfo = sceneList.createElement("trackinfo"); + if (info.type == AUDIOTRACK) trackinfo.setAttribute("type", "audio"); + trackinfo.setAttribute("mute", info.isMute); + trackinfo.setAttribute("blind", info.isBlind); + trackinfo.setAttribute("locked", info.isLocked); + tracksinfo.appendChild(trackinfo); + } + addedXml.appendChild(tracksinfo); + + // save project folders + QMap folderlist = m_clipManager->documentFolderList(); + + QMapIterator f(folderlist); + while (f.hasNext()) { + f.next(); + QDomElement folder = sceneList.createElement("folder"); + folder.setAttribute("id", f.key()); + folder.setAttribute("name", f.value()); + addedXml.appendChild(folder); + } + + // Save project clips QDomElement e; QList list = m_clipManager->documentClipList(); for (int i = 0; i < list.count(); i++) { @@ -891,7 +977,6 @@ bool KdenliveDoc::saveSceneList(const QString &path, QDomDocument sceneList) { addedXml.appendChild(markers); if (!m_guidesXml.isNull()) addedXml.appendChild(sceneList.importNode(m_guidesXml, true)); - wes.appendChild(addedXml); //wes.appendChild(doc.importNode(kdenliveData, true)); QFile file(path); @@ -900,6 +985,7 @@ bool KdenliveDoc::saveSceneList(const QString &path, QDomDocument sceneList) { KMessageBox::error(kapp->activeWindow(), i18n("Cannot write to file %1", path)); return false; } + QTextStream out(&file); out << sceneList.toString(); file.close(); @@ -921,7 +1007,7 @@ void KdenliveDoc::setProjectFolder(KUrl url) { KStandardDirs::makeDir(url.path()); KStandardDirs::makeDir(url.path() + "/titles/"); KStandardDirs::makeDir(url.path() + "/thumbs/"); - if (KMessageBox::questionYesNo(kapp->activeWindow(), i18n("You have changed the project folder. Do you want to copy the cached data from %1 to the new folder %2 ?").arg(m_projectFolder.path(), url.path())) == KMessageBox::Yes) moveProjectData(url); + if (KMessageBox::questionYesNo(kapp->activeWindow(), i18n("You have changed the project folder. Do you want to copy the cached data from %1 to the new folder %2?").arg(m_projectFolder.path(), url.path())) == KMessageBox::Yes) moveProjectData(url); m_projectFolder = url; } @@ -953,7 +1039,7 @@ void KdenliveDoc::moveProjectData(KUrl url) { } } -QString KdenliveDoc::profilePath() const { +const QString &KdenliveDoc::profilePath() const { return m_profile.path; } @@ -1036,7 +1122,7 @@ void KdenliveDoc::checkProjectClips() { QDomDocument doc; doc.setContent(clip->getProperty("xmldata")); dia_ui->setXml(doc); - QPixmap pix = dia_ui->renderedPixmap(); + QImage pix = dia_ui->renderedPixmap(); pix.save(titleresource); clip->setProperty("resource", titleresource); delete dia_ui; @@ -1125,10 +1211,6 @@ QDomNodeList KdenliveDoc::producersList() { return m_document.elementsByTagName("producer"); } -void KdenliveDoc::backupMltPlaylist() { - if (m_render) m_scenelist = m_render->sceneList(); -} - double KdenliveDoc::projectDuration() const { if (m_render) return GenTime(m_render->getLength(), m_fps).ms() / 1000; } @@ -1166,7 +1248,7 @@ bool KdenliveDoc::isModified() const { return m_modified; } -QString KdenliveDoc::description() const { +const QString KdenliveDoc::description() const { if (m_url.isEmpty()) return i18n("Untitled") + " / " + m_profile.description; else @@ -1189,20 +1271,55 @@ void KdenliveDoc::addClip(QDomElement elem, QString clipId, bool createClipItem) extension = KUrl(path).fileName(); path = KUrl(path).directory(); } - if (!path.isEmpty() && !QFile::exists(path)) { + if (!QFile::exists(path) && elem.attribute("type").toInt() == TEXT) { + kDebug() << "// TITLE: " << elem.attribute("titlename") << " Preview file: " << elem.attribute("resource") << " DOES NOT EXIST"; + QString titlename = elem.attribute("titlename"); + QString titleresource; + if (titlename.isEmpty()) { + QStringList titleInfo = TitleWidget::getFreeTitleInfo(projectFolder()); + titlename = titleInfo.at(0); + titleresource = titleInfo.at(1); + elem.setAttribute("titlename", titlename); + kDebug() << "// New title set to: " << titlename; + } else { + titleresource = TitleWidget::getTitleResourceFromName(projectFolder(), titlename); + } + QString titlepath = projectFolder().path() + "/titles/"; + TitleWidget *dia_ui = new TitleWidget(KUrl(), titlepath, m_render, kapp->activeWindow()); + QDomDocument doc; + doc.setContent(elem.attribute("xmldata")); + dia_ui->setXml(doc); + QImage pix = dia_ui->renderedPixmap(); + pix.save(titleresource); + elem.setAttribute("resource", titleresource); + delete dia_ui; + } else if (!path.isEmpty() && !QFile::exists(path) && elem.attribute("type").toInt() != TEXT) { + kDebug() << "// FOUND MISSING CLIP: " << path << ", TYPE: " << elem.attribute("type").toInt(); const QString size = elem.attribute("file_size"); const QString hash = elem.attribute("file_hash"); QString newpath; - KMessageBox::ButtonCode action = KMessageBox::No; + int action = KMessageBox::No; if (!size.isEmpty() && !hash.isEmpty()) { if (!m_searchFolder.isEmpty()) newpath = searchFileRecursively(m_searchFolder, size, hash); - else action = (KMessageBox::ButtonCode)KMessageBox::messageBox(kapp->activeWindow(), KMessageBox::WarningYesNo, i18n("Clip %1
is invalid, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search automatically")), /*KGuiItem(i18n("Remove from project")), */KGuiItem(i18n("Keep as placeholder"))); + else action = (KMessageBox::ButtonCode) KMessageBox::questionYesNoCancel(kapp->activeWindow(), i18n("Clip %1
is invalid, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search automatically")), KGuiItem(i18n("Keep as placeholder"))); } else { if (elem.attribute("type").toInt() == SLIDESHOW) { - if (KMessageBox::messageBox(kapp->activeWindow(), KMessageBox::WarningYesNo, i18n("Clip %1
is invalid or missing, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search manually")), /*KGuiItem(i18n("Remove from project")),*/ KGuiItem(i18n("Keep as placeholder"))) == KMessageBox::Yes) + int res = KMessageBox::questionYesNoCancel(kapp->activeWindow(), i18n("Clip %1
is invalid or missing, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search manually")), KGuiItem(i18n("Keep as placeholder"))); + if (res == KMessageBox::Yes) newpath = KFileDialog::getExistingDirectory(KUrl("kfiledialog:///clipfolder"), kapp->activeWindow(), i18n("Looking for %1", path)); - } else if (KMessageBox::messageBox(kapp->activeWindow(), KMessageBox::WarningYesNo, i18n("Clip %1
is invalid or missing, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search manually")), /*KGuiItem(i18n("Remove from project")),*/ KGuiItem(i18n("Keep as placeholder"))) == KMessageBox::Yes) - newpath = KFileDialog::getOpenFileName(KUrl("kfiledialog:///clipfolder"), QString(), kapp->activeWindow(), i18n("Looking for %1", path)); + else if (res == KMessageBox::Cancel) { + // Abort project loading + action = KMessageBox::Cancel; + } + } else { + int res = KMessageBox::questionYesNoCancel(kapp->activeWindow(), i18n("Clip %1
is invalid or missing, what do you want to do?", path), i18n("File not found"), KGuiItem(i18n("Search manually")), KGuiItem(i18n("Keep as placeholder"))); + if (res == KMessageBox::Yes) + newpath = KFileDialog::getOpenFileName(KUrl("kfiledialog:///clipfolder"), QString(), kapp->activeWindow(), i18n("Looking for %1", path)); + else if (res == KMessageBox::Cancel) { + // Abort project loading + action = KMessageBox::Cancel; + } + } } if (action == KMessageBox::Yes) { kDebug() << "// ASKED FOR SRCH CLIP: " << clipId; @@ -1210,6 +1327,9 @@ void KdenliveDoc::addClip(QDomElement elem, QString clipId, bool createClipItem) if (!m_searchFolder.isEmpty()) { newpath = searchFileRecursively(QDir(m_searchFolder), size, hash); } + } else if (action == KMessageBox::Cancel) { + m_abortLoading = true; + return; } if (!newpath.isEmpty()) { if (elem.attribute("type").toInt() == SLIDESHOW) newpath.append('/' + extension); @@ -1235,7 +1355,7 @@ void KdenliveDoc::setNewClipResource(const QString &id, const QString &path) { for (int i = 0; i < maxprod; i++) { QDomNode m = prods.at(i); QString prodId = m.toElement().attribute("id"); - if (prodId == id || prodId.startsWith(id + "_")) { + if (prodId == id || prodId.startsWith(id + '_')) { QDomNodeList params = m.childNodes(); for (int j = 0; j < params.count(); j++) { QDomElement e = params.item(j).toElement(); @@ -1318,14 +1438,6 @@ void KdenliveDoc::addClipInfo(QDomElement elem, QDomElement orig, QString clipId } } -void KdenliveDoc::addFolder(const QString foldername, const QString &clipId, bool edit) { - emit addProjectFolder(foldername, clipId, false, edit); -} - -void KdenliveDoc::deleteFolder(const QString foldername, const QString &clipId) { - emit addProjectFolder(foldername, clipId, true); -} - void KdenliveDoc::deleteProjectClip(QList ids) { for (int i = 0; i < ids.size(); ++i) { emit deleteTimelineClip(ids.at(i)); @@ -1334,15 +1446,6 @@ void KdenliveDoc::deleteProjectClip(QList ids) { setModified(true); } -void KdenliveDoc::deleteProjectFolder(QMap map) { - QMapIterator i(map); - while (i.hasNext()) { - i.next(); - slotDeleteFolder(i.key(), i.value()); - } - setModified(true); -} - void KdenliveDoc::deleteClip(const QString &clipId) { emit signalDeleteProjectClip(clipId); m_clipManager->deleteClip(clipId); @@ -1356,31 +1459,13 @@ void KdenliveDoc::slotAddClipList(const KUrl::List urls, const QString group, co void KdenliveDoc::slotAddClipFile(const KUrl url, const QString group, const QString &groupId) { - kDebug() << "///////// DOCUM, ADD CLP: " << url; + //kDebug() << "///////// DOCUM, ADD CLP: " << url; m_clipManager->slotAddClipFile(url, group, groupId); emit selectLastAddedClip(QString::number(m_clipManager->lastClipId())); setModified(true); } -void KdenliveDoc::slotAddFolder(const QString folderName) { - AddFolderCommand *command = new AddFolderCommand(this, folderName, QString::number(m_clipManager->getFreeClipId()), true); - commandStack()->push(command); - setModified(true); -} - -void KdenliveDoc::slotDeleteFolder(const QString folderName, const QString &id) { - AddFolderCommand *command = new AddFolderCommand(this, folderName, id, false); - commandStack()->push(command); - setModified(true); -} - -void KdenliveDoc::slotEditFolder(const QString newfolderName, const QString oldfolderName, const QString &clipId) { - EditFolderCommand *command = new EditFolderCommand(this, newfolderName, oldfolderName, clipId, false); - commandStack()->push(command); - setModified(true); -} - -const QString&KdenliveDoc::getFreeClipId() { +const QString KdenliveDoc::getFreeClipId() { return QString::number(m_clipManager->getFreeClipId()); } @@ -1388,23 +1473,13 @@ DocClipBase *KdenliveDoc::getBaseClip(const QString &clipId) { return m_clipManager->getClipById(clipId); } -void KdenliveDoc::slotAddColorClipFile(const QString name, const QString color, QString duration, const QString group, const QString &groupId) { - m_clipManager->slotAddColorClipFile(name, color, duration, group, groupId); - setModified(true); -} - -void KdenliveDoc::slotAddSlideshowClipFile(const QString name, const QString path, int count, const QString duration, const bool loop, const bool fade, const QString &luma_duration, const QString &luma_file, const int softness, const QString group, const QString &groupId) { - m_clipManager->slotAddSlideshowClipFile(name, path, count, duration, loop, fade, luma_duration, luma_file, softness, group, groupId); - setModified(true); -} - void KdenliveDoc::slotCreateTextClip(QString group, const QString &groupId) { QString titlesFolder = projectFolder().path() + "/titles/"; KStandardDirs::makeDir(titlesFolder); TitleWidget *dia_ui = new TitleWidget(KUrl(), titlesFolder, m_render, kapp->activeWindow()); if (dia_ui->exec() == QDialog::Accepted) { QStringList titleInfo = TitleWidget::getFreeTitleInfo(projectFolder()); - QPixmap pix = dia_ui->renderedPixmap(); + QImage pix = dia_ui->renderedPixmap(); pix.save(titleInfo.at(1)); //dia_ui->saveTitle(path + ".kdenlivetitle"); m_clipManager->slotAddTextClipFile(titleInfo.at(0), titleInfo.at(1), dia_ui->xml().toString(), QString(), QString()); @@ -1425,6 +1500,14 @@ void KdenliveDoc::switchTrackAudio(int ix, bool hide) { m_tracksList[ix].isMute = hide; // !m_tracksList.at(ix).isMute; } +void KdenliveDoc::switchTrackLock(int ix, bool lock) { + m_tracksList[ix].isLocked = lock; +} + +bool KdenliveDoc::isTrackLocked(int ix) const { + return m_tracksList[ix].isLocked; +} + void KdenliveDoc::switchTrackVideo(int ix, bool hide) { m_tracksList[ix].isBlind = hide; // !m_tracksList.at(ix).isBlind; } @@ -1442,6 +1525,7 @@ void KdenliveDoc::setTrackType(int ix, TrackInfo type) { m_tracksList[ix].type = type.type; m_tracksList[ix].isMute = type.isMute; m_tracksList[ix].isBlind = type.isBlind; + m_tracksList[ix].isLocked = type.isLocked; } const QList KdenliveDoc::tracksList() const { @@ -1458,15 +1542,6 @@ QPoint KdenliveDoc::getTracksCount() const { return QPoint(video, audio); } -QString KdenliveDoc::getTracksInfo() const { - QString result; - foreach(const TrackInfo &info, m_tracksList) { - if (info.type == VIDEOTRACK) result.append('v'); - else result.append('a'); - } - return result; -} - void KdenliveDoc::cachePixmap(const QString &fileId, const QPixmap &pix) const { pix.save(m_projectFolder.path() + "/thumbs/" + fileId + ".png"); }