X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmainwindow.cpp;h=7deb3717a910db1040e91caa250d6d9ab6be00af;hb=b72003117bc6322414a01a4c8148575cfa089a9f;hp=a8fb4bb3d3859aa97998f27d71bc967a1422dd86;hpb=d765a3894844444da2fc9902b55e16d433a72f4a;p=kdenlive

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index a8fb4bb3..7deb3717 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -52,6 +52,10 @@
 #include "kdenlive-config.h"
 #include "cliptranscode.h"
 #include "ui_templateclip_ui.h"
+#include "vectorscope.h"
+#include "waveform.h"
+#include "rgbparade.h"
+#include "histogram.h"
 
 #include <KApplication>
 #include <KAction>
@@ -140,6 +144,8 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent
     m_timelineArea = new KTabWidget(this);
     m_timelineArea->setTabReorderingEnabled(true);
     m_timelineArea->setTabBarHidden(true);
+    m_timelineArea->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
+    m_timelineArea->setMinimumHeight(200);
 
     QToolButton *closeTabButton = new QToolButton;
     connect(closeTabButton, SIGNAL(clicked()), this, SLOT(closeCurrentDocument()));
@@ -158,49 +164,23 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent
 
     m_monitorManager = new MonitorManager();
 
-    m_projectListDock = new QDockWidget(i18n("Project Tree"), this);
-    m_projectListDock->setObjectName("project_tree");
-    m_projectList = new ProjectList(this);
-    m_projectListDock->setWidget(m_projectList);
-    addDockWidget(Qt::TopDockWidgetArea, m_projectListDock);
-
     m_shortcutRemoveFocus = new QShortcut(QKeySequence("Esc"), this);
     connect(m_shortcutRemoveFocus, SIGNAL(activated()), this, SLOT(slotRemoveFocus()));
 
-    m_effectListDock = new QDockWidget(i18n("Effect List"), this);
-    m_effectListDock->setObjectName("effect_list");
-    m_effectList = new EffectsListView();
-
-    //m_effectList = new KListWidget(this);
-    m_effectListDock->setWidget(m_effectList);
-    addDockWidget(Qt::TopDockWidgetArea, m_effectListDock);
 
-    m_effectStackDock = new QDockWidget(i18n("Effect Stack"), this);
-    m_effectStackDock->setObjectName("effect_stack");
-    m_effectStack = new EffectStackView(this);
-    m_effectStackDock->setWidget(m_effectStack);
-    addDockWidget(Qt::TopDockWidgetArea, m_effectStackDock);
-
-    m_transitionConfigDock = new QDockWidget(i18n("Transition"), this);
-    m_transitionConfigDock->setObjectName("transition");
-    m_transitionConfig = new TransitionSettings(this);
-    m_transitionConfigDock->setWidget(m_transitionConfig);
-    addDockWidget(Qt::TopDockWidgetArea, m_transitionConfigDock);
-
-    KdenliveSettings::setCurrent_profile(KdenliveSettings::default_profile());
-    m_fileOpenRecent = KStandardAction::openRecent(this, SLOT(openFile(const KUrl &)), actionCollection());
-    readOptions();
-    m_fileRevert = KStandardAction::revert(this, SLOT(slotRevert()), actionCollection());
-    m_fileRevert->setEnabled(false);
+    /// Add Widgets ///
 
-    //slotDetectAudioDriver();
+    m_projectListDock = new QDockWidget(i18n("Project Tree"), this);
+    m_projectListDock->setObjectName("project_tree");
+    m_projectList = new ProjectList(this);
+    m_projectListDock->setWidget(m_projectList);
+    addDockWidget(Qt::TopDockWidgetArea, m_projectListDock);
 
     m_clipMonitorDock = new QDockWidget(i18n("Clip Monitor"), this);
     m_clipMonitorDock->setObjectName("clip_monitor");
     m_clipMonitor = new Monitor("clip", m_monitorManager, QString(), this);
     m_clipMonitorDock->setWidget(m_clipMonitor);
     addDockWidget(Qt::TopDockWidgetArea, m_clipMonitorDock);
-    //m_clipMonitor->stop();
 
     m_projectMonitorDock = new QDockWidget(i18n("Project Monitor"), this);
     m_projectMonitorDock->setObjectName("project_monitor");
@@ -214,11 +194,69 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent
     m_recMonitor = new RecMonitor("record", this);
     m_recMonitorDock->setWidget(m_recMonitor);
     addDockWidget(Qt::TopDockWidgetArea, m_recMonitorDock);
-
     connect(m_recMonitor, SIGNAL(addProjectClip(KUrl)), this, SLOT(slotAddProjectClip(KUrl)));
     connect(m_recMonitor, SIGNAL(showConfigDialog(int, int)), this, SLOT(slotPreferences(int, int)));
 #endif
 
+    m_effectStackDock = new QDockWidget(i18n("Effect Stack"), this);
+    m_effectStackDock->setObjectName("effect_stack");
+    m_effectStack = new EffectStackView(m_projectMonitor, this);
+    m_effectStackDock->setWidget(m_effectStack);
+    addDockWidget(Qt::TopDockWidgetArea, m_effectStackDock);
+
+    m_transitionConfigDock = new QDockWidget(i18n("Transition"), this);
+    m_transitionConfigDock->setObjectName("transition");
+    m_transitionConfig = new TransitionSettings(m_projectMonitor, this);
+    m_transitionConfigDock->setWidget(m_transitionConfig);
+    addDockWidget(Qt::TopDockWidgetArea, m_transitionConfigDock);
+
+    m_effectListDock = new QDockWidget(i18n("Effect List"), this);
+    m_effectListDock->setObjectName("effect_list");
+    m_effectList = new EffectsListView();
+    m_effectListDock->setWidget(m_effectList);
+    addDockWidget(Qt::TopDockWidgetArea, m_effectListDock);
+
+    m_vectorscope = new Vectorscope(m_projectMonitor, m_clipMonitor, this);
+    m_vectorscopeDock = new QDockWidget(i18n("Vectorscope"), this);
+    m_vectorscopeDock->setObjectName(m_vectorscope->widgetName());
+    m_vectorscopeDock->setWidget(m_vectorscope);
+    addDockWidget(Qt::TopDockWidgetArea, m_vectorscopeDock);
+    connect(m_vectorscopeDock, SIGNAL(visibilityChanged(bool)), m_vectorscope, SLOT(forceUpdate(bool)));
+    connect(m_vectorscopeDock, SIGNAL(visibilityChanged(bool)), this, SLOT(slotUpdateScopeFrameRequest()));
+    connect(m_vectorscope, SIGNAL(requestAutoRefresh(bool)), this, SLOT(slotUpdateScopeFrameRequest()));
+    m_scopesList.append(m_vectorscopeDock);
+
+    m_waveform = new Waveform(m_projectMonitor, m_clipMonitor, this);
+    m_waveformDock = new QDockWidget(i18n("Waveform"), this);
+    m_waveformDock->setObjectName(m_waveform->widgetName());
+    m_waveformDock->setWidget(m_waveform);
+    addDockWidget(Qt::TopDockWidgetArea, m_waveformDock);
+    connect(m_waveformDock, SIGNAL(visibilityChanged(bool)), m_waveform, SLOT(forceUpdate(bool)));
+    connect(m_waveformDock, SIGNAL(visibilityChanged(bool)), this, SLOT(slotUpdateScopeFrameRequest()));
+    connect(m_waveform, SIGNAL(requestAutoRefresh(bool)), this, SLOT(slotUpdateScopeFrameRequest()));
+    m_scopesList.append(m_waveformDock);
+
+    m_RGBParade = new RGBParade(m_projectMonitor, m_clipMonitor, this);
+    m_RGBParadeDock = new QDockWidget(i18n("RGB Parade"), this);
+    m_RGBParadeDock->setObjectName(m_RGBParade->widgetName());
+    m_RGBParadeDock->setWidget(m_RGBParade);
+    addDockWidget(Qt::TopDockWidgetArea, m_RGBParadeDock);
+    connect(m_RGBParadeDock, SIGNAL(visibilityChanged(bool)), m_RGBParade, SLOT(forceUpdate(bool)));
+    connect(m_RGBParadeDock, SIGNAL(visibilityChanged(bool)), this, SLOT(slotUpdateScopeFrameRequest()));
+    connect(m_RGBParade, SIGNAL(requestAutoRefresh(bool)), this, SLOT(slotUpdateScopeFrameRequest()));
+    m_scopesList.append(m_RGBParadeDock);
+
+    m_histogram = new Histogram(m_projectMonitor, m_clipMonitor, this);
+    m_histogramDock = new QDockWidget(i18n("Histogram"), this);
+    m_histogramDock->setObjectName(m_histogram->widgetName());
+    m_histogramDock->setWidget(m_histogram);
+    addDockWidget(Qt::TopDockWidgetArea, m_histogramDock);
+    connect(m_histogramDock, SIGNAL(visibilityChanged(bool)), m_histogram, SLOT(forceUpdate(bool)));
+    connect(m_histogramDock, SIGNAL(visibilityChanged(bool)), this, SLOT(slotUpdateScopeFrameRequest()));
+    connect(m_histogram, SIGNAL(requestAutoRefresh(bool)), this, SLOT(slotUpdateScopeFrameRequest()));
+    m_scopesList.append(m_histogramDock);
+
+
     m_undoViewDock = new QDockWidget(i18n("Undo History"), this);
     m_undoViewDock->setObjectName("undo_history");
     m_undoView = new QUndoView(this);
