const double DOCUMENTVERSION = 0.86;
-KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup *undoGroup, QString profileName, QMap <QString, QString> properties, const QPoint tracks, Render *render, KTextEdit *notes, MainWindow *parent, KProgressDialog *progressDialog) :
+KdenliveDoc::KdenliveDoc(const KUrl &url, const KUrl &projectFolder, QUndoGroup *undoGroup, QString profileName, QMap <QString, QString> properties, const QPoint tracks, Render *render, KTextEdit *notes, bool *openBackup, MainWindow *parent, KProgressDialog *progressDialog) :
QObject(parent),
m_autosave(NULL),
m_url(url),
m_documentProperties["proxyminsize"] = QString::number(KdenliveSettings::proxyminsize());
m_documentProperties["generateimageproxy"] = QString::number((int) KdenliveSettings::generateimageproxy());
m_documentProperties["proxyimageminsize"] = QString::number(KdenliveSettings::proxyimageminsize());
-
+#if QT_VERSION >= 0x040700
+ m_documentProperties["documentid"] = QString::number(QDateTime::currentMSecsSinceEpoch());
+#else
+ QDateTime date = QDateTime::currentDateTime();
+ m_documentProperties["documentid"] = QString::number(date.toTime_t());
+#endif
+
// Load properties
QMapIterator<QString, QString> i(properties);
while (i.hasNext()) {
i.next();
m_documentProperties[i.key()] = i.value();
}
+
+ *openBackup = false;
if (!url.isEmpty()) {
QString tmpFile;
success = KIO::NetAccess::download(url.path(), tmpFile, parent);
- if (!success) // The file cannot be opened
- KMessageBox::error(parent, KIO::NetAccess::lastErrorString());
+ if (!success) {
+ // The file cannot be opened
+ if (KMessageBox::warningContinueCancel(parent, i18n("Cannot open the project file, error is:\n%1\nDo you want to open a backup file?", KIO::NetAccess::lastErrorString()), i18n("Error opening file"), KGuiItem(i18n("Open Backup"))) == KMessageBox::Continue) {
+ *openBackup = true;
+ }
+ //KMessageBox::error(parent, KIO::NetAccess::lastErrorString());
+ }
else {
QFile file(tmpFile);
QString errorMsg;
file.close();
KIO::NetAccess::removeTempFile(tmpFile);
- if (!success) // It is corrupted
- KMessageBox::error(parent, errorMsg);
+ if (!success) {
+ // It is corrupted
+ if (KMessageBox::warningContinueCancel(parent, i18n("Cannot open the project file, error is:\n%1\nDo you want to open a backup file?", errorMsg), i18n("Error opening file"), KGuiItem(i18n("Open Backup"))) == KMessageBox::Continue) {
+ *openBackup = true;
+ }
+ //KMessageBox::error(parent, errorMsg);
+ }
else {
parent->slotGotProgressInfo(i18n("Validating"), 0);
qApp->processEvents();
if (!success) {
// It is not a project file
parent->slotGotProgressInfo(i18n("File %1 is not a Kdenlive project file", m_url.path()), 100);
+ if (KMessageBox::warningContinueCancel(parent, i18n("File %1 is not a valid project file.\nDo you want to open a backup file?", m_url.path()), i18n("Error opening file"), KGuiItem(i18n("Open Backup"))) == KMessageBox::Continue) {
+ *openBackup = true;
+ }
} else {
/*
* Validate the file against the current version (upgrade
QDomElement mlt = m_document.firstChildElement("mlt");
QDomElement infoXml = mlt.firstChildElement("kdenlivedoc");
+ // Set profile, fps, etc for the document
+ setProfilePath(infoXml.attribute("profile"));
+
// Check embedded effects
QDomElement customeffects = infoXml.firstChildElement("customeffects");
if (!customeffects.isNull() && customeffects.hasChildNodes()) {
QDomNamedNodeMap props = docproperties.attributes();
for (int i = 0; i < props.count(); i++)
m_documentProperties.insert(props.item(i).nodeName(), props.item(i).nodeValue());
- setProfilePath(infoXml.attribute("profile"));
+
if (validator.isModified()) setModified(true);
kDebug() << "Reading file: " << url.path() << ", found clips: " << producers.count();
}
// Something went wrong, or a new file was requested: create a new project
if (!success) {
- m_url = KUrl();
+ m_url.clear();
setProfilePath(profileName);
m_document = createEmptyDocument(tracks.x(), tracks.y());
}
file.close();
if (!autosave) {
cleanupBackupFiles();
+ QFileInfo info(file);
+ QString fileName = KUrl(path).fileName().section('.', 0, -2);
+ fileName.append("-" + m_documentProperties.value("documentid"));
+ fileName.append(info.lastModified().toString("-yyyy-MM-dd-hh-mm"));
+ fileName.append(".kdenlive.png");
+ KUrl backupFile = m_projectFolder;
+ backupFile.addPath(".backup/");
+ backupFile.addPath(fileName);
+ emit saveTimelinePreview(backupFile.path());
}
return true;
}
emit progressInfo(QString(), -1);
}*/
-void KdenliveDoc::checkProjectClips(bool displayRatioChanged)
+void KdenliveDoc::checkProjectClips(bool displayRatioChanged, bool fpsChanged)
{
if (m_render == NULL) return;
- m_clipManager->resetProducersList(m_render->producersList(), displayRatioChanged);
+ m_clipManager->resetProducersList(m_render->producersList(), displayRatioChanged, fpsChanged);
}
Render *KdenliveDoc::renderer()
bool KdenliveDoc::checkDocumentClips(QDomNodeList infoproducers)
{
DocumentChecker d(infoproducers, m_document);
- return (d.hasMissingClips() == false);
+ return (d.hasErrorInClips() == false);
/* int clipType;
QDomElement e;
void KdenliveDoc::backupLastSavedVersion(const QString &path)
{
// Ensure backup folder exists
+ if (path.isEmpty()) return;
QFile file(path);
KUrl backupFile = m_projectFolder;
backupFile.addPath(".backup/");
KIO::NetAccess::mkdir(backupFile, kapp->activeWindow());
QString fileName = KUrl(path).fileName().section('.', 0, -2);
QFileInfo info(file);
+ fileName.append("-" + m_documentProperties.value("documentid"));
fileName.append(info.lastModified().toString("-yyyy-MM-dd-hh-mm"));
fileName.append(".kdenlive");
backupFile.addPath(fileName);
- emit saveTimelinePreview(backupFile.path() + ".png");
-
if (file.exists()) {
// delete previous backup if it was done less than 60 seconds ago
QFile::remove(backupFile.path());
backupFile.addPath(".backup/");
QDir dir(backupFile.path());
QString projectFile = url().fileName().section('.', 0, -2);
+ projectFile.append("-" + m_documentProperties.value("documentid"));
projectFile.append("-??");
projectFile.append("??");
projectFile.append("-??");
projects / kdenlive / blobdiff