X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmainwindow.cpp;h=7147d3b8789430e3207c32018f683d3184e331b6;hb=d27942f69d13850d00f249a219107f6983473604;hp=69c24e9dce2897faf7846e4cbfeabf079ed864cc;hpb=010c83463c93a1cbf2658cced5d93b6d49a38bbc;p=kdenlive diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 69c24e9d..7147d3b8 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -51,10 +51,13 @@ #include #include #include +#include +#include + -#include #include "mainwindow.h" +#include "mainwindowadaptor.h" #include "kdenlivesettings.h" #include "kdenlivesettingsdialog.h" #include "initeffects.h" @@ -84,6 +87,10 @@ #include "markerdialog.h" #include "clipitem.h" +#include "interfaces.h" + +// #include "scriptingpart.h" + static const int ID_STATUS_MSG = 1; static const int ID_EDITMODE_MSG = 2; static const int ID_TIMELINE_MSG = 3; @@ -107,6 +114,12 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent m_jogProcess(NULL), #endif /* NO_JOGSHUTTLE */ m_findActivated(false), m_initialized(false) { + + // Create DBus interface + new MainWindowAdaptor(this); + QDBusConnection dbus = QDBusConnection::sessionBus(); + dbus.registerObject("/MainWindow", this); + setlocale(LC_NUMERIC, "POSIX"); setFont(KGlobalSettings::toolBarFont()); parseProfiles(MltPath); @@ -210,11 +223,17 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent tabifyDockWidget(clipMonitorDock, recMonitorDock); setCentralWidget(m_timelineArea); + setupGUI(); + /*ScriptingPart* sp = new ScriptingPart(this, QStringList()); + guiFactory()->addClient(sp);*/ + + loadPlugins(); //kDebug() << factory() << " " << factory()->container("video_effects_menu", this); - m_projectMonitor->setupMenu(static_cast(factory()->container("monitor_go", this))); - m_clipMonitor->setupMenu(static_cast(factory()->container("monitor_go", this)), static_cast(factory()->container("marker_menu", this))); + m_projectMonitor->setupMenu(static_cast(factory()->container("monitor_go", this)), m_playZone, m_loopZone); + m_clipMonitor->setupMenu(static_cast(factory()->container("monitor_go", this)), m_playZone, m_loopZone, static_cast(factory()->container("marker_menu", this))); + m_projectList->setupGeneratorMenu(static_cast(factory()->container("generators", this))); // build effects menus QAction *action; @@ -321,6 +340,8 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent m_timelineContextTransitionMenu->addAction(actionCollection()->action("delete_timeline_clip")); m_timelineContextTransitionMenu->addAction(actionCollection()->action(KStandardAction::name(KStandardAction::Copy))); + m_timelineContextTransitionMenu->addAction(actionCollection()->action("auto_transition")); + connect(projectMonitorDock, SIGNAL(visibilityChanged(bool)), m_projectMonitor, SLOT(refreshMonitor(bool))); connect(clipMonitorDock, SIGNAL(visibilityChanged(bool)), m_clipMonitor, SLOT(refreshMonitor(bool))); //connect(m_monitorManager, SIGNAL(connectMonitors()), this, SLOT(slotConnectMonitors())); @@ -374,6 +395,71 @@ bool MainWindow::queryClose() { return true; } + +void MainWindow::loadPlugins() { + foreach(QObject *plugin, QPluginLoader::staticInstances()) + populateMenus(plugin); + + QStringList directories = KGlobal::dirs()->findDirs("module", QString()); + QStringList filters; + filters << "libkdenlive*"; + foreach(const QString &folder, directories) { + kDebug() << "// PARSING FIOLER: " << folder; + QDir pluginsDir(folder); + foreach(QString fileName, pluginsDir.entryList(filters, QDir::Files)) { + kDebug() << "// FOUND PLUGIN: " << fileName << "= " << pluginsDir.absoluteFilePath(fileName); + QPluginLoader loader(pluginsDir.absoluteFilePath(fileName)); + QObject *plugin = loader.instance(); + if (plugin) { + populateMenus(plugin); + m_pluginFileNames += fileName; + } else kDebug() << "// ERROR LOADING PLUGIN: " << fileName << ", " << loader.errorString(); + } + } + //exit(1); +} + +void MainWindow::populateMenus(QObject *plugin) { + QMenu *addMenu = static_cast(factory()->container("generators", this)); + ClipGenerator *iGenerator = qobject_cast(plugin); + if (iGenerator) + addToMenu(plugin, iGenerator->generators(), addMenu, SLOT(generateClip()), + NULL); +} + +void MainWindow::addToMenu(QObject *plugin, const QStringList &texts, + QMenu *menu, const char *member, + QActionGroup *actionGroup) { + kDebug() << "// ADD to MENU" << texts; + foreach(QString text, texts) { + QAction *action = new QAction(text, plugin); + action->setData(text); + connect(action, SIGNAL(triggered()), this, member); + menu->addAction(action); + + if (actionGroup) { + action->setCheckable(true); + actionGroup->addAction(action); + } + } +} + +void MainWindow::aboutPlugins() { + //PluginDialog dialog(pluginsDir.path(), m_pluginFileNames, this); + //dialog.exec(); +} + + +void MainWindow::generateClip() { + QAction *action = qobject_cast(sender()); + ClipGenerator *iGenerator = qobject_cast(action->parent()); + + KUrl clipUrl = iGenerator->generatedClip(action->data().toString(), m_activeDocument->projectFolder(), QStringList(), QStringList(), 25, 720, 576); + if (!clipUrl.isEmpty()) { + m_projectList->slotAddClip(clipUrl); + } +} + void MainWindow::saveProperties(KConfig*) { // save properties here,used by session management saveFile(); @@ -480,14 +566,14 @@ void MainWindow::slotSetClipDuration(const QString &id, int duration) { void MainWindow::slotConnectMonitors() { - m_projectList->setRenderer(m_clipMonitor->render); + 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_clipMonitor->render, SLOT(getFileProperties(const QDomElement &, const QString &))); - connect(m_clipMonitor->render, SIGNAL(replyGetImage(const QString &, int, const QPixmap &, int, int)), m_projectList, SLOT(slotReplyGetImage(const QString &, int, const QPixmap &, int, int))); - connect(m_clipMonitor->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_clipMonitor->render, SIGNAL(removeInvalidClip(const QString &)), m_projectList, SLOT(slotRemoveInvalidClip(const QString &))); + connect(m_projectMonitor->render, SIGNAL(removeInvalidClip(const QString &)), m_projectList, SLOT(slotRemoveInvalidClip(const QString &))); connect(m_clipMonitor, SIGNAL(refreshClipThumbnail(const QString &)), m_projectList, SLOT(slotRefreshClipThumbnail(const QString &))); @@ -686,10 +772,20 @@ void MainWindow::setupActions() { 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())); + 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); + connect(wizAction, SIGNAL(triggered(bool)), this, SLOT(slotRunWizard())); + KAction* projectAction = new KAction(KIcon("configure"), i18n("Project Settings"), this); collection->addAction("project_settings", projectAction); connect(projectAction, SIGNAL(triggered(bool)), this, SLOT(slotEditProjectSettings())); @@ -707,6 +803,20 @@ void MainWindow::setupActions() { collection->addAction("monitor_play", monitorPlay); connect(monitorPlay, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotPlay())); + m_playZone = new KAction(KIcon("media-playback-start"), i18n("Play Zone"), this); + m_playZone->setShortcut(Qt::CTRL + Qt::Key_Space); + collection->addAction("monitor_play_zone", m_playZone); + connect(m_playZone, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotPlayZone())); + + m_loopZone = new KAction(KIcon("media-playback-start"), i18n("Loop Zone"), this); + m_loopZone->setShortcut(Qt::ALT + Qt::Key_Space); + collection->addAction("monitor_loop_zone", m_loopZone); + connect(m_loopZone, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotLoopZone())); + + KAction *dvdWizard = new KAction(KIcon("media-optical"), i18n("Dvd Wizard"), this); + collection->addAction("dvd_wizard", dvdWizard); + connect(dvdWizard, SIGNAL(triggered(bool)), this, SLOT(slotDvdWizard())); + KAction *markIn = collection->addAction("mark_in"); markIn->setText(i18n("Set In Point")); markIn->setShortcut(Qt::Key_I); @@ -727,6 +837,11 @@ void MainWindow::setupActions() { collection->addAction("monitor_seek_backward-one-frame", monitorSeekBackwardOneFrame); connect(monitorSeekBackwardOneFrame, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotRewindOneFrame())); + KAction* monitorSeekBackwardOneSecond = new KAction(KIcon("media-skip-backward"), i18n("Rewind 1 Second"), this); + monitorSeekBackwardOneSecond->setShortcut(Qt::SHIFT + Qt::Key_Left); + collection->addAction("monitor_seek_backward-one-second", monitorSeekBackwardOneSecond); + connect(monitorSeekBackwardOneSecond, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotRewindOneSecond())); + KAction* monitorSeekSnapBackward = new KAction(KIcon("media-seek-backward"), i18n("Go to Previous Snap Point"), this); monitorSeekSnapBackward->setShortcut(Qt::ALT + Qt::Key_Left); collection->addAction("monitor_seek_snap_backward", monitorSeekSnapBackward); @@ -762,6 +877,11 @@ void MainWindow::setupActions() { collection->addAction("monitor_seek_forward-one-frame", monitorSeekForwardOneFrame); connect(monitorSeekForwardOneFrame, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotForwardOneFrame())); + KAction* monitorSeekForwardOneSecond = new KAction(KIcon("media-skip-forward"), i18n("Forward 1 Second"), this); + monitorSeekForwardOneSecond->setShortcut(Qt::SHIFT + Qt::Key_Right); + collection->addAction("monitor_seek_forward-one-second", monitorSeekForwardOneSecond); + connect(monitorSeekForwardOneSecond, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotForwardOneSecond())); + KAction* monitorSeekSnapForward = new KAction(KIcon("media-seek-forward"), i18n("Go to Next Snap Point"), this); monitorSeekSnapForward->setShortcut(Qt::ALT + Qt::Key_Right); collection->addAction("monitor_seek_snap_forward", monitorSeekSnapForward); @@ -774,8 +894,16 @@ void MainWindow::setupActions() { 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"); + stickTransition->setData(QString("auto")); + stickTransition->setCheckable(true); + stickTransition->setEnabled(false); + stickTransition->setText(i18n("Automatic Transition")); + connect(stickTransition, SIGNAL(triggered(bool)), this, SLOT(slotAutoTransition())); + KAction* cutTimelineClip = new KAction(KIcon("edit-cut"), i18n("Cut Clip"), this); cutTimelineClip->setShortcut(Qt::SHIFT + Qt::Key_R); collection->addAction("cut_timeline_clip", cutTimelineClip); @@ -835,6 +963,7 @@ void MainWindow::setupActions() { 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); @@ -869,6 +998,65 @@ void MainWindow::setupActions() { connect(collection, SIGNAL(actionHovered(QAction*)), this, SLOT(slotDisplayActionMessage(QAction*))); + + + QAction *addClip = new KAction(KIcon("kdenlive-add-clip"), i18n("Add Clip"), this); + collection->addAction("add_clip", addClip); + connect(addClip , SIGNAL(triggered()), m_projectList, SLOT(slotAddClip())); + + QAction *addColorClip = new KAction(KIcon("kdenlive-add-color-clip"), i18n("Add Color Clip"), this); + collection->addAction("add_color_clip", addColorClip); + connect(addColorClip , SIGNAL(triggered()), m_projectList, SLOT(slotAddColorClip())); + + QAction *addSlideClip = new KAction(KIcon("kdenlive-add-slide-clip"), i18n("Add Slideshow Clip"), this); + collection->addAction("add_slide_clip", addSlideClip); + connect(addSlideClip , SIGNAL(triggered()), m_projectList, SLOT(slotAddSlideshowClip())); + + QAction *addTitleClip = new KAction(KIcon("kdenlive-add-text-clip"), i18n("Add Title Clip"), this); + collection->addAction("add_text_clip", addTitleClip); + connect(addTitleClip , SIGNAL(triggered()), m_projectList, SLOT(slotAddTitleClip())); + + QAction *addFolderButton = new KAction(KIcon("folder-new"), i18n("Create Folder"), this); + 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() ), //statusBar(), SLOT( clear() ) ); } @@ -914,6 +1102,14 @@ void MainWindow::readOptions() { m_projectList->setHeaderInfo(state); } +void MainWindow::slotRunWizard() { + Wizard *w = new Wizard(this); + if (w->exec() == QDialog::Accepted && w->isOk()) { + w->adjustSettings(); + } + delete w; +} + void MainWindow::newFile(bool showProjectSettings) { QString profileName; KUrl projectFolder; @@ -930,7 +1126,7 @@ void MainWindow::newFile(bool showProjectSettings) { projectTracks = w->tracks(); delete w; } - KdenliveDoc *doc = new KdenliveDoc(KUrl(), projectFolder, m_commandStack, profileName, projectTracks, this); + KdenliveDoc *doc = new KdenliveDoc(KUrl(), projectFolder, m_commandStack, profileName, projectTracks, m_projectMonitor->render, this); doc->m_autosave = new KAutoSaveFile(KUrl(), doc); TrackView *trackView = new TrackView(doc, this); m_timelineArea->addTab(trackView, KIcon("kdenlive"), doc->description()); @@ -985,7 +1181,15 @@ void MainWindow::closeCurrentDocument() { } bool MainWindow::saveFileAs(const QString &outputFileName) { - QDomDocument currentSceneList = m_projectMonitor->sceneList(); + QDomDocument currentSceneList; + if (KdenliveSettings::dropbframes()) { + KdenliveSettings::setDropbframes(false); + m_activeDocument->clipManager()->updatePreviewSettings(); + currentSceneList = m_projectMonitor->sceneList(); + KdenliveSettings::setDropbframes(true); + m_activeDocument->clipManager()->updatePreviewSettings(); + } else currentSceneList = m_projectMonitor->sceneList(); + if (m_activeDocument->saveSceneList(outputFileName, currentSceneList) == false) return false; @@ -1034,7 +1238,7 @@ void MainWindow::openFile() { 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); @@ -1043,6 +1247,7 @@ void MainWindow::openFile() { void MainWindow::openLastFile() { 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 ? if (urls.isEmpty()) newFile(false); else openFile(urls.last()); } @@ -1087,8 +1292,7 @@ void MainWindow::openFile(const KUrl &url) { } void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale) { - KdenliveDoc *doc; - doc = new KdenliveDoc(url, KUrl(), m_commandStack, QString(), QPoint(3, 2), this); + KdenliveDoc *doc = new KdenliveDoc(url, KUrl(), m_commandStack, QString(), QPoint(3, 2), m_projectMonitor->render, this); if (stale == NULL) { stale = new KAutoSaveFile(url, doc); doc->m_autosave = stale; @@ -1102,9 +1306,14 @@ void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale) { TrackView *trackView = new TrackView(doc, this); m_timelineArea->setCurrentIndex(m_timelineArea->addTab(trackView, KIcon("kdenlive"), doc->description())); m_timelineArea->setTabToolTip(m_timelineArea->currentIndex(), doc->url().path()); + trackView->setDuration(trackView->duration()); + trackView->projectView()->initCursorPos(m_projectMonitor->render->seekPosition().frames(doc->fps())); + if (m_timelineArea->count() > 1) m_timelineArea->setTabBarHidden(false); slotGotProgressInfo(QString(), -1); m_clipMonitor->refreshMonitor(true); + m_projectMonitor->adjustRulerSize(trackView->duration()); + m_projectMonitor->slotZoneMoved(trackView->inPoint(), trackView->outPoint()); } void MainWindow::recoverFiles(QList staleFiles) { @@ -1191,7 +1400,10 @@ void MainWindow::parseProfiles(const QString &mltPath) { void MainWindow::slotEditProfiles() { ProfilesDialog *w = new ProfilesDialog; - w->exec(); + if (w->exec() == QDialog::Accepted) { + KdenliveSettingsDialog* d = static_cast (KConfigDialog::exists("settings")); + if (d) d->checkProfile(); + } delete w; } @@ -1202,6 +1414,7 @@ void MainWindow::slotEditProjectSettings() { 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); @@ -1211,6 +1424,7 @@ void MainWindow::slotEditProjectSettings() { m_monitorManager->resetProfiles(m_activeDocument->timecode()); if (m_renderWidget) m_renderWidget->setProfile(m_activeDocument->mltProfile()); m_timelineArea->setTabText(m_timelineArea->currentIndex(), m_activeDocument->description()); + m_activeDocument->clipManager()->resetProducersList(m_projectMonitor->render->producersList()); // We need to desactivate & reactivate monitors to get a refresh m_monitorManager->switchMonitors(); @@ -1221,8 +1435,11 @@ void MainWindow::slotEditProjectSettings() { 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)), this, SLOT(slotDoRender(const QString&, const QString&, const QStringList &, const QStringList &, bool, bool, double, double))); + 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->setProfile(m_activeDocument->mltProfile()); m_renderWidget->setGuides(m_activeDocument->guidesXml(), m_activeDocument->projectDuration()); @@ -1234,7 +1451,8 @@ void MainWindow::slotRenderProject() { 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) { +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; @@ -1246,10 +1464,22 @@ void MainWindow::slotDoRender(const QString &dest, const QString &render, const KTemporaryFile temp; temp.setAutoRemove(false); temp.setSuffix(".westley"); - if (temp.open()) { - m_projectMonitor->saveSceneList(temp.fileName()); + if (!scriptExport.isEmpty() || temp.open()) { + if (KdenliveSettings::dropbframes()) { + KdenliveSettings::setDropbframes(false); + m_activeDocument->clipManager()->updatePreviewSettings(); + if (!scriptExport.isEmpty()) m_projectMonitor->saveSceneList(scriptExport + ".westley"); + else m_projectMonitor->saveSceneList(temp.fileName()); + KdenliveSettings::setDropbframes(true); + m_activeDocument->clipManager()->updatePreviewSettings(); + } 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) { args << "in=" + QString::number(GenTime(guideStart).frames(m_activeDocument->fps())) << "out=" + QString::number(GenTime(guideEnd).frames(m_activeDocument->fps())); @@ -1262,17 +1492,61 @@ void MainWindow::slotDoRender(const QString &dest, const QString &render, const } if (!QFile::exists(KdenliveSettings::rendererpath())) { KMessageBox::sorry(this, i18n("Cannot find the inigo program required for rendering (part of Mlt)")); + setRenderingProgress(dest, -3); return; } - args << KdenliveSettings::rendererpath() << m_activeDocument->profilePath() << render << videoPlayer << temp.fileName() << dest << avformat_args; + args << KdenliveSettings::rendererpath() << m_activeDocument->profilePath() << render << videoPlayer; + + for (int i = 0; i < avformat_args.count(); i++) { + if (avformat_args.at(i).startsWith("profile=")) { + if (avformat_args.at(i).section('=', 1) != m_activeDocument->profilePath()) resizeProfile = true; + break; + } + } + + if (resizeProfile) { + // The rendering profile is different from project profile, so use MLT's special producer_consumer + 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 %1 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 %1 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); + } } } +void MainWindow::setRenderingProgress(const QString &url, int progress) { + if (m_renderWidget) m_renderWidget->setRenderJob(url, progress); +} + +void MainWindow::setRenderingFinished(const QString &url, int status, const QString &error) { + if (m_renderWidget) m_renderWidget->setRenderStatus(url, status, error); +} + void MainWindow::slotUpdateMousePosition(int pos) { if (m_activeDocument) switch (m_timecodeFormat->currentIndex()) { @@ -1285,6 +1559,7 @@ void MainWindow::slotUpdateMousePosition(int pos) { } void MainWindow::slotUpdateDocumentState(bool modified) { + if (!m_activeDocument) return; setCaption(m_activeDocument->description(), modified); m_saveAction->setEnabled(modified); if (modified) { @@ -1310,7 +1585,6 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha kDebug() << "/////////////////// CONNECTING DOC TO PROJECT VIEW ////////////////"; if (m_activeDocument) { if (m_activeDocument == doc) return; - m_activeDocument->backupMltPlaylist(); if (m_activeTimeline) { disconnect(m_projectMonitor, SIGNAL(renderPosition(int)), m_activeTimeline, SLOT(moveCursorPos(int))); disconnect(m_projectMonitor, SIGNAL(zoneUpdated(QPoint)), m_activeTimeline, SLOT(slotSetZone(QPoint))); @@ -1320,7 +1594,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha disconnect(m_activeDocument, SIGNAL(guidesUpdated()), this, SLOT(slotGuidesUpdated())); disconnect(m_activeDocument, SIGNAL(addProjectClip(DocClipBase *, bool)), m_projectList, SLOT(slotAddClip(DocClipBase *, bool))); - disconnect(m_activeDocument, SIGNAL(addProjectFolder(const QString, const QString &, bool, bool)), m_projectList, SLOT(slotAddFolder(const QString, const QString &, bool, bool))); + disconnect(m_activeDocument, SIGNAL(resetProjectList()), m_projectList, SLOT(slotResetProjectList())); disconnect(m_activeDocument, SIGNAL(signalDeleteProjectClip(const QString &)), m_projectList, SLOT(slotDeleteClip(const QString &))); disconnect(m_activeDocument, SIGNAL(updateClipDisplay(const QString &)), m_projectList, SLOT(slotUpdateClip(const QString &))); disconnect(m_activeDocument, SIGNAL(selectLastAddedClip(const QString &)), m_projectList, SLOT(slotSelectClip(const QString &))); @@ -1328,7 +1602,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha disconnect(m_activeTimeline->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), effectStack, SLOT(slotClipItemSelected(ClipItem*, int))); disconnect(m_activeTimeline->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), this, SLOT(slotActivateEffectStackView())); disconnect(m_activeTimeline, SIGNAL(transitionItemSelected(Transition*, bool)), transitionConfig, SLOT(slotTransitionItemSelected(Transition*, bool))); - disconnect(m_activeTimeline, SIGNAL(transitionItemSelected(Transition*, bool)), this, SLOT(slotActivateTransitionView())); + disconnect(m_activeTimeline, SIGNAL(transitionItemSelected(Transition*, bool)), this, SLOT(slotActivateTransitionView(Transition *))); disconnect(m_zoomSlider, SIGNAL(valueChanged(int)), m_activeTimeline, SLOT(slotChangeZoom(int))); disconnect(m_activeTimeline->projectView(), SIGNAL(displayMessage(const QString&, MessageType)), m_messageLabel, SLOT(setMessage(const QString&, MessageType))); disconnect(m_activeTimeline->projectView(), SIGNAL(showClipFrame(DocClipBase *, const int)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *, const int))); @@ -1344,14 +1618,13 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha 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)), m_projectMonitor, SLOT(slotZoneMoved(int, int))); + disconnect(m_activeTimeline, SIGNAL(zoneMoved(int, int)), this, SLOT(slotZoneMoved(int, int))); disconnect(m_projectList, SIGNAL(loadingIsOver()), m_activeTimeline->projectView(), SLOT(slotUpdateAllThumbs())); effectStack->clear(); } - m_activeDocument->setRenderer(NULL); + //m_activeDocument->setRenderer(NULL); disconnect(m_projectList, SIGNAL(clipSelected(DocClipBase *)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *))); m_clipMonitor->stop(); } @@ -1363,6 +1636,9 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha effectStack->updateProjectFormat(doc->mltProfile(), doc->timecode()); connect(m_projectList, SIGNAL(clipSelected(DocClipBase *)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *))); connect(m_projectList, SIGNAL(projectModified()), doc, SLOT(setModified())); + connect(m_projectList, SIGNAL(clipNameChanged(const QString, const QString)), trackView->projectView(), SLOT(clipNameChanged(const QString, const QString))); + + connect(trackView, SIGNAL(cursorMoved()), m_projectMonitor, SLOT(activateMonitor())); connect(trackView, SIGNAL(insertTrack(int)), this, SLOT(slotInsertTrack(int))); connect(trackView, SIGNAL(deleteTrack(int)), this, SLOT(slotDeleteTrack(int))); @@ -1372,7 +1648,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha connect(m_projectMonitor, SIGNAL(zoneUpdated(QPoint)), trackView, SLOT(slotSetZone(QPoint))); connect(m_projectMonitor, SIGNAL(durationChanged(int)), trackView, SLOT(setDuration(int))); connect(doc, SIGNAL(addProjectClip(DocClipBase *, bool)), m_projectList, SLOT(slotAddClip(DocClipBase *, bool))); - connect(doc, SIGNAL(addProjectFolder(const QString, const QString &, bool, bool)), m_projectList, SLOT(slotAddFolder(const QString, const QString &, bool, bool))); + connect(doc, SIGNAL(resetProjectList()), m_projectList, SLOT(slotResetProjectList())); connect(doc, SIGNAL(signalDeleteProjectClip(const QString &)), m_projectList, SLOT(slotDeleteClip(const QString &))); connect(doc, SIGNAL(updateClipDisplay(const QString &)), m_projectList, SLOT(slotUpdateClip(const QString &))); connect(doc, SIGNAL(selectLastAddedClip(const QString &)), m_projectList, SLOT(slotSelectClip(const QString &))); @@ -1385,7 +1661,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha connect(trackView->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), effectStack, SLOT(slotClipItemSelected(ClipItem*, int))); connect(trackView->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), this, SLOT(slotActivateEffectStackView())); connect(trackView, SIGNAL(transitionItemSelected(Transition*, bool)), transitionConfig, SLOT(slotTransitionItemSelected(Transition*, bool))); - connect(trackView, SIGNAL(transitionItemSelected(Transition*, bool)), this, SLOT(slotActivateTransitionView())); + connect(trackView, SIGNAL(transitionItemSelected(Transition*, bool)), this, SLOT(slotActivateTransitionView(Transition *))); m_zoomSlider->setValue(doc->zoom()); connect(m_zoomSlider, SIGNAL(valueChanged(int)), trackView, SLOT(slotChangeZoom(int))); connect(trackView->projectView(), SIGNAL(zoomIn()), this, SLOT(slotZoomIn())); @@ -1401,18 +1677,20 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha 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())); connect(trackView->projectView(), SIGNAL(activateDocumentMonitor()), m_projectMonitor, SLOT(activateMonitor())); - connect(trackView, SIGNAL(zoneMoved(int, int)), m_projectMonitor, SLOT(slotZoneMoved(int, int))); + connect(trackView, SIGNAL(zoneMoved(int, int)), this, SLOT(slotZoneMoved(int, int))); connect(m_projectList, SIGNAL(loadingIsOver()), trackView->projectView(), SLOT(slotUpdateAllThumbs())); trackView->projectView()->setContextMenu(m_timelineContextMenu, m_timelineContextClipMenu, m_timelineContextTransitionMenu); m_activeTimeline = trackView; - if (m_renderWidget) m_renderWidget->setProfile(doc->mltProfile()); - doc->setRenderer(m_projectMonitor->render); + 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()); m_projectList->updateAllClips(); @@ -1425,6 +1703,15 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha setCaption(doc->description(), doc->isModified()); m_saveAction->setEnabled(doc->isModified()); m_activeDocument = doc; + if (KdenliveSettings::dropbframes()) slotUpdatePreviewSettings(); + + // set tool to select tool + m_buttonSelectTool->setChecked(true); +} + +void MainWindow::slotZoneMoved(int start, int end) { + m_activeDocument->setZone(start, end); + m_projectMonitor->slotZoneMoved(start, end); } void MainWindow::slotGuidesUpdated() { @@ -1438,7 +1725,6 @@ void MainWindow::slotPreferences(int page, int option) { if (KConfigDialog::showDialog("settings")) { KdenliveSettingsDialog* d = static_cast (KConfigDialog::exists("settings")); if (page != -1) d->showPage(page, option); - d->checkProfile(); return; } @@ -1447,10 +1733,19 @@ void MainWindow::slotPreferences(int page, int option) { KdenliveSettingsDialog* dialog = new KdenliveSettingsDialog(this); connect(dialog, SIGNAL(settingsChanged(const QString&)), this, SLOT(updateConfiguration())); connect(dialog, SIGNAL(doResetProfile()), m_monitorManager, SLOT(slotResetProfiles())); + connect(dialog, SIGNAL(updatePreviewSettings()), this, SLOT(slotUpdatePreviewSettings())); + //connect(dialog, SIGNAL(updatePreviewSettings()), this, SLOT(slotUpdatePreviewSettings())); dialog->show(); if (page != -1) dialog->showPage(page, option); } +void MainWindow::slotUpdatePreviewSettings() { + if (m_activeDocument) { + m_clipMonitor->slotSetXml(NULL, 0); + m_activeDocument->updatePreviewSettings(); + } +} + void MainWindow::updateConfiguration() { //TODO: we should apply settings to all projects, not only the current one if (m_activeTimeline) { @@ -1467,10 +1762,11 @@ void MainWindow::updateConfiguration() { } + void MainWindow::slotSwitchVideoThumbs() { KdenliveSettings::setVideothumbnails(!KdenliveSettings::videothumbnails()); if (m_activeTimeline) { - m_activeTimeline->refresh(); + m_activeTimeline->projectView()->slotUpdateAllThumbs(); } m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails()); } @@ -1757,7 +2053,7 @@ void MainWindow::slotShowClipProperties(DocClipBase *clip) { doc.setContent(clip->getProperty("xmldata")); dia_ui->setXml(doc); if (dia_ui->exec() == QDialog::Accepted) { - QPixmap pix = dia_ui->renderedPixmap(); + QImage pix = dia_ui->renderedPixmap(); pix.save(path); //slotAddClipFile(KUrl("/tmp/kdenlivetitle.png"), QString(), -1); //m_clipManager->slotEditTextClipFile(id, dia_ui->xml().toString()); @@ -1797,8 +2093,8 @@ void MainWindow::slotActivateEffectStackView() { effectStack->raiseWindow(effectStackDock); } -void MainWindow::slotActivateTransitionView() { - transitionConfig->raiseWindow(transitionConfigDock); +void MainWindow::slotActivateTransitionView(Transition *t) { + if (t) transitionConfig->raiseWindow(transitionConfigDock); } void MainWindow::slotSnapRewind() { @@ -1989,5 +2285,77 @@ void MainWindow::slotSetOutPoint() { } else m_activeTimeline->projectView()->setOutPoint(); } +void MainWindow::slotGetNewLumaStuff() { + //KNS::Entry::List download(); + KNS::Entry::List entries = KNS::Engine::download(); + int numberInstalled = 0; + // list of changed entries + kDebug() << "// PARSING KNS"; + 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; + } + } + } + qDeleteAll(entries); + 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 (KConfigDialog::exists("settings")); + if (d) d->checkProfile(); + } + } +} + +void MainWindow::slotAutoTransition() { + m_activeTimeline->projectView()->autoTransition(); +} + +void MainWindow::slotDvdWizard(const QString &url, const QString &profile) { + DvdWizard *w = new DvdWizard(url, profile, this); + w->exec(); +} + #include "mainwindow.moc"