@@ -234,20 +272,39 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent
     //overviewDock->setWidget(m_overView);
     //addDockWidget(Qt::TopDockWidgetArea, overviewDock);
 
+
     setupActions();
-    //tabifyDockWidget(projectListDock, effectListDock);
+
+    /// Tabify Widgets ///
     tabifyDockWidget(m_projectListDock, m_effectStackDock);
     tabifyDockWidget(m_projectListDock, m_transitionConfigDock);
-    //tabifyDockWidget(projectListDock, undoViewDock);
 
 
     tabifyDockWidget(m_clipMonitorDock, m_projectMonitorDock);
 #ifndef Q_WS_MAC
     tabifyDockWidget(m_clipMonitorDock, m_recMonitorDock);
 #endif
+
+    tabifyDockWidget(m_vectorscopeDock, m_waveformDock);
+    tabifyDockWidget(m_vectorscopeDock, m_RGBParadeDock);
+    tabifyDockWidget(m_vectorscopeDock, m_histogramDock);
+    tabifyDockWidget(m_vectorscopeDock, m_undoViewDock);
+    tabifyDockWidget(m_vectorscopeDock, m_effectListDock);
+
+
     setCentralWidget(m_timelineArea);
+
+
+    KdenliveSettings::setCurrent_profile(KdenliveSettings::default_profile());
+    m_fileOpenRecent = KStandardAction::openRecent(this, SLOT(openFile(const KUrl &)), actionCollection());
+    readOptions();
+    m_fileRevert = KStandardAction::revert(this, SLOT(slotRevert()), actionCollection());
+    m_fileRevert->setEnabled(false);
+
+
     setupGUI();
 
+
     // Find QDockWidget tab bars and show / hide widget title bars on right click
     QList <QTabBar *> tabs = findChildren<QTabBar *>();
     for (int i = 0; i < tabs.count(); i++) {
@@ -360,15 +417,19 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent
     //m_timelineContextClipMenu->addAction(actionCollection()->action("clip_to_project_tree"));
     m_timelineContextClipMenu->addAction(actionCollection()->action("edit_item_duration"));
     m_timelineContextClipMenu->addAction(actionCollection()->action("delete_item"));
+    m_timelineContextClipMenu->addSeparator();
     m_timelineContextClipMenu->addAction(actionCollection()->action("group_clip"));
     m_timelineContextClipMenu->addAction(actionCollection()->action("ungroup_clip"));
+    m_timelineContextClipMenu->addAction(actionCollection()->action("split_audio"));
+    m_timelineContextClipMenu->addSeparator();
     m_timelineContextClipMenu->addAction(actionCollection()->action("cut_timeline_clip"));
     m_timelineContextClipMenu->addAction(actionCollection()->action(KStandardAction::name(KStandardAction::Copy)));
     m_timelineContextClipMenu->addAction(actionCollection()->action("paste_effects"));
-    m_timelineContextClipMenu->addAction(actionCollection()->action("split_audio"));
+    m_timelineContextClipMenu->addSeparator();
 
     QMenu *markersMenu = (QMenu*)(factory()->container("marker_menu", this));
     m_timelineContextClipMenu->addMenu(markersMenu);
+    m_timelineContextClipMenu->addSeparator();
     m_timelineContextClipMenu->addMenu(m_transitionsMenu);
     m_timelineContextClipMenu->addMenu(m_videoEffectsMenu);
     m_timelineContextClipMenu->addMenu(m_audioEffectsMenu);
@@ -385,6 +446,10 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent
     connect(m_clipMonitorDock, SIGNAL(visibilityChanged(bool)), m_clipMonitor, SLOT(refreshMonitor(bool)));
     //connect(m_monitorManager, SIGNAL(connectMonitors()), this, SLOT(slotConnectMonitors()));
     connect(m_monitorManager, SIGNAL(raiseClipMonitor(bool)), this, SLOT(slotRaiseMonitor(bool)));
+    connect(m_monitorManager, SIGNAL(raiseClipMonitor(bool)), m_vectorscope, SLOT(slotActiveMonitorChanged(bool)));
+    connect(m_monitorManager, SIGNAL(raiseClipMonitor(bool)), m_waveform, SLOT(slotActiveMonitorChanged(bool)));
+    connect(m_monitorManager, SIGNAL(raiseClipMonitor(bool)), m_RGBParade, SLOT(slotActiveMonitorChanged(bool)));
+    connect(m_monitorManager, SIGNAL(raiseClipMonitor(bool)), m_histogram, SLOT(slotActiveMonitorChanged(bool)));
     connect(m_effectList, SIGNAL(addEffect(const QDomElement)), this, SLOT(slotAddEffect(const QDomElement)));
     connect(m_effectList, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects()));
 
@@ -413,21 +478,32 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent
     m_projectListDock->raise();
 }
 
