m_projectList->setRenderer(m_projectMonitor->render);
connect(m_projectList, SIGNAL(receivedClipDuration(const QString &, int)), this, SLOT(slotSetClipDuration(const QString &, int)));
connect(m_projectList, SIGNAL(showClipProperties(DocClipBase *)), this, SLOT(slotShowClipProperties(DocClipBase *)));
- connect(m_projectList, SIGNAL(getFileProperties(const QDomElement &, const QString &)), m_projectMonitor->render, SLOT(getFileProperties(const QDomElement &, const QString &)));
- connect(m_projectMonitor->render, SIGNAL(replyGetImage(const QString &, int, const QPixmap &, int, int)), m_projectList, SLOT(slotReplyGetImage(const QString &, int, const QPixmap &, int, int)));
- connect(m_projectMonitor->render, SIGNAL(replyGetFileProperties(const QString &, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &)), m_projectList, SLOT(slotReplyGetFileProperties(const QString &, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &)));
+ 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 &)));
m_projectSearchNext->setShortcut(Qt::Key_F3);
m_projectSearchNext->setEnabled(false);
- KAction* profilesAction = new KAction(KIcon("document-new"), i18n("Manage Profiles"), this);
+ KAction* profilesAction = new KAction(KIcon("document-new"), i18n("Manage Project Profiles"), this);
collection->addAction("manage_profiles", profilesAction);
connect(profilesAction, SIGNAL(triggered(bool)), this, SLOT(slotEditProfiles()));
- KAction* fileGHNS = KNS::standardAction(i18n("Download New Lumas..."), this, SLOT(slotGetNewStuff()), actionCollection(), "get_new_stuff");
+ KNS::standardAction(i18n("Download New Lumas..."), this, SLOT(slotGetNewLumaStuff()), actionCollection(), "get_new_lumas");
+
+ KNS::standardAction(i18n("Download New Render Profiles..."), this, SLOT(slotGetNewRenderStuff()), actionCollection(), "get_new_profiles");
+
+ KNS::standardAction(i18n("Download New Project Profiles..."), this, SLOT(slotGetNewMltProfileStuff()), actionCollection(), "get_new_mlt_profiles");
KAction* wizAction = new KAction(KIcon("configure"), i18n("Run Config Wizard"), this);
collection->addAction("run_wizard", wizAction);
KAction* editTimelineClipSpeed = new KAction(i18n("Change Clip Speed"), this);
collection->addAction("change_clip_speed", editTimelineClipSpeed);
+ editTimelineClipSpeed->setData("change_speed");
connect(editTimelineClipSpeed, SIGNAL(triggered(bool)), this, SLOT(slotChangeClipSpeed()));
KAction *stickTransition = collection->addAction("auto_transition");
QAction *pasteEffects = new KAction(KIcon("edit-paste"), i18n("Paste Effects"), this);
collection->addAction("paste_effects", pasteEffects);
+ pasteEffects->setData("paste_effects");
connect(pasteEffects , SIGNAL(triggered()), this, SLOT(slotPasteEffects()));
m_closeAction = KStandardAction::close(this, SLOT(closeCurrentDocument()), collection);
collection->addAction("add_folder", addFolderButton);
connect(addFolderButton , SIGNAL(triggered()), m_projectList, SLOT(slotAddFolder()));
+ QAction *clipProperties = new KAction(KIcon("document-edit"), i18n("Clip Properties"), this);
+ collection->addAction("clip_properties", clipProperties);
+ clipProperties->setData("clip_properties");
+ connect(clipProperties , SIGNAL(triggered()), m_projectList, SLOT(slotEditClip()));
+ clipProperties->setEnabled(false);
+
+ QAction *openClip = new KAction(KIcon("document-open"), i18n("Edit Clip"), this);
+ collection->addAction("edit_clip", openClip);
+ openClip->setData("edit_clip");
+ connect(openClip , SIGNAL(triggered()), m_projectList, SLOT(slotOpenClip()));
+ openClip->setEnabled(false);
+
+ QAction *deleteClip = new KAction(KIcon("edit-delete"), i18n("Delete Clip"), this);
+ collection->addAction("delete_clip", deleteClip);
+ deleteClip->setData("delete_clip");
+ connect(deleteClip , SIGNAL(triggered()), m_projectList, SLOT(slotRemoveClip()));
+ deleteClip->setEnabled(false);
+
+ QAction *reloadClip = new KAction(KIcon("view-refresh"), i18n("Reload Clip"), this);
+ collection->addAction("reload_clip", reloadClip);
+ reloadClip->setData("reload_clip");
+ connect(reloadClip , SIGNAL(triggered()), m_projectList, SLOT(slotReloadClip()));
+ reloadClip->setEnabled(false);
+
QMenu *addClips = new QMenu();
addClips->addAction(addClip);
addClips->addAction(addColorClip);
addClips->addAction(addSlideClip);
addClips->addAction(addTitleClip);
addClips->addAction(addFolderButton);
+
+ addClips->addAction(reloadClip);
+ addClips->addAction(clipProperties);
+ addClips->addAction(openClip);
+ addClips->addAction(deleteClip);
m_projectList->setupMenu(addClips, addClip);
//connect(collection, SIGNAL( clearStatusText() ),
}
bool MainWindow::saveFileAs(const QString &outputFileName) {
- QDomDocument currentSceneList;
+ QString currentSceneList;
if (KdenliveSettings::dropbframes()) {
KdenliveSettings::setDropbframes(false);
m_activeDocument->clipManager()->updatePreviewSettings();
KMimeType::Ptr mime = KMimeType::mimeType(mimetype);
if (!mime) mimetype = "*.kdenlive";
- KUrl url = KFileDialog::getOpenUrl(KUrl(), mimetype);
+ KUrl url = KFileDialog::getOpenUrl(KUrl("kfiledialog:///projectfolder"), mimetype);
if (url.isEmpty()) return;
m_fileOpenRecent->addUrl(url);
openFile(url);
void MainWindow::slotEditProfiles() {
ProfilesDialog *w = new ProfilesDialog;
- w->exec();
+ if (w->exec() == QDialog::Accepted) {
+ KdenliveSettingsDialog* d = static_cast <KdenliveSettingsDialog*>(KConfigDialog::exists("settings"));
+ if (d) d->checkProfile();
+ }
delete w;
}
if (w->exec() == QDialog::Accepted) {
QString profile = w->selectedProfile();
m_activeDocument->setProjectFolder(w->selectedFolder());
+ if (m_renderWidget) m_renderWidget->setDocumentPath(w->selectedFolder().path());
if (m_activeDocument->profilePath() != profile) {
// Profile was changed
m_activeDocument->setProfilePath(profile);
void MainWindow::slotRenderProject() {
if (!m_renderWidget) {
- m_renderWidget = new RenderWidget(this);
- connect(m_renderWidget, SIGNAL(doRender(const QString&, const QString&, const QStringList &, const QStringList &, bool, bool, double, double, bool)), this, SLOT(slotDoRender(const QString&, const QString&, const QStringList &, const QStringList &, bool, bool, double, double, bool)));
+ 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(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) {
+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) {
+ kDebug() << "// SCRIPT EXPORT: " << scriptExport;
if (dest.isEmpty()) return;
int in;
int out;
KTemporaryFile temp;
temp.setAutoRemove(false);
temp.setSuffix(".westley");
- if (temp.open()) {
-
+ if (!scriptExport.isEmpty() || temp.open()) {
if (KdenliveSettings::dropbframes()) {
KdenliveSettings::setDropbframes(false);
m_activeDocument->clipManager()->updatePreviewSettings();
- m_projectMonitor->saveSceneList(temp.fileName());
+ if (!scriptExport.isEmpty()) m_projectMonitor->saveSceneList(scriptExport + ".westley");
+ else m_projectMonitor->saveSceneList(temp.fileName());
KdenliveSettings::setDropbframes(true);
m_activeDocument->clipManager()->updatePreviewSettings();
- } else m_projectMonitor->saveSceneList(temp.fileName());
+ } else {
+ if (!scriptExport.isEmpty()) m_projectMonitor->saveSceneList(scriptExport + ".westley");
+ else m_projectMonitor->saveSceneList(temp.fileName());
+ }
QStringList args;
- args << "-erase";
+ if (scriptExport.isEmpty()) args << "-erase";
if (KdenliveSettings::usekuiserver()) args << "-kuiserver";
if (zoneOnly) args << "in=" + QString::number(in) << "out=" + QString::number(out);
else if (guideStart != -1) {
if (resizeProfile) {
// The rendering profile is different from project profile, so use MLT's special producer_consumer
- args << "consumer:" + temp.fileName();
- } else args << temp.fileName();
- args << dest << avformat_args;
+ if (scriptExport.isEmpty()) args << "consumer:" + temp.fileName();
+ else args << "consumer:$SOURCE";
+ } else {
+ if (scriptExport.isEmpty()) args << temp.fileName();
+ else args << "$SOURCE";
+ }
+ if (scriptExport.isEmpty()) args << dest;
+ else args << "$TARGET";
+ args << avformat_args;
QString renderer = QCoreApplication::applicationDirPath() + QString("/kdenlive_render");
if (!QFile::exists(renderer)) renderer = "kdenlive_render";
- QProcess::startDetached(renderer, args);
+ if (scriptExport.isEmpty()) {
+ QProcess::startDetached(renderer, args);
+ KNotification::event("RenderStarted", i18n("Rendering <i>%1</i> started", dest), QPixmap(), this);
+ } else {
+ // Generate script file
+ QFile file(scriptExport);
+ if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+ m_messageLabel->setMessage(i18n("Cannot write to file %1", scriptExport), ErrorMessage);
+ return;
+ }
- KNotification::event("RenderStarted", i18n("Rendering <i>%1</i> started", dest), QPixmap(), this);
+ QTextStream out(&file);
+ out << "#! /bin/sh" << "\n" << "\n";
+ out << "SOURCE=" << "\"" + scriptExport + ".westley\"" << "\n";
+ out << "TARGET=" << "\"" + dest + "\"" << "\n";
+ out << renderer << " " << args.join(" ") << "\n" << "\n";
+ file.close();
+ QFile::setPermissions(scriptExport, file.permissions() | QFile::ExeUser);
+ }
}
}
disconnect(effectStack, SIGNAL(refreshEffectStack(ClipItem*)), m_activeTimeline->projectView(), SLOT(slotRefreshEffects(ClipItem*)));
disconnect(effectStack, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects()));
disconnect(transitionConfig, SIGNAL(transitionUpdated(Transition *, QDomElement)), m_activeTimeline->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement)));
- disconnect(transitionConfig, SIGNAL(transitionTrackUpdated(Transition *, int)), m_activeTimeline->projectView() , SLOT(slotTransitionTrackUpdated(Transition *, int)));
disconnect(transitionConfig, SIGNAL(seekTimeline(int)), m_activeTimeline->projectView() , SLOT(setCursorPos(int)));
disconnect(m_activeTimeline->projectView(), SIGNAL(activateDocumentMonitor()), m_projectMonitor, SLOT(activateMonitor()));
disconnect(m_activeTimeline, SIGNAL(zoneMoved(int, int)), this, SLOT(slotZoneMoved(int, int)));
connect(effectStack, SIGNAL(changeEffectPosition(ClipItem*, int, int)), trackView->projectView(), SLOT(slotChangeEffectPosition(ClipItem*, int, int)));
connect(effectStack, SIGNAL(refreshEffectStack(ClipItem*)), trackView->projectView(), SLOT(slotRefreshEffects(ClipItem*)));
connect(transitionConfig, SIGNAL(transitionUpdated(Transition *, QDomElement)), trackView->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement)));
- connect(transitionConfig, SIGNAL(transitionTrackUpdated(Transition *, int)), trackView->projectView() , SLOT(slotTransitionTrackUpdated(Transition *, int)));
connect(transitionConfig, SIGNAL(seekTimeline(int)), trackView->projectView() , SLOT(setCursorPos(int)));
connect(effectStack, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects()));
trackView->projectView()->setContextMenu(m_timelineContextMenu, m_timelineContextClipMenu, m_timelineContextTransitionMenu);
m_activeTimeline = trackView;
- if (m_renderWidget) m_renderWidget->setProfile(doc->mltProfile());
+ if (m_renderWidget) {
+ m_renderWidget->setProfile(doc->mltProfile());
+ m_renderWidget->setDocumentPath(doc->projectFolder().path());
+ }
//doc->setRenderer(m_projectMonitor->render);
m_commandStack->setActiveStack(doc->commandStack());
KdenliveSettings::setProject_display_ratio(doc->dar());
if (KConfigDialog::showDialog("settings")) {
KdenliveSettingsDialog* d = static_cast <KdenliveSettingsDialog*>(KConfigDialog::exists("settings"));
if (page != -1) d->showPage(page, option);
- d->checkProfile();
return;
}
} else m_activeTimeline->projectView()->setOutPoint();
}
-void MainWindow::slotGetNewStuff() {
+void MainWindow::slotGetNewLumaStuff() {
//KNS::Entry::List download();
KNS::Entry::List entries = KNS::Engine::download();
int numberInstalled = 0;
initEffects::refreshLumas();
}
+void MainWindow::slotGetNewRenderStuff() {
+ //KNS::Entry::List download();
+
+ KNS::Engine engine(0);
+ if (engine.init("kdenlive_render.knsrc")) {
+ KNS::Entry::List entries = engine.downloadDialogModal(this);
+
+ if (entries.size() > 0) {
+ foreach(KNS::Entry* entry, entries) {
+ // care only about installed ones
+ if (entry->status() == KNS::Entry::Installed) {
+ foreach(const QString &file, entry->installedFiles()) {
+ kDebug() << "// CURRENTLY INSTALLED: " << file;
+ }
+ }
+ }
+ }
+ if (m_renderWidget) m_renderWidget->reloadProfiles();
+ }
+}
+
+void MainWindow::slotGetNewMltProfileStuff() {
+ //KNS::Entry::List download();
+
+ KNS::Engine engine(0);
+ if (engine.init("kdenlive_mltprofiles.knsrc")) {
+ KNS::Entry::List entries = engine.downloadDialogModal(this);
+
+ if (entries.size() > 0) {
+ foreach(KNS::Entry* entry, entries) {
+ // care only about installed ones
+ if (entry->status() == KNS::Entry::Installed) {
+ foreach(const QString &file, entry->installedFiles()) {
+ kDebug() << "// CURRENTLY INSTALLED: " << file;
+ }
+ }
+ }
+
+ // update the list of profiles in settings dialog
+ KdenliveSettingsDialog* d = static_cast <KdenliveSettingsDialog*>(KConfigDialog::exists("settings"));
+ if (d) d->checkProfile();
+ }
+ }
+}
+
void MainWindow::slotAutoTransition() {
m_activeTimeline->projectView()->autoTransition();
}
projects / kdenlive / blobdiff