saveOptions();
if (m_monitorManager) m_monitorManager->stopActiveMonitor();
if (m_activeDocument && m_activeDocument->isModified()) {
- switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document ?"))) {
+ switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document?"))) {
case KMessageBox::Yes :
// save document here. If saving fails, return false;
return saveFile();
case KMessageBox::No :
+ // User does not want to save the changes, clear recovery files
+ m_activeDocument->m_autosave->resize(0);
return true;
default: // cancel
return false;
QMenu *addMenu = static_cast<QMenu*>(factory()->container("generators", this));
ClipGenerator *iGenerator = qobject_cast<ClipGenerator *>(plugin);
if (iGenerator)
- addToMenu(plugin, iGenerator->generators(), addMenu, SLOT(generateClip()),
+ addToMenu(plugin, iGenerator->generators(KdenliveSettings::producerslist()), addMenu, SLOT(generateClip()),
NULL);
}
kDebug() << "--- ERROR, TRYING TO APPEND NULL EFFECT";
return;
}
- TrackView *currentTimeLine = (TrackView *) m_timelineArea->currentWidget();
- currentTimeLine->projectView()->slotAddEffect(effect.cloneNode().toElement(), pos, track);
+ m_activeTimeline->projectView()->slotAddEffect(effect.cloneNode().toElement(), pos, track);
}
void MainWindow::slotRaiseMonitor(bool clipMonitor)
else m_projectMonitorDock->raise();
}
-void MainWindow::slotSetClipDuration(const QString &id, int duration)
+void MainWindow::slotUpdateClip(const QString &id)
{
if (!m_activeDocument) return;
- m_activeDocument->setProducerDuration(id, duration);
+ m_activeTimeline->projectView()->slotUpdateClip(id);
}
void MainWindow::slotConnectMonitors()
{
m_projectList->setRenderer(m_projectMonitor->render);
- connect(m_projectList, SIGNAL(receivedClipDuration(const QString &, int)), this, SLOT(slotSetClipDuration(const QString &, int)));
+ connect(m_projectList, SIGNAL(receivedClipDuration(const QString &)), this, SLOT(slotUpdateClip(const QString &)));
connect(m_projectList, SIGNAL(showClipProperties(DocClipBase *)), this, SLOT(slotShowClipProperties(DocClipBase *)));
connect(m_projectList, SIGNAL(getFileProperties(const QDomElement &, const QString &, bool)), m_projectMonitor->render, SLOT(getFileProperties(const QDomElement &, const QString &, bool)));
connect(m_projectMonitor->render, SIGNAL(replyGetImage(const QString &, const QPixmap &)), m_projectList, SLOT(slotReplyGetImage(const QString &, const QPixmap &)));
connect(m_projectMonitor->render, SIGNAL(replyGetFileProperties(const QString &, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &, bool)), m_projectList, SLOT(slotReplyGetFileProperties(const QString &, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &, bool)));
- connect(m_projectMonitor->render, SIGNAL(removeInvalidClip(const QString &)), m_projectList, SLOT(slotRemoveInvalidClip(const QString &)));
+ connect(m_projectMonitor->render, SIGNAL(removeInvalidClip(const QString &, bool)), m_projectList, SLOT(slotRemoveInvalidClip(const QString &, bool)));
connect(m_clipMonitor, SIGNAL(refreshClipThumbnail(const QString &)), m_projectList, SLOT(slotRefreshClipThumbnail(const QString &)));
QWidget * actionWidget;
actionWidget = toolbar->widgetForAction(m_buttonSelectTool);
actionWidget->setMaximumWidth(24);
- actionWidget->setMinimumHeight(17);
+ actionWidget->setMinimumHeight(18);
actionWidget = toolbar->widgetForAction(m_buttonRazorTool);
actionWidget->setMaximumWidth(24);
- actionWidget->setMinimumHeight(17);
+ actionWidget->setMinimumHeight(18);
actionWidget = toolbar->widgetForAction(m_buttonSpacerTool);
actionWidget->setMaximumWidth(24);
- actionWidget->setMinimumHeight(17);
+ actionWidget->setMinimumHeight(18);
toolbar->setStyleSheet(style1);
connect(m_toolGroup, SIGNAL(triggered(QAction *)), this, SLOT(slotChangeTool(QAction *)));
actionWidget = toolbar->widgetForAction(m_buttonFitZoom);
actionWidget->setMaximumWidth(24);
- actionWidget->setMinimumHeight(17);
+ actionWidget->setMinimumHeight(18);
m_zoomSlider = new QSlider(Qt::Horizontal, this);
m_zoomSlider->setMaximum(13);
actionWidget = toolbar->widgetForAction(m_buttonVideoThumbs);
actionWidget->setMaximumWidth(24);
- actionWidget->setMinimumHeight(17);
+ actionWidget->setMinimumHeight(18);
actionWidget = toolbar->widgetForAction(m_buttonAudioThumbs);
actionWidget->setMaximumWidth(24);
- actionWidget->setMinimumHeight(17);
+ actionWidget->setMinimumHeight(18);
actionWidget = toolbar->widgetForAction(m_buttonShowMarkers);
actionWidget->setMaximumWidth(24);
- actionWidget->setMinimumHeight(17);
+ actionWidget->setMinimumHeight(18);
actionWidget = toolbar->widgetForAction(m_buttonSnap);
actionWidget->setMaximumWidth(24);
- actionWidget->setMinimumHeight(17);
+ actionWidget->setMinimumHeight(18);
m_messageLabel = new StatusBarMessageLabel(this);
m_messageLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::MinimumExpanding);
//Add new settings from 0.7.1
if (KdenliveSettings::defaultprojectfolder().isEmpty()) {
QString path = QDir::homePath() + "/kdenlive";
- if (KStandardDirs::makeDir(path) == false) kDebug() << "/// ERROR CREATING PROJECT FOLDER: " << path;
+ if (KStandardDirs::makeDir(path) == false) kDebug() << "/// ERROR CREATING PROJECT FOLDER: " << path;
KdenliveSettings::setDefaultprojectfolder(path);
}
}
void MainWindow::slotRunWizard()
{
- Wizard *w = new Wizard(this);
+ Wizard *w = new Wizard(false, this);
if (w->exec() == QDialog::Accepted && w->isOk()) {
w->adjustSettings();
}
TrackView *tabToClose = (TrackView *) w;
KdenliveDoc *docToClose = tabToClose->document();
if (docToClose && docToClose->isModified()) {
- switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document ?"))) {
+ switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document?"))) {
case KMessageBox::Yes :
// save document here. If saving fails, return false;
if (saveFile() == false) return;
QString outputFile = KFileDialog::getSaveFileName(KUrl(), mimetype);
if (outputFile.isEmpty()) return false;
if (QFile::exists(outputFile)) {
- if (KMessageBox::questionYesNo(this, i18n("File already exists.\nDo you want to overwrite it ?")) == KMessageBox::No) return false;
+ if (KMessageBox::questionYesNo(this, i18n("File already exists.\nDo you want to overwrite it?")) == KMessageBox::No) return false;
}
return saveFileAs(outputFile);
}
{
KSharedConfigPtr config = KGlobal::config();
KUrl::List urls = m_fileOpenRecent->urls();
- //WARNING: this is buggy, we get a random url, not the last one. Bug in KRecentFileAction ?
+ //WARNING: this is buggy, we get a random url, not the last one. Bug in KRecentFileAction?
if (urls.isEmpty()) newFile(false);
else openFile(urls.last());
}
continue;
}*/
kDebug() << "// OPENING RECOVERY: " << stale->fileName() << "\nMANAGED: " << stale->managedFile().path();
- // the stalefiles also contain ".lock" files so we must ignore them... bug in KAutoSaveFile ?
+ // the stalefiles also contain ".lock" files so we must ignore them... bug in KAutoSaveFile?
if (!stale->fileName().endsWith(".lock")) doOpenFile(KUrl(stale->fileName()), stale);
else KIO::NetAccess::del(KUrl(stale->fileName()), this);
}
//KdenliveSettings::setDefaulttmpfolder();
if (!mltPath.isEmpty()) {
KdenliveSettings::setMltpath(mltPath + "/share/mlt/profiles/");
- KdenliveSettings::setRendererpath(mltPath + "/bin/inigo");
+ KdenliveSettings::setRendererpath(mltPath + "/bin/melt");
}
if (KdenliveSettings::mltpath().isEmpty()) {
KdenliveSettings::setMltpath(QString(MLT_PREFIX) + QString("/share/mlt/profiles/"));
}
- if (KdenliveSettings::rendererpath().isEmpty()) {
- QString inigoPath = QString(MLT_PREFIX) + QString("/bin/inigo");
- if (!QFile::exists(inigoPath))
- inigoPath = KStandardDirs::findExe("inigo");
- else KdenliveSettings::setRendererpath(inigoPath);
+ if (KdenliveSettings::rendererpath().isEmpty() || KdenliveSettings::rendererpath().endsWith("inigo")) {
+ QString meltPath = QString(MLT_PREFIX) + QString("/bin/melt");
+ if (!QFile::exists(meltPath))
+ meltPath = KStandardDirs::findExe("melt");
+ KdenliveSettings::setRendererpath(meltPath);
}
QStringList profilesFilter;
profilesFilter << "*";
QStringList profilesList = QDir(KdenliveSettings::mltpath()).entryList(profilesFilter, QDir::Files);
if (profilesList.isEmpty()) {
- // Cannot find MLT path, try finding inigo
+ // Cannot find MLT path, try finding melt
QString profilePath = KdenliveSettings::rendererpath();
if (!profilePath.isEmpty()) {
profilePath = profilePath.section('/', 0, -3);
}
if (KdenliveSettings::rendererpath().isEmpty()) {
- // Cannot find the MLT inigo renderer, ask for location
- KUrlRequesterDialog *getUrl = new KUrlRequesterDialog(QString(), i18n("Cannot find the inigo program required for rendering (part of Mlt)"), this);
+ // Cannot find the MLT melt renderer, ask for location
+ KUrlRequesterDialog *getUrl = new KUrlRequesterDialog(QString(), i18n("Cannot find the melt program required for rendering (part of Mlt)"), this);
if (getUrl->exec() == QDialog::Rejected) {
::exit(0);
}
KdenliveSettings::setRendererpath(rendererPath.path());
}
- kDebug() << "RESULTING MLT PATH: " << KdenliveSettings::mltpath();
+ kDebug() << "RESULTING MLT PATH: " << KdenliveSettings::mltpath();
// Parse MLT profiles to build a list of available video formats
if (profilesList.isEmpty()) parseProfiles();
if (!m_renderWidget) {
QString projectfolder = m_activeDocument ? m_activeDocument->projectFolder().path() : KdenliveSettings::defaultprojectfolder();
m_renderWidget = new RenderWidget(projectfolder, this);
- connect(m_renderWidget, SIGNAL(doRender(const QString&, const QString&, const QStringList &, const QStringList &, bool, bool, double, double, bool, const QString &)), this, SLOT(slotDoRender(const QString&, const QString&, const QStringList &, const QStringList &, bool, bool, double, double, bool, const QString &)));
+ connect(m_renderWidget, SIGNAL(doRender(const QStringList&, const QStringList&)), this, SLOT(slotDoRender(const QStringList&, const QStringList&)));
connect(m_renderWidget, SIGNAL(abortProcess(const QString &)), this, SIGNAL(abortRenderJob(const QString &)));
connect(m_renderWidget, SIGNAL(openDvdWizard(const QString &, const QString &)), this, SLOT(slotDvdWizard(const QString &, const QString &)));
if (m_activeDocument) {
m_renderWidget->show();
}
-void MainWindow::slotDoRender(const QString &dest, const QString &render, const QStringList &overlay_args, const QStringList &avformat_args, bool zoneOnly, bool playAfter, double guideStart, double guideEnd, bool resizeProfile, const QString &scriptExport)
+void MainWindow::slotDoRender(const QStringList args, const QStringList overlay_args)
{
- kDebug() << "// SCRIPT EXPORT: " << scriptExport;
+ QString dest = args.at(0);
+ QString render = args.at(1);
+ QStringList avformat_args = args.at(2).split(' ');
+ bool zoneOnly = args.at(3).toInt();
+ bool playAfter = args.at(4).toInt();
+ double guideStart = args.at(5).toDouble();
+ double guideEnd = args.at(6).toDouble();
+ bool resizeProfile = args.at(7).toInt();
+ QString scriptExport = args.at(8);
+ bool createChapterFile = args.at(9).toInt();
+
if (dest.isEmpty()) return;
int in = 0;
int out = 0;
- TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget();
- if (currentTab && zoneOnly) {
- in = currentTab->inPoint();
- out = currentTab->outPoint();
+
+ if (m_activeTimeline && zoneOnly) {
+ in = m_activeTimeline->inPoint();
+ out = m_activeTimeline->outPoint();
}
+
KTemporaryFile temp;
temp.setAutoRemove(false);
- temp.setSuffix(".westley");
+ temp.setSuffix(".mlt");
if (!scriptExport.isEmpty() || temp.open()) {
if (KdenliveSettings::dropbframes()) {
KdenliveSettings::setDropbframes(false);
m_activeDocument->clipManager()->updatePreviewSettings();
- if (!scriptExport.isEmpty()) m_projectMonitor->saveSceneList(scriptExport + ".westley");
+ if (!scriptExport.isEmpty()) m_projectMonitor->saveSceneList(scriptExport + ".mlt");
else m_projectMonitor->saveSceneList(temp.fileName());
KdenliveSettings::setDropbframes(true);
m_activeDocument->clipManager()->updatePreviewSettings();
} else {
- if (!scriptExport.isEmpty()) m_projectMonitor->saveSceneList(scriptExport + ".westley");
+ if (!scriptExport.isEmpty()) m_projectMonitor->saveSceneList(scriptExport + ".mlt");
else m_projectMonitor->saveSceneList(temp.fileName());
}
if (videoPlayer.isEmpty()) KMessageBox::sorry(this, i18n("Cannot play video after rendering because the default video player application is not set.\nPlease define it in Kdenlive settings dialog."));
}
if (!QFile::exists(KdenliveSettings::rendererpath())) {
- KMessageBox::sorry(this, i18n("Cannot find the inigo program required for rendering (part of Mlt)"));
+ KMessageBox::sorry(this, i18n("Cannot find the melt program required for rendering (part of Mlt)"));
setRenderingProgress(dest, -3);
return;
}
return;
}
- QTextStream out(&file);
- out << "#! /bin/sh" << "\n" << "\n";
- out << "SOURCE=" << "\"" + scriptExport + ".westley\"" << "\n";
- out << "TARGET=" << "\"" + dest + "\"" << "\n";
- out << renderer << " " << args.join(" ") << "\n" << "\n";
+ QTextStream outStream(&file);
+ outStream << "#! /bin/sh" << "\n" << "\n";
+ outStream << "SOURCE=" << "\"" + scriptExport + ".westley\"" << "\n";
+ outStream << "TARGET=" << "\"" + dest + "\"" << "\n";
+ outStream << renderer << " " << args.join(" ") << "\n" << "\n";
if (file.error() != QFile::NoError) {
KMessageBox::error(this, i18n("Cannot write to file %1", scriptExport));
file.close();
file.close();
QFile::setPermissions(scriptExport, file.permissions() | QFile::ExeUser);
}
+
+ if (createChapterFile) {
+ QDomDocument doc;
+ QDomElement chapters = doc.createElement("chapters");
+ chapters.setAttribute("fps", m_activeDocument->fps());
+ doc.appendChild(chapters);
+
+ QDomElement guidesxml = m_activeDocument->guidesXml();
+ if (!zoneOnly) out = (int) GenTime(m_activeDocument->projectDuration()).frames(m_activeDocument->fps());
+
+ QDomNodeList nodes = guidesxml.elementsByTagName("guide");
+ for (int i = 0; i < nodes.count(); i++) {
+ QDomElement e = nodes.item(i).toElement();
+ if (!e.isNull()) {
+ QString comment = e.attribute("comment");
+ int time = (int) GenTime(e.attribute("time").toDouble()).frames(m_activeDocument->fps());
+ if (time >= in && time < out) {
+ if (zoneOnly) time = time - in;
+ QDomElement chapter = doc.createElement("chapter");
+ chapters.appendChild(chapter);
+ chapter.setAttribute("title", comment);
+ chapter.setAttribute("time", time);
+ }
+ }
+ }
+ if (chapters.childNodes().count() > 0) {
+ if (m_activeTimeline->projectView()->hasGuide(out, 0) == -1) {
+ // Always insert a guide in pos 0
+ QDomElement chapter = doc.createElement("chapter");
+ chapters.insertBefore(chapter, QDomNode());
+ chapter.setAttribute("title", i18n("Start"));
+ chapter.setAttribute("time", "0");
+ }
+ // save chapters file
+ QFile file(dest + ".dvdchapter");
+ if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+ kWarning() << "////// ERROR writing DVD CHAPTER file: " << dest + ".dvdchapter";
+ } else {
+ file.write(doc.toString().toUtf8());
+ if (file.error() != QFile::NoError)
+ kWarning() << "////// ERROR writing DVD CHAPTER file: " << dest + ".dvdchapter";
+ file.close();
+ }
+ }
+ }
}
}
{
//m_projectMonitor->stop();
m_closeAction->setEnabled(m_timelineArea->count() > 1);
- kDebug() << "/////////////////// CONNECTING DOC TO PROJECT VIEW ////////////////";
+ kDebug() << "/////////////////// CONNECTING DOC TO PROJECT VIEW ////////////////";
if (m_activeDocument) {
if (m_activeDocument == doc) return;
if (m_activeTimeline) {
{
if (e->type() == QEvent::User) {
// The timeline playing position changed...
- kDebug() << "RECEIVED JOG EVEMNT!!!";
+ kDebug() << "RECEIVED JOG EVEMNT!!!";
}
}
void MainWindow::slotActivateEffectStackView()
void MainWindow::slotFindNext()
{
if (m_activeTimeline && m_activeTimeline->projectView()->findNextString(m_findString)) {
- statusBar()->showMessage(i18n("Found : %1", m_findString));
+ statusBar()->showMessage(i18n("Found: %1", m_findString));
} else {
statusBar()->showMessage(i18n("Reached end of project"));
}
{
if (m_activeTimeline && m_activeTimeline->projectView()->findString(m_findString)) {
m_projectSearchNext->setEnabled(true);
- statusBar()->showMessage(i18n("Found : %1", m_findString));
+ statusBar()->showMessage(i18n("Found: %1", m_findString));
} else {
m_projectSearchNext->setEnabled(false);
- statusBar()->showMessage(i18n("Not found : %1", m_findString));
+ statusBar()->showMessage(i18n("Not found: %1", m_findString));
}
}
QLabel *label1 = new QLabel(i18n("Save clip zone as:"), this);
QString path = m_activeDocument->projectFolder().path();
path.append("/");
- path.append("untitled.westley");
+ path.append("untitled.mlt");
KUrlRequester *url = new KUrlRequester(KUrl(path), this);
url->setFilter("video/mlt-playlist");
QLabel *label2 = new QLabel(i18n("Description:"), this);
void MainWindow::slotMaximizeCurrent(bool show)
{
- //TODO: is there a way to maximize current widget?
+ //TODO: is there a way to maximize current widget?
//if (show == true)
{
m_timelineState = saveState();
projects / kdenlive / blobdiff