-void MainWindow::queryQuit()
+MainWindow::~MainWindow()
 {
-    if (queryClose()) {
-        if (m_projectMonitor) m_projectMonitor->stop();
-        if (m_clipMonitor) m_clipMonitor->stop();
-        delete m_effectStack;
-        delete m_activeTimeline;
+    m_effectStack->slotClipItemSelected(NULL, 0);
+    m_transitionConfig->slotTransitionItemSelected(NULL, 0, QPoint(), false);
+
+    if (m_projectMonitor) m_projectMonitor->stop();
+    if (m_clipMonitor) m_clipMonitor->stop();
+
+    if (m_activeTimeline) delete m_activeTimeline;
+
+    delete m_effectStack;
+    delete m_transitionConfig;
+
+    if (m_activeDocument) delete m_activeDocument;
 #ifndef Q_WS_MAC
-        // This sometimes causes crash on exit on OS X for some reason.
-        delete m_projectMonitor;
-        delete m_clipMonitor;
+    // This sometimes causes crash on exit on OS X for some reason.
+    delete m_projectMonitor;
+    delete m_clipMonitor;
 #endif
-        delete m_activeDocument;
-        delete m_shortcutRemoveFocus;
-        Mlt::Factory::close();
+    delete m_shortcutRemoveFocus;
+    Mlt::Factory::close();
+}
+
+void MainWindow::queryQuit()
+{
+    if (queryClose()) {
         kapp->quit();
     }
 }
@@ -454,10 +530,17 @@ bool MainWindow::queryClose()
     saveOptions();
     if (m_monitorManager) m_monitorManager->stopActiveMonitor();
     // warn the user to save if document is modified and we have clips in our project list
-    if (m_activeDocument && m_activeDocument->isModified()
-            && ((m_projectList->documentClipList().isEmpty() && !m_activeDocument->url().isEmpty())
-                || !m_projectList->documentClipList().isEmpty())) {
-        switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document?"))) {
+    if (m_activeDocument && m_activeDocument->isModified() &&
+            ((m_projectList->documentClipList().isEmpty() && !m_activeDocument->url().isEmpty()) ||
+             !m_projectList->documentClipList().isEmpty())) {
+        raise();
+        activateWindow();
+        QString message;
+        if (m_activeDocument->url().fileName().isEmpty())
+            message = i18n("Save changes to document?");
+        else
+            message = i18n("The project <b>\"%1\"</b> has been changed.\nDo you want to save your changes?").arg(m_activeDocument->url().fileName());
+        switch (KMessageBox::warningYesNoCancel(this, message)) {
         case KMessageBox::Yes :
             // save document here. If saving fails, return false;
             return saveFile();
@@ -472,29 +555,36 @@ bool MainWindow::queryClose()
     return true;
 }
 
-
 void MainWindow::loadPlugins()
 {
-    foreach(QObject *plugin, QPluginLoader::staticInstances())
-    populateMenus(plugin);
+    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;
+        kDebug() << "Parsing plugin folder: " << folder;
         QDir pluginsDir(folder);
-        foreach(const 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();
+        foreach(const QString &fileName,
+                pluginsDir.entryList(filters, QDir::Files)) {
+            /*
+             * Avoid loading the same plugin twice when there is more than one
+             * installation.
+             */
+            if (!m_pluginFileNames.contains(fileName)) {
+                kDebug() << "Found plugin: " << 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)
@@ -685,6 +775,8 @@ void MainWindow::slotConnectMonitors()
     connect(m_clipMonitor, SIGNAL(adjustMonitorSize()), this, SLOT(slotAdjustClipMonitor()));
     connect(m_projectMonitor, SIGNAL(adjustMonitorSize()), this, SLOT(slotAdjustProjectMonitor()));
 
+    connect(m_projectMonitor, SIGNAL(requestFrameForAnalysis(bool)), this, SLOT(slotMonitorRequestRenderFrame(bool)));
+
     connect(m_clipMonitor, SIGNAL(saveZone(Render *, QPoint)), this, SLOT(slotSaveZone(Render *, QPoint)));
     connect(m_projectMonitor, SIGNAL(saveZone(Render *, QPoint)), this, SLOT(slotSaveZone(Render *, QPoint)));
 }
@@ -1549,7 +1641,12 @@ void MainWindow::closeCurrentDocument(bool saveChanges)
     TrackView *tabToClose = (TrackView *) w;
     KdenliveDoc *docToClose = tabToClose->document();
     if (docToClose && docToClose->isModified() && saveChanges) {
-        switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document?"))) {
+        QString message;
+        if (m_activeDocument->url().fileName().isEmpty())
+            message = i18n("Save changes to document?");
+        else
+            message = i18n("The project <b>\"%1\"</b> has been changed.\nDo you want to save your changes?").arg(m_activeDocument->url().fileName());
+        switch (KMessageBox::warningYesNoCancel(this, message)) {
         case KMessageBox::Yes :
             // save document here. If saving fails, return false;
             if (saveFile() == false) return;
@@ -1572,11 +1669,15 @@ void MainWindow::closeCurrentDocument(bool saveChanges)
         m_activeDocument = NULL;
         m_effectStack->clear();
         m_transitionConfig->slotTransitionItemSelected(NULL, 0, QPoint(), false);
-    } else delete docToClose;
+    } else {
+        delete docToClose;
+    }
     if (w == m_activeTimeline) {
         delete m_activeTimeline;
         m_activeTimeline = NULL;
-    } else delete w;
+    } else {
+        delete w;
+    }
 }
 
 bool MainWindow::saveFileAs(const QString &outputFileName)
@@ -1611,11 +1712,13 @@ bool MainWindow::saveFileAs(const QString &outputFileName)
 
 bool MainWindow::saveFileAs()
 {
-    QString outputFile = KFileDialog::getSaveFileName(KUrl(), getMimeType());
-    if (outputFile.isEmpty()) return false;
+    QString outputFile = KFileDialog::getSaveFileName(m_activeDocument->projectFolder(), getMimeType());
+    if (outputFile.isEmpty()) {
+        return false;
+    }
     if (QFile::exists(outputFile)) {
         // Show the file dialog again if the user does not want to overwrite the file
-        if (KMessageBox::questionYesNo(this, i18n("File already exists.\nDo you want to overwrite it?")) == KMessageBox::No)
+        if (KMessageBox::questionYesNo(this, i18n("File %1 already exists.\nDo you want to overwrite it?", outputFile)) == KMessageBox::No)
             return saveFileAs();
     }
     return saveFileAs(outputFile);
@@ -1759,9 +1862,8 @@ void MainWindow::parseProfiles(const QString &mltPath)
         KdenliveSettings::setRendererpath(mltPath + "/bin/melt");
     }
 
-    if (KdenliveSettings::mltpath().isEmpty()) {
+    if (KdenliveSettings::mltpath().isEmpty())
         KdenliveSettings::setMltpath(QString(MLT_PREFIX) + QString("/share/mlt/profiles/"));
-    }
 
     if (KdenliveSettings::rendererpath().isEmpty() || KdenliveSettings::rendererpath().endsWith("inigo")) {
         QString meltPath = QString(MLT_PREFIX) + QString("/bin/melt");
@@ -1906,7 +2008,7 @@ void MainWindow::slotRenderProject()
         QString projectfolder = m_activeDocument ? m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash) : KdenliveSettings::defaultprojectfolder();
         m_renderWidget = new RenderWidget(projectfolder, this);
         connect(m_renderWidget, SIGNAL(shutdown()), this, SLOT(slotShutdown()));
-        connect(m_renderWidget, SIGNAL(selectedRenderProfile(const QString &, const QString &, const QString &, const QString&)), this, SLOT(slotSetDocumentRenderProfile(const QString &, const QString &, const QString &, const QString&)));
+        connect(m_renderWidget, SIGNAL(selectedRenderProfile(QMap <QString, QString>)), this, SLOT(slotSetDocumentRenderProfile(QMap <QString, QString>)));
         connect(m_renderWidget, SIGNAL(prepareRenderingData(bool, bool, const QString&)), this, SLOT(slotPrepareRendering(bool, 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 &)));
@@ -1914,31 +2016,36 @@ void MainWindow::slotRenderProject()
             m_renderWidget->setProfile(m_activeDocument->mltProfile());
             m_renderWidget->setGuides(m_activeDocument->guidesXml(), m_activeDocument->projectDuration());
             m_renderWidget->setDocumentPath(m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash));
-            m_renderWidget->setRenderProfile(m_activeDocument->getDocumentProperty("renderdestination"), m_activeDocument->getDocumentProperty("rendercategory"), m_activeDocument->getDocumentProperty("renderprofile"), m_activeDocument->getDocumentProperty("renderurl"));
+            m_renderWidget->setRenderProfile(m_activeDocument->getRenderProperties());
         }
     }
     slotCheckRenderStatus();
-    /*TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget();
-    if (currentTab) m_renderWidget->setTimeline(currentTab);
-    m_renderWidget->setDocument(m_activeDocument);*/
     m_renderWidget->show();
     m_renderWidget->showNormal();
+
+    // What are the following lines supposed to do?
+    //m_activeTimeline->tracksNumber();
+    //m_renderWidget->enableAudio(false);
+    //m_renderWidget->export_audio;
 }
 
 void MainWindow::slotCheckRenderStatus()
 {
     // Make sure there are no missing clips
-    if (m_renderWidget) m_renderWidget->missingClips(m_projectList->hasMissingClips());
+    if (m_renderWidget)
+        m_renderWidget->missingClips(m_projectList->hasMissingClips());
 }
 
 void MainWindow::setRenderingProgress(const QString &url, int progress)
 {
-    if (m_renderWidget) m_renderWidget->setRenderJob(url, 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);
+    if (m_renderWidget)
+        m_renderWidget->setRenderStatus(url, status, error);
 }
 
 void MainWindow::slotCleanProject()
@@ -1993,6 +2100,8 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc)   //cha
             disconnect(m_projectMonitor, SIGNAL(renderPosition(int)), m_activeTimeline, SLOT(moveCursorPos(int)));
             disconnect(m_projectMonitor, SIGNAL(zoneUpdated(QPoint)), m_activeTimeline, SLOT(slotSetZone(QPoint)));
             disconnect(m_projectMonitor, SIGNAL(durationChanged(int)), m_activeTimeline, SLOT(setDuration(int)));
+            disconnect(m_projectMonitor, SIGNAL(zoneUpdated(QPoint)), m_activeDocument, SLOT(setModified()));
+            disconnect(m_clipMonitor, SIGNAL(zoneUpdated(QPoint)), m_activeDocument, SLOT(setModified()));
             disconnect(m_projectList, SIGNAL(projectModified()), m_activeDocument, SLOT(setModified()));
             disconnect(m_projectMonitor->render, SIGNAL(refreshDocumentProducers()), m_activeDocument, SLOT(checkProjectClips()));
 
@@ -2015,12 +2124,13 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc)   //cha
             disconnect(m_activeTimeline, SIGNAL(deleteTrack(int)), this, SLOT(slotDeleteTrack(int)));
             disconnect(m_activeTimeline, SIGNAL(configTrack(int)), this, SLOT(slotConfigTrack(int)));
             disconnect(m_activeDocument, SIGNAL(docModified(bool)), this, SLOT(slotUpdateDocumentState(bool)));
-            disconnect(m_effectStack, SIGNAL(updateClipEffect(ClipItem*, QDomElement, QDomElement, int)), m_activeTimeline->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, QDomElement, QDomElement, int)));
-            disconnect(m_effectStack, SIGNAL(removeEffect(ClipItem*, QDomElement)), m_activeTimeline->projectView(), SLOT(slotDeleteEffect(ClipItem*, QDomElement)));
-            disconnect(m_effectStack, SIGNAL(changeEffectState(ClipItem*, int, bool)), m_activeTimeline->projectView(), SLOT(slotChangeEffectState(ClipItem*, int, bool)));
-            disconnect(m_effectStack, SIGNAL(changeEffectPosition(ClipItem*, int, int)), m_activeTimeline->projectView(), SLOT(slotChangeEffectPosition(ClipItem*, int, int)));
+            disconnect(m_effectStack, SIGNAL(updateEffect(ClipItem*, int, QDomElement, QDomElement, int)), m_activeTimeline->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, int, QDomElement, QDomElement, int)));
+            disconnect(m_effectStack, SIGNAL(removeEffect(ClipItem*, int, QDomElement)), m_activeTimeline->projectView(), SLOT(slotDeleteEffect(ClipItem*, int, QDomElement)));
+            disconnect(m_effectStack, SIGNAL(changeEffectState(ClipItem*, int, int, bool)), m_activeTimeline->projectView(), SLOT(slotChangeEffectState(ClipItem*, int, int, bool)));
+            disconnect(m_effectStack, SIGNAL(changeEffectPosition(ClipItem*, int, int, int)), m_activeTimeline->projectView(), SLOT(slotChangeEffectPosition(ClipItem*, int, int, int)));
             disconnect(m_effectStack, SIGNAL(refreshEffectStack(ClipItem*)), m_activeTimeline->projectView(), SLOT(slotRefreshEffects(ClipItem*)));
             disconnect(m_effectStack, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects()));
+            disconnect(m_effectStack, SIGNAL(displayMessage(const QString&, int)), this, SLOT(slotGotProgressInfo(const QString&, int)));
             disconnect(m_transitionConfig, SIGNAL(transitionUpdated(Transition *, QDomElement)), m_activeTimeline->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement)));
             disconnect(m_transitionConfig, SIGNAL(seekTimeline(int)), m_activeTimeline->projectView() , SLOT(setCursorPos(int)));
             disconnect(m_activeTimeline->projectView(), SIGNAL(activateDocumentMonitor()), m_projectMonitor, SLOT(activateMonitor()));
@@ -2058,9 +2168,12 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc)   //cha
     connect(trackView, SIGNAL(configTrack(int)), this, SLOT(slotConfigTrack(int)));
     connect(trackView, SIGNAL(updateTracksInfo()), this, SLOT(slotUpdateTrackInfo()));
     connect(trackView, SIGNAL(mousePosition(int)), this, SLOT(slotUpdateMousePosition(int)));
+    connect(trackView->projectView(), SIGNAL(forceClipProcessing(const QString &)), m_projectList, SLOT(slotForceProcessing(const QString &)));
     connect(m_projectMonitor, SIGNAL(renderPosition(int)), trackView, SLOT(moveCursorPos(int)));
     connect(m_projectMonitor, SIGNAL(zoneUpdated(QPoint)), trackView, SLOT(slotSetZone(QPoint)));
     connect(m_clipMonitor, SIGNAL(zoneUpdated(QPoint)), m_projectList, SLOT(slotUpdateClipCut(QPoint)));
+    connect(m_projectMonitor, SIGNAL(zoneUpdated(QPoint)), doc, SLOT(setModified()));
+    connect(m_clipMonitor, SIGNAL(zoneUpdated(QPoint)), doc, SLOT(setModified()));
     connect(m_projectMonitor, SIGNAL(durationChanged(int)), trackView, SLOT(setDuration(int)));
     connect(m_projectMonitor->render, SIGNAL(refreshDocumentProducers()), doc, SLOT(checkProjectClips()));
 
@@ -2077,6 +2190,8 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc)   //cha
 
     connect(trackView->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), m_effectStack, SLOT(slotClipItemSelected(ClipItem*, int)));
     connect(trackView->projectView(), SIGNAL(updateClipMarkers(DocClipBase *)), this, SLOT(slotUpdateClipMarkers(DocClipBase*)));
+    connect(trackView, SIGNAL(showTrackEffects(int, TrackInfo)), m_effectStack, SLOT(slotTrackItemSelected(int, TrackInfo)));
+    connect(trackView, SIGNAL(showTrackEffects(int, TrackInfo)), this, SLOT(slotActivateEffectStackView()));
 
     connect(trackView->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), this, SLOT(slotActivateEffectStackView()));
     connect(trackView->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, bool)), m_transitionConfig, SLOT(slotTransitionItemSelected(Transition*, int, QPoint, bool)));
@@ -2091,16 +2206,17 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc)   //cha
     connect(trackView->projectView(), SIGNAL(playMonitor()), m_projectMonitor, SLOT(slotPlay()));
 
 
-    connect(m_effectStack, SIGNAL(updateClipEffect(ClipItem*, QDomElement, QDomElement, int)), trackView->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, QDomElement, QDomElement, int)));
+    connect(m_effectStack, SIGNAL(updateEffect(ClipItem*, int, QDomElement, QDomElement, int)), trackView->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, int, QDomElement, QDomElement, int)));
     connect(m_effectStack, SIGNAL(updateClipRegion(ClipItem*, int, QString)), trackView->projectView(), SLOT(slotUpdateClipRegion(ClipItem*, int, QString)));
-    connect(m_effectStack, SIGNAL(removeEffect(ClipItem*, QDomElement)), trackView->projectView(), SLOT(slotDeleteEffect(ClipItem*, QDomElement)));
-    connect(m_effectStack, SIGNAL(changeEffectState(ClipItem*, int, bool)), trackView->projectView(), SLOT(slotChangeEffectState(ClipItem*, int, bool)));
-    connect(m_effectStack, SIGNAL(changeEffectPosition(ClipItem*, int, int)), trackView->projectView(), SLOT(slotChangeEffectPosition(ClipItem*, int, int)));
+    connect(m_effectStack, SIGNAL(removeEffect(ClipItem*, int, QDomElement)), trackView->projectView(), SLOT(slotDeleteEffect(ClipItem*, int, QDomElement)));
+    connect(m_effectStack, SIGNAL(changeEffectState(ClipItem*, int, int, bool)), trackView->projectView(), SLOT(slotChangeEffectState(ClipItem*, int, int, bool)));
+    connect(m_effectStack, SIGNAL(changeEffectPosition(ClipItem*, int, int, int)), trackView->projectView(), SLOT(slotChangeEffectPosition(ClipItem*, int, int, int)));
     connect(m_effectStack, SIGNAL(refreshEffectStack(ClipItem*)), trackView->projectView(), SLOT(slotRefreshEffects(ClipItem*)));
     connect(m_transitionConfig, SIGNAL(transitionUpdated(Transition *, QDomElement)), trackView->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement)));
     connect(m_transitionConfig, SIGNAL(seekTimeline(int)), trackView->projectView() , SLOT(setCursorPos(int)));
     connect(m_effectStack, SIGNAL(seekTimeline(int)), trackView->projectView() , SLOT(setCursorPos(int)));
     connect(m_effectStack, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects()));
+    connect(m_effectStack, SIGNAL(displayMessage(const QString&, int)), this, SLOT(slotGotProgressInfo(const QString&, int)));
 
     connect(trackView->projectView(), SIGNAL(activateDocumentMonitor()), m_projectMonitor, SLOT(activateMonitor()));
     connect(trackView, SIGNAL(zoneMoved(int, int)), this, SLOT(slotZoneMoved(int, int)));
@@ -2116,7 +2232,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc)   //cha
         m_renderWidget->setProfile(doc->mltProfile());
         m_renderWidget->setGuides(doc->guidesXml(), doc->projectDuration());
         m_renderWidget->setDocumentPath(doc->projectFolder().path(KUrl::AddTrailingSlash));
-        m_renderWidget->setRenderProfile(doc->getDocumentProperty("renderdestination"), doc->getDocumentProperty("rendercategory"), doc->getDocumentProperty("renderprofile"), doc->getDocumentProperty("renderurl"));
+        m_renderWidget->setRenderProfile(doc->getRenderProperties());
     }
     //doc->setRenderer(m_projectMonitor->render);
     m_commandStack->setActiveStack(doc->commandStack());
@@ -2148,7 +2264,8 @@ void MainWindow::slotZoneMoved(int start, int end)
 
 void MainWindow::slotGuidesUpdated()
 {
-    if (m_renderWidget) m_renderWidget->setGuides(m_activeDocument->guidesXml(), m_activeDocument->projectDuration());
+    if (m_renderWidget)
+        m_renderWidget->setGuides(m_activeDocument->guidesXml(), m_activeDocument->projectDuration());
 }
 
 void MainWindow::slotEditKeys()
@@ -2200,10 +2317,12 @@ void MainWindow::updateConfiguration()
         m_activeTimeline->refresh();
         m_activeTimeline->projectView()->checkAutoScroll();
         m_activeTimeline->projectView()->checkTrackHeight();
-        if (m_activeDocument) m_activeDocument->clipManager()->checkAudioThumbs();
+        if (m_activeDocument)
+            m_activeDocument->clipManager()->checkAudioThumbs();
     }
     m_buttonAudioThumbs->setChecked(KdenliveSettings::audiothumbnails());
     m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails());
+    m_buttonShowMarkers->setChecked(KdenliveSettings::showmarkers());
     m_buttonAutomaticSplitAudio->setChecked(KdenliveSettings::splitaudio());
 
     // Update list of transcoding profiles
@@ -2223,9 +2342,8 @@ void MainWindow::slotSwitchSplitAudio()
 void MainWindow::slotSwitchVideoThumbs()
 {
     KdenliveSettings::setVideothumbnails(!KdenliveSettings::videothumbnails());
-    if (m_activeTimeline) {
+    if (m_activeTimeline)
         m_activeTimeline->projectView()->slotUpdateAllThumbs();
-    }
     m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails());
 }
 
@@ -2235,7 +2353,8 @@ void MainWindow::slotSwitchAudioThumbs()
     if (m_activeTimeline) {
         m_activeTimeline->refresh();
         m_activeTimeline->projectView()->checkAutoScroll();
-        if (m_activeDocument) m_activeDocument->clipManager()->checkAudioThumbs();
+        if (m_activeDocument)
+            m_activeDocument->clipManager()->checkAudioThumbs();
     }
     m_buttonAudioThumbs->setChecked(KdenliveSettings::audiothumbnails());
 }
@@ -2243,9 +2362,8 @@ void MainWindow::slotSwitchAudioThumbs()
 void MainWindow::slotSwitchMarkersComments()
 {
     KdenliveSettings::setShowmarkers(!KdenliveSettings::showmarkers());
-    if (m_activeTimeline) {
+    if (m_activeTimeline)
         m_activeTimeline->refresh();
-    }
     m_buttonShowMarkers->setChecked(KdenliveSettings::showmarkers());
 }
 
@@ -2258,10 +2376,10 @@ void MainWindow::slotSwitchSnap()
 
 void MainWindow::slotDeleteItem()
 {
-    if (QApplication::focusWidget()
-            && QApplication::focusWidget()->parentWidget()
-            && QApplication::focusWidget()->parentWidget()->parentWidget()
-            && QApplication::focusWidget()->parentWidget()->parentWidget() == m_projectListDock) {
+    if (QApplication::focusWidget() &&
+            QApplication::focusWidget()->parentWidget() &&
+            QApplication::focusWidget()->parentWidget()->parentWidget() &&
+            QApplication::focusWidget()->parentWidget()->parentWidget() == m_projectListDock) {
         m_projectList->slotRemoveClip();
 
     } else {
@@ -2282,7 +2400,8 @@ void MainWindow::slotDeleteItem()
 
 void MainWindow::slotUpdateClipMarkers(DocClipBase *clip)
 {
-    if (m_clipMonitor->isActive()) m_clipMonitor->checkOverlay();
+    if (m_clipMonitor->isActive())
+        m_clipMonitor->checkOverlay();
     m_clipMonitor->updateMarkers(clip);
 }
 
@@ -2309,9 +2428,8 @@ void MainWindow::slotAddClipMarker()
     QString id = clip->getId();
     CommentedTime marker(pos, i18n("Marker"));
     MarkerDialog d(clip, marker, m_activeDocument->timecode(), i18n("Add Marker"), this);
-    if (d.exec() == QDialog::Accepted) {
+    if (d.exec() == QDialog::Accepted)
         m_activeTimeline->projectView()->slotAddClipMarker(id, d.newMarker().time(), d.newMarker().comment());
-    }
 }
 
 void MainWindow::slotDeleteClipMarker()
@@ -2468,9 +2586,8 @@ void MainWindow::slotDeleteAllGuides()
 
 void MainWindow::slotCutTimelineClip()
 {
-    if (m_activeTimeline) {
+    if (m_activeTimeline)
         m_activeTimeline->projectView()->cutSelectedClips();
-    }
 }
 
 void MainWindow::slotInsertClipOverwrite()
@@ -2483,65 +2600,56 @@ void MainWindow::slotInsertClipOverwrite()
 
 void MainWindow::slotSelectTimelineClip()
 {
-    if (m_activeTimeline) {
+    if (m_activeTimeline)
         m_activeTimeline->projectView()->selectClip(true);
-    }
 }
 
 void MainWindow::slotSelectTimelineTransition()
 {
-    if (m_activeTimeline) {
+    if (m_activeTimeline)
         m_activeTimeline->projectView()->selectTransition(true);
-    }
 }
 
 void MainWindow::slotDeselectTimelineClip()
 {
-    if (m_activeTimeline) {
+    if (m_activeTimeline)
         m_activeTimeline->projectView()->selectClip(false, true);
-    }
 }
 
 void MainWindow::slotDeselectTimelineTransition()
 {
-    if (m_activeTimeline) {
+    if (m_activeTimeline)
         m_activeTimeline->projectView()->selectTransition(false, true);
-    }
 }
 
 void MainWindow::slotSelectAddTimelineClip()
 {
-    if (m_activeTimeline) {
+    if (m_activeTimeline)
         m_activeTimeline->projectView()->selectClip(true, true);
-    }
 }
 
 void MainWindow::slotSelectAddTimelineTransition()
 {
-    if (m_activeTimeline) {
+    if (m_activeTimeline)
         m_activeTimeline->projectView()->selectTransition(true, true);
-    }
 }
 
 void MainWindow::slotGroupClips()
 {
-    if (m_activeTimeline) {
+    if (m_activeTimeline)
         m_activeTimeline->projectView()->groupClips();
-    }
 }
 
 void MainWindow::slotUnGroupClips()
 {
-    if (m_activeTimeline) {
+    if (m_activeTimeline)
         m_activeTimeline->projectView()->groupClips(false);
-    }
 }
 
 void MainWindow::slotEditItemDuration()
 {
-    if (m_activeTimeline) {
+    if (m_activeTimeline)
         m_activeTimeline->projectView()->editItemDuration();
-    }
 }
 
 void MainWindow::slotAddProjectClip(KUrl url)
@@ -2602,9 +2710,8 @@ void MainWindow::slotZoomOut()
 
 void MainWindow::slotFitZoom()
 {
-    if (m_activeTimeline) {
+    if (m_activeTimeline)
         m_zoomSlider->setValue(m_activeTimeline->fitZoom());
-    }
 }
 
 void MainWindow::slotSetZoom(int value)
@@ -2641,10 +2748,12 @@ void MainWindow::slotGotProgressInfo(const QString &message, int progress)
 {
     m_statusProgressBar->setValue(progress);
     if (progress >= 0) {
-        if (!message.isEmpty()) m_messageLabel->setMessage(message, InformationMessage);//statusLabel->setText(message);
+        if (!message.isEmpty())
+            m_messageLabel->setMessage(message, InformationMessage);//statusLabel->setText(message);
         m_statusProgressBar->setVisible(true);
     } else if (progress == -2) {
-        if (!message.isEmpty()) m_messageLabel->setMessage(message, ErrorMessage);
+        if (!message.isEmpty())
+            m_messageLabel->setMessage(message, ErrorMessage);
         m_statusProgressBar->setVisible(false);
     } else {
         m_messageLabel->setMessage(QString(), DefaultMessage);
@@ -2760,17 +2869,15 @@ void MainWindow::slotShowClipProperties(QList <DocClipBase *> cliplist, QMap<QSt
             new EditClipCommand(m_projectList, clip->getId(), clip->properties(), dia.properties(), true, command);
         }
         m_activeDocument->commandStack()->push(command);
-        for (int i = 0; i < cliplist.count(); i++) {
+        for (int i = 0; i < cliplist.count(); i++)
             m_activeTimeline->projectView()->slotUpdateClip(cliplist.at(i)->getId(), dia.needsTimelineReload());
-        }
     }
 }
 
 void MainWindow::customEvent(QEvent* e)
 {
-    if (e->type() == QEvent::User) {
+    if (e->type() == QEvent::User)
         m_messageLabel->setMessage(static_cast <MltErrorEvent *>(e)->message(), MltError);
-    }
 }
 void MainWindow::slotActivateEffectStackView()
 {
@@ -2779,7 +2886,8 @@ void MainWindow::slotActivateEffectStackView()
 
 void MainWindow::slotActivateTransitionView(Transition *t)
 {
-    if (t) m_transitionConfig->raiseWindow(m_transitionConfigDock);
+    if (t)
+        m_transitionConfig->raiseWindow(m_transitionConfigDock);
 }
 
 void MainWindow::slotSnapRewind()
@@ -2787,7 +2895,9 @@ void MainWindow::slotSnapRewind()
     if (m_projectMonitor->isActive()) {
         if (m_activeTimeline)
             m_activeTimeline->projectView()->slotSeekToPreviousSnap();
-    } else m_clipMonitor->slotSeekToPreviousSnap();
+    } else  {
+        m_clipMonitor->slotSeekToPreviousSnap();
+    }
 }
 
 void MainWindow::slotSnapForward()
@@ -2795,7 +2905,9 @@ void MainWindow::slotSnapForward()
     if (m_projectMonitor->isActive()) {
         if (m_activeTimeline)
             m_activeTimeline->projectView()->slotSeekToNextSnap();
-    } else m_clipMonitor->slotSeekToNextSnap();
+    } else {
+        m_clipMonitor->slotSeekToNextSnap();
+    }
 }
 
 void MainWindow::slotClipStart()
@@ -2816,29 +2928,41 @@ void MainWindow::slotClipEnd()
 
 void MainWindow::slotZoneStart()
 {
-    if (m_projectMonitor->isActive()) m_projectMonitor->slotZoneStart();
-    else m_clipMonitor->slotZoneStart();
+    if (m_projectMonitor->isActive())
+        m_projectMonitor->slotZoneStart();
+    else
+        m_clipMonitor->slotZoneStart();
 }
 
 void MainWindow::slotZoneEnd()
 {
-    if (m_projectMonitor->isActive()) m_projectMonitor->slotZoneEnd();
-    else m_clipMonitor->slotZoneEnd();
+    if (m_projectMonitor->isActive())
+        m_projectMonitor->slotZoneEnd();
+    else
+        m_clipMonitor->slotZoneEnd();
 }
 
 void MainWindow::slotChangeTool(QAction * action)
 {
-    if (action == m_buttonSelectTool) slotSetTool(SELECTTOOL);
-    else if (action == m_buttonRazorTool) slotSetTool(RAZORTOOL);
-    else if (action == m_buttonSpacerTool) slotSetTool(SPACERTOOL);
+    if (action == m_buttonSelectTool)
+        slotSetTool(SELECTTOOL);
+    else if (action == m_buttonRazorTool)
+        slotSetTool(RAZORTOOL);
+    else if (action == m_buttonSpacerTool)
+        slotSetTool(SPACERTOOL);
 }
 
 void MainWindow::slotChangeEdit(QAction * action)
 {
-    if (!m_activeTimeline) return;
-    if (action == m_overwriteEditTool) m_activeTimeline->projectView()->setEditMode(OVERWRITEEDIT);
-    else if (action == m_insertEditTool) m_activeTimeline->projectView()->setEditMode(INSERTEDIT);
-    else m_activeTimeline->projectView()->setEditMode(NORMALEDIT);
+    if (!m_activeTimeline)
+        return;
+
+    if (action == m_overwriteEditTool)
+        m_activeTimeline->projectView()->setEditMode(OVERWRITEEDIT);
+    else if (action == m_insertEditTool)
+        m_activeTimeline->projectView()->setEditMode(INSERTEDIT);
+    else
+        m_activeTimeline->projectView()->setEditMode(NORMALEDIT);
 }
 
 void MainWindow::slotSetTool(PROJECTTOOL tool)
@@ -2864,20 +2988,20 @@ void MainWindow::slotSetTool(PROJECTTOOL tool)
 
 void MainWindow::slotCopy()
 {
-    if (!m_activeDocument || !m_activeTimeline) return;
-    m_activeTimeline->projectView()->copyClip();
+    if (m_activeDocument && m_activeTimeline)
+        m_activeTimeline->projectView()->copyClip();
 }
 
 void MainWindow::slotPaste()
 {
-    if (!m_activeDocument || !m_activeTimeline) return;
-    m_activeTimeline->projectView()->pasteClip();
+    if (m_activeDocument && m_activeTimeline)
+        m_activeTimeline->projectView()->pasteClip();
 }
 
 void MainWindow::slotPasteEffects()
 {
-    if (!m_activeDocument || !m_activeTimeline) return;
-    m_activeTimeline->projectView()->pasteClipEffects();
+    if (m_activeDocument && m_activeTimeline)
+        m_activeTimeline->projectView()->pasteClipEffects();
 }
 
 void MainWindow::slotFind()
@@ -2894,11 +3018,10 @@ void MainWindow::slotFind()
 
 void MainWindow::slotFindNext()
 {
-    if (m_activeTimeline && m_activeTimeline->projectView()->findNextString(m_findString)) {
+    if (m_activeTimeline && m_activeTimeline->projectView()->findNextString(m_findString))
         statusBar()->showMessage(i18n("Found: %1", m_findString));
-    } else {
+    else
         statusBar()->showMessage(i18n("Reached end of project"));
-    }
     m_findTimer.start(4000);
 }
 
@@ -2960,11 +3083,11 @@ void MainWindow::slotClipInProjectTree()
 {
     if (m_activeTimeline) {
         const QStringList &clipIds = m_activeTimeline->projectView()->selectedClips();
-        if (clipIds.isEmpty()) return;
+        if (clipIds.isEmpty())
+            return;
         m_projectListDock->raise();
-        for (int i = 0; i < clipIds.count(); i++) {
+        for (int i = 0; i < clipIds.count(); i++)
             m_projectList->selectItemById(clipIds.at(i));
-        }
         if (m_projectMonitor->isActive())
             slotSwitchMonitors();
     }
@@ -2997,11 +3120,10 @@ void MainWindow::keyPressEvent(QKeyEvent *ke)
         if (ke->key() == Qt::Key_Backspace) {
             m_findString = m_findString.left(m_findString.length() - 1);
 
-            if (!m_findString.isEmpty()) {
+            if (!m_findString.isEmpty())
                 findAhead();
-            } else {
+            else
                 findTimeout();
-            }
 
             m_findTimer.start(4000);
             ke->accept();
@@ -3019,7 +3141,9 @@ void MainWindow::keyPressEvent(QKeyEvent *ke)
             ke->accept();
             return;
         }
-    } else KXmlGuiWindow::keyPressEvent(ke);
+    } else {
+        KXmlGuiWindow::keyPressEvent(ke);
+    }
 }
 
 
@@ -3039,7 +3163,9 @@ bool MainWindow::eventFilter(QObject *obj, QEvent *event)
             if (ke->text().trimmed().isEmpty()) return false;
             ke->accept();
             return true;
-        } else return false;
+        } else {
+            return false;
+        }
     } else {
         // pass the event on to the parent class
         return QMainWindow::eventFilter(obj, event);
@@ -3069,34 +3195,39 @@ void MainWindow::slotSaveZone(Render *render, QPoint zone)
     vbox->addWidget(url);
     vbox->addWidget(label2);
     vbox->addWidget(edit);
-    if (dialog->exec() == QDialog::Accepted) render->saveZone(url->url(), edit->text(), zone);
+    if (dialog->exec() == QDialog::Accepted)
+        render->saveZone(url->url(), edit->text(), zone);
 
 }
 
 void MainWindow::slotSetInPoint()
 {
-    if (m_clipMonitor->isActive()) {
+    if (m_clipMonitor->isActive())
         m_clipMonitor->slotSetZoneStart();
-    } else m_projectMonitor->slotSetZoneStart();
+    else
+        m_projectMonitor->slotSetZoneStart();
     //else m_activeTimeline->projectView()->setInPoint();
 }
 
 void MainWindow::slotSetOutPoint()
 {
-    if (m_clipMonitor->isActive()) {
+    if (m_clipMonitor->isActive())
         m_clipMonitor->slotSetZoneEnd();
-    } else m_projectMonitor->slotSetZoneEnd();
+    else
+        m_projectMonitor->slotSetZoneEnd();
     // else m_activeTimeline->projectView()->setOutPoint();
 }
 
 void MainWindow::slotResizeItemStart()
 {
-    if (m_activeTimeline) m_activeTimeline->projectView()->setInPoint();
+    if (m_activeTimeline)
+        m_activeTimeline->projectView()->setInPoint();
 }
 
 void MainWindow::slotResizeItemEnd()
 {
-    if (m_activeTimeline) m_activeTimeline->projectView()->setOutPoint();
+    if (m_activeTimeline)
+        m_activeTimeline->projectView()->setOutPoint();
 }
 
 int MainWindow::getNewStuff(const QString &configFile)
@@ -3155,12 +3286,14 @@ void MainWindow::slotGetNewMltProfileStuff()
 
 void MainWindow::slotAutoTransition()
 {
-    if (m_activeTimeline) m_activeTimeline->projectView()->autoTransition();
+    if (m_activeTimeline)
+        m_activeTimeline->projectView()->autoTransition();
 }
 
 void MainWindow::slotSplitAudio()
 {
-    if (m_activeTimeline) m_activeTimeline->projectView()->splitAudio();
+    if (m_activeTimeline)
+        m_activeTimeline->projectView()->splitAudio();
 }
 
 void MainWindow::slotUpdateClipType(QAction *action)
@@ -3200,9 +3333,8 @@ void MainWindow::slotMaximizeCurrent(bool /*show*/)
     {
         m_timelineState = saveState();
         QWidget *par = focusWidget()->parentWidget();
-        while (par->parentWidget() && par->parentWidget() != this) {
+        while (par->parentWidget() && par->parentWidget() != this)
             par = par->parentWidget();
-        }
         kDebug() << "CURRENT WIDGET: " << par->objectName();
     }
     /*else {
@@ -3226,9 +3358,8 @@ void MainWindow::loadTranscoders()
         QStringList data = i.value().split(";", QString::SkipEmptyParts);
         QAction *a = transMenu->addAction(i.key());
         a->setData(data);
-        if (data.count() > 1) {
+        if (data.count() > 1)
             a->setToolTip(data.at(1));
-        }
         connect(a, SIGNAL(triggered()), this, SLOT(slotTranscode()));
     }
 }
@@ -3264,13 +3395,14 @@ void MainWindow::slotTranscodeClip()
     slotTranscode(urls);
 }
 
-void MainWindow::slotSetDocumentRenderProfile(const QString &dest, const QString &group, const QString &name, const QString &file)
+void MainWindow::slotSetDocumentRenderProfile(QMap <QString, QString> props)
 {
     if (m_activeDocument == NULL) return;
-    m_activeDocument->setDocumentProperty("renderdestination", dest);
-    m_activeDocument->setDocumentProperty("rendercategory", group);
-    m_activeDocument->setDocumentProperty("renderprofile", name);
-    m_activeDocument->setDocumentProperty("renderurl", file);
+    QMapIterator<QString, QString> i(props);
+    while (i.hasNext()) {
+        i.next();
+        m_activeDocument->setDocumentProperty(i.key(), i.value());
+    }
     m_activeDocument->setModified(true);
 }
 
@@ -3353,8 +3485,11 @@ void MainWindow::slotPrepareRendering(bool scriptExport, bool zoneOnly, const QS
             }
         }
     }
-
-    m_renderWidget->slotExport(scriptExport, m_activeTimeline->inPoint(), m_activeTimeline->outPoint(), playlistPath, scriptPath);
+    bool exportAudio;
+    if (m_renderWidget->automaticAudioExport()) {
+        exportAudio = m_activeTimeline->checkProjectAudio();
+    } else exportAudio = m_renderWidget->selectedAudioExport();
+    m_renderWidget->slotExport(scriptExport, m_activeTimeline->inPoint(), m_activeTimeline->outPoint(), playlistPath, scriptPath, exportAudio);
 }
 
 void MainWindow::slotUpdateTimecodeFormat(int ix)
@@ -3525,17 +3660,49 @@ void MainWindow::slotShowTitleBars(bool show)
         m_transitionConfigDock->setTitleBarWidget(0);
         m_projectListDock->setTitleBarWidget(0);
         m_undoViewDock->setTitleBarWidget(0);
+        m_vectorscopeDock->setTitleBarWidget(0);
+        m_waveformDock->setTitleBarWidget(0);
+        m_RGBParadeDock->setTitleBarWidget(0);
+        m_histogramDock->setTitleBarWidget(0);
     } else {
-        if (!m_effectStackDock->isFloating()) m_effectStackDock->setTitleBarWidget(new QWidget(this));
-        if (!m_clipMonitorDock->isFloating()) m_clipMonitorDock->setTitleBarWidget(new QWidget(this));
-        if (!m_projectMonitorDock->isFloating()) m_projectMonitorDock->setTitleBarWidget(new QWidget(this));
+        if (!m_effectStackDock->isFloating()) {
+            m_effectStackDock->setTitleBarWidget(new QWidget);
+        }
+        if (!m_clipMonitorDock->isFloating()) {
+            m_clipMonitorDock->setTitleBarWidget(new QWidget);
+        }
+        if (!m_projectMonitorDock->isFloating()) {
+            m_projectMonitorDock->setTitleBarWidget(new QWidget);
+        }
 #ifndef Q_WS_MAC
-        if (!m_recMonitorDock->isFloating()) m_recMonitorDock->setTitleBarWidget(new QWidget(this));
+        if (!m_recMonitorDock->isFloating()) {
+            m_recMonitorDock->setTitleBarWidget(new QWidget);
+        }
 #endif
-        if (!m_effectListDock->isFloating()) m_effectListDock->setTitleBarWidget(new QWidget(this));
-        if (!m_transitionConfigDock->isFloating()) m_transitionConfigDock->setTitleBarWidget(new QWidget(this));
-        if (!m_projectListDock->isFloating()) m_projectListDock->setTitleBarWidget(new QWidget(this));
-        if (!m_undoViewDock->isFloating()) m_undoViewDock->setTitleBarWidget(new QWidget(this));
+        if (!m_effectListDock->isFloating()) {
+            m_effectListDock->setTitleBarWidget(new QWidget);
+        }
+        if (!m_transitionConfigDock->isFloating()) {
+            m_transitionConfigDock->setTitleBarWidget(new QWidget);
+        }
+        if (!m_projectListDock->isFloating()) {
+            m_projectListDock->setTitleBarWidget(new QWidget);
+        }
+        if (!m_undoViewDock->isFloating()) {
+            m_undoViewDock->setTitleBarWidget(new QWidget);
+        }
+        if (!m_vectorscopeDock->isFloating()) {
+            m_vectorscopeDock->setTitleBarWidget(new QWidget);
+        }
+        if (!m_waveformDock->isFloating()) {
+            m_waveformDock->setTitleBarWidget(new QWidget);
+        }
+        if (!m_RGBParadeDock->isFloating()) {
+            m_RGBParadeDock->setTitleBarWidget(new QWidget(this));
+        }
+        if (!m_histogramDock->isFloating()) {
+            m_histogramDock->setTitleBarWidget(new QWidget(this));
+        }
     }
     KdenliveSettings::setShowtitlebars(show);
 }
@@ -3553,5 +3720,50 @@ QString MainWindow::getMimeType()
     return mimetype;
 }
 
+void MainWindow::slotMonitorRequestRenderFrame(bool request)
+{
+    if (request) {
+        m_projectMonitor->render->sendFrameForAnalysis = true;
+        return;
+    } else {
+        for (int i = 0; i < m_scopesList.count(); i++) {
+            if (m_scopesList.at(i)->isVisible() && tabifiedDockWidgets(m_scopesList.at(i)).isEmpty() && static_cast<AbstractScopeWidget *>(m_scopesList.at(i)->widget())->autoRefreshEnabled()) {
+                request = true;
+                break;
+            }
+        }
+    }
+    if (!request) {
+        m_projectMonitor->render->sendFrameForAnalysis = false;
+    }
+}
+
+void MainWindow::slotUpdateScopeFrameRequest()
+{
+    // We need a delay to make sure widgets are hidden after a close event for example
+    QTimer::singleShot(500, this, SLOT(slotDoUpdateScopeFrameRequest()));
+}
+
+void MainWindow::slotDoUpdateScopeFrameRequest()
+{
+    // Check scopes
+    bool request = false;
+    for (int i = 0; i < m_scopesList.count(); i++) {
+        if (!m_scopesList.at(i)->widget()->visibleRegion().isEmpty() && static_cast<AbstractScopeWidget *>(m_scopesList.at(i)->widget())->autoRefreshEnabled()) {
+            kDebug() << "SCOPE VISIBLE: " << static_cast<AbstractScopeWidget *>(m_scopesList.at(i)->widget())->widgetName();
+            request = true;
+            break;
+        }
+    }
+    if (!request) {
+        if (!m_projectMonitor->effectSceneDisplayed())
+            m_projectMonitor->render->sendFrameForAnalysis = false;
+        m_clipMonitor->render->sendFrameForAnalysis = false;
+    } else {
+        m_projectMonitor->render->sendFrameForAnalysis = true;
+        m_clipMonitor->render->sendFrameForAnalysis = true;
+    }
+}
+
 #include "mainwindow.moc"