]> git.sesse.net Git - kdenlive/blobdiff - src/mainwindow.cpp
Move undo commands to their own subdirectory
[kdenlive] / src / mainwindow.cpp
index 7c97a3daa59cd7e4e87713633b6941f421e41784..5a76ffb38f6137b627d8aa703e9850fef055b48e 100644 (file)
 #include "transitionsettings.h"
 #include "renderwidget.h"
 #include "renderer.h"
+#include "audiosignal.h"
 #ifndef NO_JOGSHUTTLE
 #include "jogshuttle.h"
+#include "jogaction.h"
+#include "jogshuttleconfig.h"
 #endif /* NO_JOGSHUTTLE */
 #include "clipproperties.h"
 #include "wizard.h"
-#include "editclipcommand.h"
+#include "commands/editclipcommand.h"
 #include "titlewidget.h"
 #include "markerdialog.h"
 #include "clipitem.h"
 #include "kdenlive-config.h"
 #include "cliptranscode.h"
 #include "ui_templateclip_ui.h"
+#include "colorscopes/vectorscope.h"
+#include "colorscopes/waveform.h"
+#include "colorscopes/rgbparade.h"
+#include "colorscopes/histogram.h"
+#include "audiospectrum.h"
+#include "spectrogram.h"
+#include "archivewidget.h"
+#include "databackup/backupwidget.h"
+
 
 #include <KApplication>
 #include <KAction>
 #include <KLocale>
 #include <KGlobal>
 #include <KActionCollection>
+#include <KActionCategory>
 #include <KStandardAction>
+#include <KShortcutsDialog>
 #include <KFileDialog>
 #include <KMessageBox>
 #include <KDebug>
 #include <KProcess>
 #include <KActionMenu>
 #include <KMenu>
-#include <locale.h>
 #include <ktogglefullscreenaction.h>
 #include <KFileItem>
 #include <KNotification>
 #include <KNotifyConfigWidget>
-#if KDE_IS_VERSION(4,3,80)
 #include <knewstuff3/downloaddialog.h>
 #include <knewstuff3/knewstuffaction.h>
-#else
-#include <knewstuff2/engine.h>
-#include <knewstuff2/ui/knewstuffaction.h>
-#define KNS3 KNS
-#endif /* KDE_IS_VERSION(4,3,80) */
 #include <KToolBar>
 #include <KColorScheme>
+#include <KProgressDialog>
 
 #include <QTextStream>
 #include <QTimer>
 
 #include <stdlib.h>
 
+// Uncomment for deeper debugging
+//#define DEBUG_MAINW
+
+#ifdef DEBUG_MAINW
+#include <QDebug>
+#endif
+
 static const char version[] = VERSION;
 
 static const int ID_TIMELINE_POS = 0;
-
 namespace Mlt
 {
 class Producer;
 };
 
+Q_DECLARE_METATYPE(QVector<int16_t>)
+
+
 EffectsList MainWindow::videoEffects;
 EffectsList MainWindow::audioEffects;
 EffectsList MainWindow::customEffects;
 EffectsList MainWindow::transitions;
 
-MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent) :
-        KXmlGuiWindow(parent),
-        m_activeDocument(NULL),
-        m_activeTimeline(NULL),
-        m_renderWidget(NULL),
+MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, const QString & clipsToLoad, QWidget *parent) :
+    KXmlGuiWindow(parent),
+    m_activeDocument(NULL),
+    m_activeTimeline(NULL),
+    m_recMonitor(NULL),
+    m_renderWidget(NULL),
 #ifndef NO_JOGSHUTTLE
-        m_jogProcess(NULL),
+    m_jogProcess(NULL),
+    m_jogShuttle(NULL),
 #endif /* NO_JOGSHUTTLE */
-        m_findActivated(false)
-{
+    m_findActivated(false),
+    m_stopmotion(NULL)
+{   
+    qRegisterMetaType<QVector<int16_t> > ();
+    qRegisterMetaType<stringMap> ("stringMap");
+    qRegisterMetaType<audioByteArray> ("audioByteArray");
+
+    // Init locale
+    QLocale systemLocale = QLocale();
+    systemLocale.setNumberOptions(QLocale::OmitGroupSeparator);
+    QLocale::setDefault(systemLocale);
 
     // Create DBus interface
     new MainWindowAdaptor(this);
     QDBusConnection dbus = QDBusConnection::sessionBus();
     dbus.registerObject("/MainWindow", this);
 
-    setlocale(LC_NUMERIC, "POSIX");
     if (!KdenliveSettings::colortheme().isEmpty()) slotChangePalette(NULL, KdenliveSettings::colortheme());
     setFont(KGlobalSettings::toolBarFont());
     parseProfiles(MltPath);
+    KdenliveSettings::setCurrent_profile(KdenliveSettings::default_profile());
     m_commandStack = new QUndoGroup;
+    setDockNestingEnabled(true);
     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()));
@@ -145,7 +176,7 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent
     closeTabButton->adjustSize();
     closeTabButton->setToolTip(i18n("Close the current tab"));
     m_timelineArea->setCornerWidget(closeTabButton);
-    connect(m_timelineArea, SIGNAL(currentChanged(int)), this, SLOT(activateDocument()));
+    //connect(m_timelineArea, SIGNAL(currentChanged(int)), this, SLOT(activateDocument()));
 
     connect(&m_findTimer, SIGNAL(timeout()), this, SLOT(findTimeout()));
     m_findTimer.setSingleShot(true);
@@ -156,94 +187,254 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent
 
     m_monitorManager = new MonitorManager();
 
+    m_shortcutRemoveFocus = new QShortcut(QKeySequence("Esc"), this);
+    connect(m_shortcutRemoveFocus, SIGNAL(activated()), this, SLOT(slotRemoveFocus()));
+
+
+    /// Add Widgets ///
+
     m_projectListDock = new QDockWidget(i18n("Project Tree"), this);
     m_projectListDock->setObjectName("project_tree");
-    m_projectList = new ProjectList(this);
+    m_projectList = new ProjectList();
     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_clipMonitorDock = new QDockWidget(i18n("Clip Monitor"), this);
+    m_clipMonitorDock->setObjectName("clip_monitor");
+    m_clipMonitor = new Monitor("clip", m_monitorManager, QString(), m_timelineArea);
+    m_clipMonitorDock->setWidget(m_clipMonitor);
+    connect(m_projectList, SIGNAL(clipSelected(DocClipBase *, QPoint)), m_clipMonitor, SLOT(slotSetClipProducer(DocClipBase *, QPoint)));
+    connect(m_projectList, SIGNAL(raiseClipMonitor()), m_clipMonitor, SLOT(activateMonitor()));
+    
+    m_projectMonitorDock = new QDockWidget(i18n("Project Monitor"), this);
+    m_projectMonitorDock->setObjectName("project_monitor");
+    m_projectMonitor = new Monitor("project", m_monitorManager, QString());
+    m_projectMonitorDock->setWidget(m_projectMonitor);
 
-    m_effectListDock = new QDockWidget(i18n("Effect List"), this);
-    m_effectListDock->setObjectName("effect_list");
-    m_effectList = new EffectsListView();
+#ifndef Q_WS_MAC
+    m_recMonitorDock = new QDockWidget(i18n("Record Monitor"), this);
+    m_recMonitorDock->setObjectName("record_monitor");
+    m_recMonitor = new RecMonitor("record", m_monitorManager);
+    m_recMonitorDock->setWidget(m_recMonitor);
+    connect(m_recMonitor, SIGNAL(addProjectClip(KUrl)), this, SLOT(slotAddProjectClip(KUrl)));
+    connect(m_recMonitor, SIGNAL(addProjectClipList(KUrl::List)), this, SLOT(slotAddProjectClipList(KUrl::List)));
+    connect(m_recMonitor, SIGNAL(showConfigDialog(int, int)), this, SLOT(slotPreferences(int, int)));
+#endif
+    m_monitorManager->initMonitors(m_clipMonitor, m_projectMonitor, m_recMonitor);
 
-    //m_effectList = new KListWidget(this);
-    m_effectListDock->setWidget(m_effectList);
-    addDockWidget(Qt::TopDockWidgetArea, m_effectListDock);
+    m_notesDock = new QDockWidget(i18n("Project Notes"), this);
+    m_notesDock->setObjectName("notes_widget");
+    m_notesWidget = new NotesWidget();
+    connect(m_notesWidget, SIGNAL(insertNotesTimecode()), this, SLOT(slotInsertNotesTimecode()));
+    connect(m_notesWidget, SIGNAL(seekProject(int)), m_projectMonitor->render, SLOT(seekToFrame(int)));
+    
+    m_notesWidget->setTabChangesFocus(true);
+    m_notesWidget->setClickMessage(i18n("Enter your project notes here ..."));
+    m_notesDock->setWidget(m_notesWidget);
+    addDockWidget(Qt::TopDockWidgetArea, m_notesDock);
 
     m_effectStackDock = new QDockWidget(i18n("Effect Stack"), this);
     m_effectStackDock->setObjectName("effect_stack");
-    m_effectStack = new EffectStackView(this);
+    m_effectStack = new EffectStackView(m_projectMonitor);
     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_transitionConfig = new TransitionSettings(m_projectMonitor);
     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);
+    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_monitorManager);
+    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(slotUpdateGfxScopeFrameRequest()));
+    connect(m_vectorscope, SIGNAL(requestAutoRefresh(bool)), this, SLOT(slotUpdateGfxScopeFrameRequest()));
+    m_gfxScopesList.append(m_vectorscopeDock);
+
+    m_waveform = new Waveform(m_monitorManager);
+    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(slotUpdateGfxScopeFrameRequest()));
+    connect(m_waveform, SIGNAL(requestAutoRefresh(bool)), this, SLOT(slotUpdateGfxScopeFrameRequest()));
+    m_gfxScopesList.append(m_waveformDock);
+
+    m_RGBParade = new RGBParade(m_monitorManager);
+    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(slotUpdateGfxScopeFrameRequest()));
+    connect(m_RGBParade, SIGNAL(requestAutoRefresh(bool)), this, SLOT(slotUpdateGfxScopeFrameRequest()));
+    m_gfxScopesList.append(m_RGBParadeDock);
+
+    m_histogram = new Histogram(m_monitorManager);
+    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(slotUpdateGfxScopeFrameRequest()));
+    connect(m_histogram, SIGNAL(requestAutoRefresh(bool)), this, SLOT(slotUpdateGfxScopeFrameRequest()));
+    m_gfxScopesList.append(m_histogramDock);
+
+
+    m_audiosignal = new AudioSignal;
+    m_audiosignalDock = new QDockWidget(i18n("Audio Signal"), this);
+    m_audiosignalDock->setObjectName("audiosignal");
+    m_audiosignalDock->setWidget(m_audiosignal);
+    addDockWidget(Qt::TopDockWidgetArea, m_audiosignalDock);
+    connect(m_audiosignalDock, SIGNAL(visibilityChanged(bool)), this, SLOT(slotUpdateAudioScopeFrameRequest()));
+    connect(m_audiosignal, SIGNAL(updateAudioMonitoring()), this, SLOT(slotUpdateAudioScopeFrameRequest()));
+
+    m_audioSpectrum = new AudioSpectrum();
+    m_audioSpectrumDock = new QDockWidget(i18n("AudioSpectrum"), this);
+    m_audioSpectrumDock->setObjectName(m_audioSpectrum->widgetName());
+    m_audioSpectrumDock->setWidget(m_audioSpectrum);
+    addDockWidget(Qt::TopDockWidgetArea, m_audioSpectrumDock);
+    m_audioScopesList.append(m_audioSpectrum);
+    connect(m_audioSpectrumDock, SIGNAL(visibilityChanged(bool)), this, SLOT(slotUpdateAudioScopeFrameRequest()));
+    connect(m_audioSpectrum, SIGNAL(requestAutoRefresh(bool)), this, SLOT(slotUpdateAudioScopeFrameRequest()));
+
+    m_spectrogram = new Spectrogram();
+    m_spectrogramDock = new QDockWidget(i18n("Spectrogram"), this);
+    m_spectrogramDock->setObjectName(m_spectrogram->widgetName());
+    m_spectrogramDock->setWidget(m_spectrogram);
+    addDockWidget(Qt::TopDockWidgetArea, m_spectrogramDock);
+    m_audioScopesList.append(m_spectrogram);
+    connect(m_audioSpectrumDock, SIGNAL(visibilityChanged(bool)), this, SLOT(slotUpdateAudioScopeFrameRequest()));
+    connect(m_audioSpectrum, SIGNAL(requestAutoRefresh(bool)), this, SLOT(slotUpdateAudioScopeFrameRequest()));
+
+    // Connect the audio signal to the audio scope slots
+    bool b = true;
+    if (m_projectMonitor) {
+        qDebug() << "project monitor connected";
+        b &= connect(m_projectMonitor->render, SIGNAL(audioSamplesSignal(QVector<int16_t>, int, int, int)),
+                     m_audioSpectrum, SLOT(slotReceiveAudio(QVector<int16_t>, int, int, int)));
+        b &= connect(m_projectMonitor->render, SIGNAL(audioSamplesSignal(const QVector<int16_t>&, const int&, const int&, const int&)),
+                     m_audiosignal, SLOT(slotReceiveAudio(const QVector<int16_t>&, const int&, const int&, const int&)));
+        b &= connect(m_projectMonitor->render, SIGNAL(audioSamplesSignal(QVector<int16_t>,int,int,int)),
+                     m_spectrogram, SLOT(slotReceiveAudio(QVector<int16_t>,int,int,int)));
+    }
+    if (m_clipMonitor) {
+        qDebug() << "clip monitor connected";
+        b &= connect(m_clipMonitor->render, SIGNAL(audioSamplesSignal(QVector<int16_t>, int, int, int)),
+                     m_audioSpectrum, SLOT(slotReceiveAudio(QVector<int16_t>, int, int, int)));
+        b &= connect(m_clipMonitor->render, SIGNAL(audioSamplesSignal(const QVector<int16_t>&, int, int, int)),
+                     m_audiosignal, SLOT(slotReceiveAudio(const QVector<int16_t>&, int, int, int)));
+        b &= connect(m_clipMonitor->render, SIGNAL(audioSamplesSignal(QVector<int16_t>,int,int,int)),
+                     m_spectrogram, SLOT(slotReceiveAudio(QVector<int16_t>,int,int,int)));
+    }
+    // Ensure connections were set up correctly
+    Q_ASSERT(b);
 
-    //slotDetectAudioDriver();
 
-    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");
-    m_projectMonitor = new Monitor("project", m_monitorManager, QString(), this);
-    m_projectMonitorDock->setWidget(m_projectMonitor);
+    // Add monitors here to keep them at the right of the window
+    addDockWidget(Qt::TopDockWidgetArea, m_clipMonitorDock);
     addDockWidget(Qt::TopDockWidgetArea, m_projectMonitorDock);
-
 #ifndef Q_WS_MAC
-    m_recMonitorDock = new QDockWidget(i18n("Record Monitor"), this);
-    m_recMonitorDock->setObjectName("record_monitor");
-    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_undoViewDock = new QDockWidget(i18n("Undo History"), this);
     m_undoViewDock->setObjectName("undo_history");
-    m_undoView = new QUndoView(this);
+    m_undoView = new QUndoView();
     m_undoView->setCleanIcon(KIcon("edit-clear"));
     m_undoView->setEmptyLabel(i18n("Clean"));
     m_undoViewDock->setWidget(m_undoView);
     m_undoView->setGroup(m_commandStack);
     addDockWidget(Qt::TopDockWidgetArea, m_undoViewDock);
 
-    //overviewDock = new QDockWidget(i18n("Project Overview"), this);
-    //overviewDock->setObjectName("project_overview");
-    //m_overView = new CustomTrackView(NULL, NULL, this);
-    //overviewDock->setWidget(m_overView);
-    //addDockWidget(Qt::TopDockWidgetArea, overviewDock);
 
     setupActions();
-    //tabifyDockWidget(projectListDock, effectListDock);
-    tabifyDockWidget(m_projectListDock, m_effectStackDock);
-    tabifyDockWidget(m_projectListDock, m_transitionConfigDock);
-    //tabifyDockWidget(projectListDock, undoViewDock);
+    connect(m_commandStack, SIGNAL(cleanChanged(bool)), m_saveAction, SLOT(setDisabled(bool)));
+
+
+    // Close non-general docks for the initial layout
+    // only show important ones
+    m_histogramDock->close();
+    m_RGBParadeDock->close();
+    m_waveformDock->close();
+    m_vectorscopeDock->close();
+
+    m_audioSpectrumDock->close();
+    m_spectrogramDock->close();
+    m_audiosignalDock->close();
 
+    m_undoViewDock->close();
+
+
+
+    /// Tabify Widgets ///
+    tabifyDockWidget(m_effectListDock, m_effectStackDock);
+    tabifyDockWidget(m_effectListDock, m_transitionConfigDock);
+    tabifyDockWidget(m_projectListDock, m_notesDock);
 
     tabifyDockWidget(m_clipMonitorDock, m_projectMonitorDock);
 #ifndef Q_WS_MAC
     tabifyDockWidget(m_clipMonitorDock, m_recMonitorDock);
 #endif
+
+
+
+
     setCentralWidget(m_timelineArea);
+
+
+    m_fileOpenRecent = KStandardAction::openRecent(this, SLOT(openFile(const KUrl &)), actionCollection());
+    readOptions();
+    m_fileRevert = KStandardAction::revert(this, SLOT(slotRevert()), actionCollection());
+    m_fileRevert->setEnabled(false);
+
+    // Prepare layout actions
+    KActionCategory *layoutActions = new KActionCategory(i18n("Layouts"), actionCollection());
+    m_loadLayout = new KSelectAction(i18n("Load Layout"), actionCollection());
+    for (int i = 1; i < 5; i++) {
+        KAction *load = new KAction(KIcon(), i18n("Layout %1").arg(i), this);
+        load->setData("_" + QString::number(i));
+       layoutActions->addAction("load_layout" + QString::number(i), load);
+        m_loadLayout->addAction(load);
+        KAction *save = new KAction(KIcon(), i18n("Save As Layout %1").arg(i), this);
+        save->setData("_" + QString::number(i));
+        layoutActions->addAction("save_layout" + QString::number(i), save);
+    }
+    layoutActions->addAction("load_layouts", m_loadLayout);
+    connect(m_loadLayout, SIGNAL(triggered(QAction*)), this, SLOT(slotLoadLayout(QAction*)));
+
+    KAction *action;
+    // Stop motion actions. Beware of the order, we MUST use the same order in stopmotion/stopmotion.cpp
+    m_stopmotion_actions = new KActionCategory(i18n("Stop Motion"), actionCollection());
+    action = new KAction(KIcon("media-record"), i18n("Capture frame"), this);
+    //action->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+    m_stopmotion_actions->addAction("stopmotion_capture", action);
+    action = new KAction(i18n("Switch live / captured frame"), this);
+    //action->setShortcutContext(Qt::WidgetWithChildrenShortcut);
+    m_stopmotion_actions->addAction("stopmotion_switch", action);
+    action = new KAction(KIcon("edit-paste"), i18n("Show last frame over video"), this);
+    action->setCheckable(true);
+    action->setChecked(false);
+    m_stopmotion_actions->addAction("stopmotion_overlay", action);
+
+    // Build effects menu
+    m_effectsMenu = new QMenu(i18n("Add Effect"));
+    m_effectActions = new KActionCategory(i18n("Effects"), actionCollection());
+    m_effectList->reloadEffectList(m_effectsMenu, m_effectActions);
+    m_effectsActionCollection->readSettings();
+    
     setupGUI();
 
     // Find QDockWidget tab bars and show / hide widget title bars on right click
@@ -256,11 +447,18 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent
     /*ScriptingPart* sp = new ScriptingPart(this, QStringList());
     guiFactory()->addClient(sp);*/
 
+    QMenu *saveLayout = (QMenu*)(factory()->container("layout_save_as", this));
+    if (saveLayout)
+        connect(saveLayout, SIGNAL(triggered(QAction*)), this, SLOT(slotSaveLayout(QAction*)));
+
+
+    // Load layout names from config file
+    loadLayouts();
+
     loadPlugins();
     loadTranscoders();
-    //kDebug() << factory() << " " << factory()->container("video_effects_menu", this);
 
-    m_projectMonitor->setupMenu(static_cast<QMenu*>(factory()->container("monitor_go", this)), m_playZone, m_loopZone);
+    m_projectMonitor->setupMenu(static_cast<QMenu*>(factory()->container("monitor_go", this)), m_playZone, m_loopZone, NULL, m_loopClip);
     m_clipMonitor->setupMenu(static_cast<QMenu*>(factory()->container("monitor_go", this)), m_playZone, m_loopZone, static_cast<QMenu*>(factory()->container("marker_menu", this)));
 
     QMenu *clipInTimeline = static_cast<QMenu*>(factory()->container("clip_in_timeline", this));
@@ -269,17 +467,15 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent
                                       static_cast<QMenu*>(factory()->container("transcoders", this)),
                                       clipInTimeline);
 
-    QAction *action;
     // build themes menus
     QMenu *themesMenu = static_cast<QMenu*>(factory()->container("themes_menu", this));
     QActionGroup *themegroup = new QActionGroup(this);
     themegroup->setExclusive(true);
-    action = new QAction(i18n("Default"), this);
+    action = new KAction(i18n("Default"), this);
     action->setCheckable(true);
     themegroup->addAction(action);
     if (KdenliveSettings::colortheme().isEmpty()) action->setChecked(true);
 
-
     const QStringList schemeFiles = KGlobal::dirs()->findAllResources("data", "color-schemes/*.colors", KStandardDirs::NoDuplicates);
 
     for (int i = 0; i < schemeFiles.size(); ++i) {
@@ -292,7 +488,7 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent
         QIcon icon = createSchemePreviewIcon(config);
         KConfigGroup group(config, "General");
         const QString name = group.readEntry("Name", info.baseName());
-        action = new QAction(name, this);
+        action = new KAction(name, this);
         action->setData(filename);
         action->setIcon(icon);
         action->setCheckable(true);
@@ -300,11 +496,6 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent
         if (KdenliveSettings::colortheme() == filename) action->setChecked(true);
     }
 
-
-
-
-
-
     /*KGlobal::dirs()->addResourceDir("themes", KStandardDirs::installPath("data") + QString("kdenlive/themes"));
     QStringList themes = KGlobal::dirs()->findAllResources("themes", QString(), KStandardDirs::Recursive | KStandardDirs::NoDuplicates);
     for (QStringList::const_iterator it = themes.constBegin(); it != themes.constEnd(); ++it)
@@ -319,110 +510,54 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent
     themesMenu->addActions(themegroup->actions());
     connect(themesMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotChangePalette(QAction*)));
 
-    // build effects menus
-    QMenu *videoEffectsMenu = static_cast<QMenu*>(factory()->container("video_effects_menu", this));
-
-    QStringList effectInfo;
-    QMap<QString, QStringList> effectsList;
-    for (int ix = 0; ix < videoEffects.count(); ix++) {
-        effectInfo = videoEffects.effectIdInfo(ix);
-        effectsList.insert(effectInfo.at(0).toLower(), effectInfo);
-    }
-
-    foreach(const QStringList &value, effectsList) {
-        action = new QAction(value.at(0), this);
-        action->setData(value);
-        videoEffectsMenu->addAction(action);
-    }
-
-    QMenu *audioEffectsMenu = static_cast<QMenu*>(factory()->container("audio_effects_menu", this));
-
-
-    effectsList.clear();
-    for (int ix = 0; ix < audioEffects.count(); ix++) {
-        effectInfo = audioEffects.effectIdInfo(ix);
-        effectsList.insert(effectInfo.at(0).toLower(), effectInfo);
-    }
-
-    foreach(const QStringList &value, effectsList) {
-        action = new QAction(value.at(0), this);
-        action->setData(value);
-        audioEffectsMenu->addAction(action);
-    }
+    // Setup and fill effects and transitions menus.
 
-    m_customEffectsMenu = static_cast<QMenu*>(factory()->container("custom_effects_menu", this));
 
-    if (customEffects.isEmpty()) m_customEffectsMenu->setEnabled(false);
-    else m_customEffectsMenu->setEnabled(true);
+    QMenu *m = static_cast<QMenu*>(factory()->container("video_effects_menu", this));
+    m->addActions(m_effectsMenu->actions());
 
-    effectsList.clear();
-    for (int ix = 0; ix < customEffects.count(); ix++) {
-        effectInfo = customEffects.effectIdInfo(ix);
-        effectsList.insert(effectInfo.at(0).toLower(), effectInfo);
-    }
 
-    foreach(const QStringList &value, effectsList) {
-        action = new QAction(value.at(0), this);
-        action->setData(value);
-        m_customEffectsMenu->addAction(action);
-    }
+    m_transitionsMenu = new QMenu(i18n("Add Transition"), this);
+    for (int i = 0; i < transitions.count(); ++i)
+        m_transitionsMenu->addAction(m_transitions[i]);
 
-    QMenu *newEffect = new QMenu(this);
-    newEffect->addMenu(videoEffectsMenu);
-    newEffect->addMenu(audioEffectsMenu);
-    newEffect->addMenu(m_customEffectsMenu);
-    m_effectStack->setMenu(newEffect);
+    connect(m, SIGNAL(triggered(QAction *)), this, SLOT(slotAddVideoEffect(QAction *)));
+    connect(m_effectsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddVideoEffect(QAction *)));
+    connect(m_transitionsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddTransition(QAction *)));
 
+    m_effectStack->setMenu(m_effectsMenu);
 
     QMenu *viewMenu = static_cast<QMenu*>(factory()->container("dockwindows", this));
     const QList<QAction *> viewActions = createPopupMenu()->actions();
     viewMenu->insertActions(NULL, viewActions);
 
-    connect(videoEffectsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddVideoEffect(QAction *)));
-    connect(audioEffectsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddAudioEffect(QAction *)));
-    connect(m_customEffectsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddCustomEffect(QAction *)));
-
     m_timelineContextMenu = new QMenu(this);
     m_timelineContextClipMenu = new QMenu(this);
     m_timelineContextTransitionMenu = new QMenu(this);
 
-
-    QMenu *transitionsMenu = new QMenu(i18n("Add Transition"), this);
-    QStringList effects = transitions.effectNames();
-
-    effectsList.clear();
-    for (int ix = 0; ix < transitions.count(); ix++) {
-        effectInfo = transitions.effectIdInfo(ix);
-        effectsList.insert(effectInfo.at(0).toLower(), effectInfo);
-    }
-    foreach(const QStringList &value, effectsList) {
-        action = new QAction(value.at(0), this);
-        action->setData(value);
-        transitionsMenu->addAction(action);
-    }
-    connect(transitionsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddTransition(QAction *)));
-
     m_timelineContextMenu->addAction(actionCollection()->action("insert_space"));
     m_timelineContextMenu->addAction(actionCollection()->action("delete_space"));
     m_timelineContextMenu->addAction(actionCollection()->action(KStandardAction::name(KStandardAction::Paste)));
 
     m_timelineContextClipMenu->addAction(actionCollection()->action("clip_in_project_tree"));
+    //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->addMenu(transitionsMenu);
-    m_timelineContextClipMenu->addMenu(videoEffectsMenu);
-    m_timelineContextClipMenu->addMenu(audioEffectsMenu);
-    //TODO: re-enable custom effects menu when it is implemented
-    m_timelineContextClipMenu->addMenu(m_customEffectsMenu);
+    m_timelineContextClipMenu->addSeparator();
+    m_timelineContextClipMenu->addMenu(m_transitionsMenu);
+    m_timelineContextClipMenu->addMenu(m_effectsMenu);
 
     m_timelineContextTransitionMenu->addAction(actionCollection()->action("edit_item_duration"));
     m_timelineContextTransitionMenu->addAction(actionCollection()->action("delete_item"));
@@ -433,16 +568,13 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent
     connect(m_projectMonitorDock, SIGNAL(visibilityChanged(bool)), m_projectMonitor, SLOT(refreshMonitor(bool)));
     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(checkColorScopes()), this, SLOT(slotUpdateColorScopes()));
+    connect(m_monitorManager, SIGNAL(clearScopes()), this, SLOT(slotClearColorScopes()));
     connect(m_effectList, SIGNAL(addEffect(const QDomElement)), this, SLOT(slotAddEffect(const QDomElement)));
     connect(m_effectList, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects()));
 
-    m_monitorManager->initMonitors(m_clipMonitor, m_projectMonitor);
     slotConnectMonitors();
 
-    // Disable drop B frames, see Kdenlive issue #1330, see also kdenlivesettingsdialog.cpp
-    KdenliveSettings::setDropbframes(false);
-
     // Open or create a file.  Command line argument passed in Url has
     // precedence, then "openlastproject", then just a plain empty file.
     // If opening Url fails, openlastproject will _not_ be used.
@@ -456,29 +588,81 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent
         newFile(false);
     }
 
+    if (!clipsToLoad.isEmpty() && m_activeDocument) {
+        QStringList list = clipsToLoad.split(',');
+        QList <QUrl> urls;
+        foreach(QString path, list) {
+            kDebug() << QDir::current().absoluteFilePath(path);
+            urls << QUrl::fromLocalFile(QDir::current().absoluteFilePath(path));
+        }
+        m_projectList->slotAddClip(urls);
+    }
+
 #ifndef NO_JOGSHUTTLE
     activateShuttleDevice();
 #endif /* NO_JOGSHUTTLE */
     m_projectListDock->raise();
+
+    actionCollection()->addAssociatedWidget(m_clipMonitor->container());
+    actionCollection()->addAssociatedWidget(m_projectMonitor->container());
+    
+    // Populate encoding profiles
+    KConfig conf("encodingprofiles.rc", KConfig::FullConfig, "appdata");
+    if (KdenliveSettings::proxyparams().isEmpty()) {
+        KConfigGroup group(&conf, "proxy");
+        QMap< QString, QString > values = group.entryMap();
+        QMapIterator<QString, QString> i(values);
+        if (i.hasNext()) {
+            i.next();
+            QString data = i.value();
+            KdenliveSettings::setProxyparams(data.section(';', 0, 0));
+            KdenliveSettings::setProxyextension(data.section(';', 1, 1));
+        }
+    }
+    if (KdenliveSettings::v4l_parameters().isEmpty()) {
+        KConfigGroup group(&conf, "video4linux");
+        QMap< QString, QString > values = group.entryMap();
+        QMapIterator<QString, QString> i(values);
+        if (i.hasNext()) {
+            i.next();
+            QString data = i.value();
+            KdenliveSettings::setV4l_parameters(data.section(';', 0, 0));
+            KdenliveSettings::setV4l_extension(data.section(';', 1, 1));
+        }
+    }
+    if (KdenliveSettings::decklink_parameters().isEmpty()) {
+        KConfigGroup group(&conf, "decklink");
+        QMap< QString, QString > values = group.entryMap();
+        QMapIterator<QString, QString> i(values);
+        if (i.hasNext()) {
+            i.next();
+            QString data = i.value();
+            KdenliveSettings::setDecklink_parameters(data.section(';', 0, 0));
+            KdenliveSettings::setDecklink_extension(data.section(';', 1, 1));
+        }
+    }
 }
 
-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;
-#ifndef Q_WS_MAC
-        // 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();
-        kapp->quit();
+    if (m_stopmotion) {
+        delete m_stopmotion;
     }
+    m_effectStack->slotClipItemSelected(NULL, 0);
+    m_transitionConfig->slotTransitionItemSelected(NULL, 0, QPoint(), false);
+
+    if (m_projectMonitor) m_projectMonitor->stop();
+    if (m_clipMonitor) m_clipMonitor->stop();
+
+    delete m_activeTimeline;
+    delete m_effectStack;
+    delete m_transitionConfig;
+    delete m_activeDocument;
+    delete m_projectMonitor;
+    delete m_clipMonitor;
+    delete m_shortcutRemoveFocus;
+    delete[] m_transitions;
+    Mlt::Factory::close();
 }
 
 //virtual
@@ -502,8 +686,18 @@ bool MainWindow::queryClose()
     }
     saveOptions();
     if (m_monitorManager) m_monitorManager->stopActiveMonitor();
-    if (m_activeDocument && m_activeDocument->isModified()) {
-        switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document?"))) {
+    // 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())) {
+        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();
@@ -518,29 +712,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;
+    foreach(const QString & folder, directories) {
+        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)
@@ -557,7 +758,7 @@ void MainWindow::addToMenu(QObject *plugin, const QStringList &texts,
                            QActionGroup *actionGroup)
 {
     kDebug() << "// ADD to MENU" << texts;
-    foreach(const QString &text, texts) {
+    foreach(const QString & text, texts) {
         QAction *action = new QAction(text, plugin);
         action->setData(text);
         connect(action, SIGNAL(triggered()), this, member);
@@ -582,7 +783,8 @@ void MainWindow::generateClip()
     QAction *action = qobject_cast<QAction *>(sender());
     ClipGenerator *iGenerator = qobject_cast<ClipGenerator *>(action->parent());
 
-    KUrl clipUrl = iGenerator->generatedClip(action->data().toString(), m_activeDocument->projectFolder(), QStringList(), QStringList(), 25, 720, 576);
+    KUrl clipUrl = iGenerator->generatedClip(action->data().toString(), m_activeDocument->projectFolder(),
+                   QStringList(), QStringList(), m_activeDocument->fps(), m_activeDocument->width(), m_activeDocument->height());
     if (!clipUrl.isEmpty()) {
         m_projectList->slotAddClip(QList <QUrl> () << clipUrl);
     }
@@ -606,79 +808,39 @@ void MainWindow::readProperties(const KConfigGroup &config)
 
 void MainWindow::slotReloadEffects()
 {
-    m_customEffectsMenu->clear();
     initEffects::parseCustomEffectsFile();
-    QAction *action;
-    QStringList effectInfo;
-    QMap<QString, QStringList> effectsList;
-
-    for (int ix = 0; ix < customEffects.count(); ix++) {
-        effectInfo = customEffects.effectIdInfo(ix);
-        effectsList.insert(effectInfo.at(0).toLower(), effectInfo);
-    }
-    if (effectsList.isEmpty()) {
-        m_customEffectsMenu->setEnabled(false);
-        return;
-    } else m_customEffectsMenu->setEnabled(true);
-
-    foreach(const QStringList &value, effectsList) {
-        action = new QAction(value.at(0), this);
-        action->setData(value);
-        m_customEffectsMenu->addAction(action);
-    }
-    m_effectList->reloadEffectList();
+    m_effectList->reloadEffectList(m_effectsMenu, m_effectActions);
 }
 
 #ifndef NO_JOGSHUTTLE
 void MainWindow::activateShuttleDevice()
 {
+    delete m_jogShuttle;
+    m_jogShuttle = NULL;
     delete m_jogProcess;
     m_jogProcess = NULL;
     if (KdenliveSettings::enableshuttle() == false) return;
+    
     m_jogProcess = new JogShuttle(KdenliveSettings::shuttledevice());
-    connect(m_jogProcess, SIGNAL(rewind1()), m_monitorManager, SLOT(slotRewindOneFrame()));
-    connect(m_jogProcess, SIGNAL(forward1()), m_monitorManager, SLOT(slotForwardOneFrame()));
-    connect(m_jogProcess, SIGNAL(rewind(double)), m_monitorManager, SLOT(slotRewind(double)));
-    connect(m_jogProcess, SIGNAL(forward(double)), m_monitorManager, SLOT(slotForward(double)));
-    connect(m_jogProcess, SIGNAL(stop()), m_monitorManager, SLOT(slotPlay()));
-    connect(m_jogProcess, SIGNAL(button(int)), this, SLOT(slotShuttleButton(int)));
-}
-
-void MainWindow::slotShuttleButton(int code)
-{
-    switch (code) {
-    case 5:
-        slotShuttleAction(KdenliveSettings::shuttle1());
-        break;
-    case 6:
-        slotShuttleAction(KdenliveSettings::shuttle2());
-        break;
-    case 7:
-        slotShuttleAction(KdenliveSettings::shuttle3());
-        break;
-    case 8:
-        slotShuttleAction(KdenliveSettings::shuttle4());
-        break;
-    case 9:
-        slotShuttleAction(KdenliveSettings::shuttle5());
-        break;
-    }
-}
-
-void MainWindow::slotShuttleAction(int code)
-{
-    switch (code) {
-    case 0:
+    m_jogShuttle = new JogShuttleAction(m_jogProcess, JogShuttleConfig::actionMap(KdenliveSettings::shuttlebuttons()));
+    
+    connect(m_jogShuttle, SIGNAL(rewindOneFrame()), m_monitorManager, SLOT(slotRewindOneFrame()));
+    connect(m_jogShuttle, SIGNAL(forwardOneFrame()), m_monitorManager, SLOT(slotForwardOneFrame()));
+    connect(m_jogShuttle, SIGNAL(rewind(double)), m_monitorManager, SLOT(slotRewind(double)));
+    connect(m_jogShuttle, SIGNAL(forward(double)), m_monitorManager, SLOT(slotForward(double)));
+    connect(m_jogShuttle, SIGNAL(action(const QString&)), this, SLOT(slotDoAction(const QString&)));
+}
+#endif /* NO_JOGSHUTTLE */
+
+void MainWindow::slotDoAction(const QString& action_name)
+{
+    QAction* action = actionCollection()->action(action_name);
+    if (!action) {
+        fprintf(stderr, "%s", QString("shuttle action '%1' unknown\n").arg(action_name).toAscii().constData());
         return;
-    case 1:
-        m_monitorManager->slotPlay();
-        break;
-    default:
-        m_monitorManager->slotPlay();
-        break;
     }
+    action->trigger();
 }
-#endif /* NO_JOGSHUTTLE */
 
 void MainWindow::configureNotifications()
 {
@@ -690,7 +852,7 @@ void MainWindow::slotFullScreen()
     KToggleFullScreenAction::setFullScreen(this, actionCollection()->action("fullscreen")->isChecked());
 }
 
-void MainWindow::slotAddEffect(const QDomElement effect, GenTime pos, int track)
+void MainWindow::slotAddEffect(const QDomElement effect)
 {
     if (!m_activeDocument) return;
     if (effect.isNull()) {
@@ -698,42 +860,48 @@ void MainWindow::slotAddEffect(const QDomElement effect, GenTime pos, int track)
         return;
     }
     QDomElement effectToAdd = effect.cloneNode().toElement();
-    m_activeTimeline->projectView()->slotAddEffect(effectToAdd, pos, track);
-}
-
-void MainWindow::slotRaiseMonitor(bool clipMonitor)
-{
-    if (clipMonitor) m_clipMonitorDock->raise();
-    else m_projectMonitorDock->raise();
+    bool ok;
+    int ix = m_effectStack->isTrackMode(&ok);
+    if (ok) m_activeTimeline->projectView()->slotAddTrackEffect(effectToAdd, m_activeDocument->tracksCount() - ix);
+    else m_activeTimeline->projectView()->slotAddEffect(effectToAdd, GenTime(), -1);
 }
 
 void MainWindow::slotUpdateClip(const QString &id)
 {
     if (!m_activeDocument) return;
-    m_activeTimeline->projectView()->slotUpdateClip(id);
+    DocClipBase *clip = m_activeDocument->clipManager()->getClipById(id);
+    if (!clip) return;
+    if (clip->numReferences() > 0) m_activeTimeline->projectView()->slotUpdateClip(id);
+    if (m_clipMonitor->activeClip() && m_clipMonitor->activeClip()->getId() == id) {
+        Mlt::Producer *monitorProducer = clip->getCloneProducer();
+        m_clipMonitor->updateClipProducer(monitorProducer);
+    }
+    clip->cleanupProducers();
 }
 
 void MainWindow::slotConnectMonitors()
 {
-
     m_projectList->setRenderer(m_projectMonitor->render);
-    //connect(m_projectList, SIGNAL(receivedClipDuration(const QString &)), this, SLOT(slotUpdateClip(const QString &)));
     connect(m_projectList, SIGNAL(deleteProjectClips(QStringList, QMap<QString, QString>)), this, SLOT(slotDeleteProjectClips(QStringList, QMap<QString, QString>)));
     connect(m_projectList, SIGNAL(showClipProperties(DocClipBase *)), this, SLOT(slotShowClipProperties(DocClipBase *)));
     connect(m_projectList, SIGNAL(showClipProperties(QList <DocClipBase *>, QMap<QString, QString>)), this, SLOT(slotShowClipProperties(QList <DocClipBase *>, QMap<QString, QString>)));
-    connect(m_projectList, SIGNAL(getFileProperties(const QDomElement, const QString &, int, bool)), m_projectMonitor->render, SLOT(getFileProperties(const QDomElement, const QString &, int, bool)));
-    connect(m_projectMonitor->render, SIGNAL(replyGetImage(const QString &, const QPixmap &)), m_projectList, SLOT(slotReplyGetImage(const QString &, const QPixmap &)));
-    connect(m_projectMonitor->render, SIGNAL(replyGetFileProperties(const QString &, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &, bool)), m_projectList, SLOT(slotReplyGetFileProperties(const QString &, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &, bool)));
+    connect(m_projectMonitor->render, SIGNAL(replyGetImage(const QString &, const QString &, int, int)), m_projectList, SLOT(slotReplyGetImage(const QString &, const QString &, int, int)));
+    connect(m_projectMonitor->render, SIGNAL(replyGetImage(const QString &, const QImage &)), m_projectList, SLOT(slotReplyGetImage(const QString &, const QImage &)));
+    connect(m_projectMonitor->render, SIGNAL(replyGetFileProperties(const QString &, Mlt::Producer*, const stringMap &, const stringMap &, bool)), m_projectList, SLOT(slotReplyGetFileProperties(const QString &, Mlt::Producer*, const stringMap &, const stringMap &, bool)));
 
     connect(m_projectMonitor->render, SIGNAL(removeInvalidClip(const QString &, bool)), m_projectList, SLOT(slotRemoveInvalidClip(const QString &, bool)));
+    
+    connect(m_projectMonitor->render, SIGNAL(removeInvalidProxy(const QString &, bool)), m_projectList, SLOT(slotRemoveInvalidProxy(const QString &, bool)));
 
-    connect(m_clipMonitor, SIGNAL(refreshClipThumbnail(const QString &)), m_projectList, SLOT(slotRefreshClipThumbnail(const QString &)));
+    connect(m_clipMonitor, SIGNAL(refreshClipThumbnail(const QString &, bool)), m_projectList, SLOT(slotRefreshClipThumbnail(const QString &, bool)));
 
     connect(m_clipMonitor, SIGNAL(adjustMonitorSize()), this, SLOT(slotAdjustClipMonitor()));
     connect(m_projectMonitor, SIGNAL(adjustMonitorSize()), this, SLOT(slotAdjustProjectMonitor()));
 
-    connect(m_clipMonitor, SIGNAL(saveZone(Render *, QPoint)), this, SLOT(slotSaveZone(Render *, QPoint)));
-    connect(m_projectMonitor, SIGNAL(saveZone(Render *, QPoint)), this, SLOT(slotSaveZone(Render *, QPoint)));
+    connect(m_projectMonitor, SIGNAL(requestFrameForAnalysis(bool)), this, SLOT(slotMonitorRequestRenderFrame(bool)));
+
+    connect(m_clipMonitor, SIGNAL(saveZone(Render *, QPoint, DocClipBase *)), this, SLOT(slotSaveZone(Render *, QPoint, DocClipBase *)));
+    connect(m_projectMonitor, SIGNAL(saveZone(Render *, QPoint, DocClipBase *)), this, SLOT(slotSaveZone(Render *, QPoint, DocClipBase *)));
 }
 
 void MainWindow::slotAdjustClipMonitor()
@@ -750,12 +918,34 @@ void MainWindow::slotAdjustProjectMonitor()
     m_projectMonitor->resetSize();
 }
 
+
+class NameGrabbingKActionCollection {
+public:
+  NameGrabbingKActionCollection(KActionCollection* collection, QStringList& action_names)
+    : m_collection(collection), m_action_names(action_names) {
+      m_action_names.clear();
+    }
+  KAction* addAction(const QString& action_name) {
+    m_action_names << action_name;
+    return m_collection->addAction(action_name);
+  }
+  void addAction(const QString& action_name, QAction* action) {
+    m_action_names << action_name;
+    m_collection->addAction(action_name, action);
+  }
+  operator KActionCollection*() { return m_collection; }
+  const QStringList& actionNames() const { return m_action_names; }
+private:
+  KActionCollection* m_collection;
+  QStringList& m_action_names;
+};
+
 void MainWindow::setupActions()
 {
 
-    KActionCollection* collection = actionCollection();
+    NameGrabbingKActionCollection collection(actionCollection(), m_action_names);
     m_timecodeFormat = new KComboBox(this);
-    m_timecodeFormat->addItem(i18n("hh:mm:ss::ff"));
+    m_timecodeFormat->addItem(i18n("hh:mm:ss:ff"));
     m_timecodeFormat->addItem(i18n("Frames"));
     if (KdenliveSettings::frametimecode()) m_timecodeFormat->setCurrentIndex(1);
     connect(m_timecodeFormat, SIGNAL(activated(int)), this, SLOT(slotUpdateTimecodeFormat(int)));
@@ -768,8 +958,13 @@ void MainWindow::setupActions()
 
     KToolBar *toolbar = new KToolBar("statusToolBar", this, Qt::BottomToolBarArea);
     toolbar->setMovable(false);
+    KColorScheme scheme(palette().currentColorGroup(), KColorScheme::Window, KSharedConfig::openConfig(KdenliveSettings::colortheme()));
+    QColor buttonBg = scheme.background(KColorScheme::LinkBackground).color();
+    QColor buttonBord = scheme.foreground(KColorScheme::LinkText).color();
+    QColor buttonBord2 = scheme.shade(KColorScheme::LightShade);
     statusBar()->setStyleSheet(QString("QStatusBar QLabel {font-size:%1pt;} QStatusBar::item { border: 0px; font-size:%1pt;padding:0px; }").arg(statusBar()->font().pointSize()));
-    QString style1 = "QToolBar { border: 0px } QToolButton { border-style: inset; border:1px solid #999999;border-radius: 3px;margin: 0px 3px;padding: 0px;} QToolButton:checked { background-color: rgba(224, 224, 0, 100); border-style: inset; border:1px solid #cc6666;border-radius: 3px;}";
+    QString style1 = QString("QToolBar { border: 0px } QToolButton { border-style: inset; border:1px solid transparent;border-radius: 3px;margin: 0px 3px;padding: 0px;} QToolButton:hover { background: rgb(%7, %8, %9);border-style: inset; border:1px solid rgb(%7, %8, %9);border-radius: 3px;} QToolButton:checked { background-color: rgb(%1, %2, %3); border-style: inset; border:1px solid rgb(%4, %5, %6);border-radius: 3px;}").arg(buttonBg.red()).arg(buttonBg.green()).arg(buttonBg.blue()).arg(buttonBord.red()).arg(buttonBord.green()).arg(buttonBord.blue()).arg(buttonBord2.red()).arg(buttonBord2.green()).arg(buttonBord2.blue());
+    QString styleBorderless = "QToolButton { border-width: 0px;margin: 1px 3px 0px;padding: 0px;}";
 
     //create edit mode buttons
     m_normalEditTool = new KAction(KIcon("kdenlive-normal-edit"), i18n("Normal mode"), this);
@@ -861,20 +1056,54 @@ void MainWindow::setupActions()
     m_buttonFitZoom = new KAction(KIcon("zoom-fit-best"), i18n("Fit zoom to project"), this);
     toolbar->addAction(m_buttonFitZoom);
     m_buttonFitZoom->setCheckable(false);
-    connect(m_buttonFitZoom, SIGNAL(triggered()), this, SLOT(slotFitZoom()));
 
-    actionWidget = toolbar->widgetForAction(m_buttonFitZoom);
-    actionWidget->setMaximumWidth(max);
-    actionWidget->setMaximumHeight(max - 4);
+    m_zoomOut = new KAction(KIcon("zoom-out"), i18n("Zoom Out"), this);
+    toolbar->addAction(m_zoomOut);
+    m_zoomOut->setShortcut(Qt::CTRL + Qt::Key_Minus);
 
     m_zoomSlider = new QSlider(Qt::Horizontal, this);
     m_zoomSlider->setMaximum(13);
     m_zoomSlider->setPageStep(1);
+    m_zoomSlider->setInvertedAppearance(true);
 
     m_zoomSlider->setMaximumWidth(150);
     m_zoomSlider->setMinimumWidth(100);
     toolbar->addWidget(m_zoomSlider);
 
+    m_zoomIn = new KAction(KIcon("zoom-in"), i18n("Zoom In"), this);
+    toolbar->addAction(m_zoomIn);
+    m_zoomIn->setShortcut(Qt::CTRL + Qt::Key_Plus);
+
+    actionWidget = toolbar->widgetForAction(m_buttonFitZoom);
+    actionWidget->setMaximumWidth(max);
+    actionWidget->setMaximumHeight(max - 4);
+    actionWidget->setStyleSheet(styleBorderless);
+
+    actionWidget = toolbar->widgetForAction(m_zoomIn);
+    actionWidget->setMaximumWidth(max);
+    actionWidget->setMaximumHeight(max - 4);
+    actionWidget->setStyleSheet(styleBorderless);
+
+    actionWidget = toolbar->widgetForAction(m_zoomOut);
+    actionWidget->setMaximumWidth(max);
+    actionWidget->setMaximumHeight(max - 4);
+    actionWidget->setStyleSheet(styleBorderless);
+
+    connect(m_zoomSlider, SIGNAL(valueChanged(int)), this, SLOT(slotSetZoom(int)));
+    connect(m_zoomSlider, SIGNAL(sliderMoved(int)), this, SLOT(slotShowZoomSliderToolTip(int)));
+    connect(m_buttonFitZoom, SIGNAL(triggered()), this, SLOT(slotFitZoom()));
+    connect(m_zoomIn, SIGNAL(triggered(bool)), this, SLOT(slotZoomIn()));
+    connect(m_zoomOut, SIGNAL(triggered(bool)), this, SLOT(slotZoomOut()));
+
+    toolbar->addSeparator();
+
+    //create automatic audio split button
+    m_buttonAutomaticSplitAudio = new KAction(KIcon("kdenlive-split-audio"), i18n("Split audio and video automatically"), this);
+    toolbar->addAction(m_buttonAutomaticSplitAudio);
+    m_buttonAutomaticSplitAudio->setCheckable(true);
+    m_buttonAutomaticSplitAudio->setChecked(KdenliveSettings::splitaudio());
+    connect(m_buttonAutomaticSplitAudio, SIGNAL(triggered()), this, SLOT(slotSwitchSplitAudio()));
+
     m_buttonVideoThumbs = new KAction(KIcon("kdenlive-show-videothumb"), i18n("Show video thumbnails"), this);
     toolbar->addAction(m_buttonVideoThumbs);
     m_buttonVideoThumbs->setCheckable(true);
@@ -899,6 +1128,10 @@ void MainWindow::setupActions()
     m_buttonSnap->setChecked(KdenliveSettings::snaptopoints());
     connect(m_buttonSnap, SIGNAL(triggered()), this, SLOT(slotSwitchSnap()));
 
+    actionWidget = toolbar->widgetForAction(m_buttonAutomaticSplitAudio);
+    actionWidget->setMaximumWidth(max);
+    actionWidget->setMaximumHeight(max - 4);
+
     actionWidget = toolbar->widgetForAction(m_buttonVideoThumbs);
     actionWidget->setMaximumWidth(max);
     actionWidget->setMaximumHeight(max - 4);
@@ -925,211 +1158,228 @@ void MainWindow::setupActions()
     statusBar()->addPermanentWidget(m_timecodeFormat);
     //statusBar()->setMaximumHeight(statusBar()->font().pointSize() * 3);
 
-    collection->addAction("normal_mode", m_normalEditTool);
-    collection->addAction("overwrite_mode", m_overwriteEditTool);
-    collection->addAction("insert_mode", m_insertEditTool);
-    collection->addAction("select_tool", m_buttonSelectTool);
-    collection->addAction("razor_tool", m_buttonRazorTool);
-    collection->addAction("spacer_tool", m_buttonSpacerTool);
-
-    collection->addAction("show_video_thumbs", m_buttonVideoThumbs);
-    collection->addAction("show_audio_thumbs", m_buttonAudioThumbs);
-    collection->addAction("show_markers", m_buttonShowMarkers);
-    collection->addAction("snap", m_buttonSnap);
-    collection->addAction("zoom_fit", m_buttonFitZoom);
-
-    KAction* zoomIn = new KAction(KIcon("zoom-in"), i18n("Zoom In"), this);
-    collection->addAction("zoom_in", zoomIn);
-    connect(zoomIn, SIGNAL(triggered(bool)), this, SLOT(slotZoomIn()));
-    zoomIn->setShortcut(Qt::CTRL + Qt::Key_Plus);
-
-    KAction* zoomOut = new KAction(KIcon("zoom-out"), i18n("Zoom Out"), this);
-    collection->addAction("zoom_out", zoomOut);
-    connect(zoomOut, SIGNAL(triggered(bool)), this, SLOT(slotZoomOut()));
-    zoomOut->setShortcut(Qt::CTRL + Qt::Key_Minus);
+    collection.addAction("normal_mode", m_normalEditTool);
+    collection.addAction("overwrite_mode", m_overwriteEditTool);
+    collection.addAction("insert_mode", m_insertEditTool);
+    collection.addAction("select_tool", m_buttonSelectTool);
+    collection.addAction("razor_tool", m_buttonRazorTool);
+    collection.addAction("spacer_tool", m_buttonSpacerTool);
+
+    collection.addAction("automatic_split_audio", m_buttonAutomaticSplitAudio);
+    collection.addAction("show_video_thumbs", m_buttonVideoThumbs);
+    collection.addAction("show_audio_thumbs", m_buttonAudioThumbs);
+    collection.addAction("show_markers", m_buttonShowMarkers);
+    collection.addAction("snap", m_buttonSnap);
+    collection.addAction("zoom_fit", m_buttonFitZoom);
+    collection.addAction("zoom_in", m_zoomIn);
+    collection.addAction("zoom_out", m_zoomOut);
 
     m_projectSearch = new KAction(KIcon("edit-find"), i18n("Find"), this);
-    collection->addAction("project_find", m_projectSearch);
+    collection.addAction("project_find", m_projectSearch);
     connect(m_projectSearch, SIGNAL(triggered(bool)), this, SLOT(slotFind()));
     m_projectSearch->setShortcut(Qt::Key_Slash);
 
     m_projectSearchNext = new KAction(KIcon("go-down-search"), i18n("Find Next"), this);
-    collection->addAction("project_find_next", m_projectSearchNext);
+    collection.addAction("project_find_next", m_projectSearchNext);
     connect(m_projectSearchNext, SIGNAL(triggered(bool)), this, SLOT(slotFindNext()));
     m_projectSearchNext->setShortcut(Qt::Key_F3);
     m_projectSearchNext->setEnabled(false);
 
     KAction* profilesAction = new KAction(KIcon("document-new"), i18n("Manage Project Profiles"), this);
-    collection->addAction("manage_profiles", profilesAction);
+    collection.addAction("manage_profiles", profilesAction);
     connect(profilesAction, SIGNAL(triggered(bool)), this, SLOT(slotEditProfiles()));
 
-    KNS3::standardAction(i18n("Download New Wipes..."), this, SLOT(slotGetNewLumaStuff()), actionCollection(), "get_new_lumas");
-
-    KNS3::standardAction(i18n("Download New Render Profiles..."), this, SLOT(slotGetNewRenderStuff()), actionCollection(), "get_new_profiles");
-
+    KNS3::standardAction(i18n("Download New Wipes..."),            this, SLOT(slotGetNewLumaStuff()),       actionCollection(), "get_new_lumas");
+    KNS3::standardAction(i18n("Download New Render Profiles..."),  this, SLOT(slotGetNewRenderStuff()),     actionCollection(), "get_new_profiles");
     KNS3::standardAction(i18n("Download New Project Profiles..."), this, SLOT(slotGetNewMltProfileStuff()), actionCollection(), "get_new_mlt_profiles");
-
-    KNS3::standardAction(i18n("Download New Title Templates..."), this, SLOT(slotGetNewTitleStuff()), actionCollection(), "get_new_titles");
+    KNS3::standardAction(i18n("Download New Title Templates..."),  this, SLOT(slotGetNewTitleStuff()),      actionCollection(), "get_new_titles");
 
     KAction* wizAction = new KAction(KIcon("configure"), i18n("Run Config Wizard"), this);
-    collection->addAction("run_wizard", wizAction);
+    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);
+    collection.addAction("project_settings", projectAction);
     connect(projectAction, SIGNAL(triggered(bool)), this, SLOT(slotEditProjectSettings()));
 
+    KAction* backupAction = new KAction(KIcon("edit-undo"), i18n("Open Backup File"), this);
+    collection.addAction("open_backup", backupAction);
+    connect(backupAction, SIGNAL(triggered(bool)), this, SLOT(slotOpenBackupDialog()));
+
     KAction* projectRender = new KAction(KIcon("media-record"), i18n("Render"), this);
-    collection->addAction("project_render", projectRender);
+    collection.addAction("project_render", projectRender);
     projectRender->setShortcut(Qt::CTRL + Qt::Key_Return);
     connect(projectRender, SIGNAL(triggered(bool)), this, SLOT(slotRenderProject()));
 
     KAction* projectClean = new KAction(KIcon("edit-clear"), i18n("Clean Project"), this);
-    collection->addAction("project_clean", projectClean);
+    collection.addAction("project_clean", projectClean);
     connect(projectClean, SIGNAL(triggered(bool)), this, SLOT(slotCleanProject()));
 
+    KAction* projectAdjust = new KAction(KIcon(), i18n("Adjust Profile to Current Clip"), this);
+    collection.addAction("project_adjust_profile", projectAdjust);
+    connect(projectAdjust, SIGNAL(triggered(bool)), m_projectList, SLOT(adjustProjectProfileToItem()));
+
     KAction* monitorPlay = new KAction(KIcon("media-playback-start"), i18n("Play"), this);
     KShortcut playShortcut;
     playShortcut.setPrimary(Qt::Key_Space);
     playShortcut.setAlternate(Qt::Key_K);
     monitorPlay->setShortcut(playShortcut);
-    collection->addAction("monitor_play", monitorPlay);
+    collection.addAction("monitor_play", monitorPlay);
     connect(monitorPlay, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotPlay()));
 
+    KAction* monitorPause = new KAction(KIcon("media-playback-stop"), i18n("Pause"), this);
+    collection.addAction("monitor_pause", monitorPause);
+    connect(monitorPause, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotPause()));
+
     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);
+    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);
+    collection.addAction("monitor_loop_zone", m_loopZone);
     connect(m_loopZone, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotLoopZone()));
 
+    m_loopClip = new KAction(KIcon("media-playback-start"), i18n("Loop selected clip"), this);
+    m_loopClip->setEnabled(false);
+    collection.addAction("monitor_loop_clip", m_loopClip);
+    connect(m_loopClip, SIGNAL(triggered(bool)), m_projectMonitor, SLOT(slotLoopClip()));
+
     KAction *dvdWizard =  new KAction(KIcon("media-optical"), i18n("DVD Wizard"), this);
-    collection->addAction("dvd_wizard", dvdWizard);
+    collection.addAction("dvd_wizard", dvdWizard);
     connect(dvdWizard, SIGNAL(triggered(bool)), this, SLOT(slotDvdWizard()));
 
     KAction *transcodeClip =  new KAction(KIcon("edit-copy"), i18n("Transcode Clips"), this);
-    collection->addAction("transcode_clip", transcodeClip);
+    collection.addAction("transcode_clip", transcodeClip);
     connect(transcodeClip, SIGNAL(triggered(bool)), this, SLOT(slotTranscodeClip()));
 
-    KAction *markIn = collection->addAction("mark_in");
+    KAction *archiveProject =  new KAction(KIcon("file-save"), i18n("Archive Project"), this);
+    collection.addAction("archive_project", archiveProject);
+    connect(archiveProject, SIGNAL(triggered(bool)), this, SLOT(slotArchiveProject()));
+    
+
+    KAction *markIn = collection.addAction("mark_in");
     markIn->setText(i18n("Set Zone In"));
     markIn->setShortcut(Qt::Key_I);
     connect(markIn, SIGNAL(triggered(bool)), this, SLOT(slotSetInPoint()));
 
-    KAction *markOut = collection->addAction("mark_out");
+    KAction *markOut = collection.addAction("mark_out");
     markOut->setText(i18n("Set Zone Out"));
     markOut->setShortcut(Qt::Key_O);
     connect(markOut, SIGNAL(triggered(bool)), this, SLOT(slotSetOutPoint()));
 
-    KAction *switchMon = collection->addAction("switch_monitor");
+    KAction *switchMon = collection.addAction("switch_monitor");
     switchMon->setText(i18n("Switch monitor"));
     switchMon->setShortcut(Qt::Key_T);
     connect(switchMon, SIGNAL(triggered(bool)), this, SLOT(slotSwitchMonitors()));
 
-    KAction *insertTree = collection->addAction("insert_project_tree");
+    KAction *fullMon = collection.addAction("monitor_fullscreen");
+    fullMon->setText(i18n("Switch monitor fullscreen"));
+    fullMon->setIcon(KIcon("view-fullscreen"));
+    connect(fullMon, SIGNAL(triggered(bool)), this, SLOT(slotSwitchFullscreen()));
+
+    KAction *insertTree = collection.addAction("insert_project_tree");
     insertTree->setText(i18n("Insert zone in project tree"));
     insertTree->setShortcut(Qt::CTRL + Qt::Key_I);
     connect(insertTree, SIGNAL(triggered(bool)), this, SLOT(slotInsertZoneToTree()));
 
-    KAction *insertTimeline = collection->addAction("insert_timeline");
+    KAction *insertTimeline = collection.addAction("insert_timeline");
     insertTimeline->setText(i18n("Insert zone in timeline"));
     insertTimeline->setShortcut(Qt::SHIFT + Qt::CTRL + Qt::Key_I);
     connect(insertTimeline, SIGNAL(triggered(bool)), this, SLOT(slotInsertZoneToTimeline()));
 
     KAction *resizeStart =  new KAction(KIcon(), i18n("Resize Item Start"), this);
-    collection->addAction("resize_timeline_clip_start", resizeStart);
+    collection.addAction("resize_timeline_clip_start", resizeStart);
     resizeStart->setShortcut(Qt::Key_1);
     connect(resizeStart, SIGNAL(triggered(bool)), this, SLOT(slotResizeItemStart()));
 
     KAction *resizeEnd =  new KAction(KIcon(), i18n("Resize Item End"), this);
-    collection->addAction("resize_timeline_clip_end", resizeEnd);
+    collection.addAction("resize_timeline_clip_end", resizeEnd);
     resizeEnd->setShortcut(Qt::Key_2);
     connect(resizeEnd, SIGNAL(triggered(bool)), this, SLOT(slotResizeItemEnd()));
 
     KAction* monitorSeekBackward = new KAction(KIcon("media-seek-backward"), i18n("Rewind"), this);
     monitorSeekBackward->setShortcut(Qt::Key_J);
-    collection->addAction("monitor_seek_backward", monitorSeekBackward);
+    collection.addAction("monitor_seek_backward", monitorSeekBackward);
     connect(monitorSeekBackward, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotRewind()));
 
     KAction* monitorSeekBackwardOneFrame = new KAction(KIcon("media-skip-backward"), i18n("Rewind 1 Frame"), this);
     monitorSeekBackwardOneFrame->setShortcut(Qt::Key_Left);
-    collection->addAction("monitor_seek_backward-one-frame", monitorSeekBackwardOneFrame);
+    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);
+    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);
+    collection.addAction("monitor_seek_snap_backward", monitorSeekSnapBackward);
     connect(monitorSeekSnapBackward, SIGNAL(triggered(bool)), this, SLOT(slotSnapRewind()));
 
     KAction* monitorSeekForward = new KAction(KIcon("media-seek-forward"), i18n("Forward"), this);
     monitorSeekForward->setShortcut(Qt::Key_L);
-    collection->addAction("monitor_seek_forward", monitorSeekForward);
+    collection.addAction("monitor_seek_forward", monitorSeekForward);
     connect(monitorSeekForward, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotForward()));
 
     KAction* clipStart = new KAction(KIcon("media-seek-backward"), i18n("Go to Clip Start"), this);
     clipStart->setShortcut(Qt::Key_Home);
-    collection->addAction("seek_clip_start", clipStart);
+    collection.addAction("seek_clip_start", clipStart);
     connect(clipStart, SIGNAL(triggered(bool)), this, SLOT(slotClipStart()));
 
     KAction* clipEnd = new KAction(KIcon("media-seek-forward"), i18n("Go to Clip End"), this);
     clipEnd->setShortcut(Qt::Key_End);
-    collection->addAction("seek_clip_end", clipEnd);
+    collection.addAction("seek_clip_end", clipEnd);
     connect(clipEnd, SIGNAL(triggered(bool)), this, SLOT(slotClipEnd()));
 
     KAction* zoneStart = new KAction(KIcon("media-seek-backward"), i18n("Go to Zone Start"), this);
     zoneStart->setShortcut(Qt::SHIFT + Qt::Key_I);
-    collection->addAction("seek_zone_start", zoneStart);
+    collection.addAction("seek_zone_start", zoneStart);
     connect(zoneStart, SIGNAL(triggered(bool)), this, SLOT(slotZoneStart()));
 
     KAction* zoneEnd = new KAction(KIcon("media-seek-forward"), i18n("Go to Zone End"), this);
     zoneEnd->setShortcut(Qt::SHIFT + Qt::Key_O);
-    collection->addAction("seek_zone_end", zoneEnd);
+    collection.addAction("seek_zone_end", zoneEnd);
     connect(zoneEnd, SIGNAL(triggered(bool)), this, SLOT(slotZoneEnd()));
 
     KAction* projectStart = new KAction(KIcon("go-first"), i18n("Go to Project Start"), this);
     projectStart->setShortcut(Qt::CTRL + Qt::Key_Home);
-    collection->addAction("seek_start", projectStart);
+    collection.addAction("seek_start", projectStart);
     connect(projectStart, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotStart()));
 
     KAction* projectEnd = new KAction(KIcon("go-last"), i18n("Go to Project End"), this);
     projectEnd->setShortcut(Qt::CTRL + Qt::Key_End);
-    collection->addAction("seek_end", projectEnd);
+    collection.addAction("seek_end", projectEnd);
     connect(projectEnd, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotEnd()));
 
     KAction* monitorSeekForwardOneFrame = new KAction(KIcon("media-skip-forward"), i18n("Forward 1 Frame"), this);
     monitorSeekForwardOneFrame->setShortcut(Qt::Key_Right);
-    collection->addAction("monitor_seek_forward-one-frame", monitorSeekForwardOneFrame);
+    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);
+    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);
+    collection.addAction("monitor_seek_snap_forward", monitorSeekSnapForward);
     connect(monitorSeekSnapForward, SIGNAL(triggered(bool)), this, SLOT(slotSnapForward()));
 
     KAction* deleteItem = new KAction(KIcon("edit-delete"), i18n("Delete Selected Item"), this);
     deleteItem->setShortcut(Qt::Key_Delete);
-    collection->addAction("delete_timeline_clip", deleteItem);
+    collection.addAction("delete_timeline_clip", deleteItem);
     connect(deleteItem, SIGNAL(triggered(bool)), this, SLOT(slotDeleteItem()));
 
     /*KAction* editTimelineClipSpeed = new KAction(i18n("Change Clip Speed"), this);
-    collection->addAction("change_clip_speed", editTimelineClipSpeed);
+    collection.addAction("change_clip_speed", editTimelineClipSpeed);
     editTimelineClipSpeed->setData("change_speed");
     connect(editTimelineClipSpeed, SIGNAL(triggered(bool)), this, SLOT(slotChangeClipSpeed()));*/
 
-    KAction *stickTransition = collection->addAction("auto_transition");
+    KAction *stickTransition = collection.addAction("auto_transition");
     stickTransition->setData(QString("auto"));
     stickTransition->setCheckable(true);
     stickTransition->setEnabled(false);
@@ -1138,95 +1388,105 @@ void MainWindow::setupActions()
 
     KAction* groupClip = new KAction(KIcon("object-group"), i18n("Group Clips"), this);
     groupClip->setShortcut(Qt::CTRL + Qt::Key_G);
-    collection->addAction("group_clip", groupClip);
+    collection.addAction("group_clip", groupClip);
     connect(groupClip, SIGNAL(triggered(bool)), this, SLOT(slotGroupClips()));
 
     KAction* ungroupClip = new KAction(KIcon("object-ungroup"), i18n("Ungroup Clips"), this);
-    collection->addAction("ungroup_clip", ungroupClip);
+    collection.addAction("ungroup_clip", ungroupClip);
     ungroupClip->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_G);
     ungroupClip->setData("ungroup_clip");
     connect(ungroupClip, SIGNAL(triggered(bool)), this, SLOT(slotUnGroupClips()));
 
     KAction* editItemDuration = new KAction(KIcon("measure"), i18n("Edit Duration"), this);
-    collection->addAction("edit_item_duration", editItemDuration);
+    collection.addAction("edit_item_duration", editItemDuration);
     connect(editItemDuration, SIGNAL(triggered(bool)), this, SLOT(slotEditItemDuration()));
 
     KAction* clipInProjectTree = new KAction(KIcon("go-jump-definition"), i18n("Clip in Project Tree"), this);
-    collection->addAction("clip_in_project_tree", clipInProjectTree);
+    collection.addAction("clip_in_project_tree", clipInProjectTree);
     connect(clipInProjectTree, SIGNAL(triggered(bool)), this, SLOT(slotClipInProjectTree()));
 
+    /*KAction* clipToProjectTree = new KAction(KIcon("go-jump-definition"), i18n("Add Clip to Project Tree"), this);
+    collection.addAction("clip_to_project_tree", clipToProjectTree);
+    connect(clipToProjectTree, SIGNAL(triggered(bool)), this, SLOT(slotClipToProjectTree()));*/
+
     KAction* insertOvertwrite = new KAction(KIcon(), i18n("Insert Clip Zone in Timeline (Overwrite)"), this);
     insertOvertwrite->setShortcut(Qt::Key_V);
-    collection->addAction("overwrite_to_in_point", insertOvertwrite);
+    collection.addAction("overwrite_to_in_point", insertOvertwrite);
     connect(insertOvertwrite, SIGNAL(triggered(bool)), this, SLOT(slotInsertClipOverwrite()));
 
     KAction* selectTimelineClip = new KAction(KIcon("edit-select"), i18n("Select Clip"), this);
     selectTimelineClip->setShortcut(Qt::Key_Plus);
-    collection->addAction("select_timeline_clip", selectTimelineClip);
+    collection.addAction("select_timeline_clip", selectTimelineClip);
     connect(selectTimelineClip, SIGNAL(triggered(bool)), this, SLOT(slotSelectTimelineClip()));
 
     KAction* deselectTimelineClip = new KAction(KIcon("edit-select"), i18n("Deselect Clip"), this);
     deselectTimelineClip->setShortcut(Qt::Key_Minus);
-    collection->addAction("deselect_timeline_clip", deselectTimelineClip);
+    collection.addAction("deselect_timeline_clip", deselectTimelineClip);
     connect(deselectTimelineClip, SIGNAL(triggered(bool)), this, SLOT(slotDeselectTimelineClip()));
 
     KAction* selectAddTimelineClip = new KAction(KIcon("edit-select"), i18n("Add Clip To Selection"), this);
     selectAddTimelineClip->setShortcut(Qt::ALT + Qt::Key_Plus);
-    collection->addAction("select_add_timeline_clip", selectAddTimelineClip);
+    collection.addAction("select_add_timeline_clip", selectAddTimelineClip);
     connect(selectAddTimelineClip, SIGNAL(triggered(bool)), this, SLOT(slotSelectAddTimelineClip()));
 
     KAction* selectTimelineTransition = new KAction(KIcon("edit-select"), i18n("Select Transition"), this);
     selectTimelineTransition->setShortcut(Qt::SHIFT + Qt::Key_Plus);
-    collection->addAction("select_timeline_transition", selectTimelineTransition);
+    collection.addAction("select_timeline_transition", selectTimelineTransition);
     connect(selectTimelineTransition, SIGNAL(triggered(bool)), this, SLOT(slotSelectTimelineTransition()));
 
     KAction* deselectTimelineTransition = new KAction(KIcon("edit-select"), i18n("Deselect Transition"), this);
     deselectTimelineTransition->setShortcut(Qt::SHIFT + Qt::Key_Minus);
-    collection->addAction("deselect_timeline_transition", deselectTimelineTransition);
+    collection.addAction("deselect_timeline_transition", deselectTimelineTransition);
     connect(deselectTimelineTransition, SIGNAL(triggered(bool)), this, SLOT(slotDeselectTimelineTransition()));
 
     KAction* selectAddTimelineTransition = new KAction(KIcon("edit-select"), i18n("Add Transition To Selection"), this);
     selectAddTimelineTransition->setShortcut(Qt::ALT + Qt::SHIFT + Qt::Key_Plus);
-    collection->addAction("select_add_timeline_transition", selectAddTimelineTransition);
+    collection.addAction("select_add_timeline_transition", selectAddTimelineTransition);
     connect(selectAddTimelineTransition, SIGNAL(triggered(bool)), this, SLOT(slotSelectAddTimelineTransition()));
 
     KAction* cutTimelineClip = new KAction(KIcon("edit-cut"), i18n("Cut Clip"), this);
     cutTimelineClip->setShortcut(Qt::SHIFT + Qt::Key_R);
-    collection->addAction("cut_timeline_clip", cutTimelineClip);
+    collection.addAction("cut_timeline_clip", cutTimelineClip);
     connect(cutTimelineClip, SIGNAL(triggered(bool)), this, SLOT(slotCutTimelineClip()));
 
     KAction* addClipMarker = new KAction(KIcon("bookmark-new"), i18n("Add Marker"), this);
-    collection->addAction("add_clip_marker", addClipMarker);
+    collection.addAction("add_clip_marker", addClipMarker);
     connect(addClipMarker, SIGNAL(triggered(bool)), this, SLOT(slotAddClipMarker()));
 
     KAction* deleteClipMarker = new KAction(KIcon("edit-delete"), i18n("Delete Marker"), this);
-    collection->addAction("delete_clip_marker", deleteClipMarker);
+    collection.addAction("delete_clip_marker", deleteClipMarker);
     connect(deleteClipMarker, SIGNAL(triggered(bool)), this, SLOT(slotDeleteClipMarker()));
 
     KAction* deleteAllClipMarkers = new KAction(KIcon("edit-delete"), i18n("Delete All Markers"), this);
-    collection->addAction("delete_all_clip_markers", deleteAllClipMarkers);
+    collection.addAction("delete_all_clip_markers", deleteAllClipMarkers);
     connect(deleteAllClipMarkers, SIGNAL(triggered(bool)), this, SLOT(slotDeleteAllClipMarkers()));
 
     KAction* editClipMarker = new KAction(KIcon("document-properties"), i18n("Edit Marker"), this);
-    collection->addAction("edit_clip_marker", editClipMarker);
+    editClipMarker->setData(QString("edit_marker"));
+    collection.addAction("edit_clip_marker", editClipMarker);
     connect(editClipMarker, SIGNAL(triggered(bool)), this, SLOT(slotEditClipMarker()));
 
+    KAction *addMarkerGuideQuickly = new KAction(KIcon("bookmark-new"), i18n("Add Marker/Guide quickly"), this);
+    addMarkerGuideQuickly->setShortcut(Qt::Key_Asterisk);
+    collection.addAction("add_marker_guide_quickly", addMarkerGuideQuickly);
+    connect(addMarkerGuideQuickly, SIGNAL(triggered(bool)), this, SLOT(slotAddMarkerGuideQuickly()));
+
     KAction* splitAudio = new KAction(KIcon("document-new"), i18n("Split Audio"), this);
-    collection->addAction("split_audio", splitAudio);
+    collection.addAction("split_audio", splitAudio);
     connect(splitAudio, SIGNAL(triggered(bool)), this, SLOT(slotSplitAudio()));
 
     KAction* audioOnly = new KAction(KIcon("document-new"), i18n("Audio Only"), this);
-    collection->addAction("clip_audio_only", audioOnly);
+    collection.addAction("clip_audio_only", audioOnly);
     audioOnly->setData("clip_audio_only");
     audioOnly->setCheckable(true);
 
     KAction* videoOnly = new KAction(KIcon("document-new"), i18n("Video Only"), this);
-    collection->addAction("clip_video_only", videoOnly);
+    collection.addAction("clip_video_only", videoOnly);
     videoOnly->setData("clip_video_only");
     videoOnly->setCheckable(true);
 
     KAction* audioAndVideo = new KAction(KIcon("document-new"), i18n("Audio and Video"), this);
-    collection->addAction("clip_audio_and_video", audioAndVideo);
+    collection.addAction("clip_audio_and_video", audioAndVideo);
     audioAndVideo->setData("clip_audio_and_video");
     audioAndVideo->setCheckable(true);
 
@@ -1238,85 +1498,72 @@ void MainWindow::setupActions()
     m_clipTypeGroup->setEnabled(false);
 
     KAction *insertSpace = new KAction(KIcon(), i18n("Insert Space"), this);
-    collection->addAction("insert_space", insertSpace);
+    collection.addAction("insert_space", insertSpace);
     connect(insertSpace, SIGNAL(triggered()), this, SLOT(slotInsertSpace()));
 
     KAction *removeSpace = new KAction(KIcon(), i18n("Remove Space"), this);
-    collection->addAction("delete_space", removeSpace);
+    collection.addAction("delete_space", removeSpace);
     connect(removeSpace, SIGNAL(triggered()), this, SLOT(slotRemoveSpace()));
 
     KAction *insertTrack = new KAction(KIcon(), i18n("Insert Track"), this);
-    collection->addAction("insert_track", insertTrack);
+    collection.addAction("insert_track", insertTrack);
     connect(insertTrack, SIGNAL(triggered()), this, SLOT(slotInsertTrack()));
 
     KAction *deleteTrack = new KAction(KIcon(), i18n("Delete Track"), this);
-    collection->addAction("delete_track", deleteTrack);
+    collection.addAction("delete_track", deleteTrack);
     connect(deleteTrack, SIGNAL(triggered()), this, SLOT(slotDeleteTrack()));
 
-    KAction *changeTrack = new KAction(KIcon(), i18n("Change Track"), this);
-    collection->addAction("change_track", changeTrack);
-    connect(changeTrack, SIGNAL(triggered()), this, SLOT(slotChangeTrack()));
+    KAction *configTracks = new KAction(KIcon("configure"), i18n("Configure Tracks"), this);
+    collection.addAction("config_tracks", configTracks);
+    connect(configTracks, SIGNAL(triggered()), this, SLOT(slotConfigTrack()));
 
     KAction *addGuide = new KAction(KIcon("document-new"), i18n("Add Guide"), this);
-    collection->addAction("add_guide", addGuide);
+    collection.addAction("add_guide", addGuide);
     connect(addGuide, SIGNAL(triggered()), this, SLOT(slotAddGuide()));
 
     QAction *delGuide = new KAction(KIcon("edit-delete"), i18n("Delete Guide"), this);
-    collection->addAction("delete_guide", delGuide);
+    collection.addAction("delete_guide", delGuide);
     connect(delGuide, SIGNAL(triggered()), this, SLOT(slotDeleteGuide()));
 
     QAction *editGuide = new KAction(KIcon("document-properties"), i18n("Edit Guide"), this);
-    collection->addAction("edit_guide", editGuide);
+    collection.addAction("edit_guide", editGuide);
     connect(editGuide, SIGNAL(triggered()), this, SLOT(slotEditGuide()));
 
     QAction *delAllGuides = new KAction(KIcon("edit-delete"), i18n("Delete All Guides"), this);
-    collection->addAction("delete_all_guides", delAllGuides);
+    collection.addAction("delete_all_guides", delAllGuides);
     connect(delAllGuides, SIGNAL(triggered()), this, SLOT(slotDeleteAllGuides()));
 
     QAction *pasteEffects = new KAction(KIcon("edit-paste"), i18n("Paste Effects"), this);
-    collection->addAction("paste_effects", pasteEffects);
+    collection.addAction("paste_effects", pasteEffects);
     pasteEffects->setData("paste_effects");
     connect(pasteEffects , SIGNAL(triggered()), this, SLOT(slotPasteEffects()));
 
     QAction *showTimeline = new KAction(i18n("Show Timeline"), this);
-    collection->addAction("show_timeline", showTimeline);
+    collection.addAction("show_timeline", showTimeline);
     showTimeline->setCheckable(true);
     showTimeline->setChecked(true);
     connect(showTimeline, SIGNAL(triggered(bool)), this, SLOT(slotShowTimeline(bool)));
 
     QAction *showTitleBar = new KAction(i18n("Show Title Bars"), this);
-    collection->addAction("show_titlebars", showTitleBar);
+    collection.addAction("show_titlebars", showTitleBar);
     showTitleBar->setCheckable(true);
     connect(showTitleBar, SIGNAL(triggered(bool)), this, SLOT(slotShowTitleBars(bool)));
     showTitleBar->setChecked(KdenliveSettings::showtitlebars());
     slotShowTitleBars(KdenliveSettings::showtitlebars());
 
-    /*QAction *maxCurrent = new KAction(i18n("Maximize Current Widget"), this);
-    collection->addAction("maximize_current", maxCurrent);
-    maxCurrent->setCheckable(true);
-    maxCurrent->setChecked(false);
-    connect(maxCurrent, SIGNAL(triggered(bool)), this, SLOT(slotMaximizeCurrent(bool)));*/
-
-
-    m_closeAction = KStandardAction::close(this, SLOT(closeCurrentDocument()), collection);
-
-    KStandardAction::quit(this, SLOT(queryQuit()), collection);
-
-    KStandardAction::open(this, SLOT(openFile()), collection);
-
-    m_saveAction = KStandardAction::save(this, SLOT(saveFile()), collection);
-
-    KStandardAction::saveAs(this, SLOT(saveFileAs()), collection);
-
-    KStandardAction::openNew(this, SLOT(newFile()), collection);
-
-    KStandardAction::preferences(this, SLOT(slotPreferences()), collection);
-
-    KStandardAction::configureNotifications(this , SLOT(configureNotifications()), collection);
-
-    KStandardAction::copy(this, SLOT(slotCopy()), collection);
-
-    KStandardAction::paste(this, SLOT(slotPaste()), collection);
+    m_closeAction = KStandardAction::close(this,  SLOT(closeCurrentDocument()),   collection);
+    KStandardAction::quit(this,                   SLOT(close()),                  collection);
+    KStandardAction::open(this,                   SLOT(openFile()),               collection);
+    m_saveAction = KStandardAction::save(this,    SLOT(saveFile()),               collection);
+    KStandardAction::saveAs(this,                 SLOT(saveFileAs()),             collection);
+    KStandardAction::openNew(this,                SLOT(newFile()),                collection);
+    // TODO: make the following connection to slotEditKeys work
+    KStandardAction::keyBindings(this,            SLOT(slotEditKeys()),           collection);
+    KStandardAction::preferences(this,            SLOT(slotPreferences()),        collection);
+    KStandardAction::configureNotifications(this, SLOT(configureNotifications()), collection);
+    KStandardAction::copy(this,                   SLOT(slotCopy()),               collection);
+    KStandardAction::paste(this,                  SLOT(slotPaste()),              collection);
+    KStandardAction::fullScreen(this,             SLOT(slotFullScreen()), this,   collection);
 
     KAction *undo = KStandardAction::undo(m_commandStack, SLOT(undo()), collection);
     undo->setEnabled(false);
@@ -1326,8 +1573,6 @@ void MainWindow::setupActions()
     redo->setEnabled(false);
     connect(m_commandStack, SIGNAL(canRedoChanged(bool)), redo, SLOT(setEnabled(bool)));
 
-    KStandardAction::fullScreen(this, SLOT(slotFullScreen()), this, collection);
-
     /*
     //TODO: Add status tooltip to actions ?
     connect(collection, SIGNAL(actionHovered(QAction*)),
@@ -1335,53 +1580,64 @@ void MainWindow::setupActions()
 
 
     QAction *addClip = new KAction(KIcon("kdenlive-add-clip"), i18n("Add Clip"), this);
-    collection->addAction("add_clip", addClip);
+    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);
+    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);
+    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);
+    collection.addAction("add_text_clip", addTitleClip);
     connect(addTitleClip , SIGNAL(triggered()), m_projectList, SLOT(slotAddTitleClip()));
 
     QAction *addTitleTemplateClip = new KAction(KIcon("kdenlive-add-text-clip"), i18n("Add Template Title"), this);
-    collection->addAction("add_text_template_clip", addTitleTemplateClip);
+    collection.addAction("add_text_template_clip", addTitleTemplateClip);
     connect(addTitleTemplateClip , SIGNAL(triggered()), m_projectList, SLOT(slotAddTitleTemplateClip()));
 
     QAction *addFolderButton = new KAction(KIcon("folder-new"), i18n("Create Folder"), this);
-    collection->addAction("add_folder", addFolderButton);
+    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);
+    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);
+    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);
+    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);
+    collection.addAction("reload_clip", reloadClip);
     reloadClip->setData("reload_clip");
     connect(reloadClip , SIGNAL(triggered()), m_projectList, SLOT(slotReloadClip()));
     reloadClip->setEnabled(false);
 
+    QAction *proxyClip = new KAction(i18n("Proxy Clip"), this);
+    collection.addAction("proxy_clip", proxyClip);
+    proxyClip->setData("proxy_clip");
+    proxyClip->setCheckable(true);
+    proxyClip->setChecked(false);
+    connect(proxyClip, SIGNAL(toggled(bool)), m_projectList, SLOT(slotProxyCurrentItem(bool)));
+    
+    QAction *stopMotion = new KAction(KIcon("image-x-generic"), i18n("Stop Motion Capture"), this);
+    collection.addAction("stopmotion", stopMotion);
+    connect(stopMotion , SIGNAL(triggered()), this, SLOT(slotOpenStopmotion()));
+
     QMenu *addClips = new QMenu();
     addClips->addAction(addClip);
     addClips->addAction(addColorClip);
@@ -1391,13 +1647,28 @@ void MainWindow::setupActions()
     addClips->addAction(addFolderButton);
 
     addClips->addAction(reloadClip);
+    addClips->addAction(proxyClip);
     addClips->addAction(clipProperties);
     addClips->addAction(openClip);
     addClips->addAction(deleteClip);
     m_projectList->setupMenu(addClips, addClip);
 
-    //connect(collection, SIGNAL( clearStatusText() ),
-    //statusBar(), SLOT( clear() ) );
+    // Setup effects and transitions actions.
+    m_effectsActionCollection = new KActionCollection(this, KGlobal::mainComponent());
+    //KActionCategory *transitionActions = new KActionCategory(i18n("Transitions"), m_effectsActionCollection);
+    KActionCategory *transitionActions = new KActionCategory(i18n("Transitions"), collection);
+    m_transitions = new KAction*[transitions.count()];
+    for (int i = 0; i < transitions.count(); i++) {
+        QStringList effectInfo = transitions.effectIdInfo(i);
+        m_transitions[i] = new KAction(effectInfo.at(0), this);
+        m_transitions[i]->setData(effectInfo);
+        m_transitions[i]->setIconVisibleInMenu(false);
+        QString id = effectInfo.at(2);
+        if (id.isEmpty()) id = effectInfo.at(1);
+        transitionActions->addAction("transition_" + id, m_transitions[i]);
+    }
+    //m_effectsActionCollection->readSettings();
+
 }
 
 void MainWindow::slotDisplayActionMessage(QAction *a)
@@ -1405,6 +1676,68 @@ void MainWindow::slotDisplayActionMessage(QAction *a)
     statusBar()->showMessage(a->data().toString(), 3000);
 }
 
+void MainWindow::loadLayouts()
+{
+    QMenu *saveLayout = (QMenu*)(factory()->container("layout_save_as", this));
+    if (m_loadLayout == NULL || saveLayout == NULL) return;
+    KSharedConfigPtr config = KGlobal::config();
+    KConfigGroup layoutGroup(config, "Layouts");
+    QStringList entries = layoutGroup.keyList();
+    QList<QAction *> loadActions = m_loadLayout->actions();
+    QList<QAction *> saveActions = saveLayout->actions();
+    for (int i = 1; i < 5; i++) {
+        // Rename the layouts actions
+        foreach(const QString & key, entries) {
+            if (key.endsWith(QString("_%1").arg(i))) {
+                // Found previously saved layout
+                QString layoutName = key.section("_", 0, -2);
+                for (int j = 0; j < loadActions.count(); j++) {
+                    if (loadActions.at(j)->data().toString().endsWith("_" + QString::number(i))) {
+                        loadActions[j]->setText(layoutName);
+                        loadActions[j]->setData(key);
+                        break;
+                    }
+                }
+                for (int j = 0; j < saveActions.count(); j++) {
+                    if (saveActions.at(j)->data().toString().endsWith("_" + QString::number(i))) {
+                        saveActions[j]->setText(i18n("Save as %1").arg(layoutName));
+                        saveActions[j]->setData(key);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+}
+
+void MainWindow::slotLoadLayout(QAction *action)
+{
+    if (!action) return;
+    QString layoutId = action->data().toString();
+    if (layoutId.isEmpty()) return;
+    KSharedConfigPtr config = KGlobal::config();
+    KConfigGroup layouts(config, "Layouts");
+    QByteArray state = QByteArray::fromBase64(layouts.readEntry(layoutId).toAscii());
+    restoreState(state);
+}
+
+void MainWindow::slotSaveLayout(QAction *action)
+{
+    QString originallayoutName = action->data().toString();
+    int layoutId = originallayoutName.section('_', -1).toInt();
+
+    QString layoutName = QInputDialog::getText(this, i18n("Save Layout"), i18n("Layout name:"), QLineEdit::Normal, originallayoutName.section('_', 0, -2));
+    if (layoutName.isEmpty()) return;
+    KSharedConfigPtr config = KGlobal::config();
+    KConfigGroup layouts(config, "Layouts");
+    layouts.deleteEntry(originallayoutName);
+
+    QByteArray st = saveState();
+    layoutName.append("_" + QString::number(layoutId));
+    layouts.writeEntry(layoutName, st.toBase64());
+    loadLayouts();
+}
+
 void MainWindow::saveOptions()
 {
     KdenliveSettings::self()->writeConfig();
@@ -1466,29 +1799,44 @@ void MainWindow::slotRunWizard()
 
 void MainWindow::newFile(bool showProjectSettings, bool force)
 {
-    if (!m_timelineArea->isEnabled() && !force) return;
+    if (!m_timelineArea->isEnabled() && !force)
+        return;
     m_fileRevert->setEnabled(false);
-    QString profileName;
-    KUrl projectFolder;
+    QString profileName = KdenliveSettings::default_profile();
+    KUrl projectFolder = KdenliveSettings::defaultprojectfolder();
+    QMap <QString, QString> documentProperties;
     QPoint projectTracks(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks());
     if (!showProjectSettings) {
-        if (!KdenliveSettings::activatetabs()) closeCurrentDocument();
-        profileName = KdenliveSettings::default_profile();
-        projectFolder = KdenliveSettings::defaultprojectfolder();
+        if (!KdenliveSettings::activatetabs())
+            if (!closeCurrentDocument())
+                return;
     } else {
         ProjectSettings *w = new ProjectSettings(NULL, QStringList(), projectTracks.x(), projectTracks.y(), KdenliveSettings::defaultprojectfolder(), false, true, this);
-        if (w->exec() != QDialog::Accepted) return;
-        if (!KdenliveSettings::activatetabs()) closeCurrentDocument();
-        if (KdenliveSettings::videothumbnails() != w->enableVideoThumbs()) slotSwitchVideoThumbs();
-        if (KdenliveSettings::audiothumbnails() != w->enableAudioThumbs()) slotSwitchAudioThumbs();
+        if (w->exec() != QDialog::Accepted)
+            return;
+        if (!KdenliveSettings::activatetabs())
+            if (!closeCurrentDocument())
+                return;
+        if (KdenliveSettings::videothumbnails() != w->enableVideoThumbs())
+            slotSwitchVideoThumbs();
+        if (KdenliveSettings::audiothumbnails() != w->enableAudioThumbs())
+            slotSwitchAudioThumbs();
         profileName = w->selectedProfile();
         projectFolder = w->selectedFolder();
         projectTracks = w->tracks();
+        documentProperties.insert("enableproxy", QString::number((int) w->useProxy()));
+        documentProperties.insert("generateproxy", QString::number((int) w->generateProxy()));
+        documentProperties.insert("proxyminsize", QString::number(w->proxyMinSize()));
+        documentProperties.insert("proxyparams", w->proxyParams());
+        documentProperties.insert("proxyextension", w->proxyExtension());
+        documentProperties.insert("generateimageproxy", QString::number((int) w->generateImageProxy()));
+        documentProperties.insert("proxyimageminsize", QString::number(w->proxyImageMinSize()));
         delete w;
     }
     m_timelineArea->setEnabled(true);
     m_projectList->setEnabled(true);
-    KdenliveDoc *doc = new KdenliveDoc(KUrl(), projectFolder, m_commandStack, profileName, projectTracks, m_projectMonitor->render, this);
+    bool openBackup;
+    KdenliveDoc *doc = new KdenliveDoc(KUrl(), projectFolder, m_commandStack, profileName, documentProperties, projectTracks, m_projectMonitor->render, m_notesWidget, &openBackup, this);
     doc->m_autosave = new KAutoSaveFile(KUrl(), doc);
     bool ok;
     TrackView *trackView = new TrackView(doc, &ok, this);
@@ -1503,7 +1851,8 @@ void MainWindow::newFile(bool showProjectSettings, bool force)
     if (m_timelineArea->count() == 1) {
         connectDocumentInfo(doc);
         connectDocument(trackView, doc);
-    } else m_timelineArea->setTabBarHidden(false);
+    } else
+        m_timelineArea->setTabBarHidden(false);
     m_monitorManager->activateMonitor("clip");
     m_closeAction->setEnabled(m_timelineArea->count() > 1);
 }
@@ -1517,10 +1866,10 @@ void MainWindow::activateDocument()
     connectDocument(currentTab, currentDoc);
 }
 
-void MainWindow::closeCurrentDocument(bool saveChanges)
+bool MainWindow::closeCurrentDocument(bool saveChanges)
 {
     QWidget *w = m_timelineArea->currentWidget();
-    if (!w) return;
+    if (!w) return true;
     // closing current document
     int ix = m_timelineArea->currentIndex() + 1;
     if (ix == m_timelineArea->count()) ix = 0;
@@ -1528,19 +1877,25 @@ 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;
+            if (saveFile() == false) return false;
             break;
         case KMessageBox::Cancel :
-            return;
+            return false;
             break;
         default:
             break;
         }
     }
-    m_clipMonitor->slotSetXml(NULL);
+    m_clipMonitor->slotSetClipProducer(NULL);
+    m_projectList->slotResetProjectList();
     m_timelineArea->removeTab(m_timelineArea->indexOf(w));
     if (m_timelineArea->count() == 1) {
         m_timelineArea->setTabBarHidden(true);
@@ -1551,26 +1906,24 @@ 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;
+    }
+    return true;
 }
 
 bool MainWindow::saveFileAs(const QString &outputFileName)
 {
     QString currentSceneList;
     m_monitorManager->stopActiveMonitor();
-    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)
+
+    if (m_activeDocument->saveSceneList(outputFileName, m_projectMonitor->sceneList(), m_projectList->expandedFolders()) == false)
         return false;
 
     // Save timeline thumbnails
@@ -1585,20 +1938,20 @@ bool MainWindow::saveFileAs(const QString &outputFileName)
     m_activeDocument->setModified(false);
     m_fileOpenRecent->addUrl(KUrl(outputFileName));
     m_fileRevert->setEnabled(true);
+    m_undoView->stack()->setClean();
     return true;
 }
 
 bool MainWindow::saveFileAs()
 {
-    // Check that the Kdenlive mime type is correctly installed
-    QString mimetype = "application/x-kdenlive";
-    KMimeType::Ptr mime = KMimeType::mimeType(mimetype);
-    if (!mime) mimetype = "*.kdenlive";
-
-    QString outputFile = KFileDialog::getSaveFileName(KUrl(), mimetype);
-    if (outputFile.isEmpty()) return false;
+    QString outputFile = KFileDialog::getSaveFileName(m_activeDocument->projectFolder(), getMimeType(false));
+    if (outputFile.isEmpty()) {
+        return false;
+    }
     if (QFile::exists(outputFile)) {
-        if (KMessageBox::questionYesNo(this, i18n("File already exists.\nDo you want to overwrite it?")) == KMessageBox::No) return false;
+        // Show the file dialog again if the user does not want to overwrite the file
+        if (KMessageBox::questionYesNo(this, i18n("File %1 already exists.\nDo you want to overwrite it?", outputFile)) == KMessageBox::No)
+            return saveFileAs();
     }
     return saveFileAs(outputFile);
 }
@@ -1622,12 +1975,7 @@ void MainWindow::openFile()
         m_startUrl = KUrl();
         return;
     }
-    // Check that the Kdenlive mime type is correctly installed
-    QString mimetype = "application/x-kdenlive";
-    KMimeType::Ptr mime = KMimeType::mimeType(mimetype);
-    if (!mime) mimetype = "*.kdenlive";
-
-    KUrl url = KFileDialog::getOpenUrl(KUrl("kfiledialog:///projectfolder"), mimetype);
+    KUrl url = KFileDialog::getOpenUrl(KUrl("kfiledialog:///projectfolder"), getMimeType());
     if (url.isEmpty()) return;
     m_fileOpenRecent->addUrl(url);
     openFile(url);
@@ -1644,6 +1992,22 @@ void MainWindow::openLastFile()
 
 void MainWindow::openFile(const KUrl &url)
 {
+    // Make sure the url is a Kdenlive project file
+    KMimeType::Ptr mime = KMimeType::findByUrl(url);
+    if (mime.data()->is("application/x-compressed-tar")) {
+        // Opening a compressed project file, we need to process it
+        kDebug()<<"Opening archive, processing";
+        ArchiveWidget *ar = new ArchiveWidget(url);
+        if (ar->exec() == QDialog::Accepted) openFile(KUrl(ar->extractedProjectFile()));
+        delete ar;
+        return;
+    }
+    if (!url.fileName().endsWith(".kdenlive")) {
+        // This is not a Kdenlive project file, abort loading
+        KMessageBox::sorry(this, i18n("File %1 is not a Kdenlive project file", url.path()));
+        return;
+    }
+    
     // Check if the document is already opened
     const int ct = m_timelineArea->count();
     bool isOpened = false;
@@ -1661,6 +2025,8 @@ void MainWindow::openFile(const KUrl &url)
         return;
     }
 
+    if (!KdenliveSettings::activatetabs()) if (!closeCurrentDocument()) return;
+
     // Check for backup file
     QList<KAutoSaveFile *> staleFiles = KAutoSaveFile::staleFiles(url);
     if (!staleFiles.isEmpty()) {
@@ -1672,13 +2038,12 @@ void MainWindow::openFile(const KUrl &url)
             return;
         } else {
             // remove the stale files
-            foreach(KAutoSaveFile *stale, staleFiles) {
+            foreach(KAutoSaveFile * stale, staleFiles) {
                 stale->open(QIODevice::ReadWrite);
                 delete stale;
             }
         }
     }
-    if (!KdenliveSettings::activatetabs()) closeCurrentDocument();
     m_messageLabel->setMessage(i18n("Opening file %1", url.path()), InformationMessage);
     m_messageLabel->repaint();
     doOpenFile(url, NULL);
@@ -1688,7 +2053,29 @@ void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale)
 {
     if (!m_timelineArea->isEnabled()) return;
     m_fileRevert->setEnabled(true);
-    KdenliveDoc *doc = new KdenliveDoc(url, KdenliveSettings::defaultprojectfolder(), m_commandStack, KdenliveSettings::default_profile(), QPoint(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks()), m_projectMonitor->render, this);
+
+    // Recreate stopmotion widget on document change
+    if (m_stopmotion) {
+        delete m_stopmotion;
+        m_stopmotion = NULL;
+    }
+    
+    m_timer.start();
+    KProgressDialog progressDialog(this, i18n("Loading project"), i18n("Loading project"));
+    progressDialog.setAllowCancel(false);
+    progressDialog.progressBar()->setMaximum(4);
+    progressDialog.show();
+    progressDialog.progressBar()->setValue(0);
+    qApp->processEvents();
+
+    bool openBackup;
+    KdenliveDoc *doc = new KdenliveDoc(url, KdenliveSettings::defaultprojectfolder(), m_commandStack, KdenliveSettings::default_profile(), QMap <QString, QString> (), QPoint(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks()), m_projectMonitor->render, m_notesWidget, &openBackup, this, &progressDialog);
+
+    progressDialog.progressBar()->setValue(1);
+    progressDialog.progressBar()->setMaximum(4);
+    progressDialog.setLabelText(i18n("Loading project"));
+    qApp->processEvents();
+
     if (stale == NULL) {
         stale = new KAutoSaveFile(url, doc);
         doc->m_autosave = stale;
@@ -1699,8 +2086,16 @@ void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale)
         stale->setParent(doc);
     }
     connectDocumentInfo(doc);
+
+    progressDialog.progressBar()->setValue(2);
+    qApp->processEvents();
+
     bool ok;
     TrackView *trackView = new TrackView(doc, &ok, this);
+    connectDocument(trackView, doc);
+    progressDialog.progressBar()->setValue(3);
+    qApp->processEvents();
+
     m_timelineArea->setCurrentIndex(m_timelineArea->addTab(trackView, KIcon("kdenlive"), doc->description()));
     if (!ok) {
         m_timelineArea->setEnabled(false);
@@ -1718,13 +2113,13 @@ void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale)
     slotGotProgressInfo(QString(), -1);
     m_projectMonitor->adjustRulerSize(trackView->duration());
     m_projectMonitor->slotZoneMoved(trackView->inPoint(), trackView->outPoint());
-    m_clipMonitor->refreshMonitor(true);
+    progressDialog.progressBar()->setValue(4);
+    if (openBackup) slotOpenBackupDialog(url);
 }
 
 void MainWindow::recoverFiles(QList<KAutoSaveFile *> staleFiles)
 {
-    if (!KdenliveSettings::activatetabs()) closeCurrentDocument();
-    foreach(KAutoSaveFile *stale, staleFiles) {
+    foreach(KAutoSaveFile * stale, staleFiles) {
         /*if (!stale->open(QIODevice::QIODevice::ReadOnly)) {
                   // show an error message; we could not steal the lockfile
                   // maybe another application got to the file before us?
@@ -1746,9 +2141,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");
@@ -1844,56 +2238,105 @@ void MainWindow::slotEditProjectSettings()
 {
     QPoint p = m_activeDocument->getTracksCount();
     ProjectSettings *w = new ProjectSettings(m_projectList, m_activeTimeline->projectView()->extractTransitionsLumas(), p.x(), p.y(), m_activeDocument->projectFolder().path(), true, !m_activeDocument->isModified(), this);
+    connect(w, SIGNAL(disableProxies()), this, SLOT(slotDisableProxies()));
 
     if (w->exec() == QDialog::Accepted) {
         QString profile = w->selectedProfile();
         m_activeDocument->setProjectFolder(w->selectedFolder());
-        if (m_renderWidget) m_renderWidget->setDocumentPath(w->selectedFolder().path(KUrl::AddTrailingSlash));
+#ifndef   Q_WS_MAC
+        m_recMonitor->slotUpdateCaptureFolder(m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash));
+#endif
+        if (m_renderWidget) m_renderWidget->setDocumentPath(m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash));
         if (KdenliveSettings::videothumbnails() != w->enableVideoThumbs()) slotSwitchVideoThumbs();
         if (KdenliveSettings::audiothumbnails() != w->enableAudioThumbs()) slotSwitchAudioThumbs();
-        if (m_activeDocument->profilePath() != profile) {
-            // Profile was changed
-            double dar = m_activeDocument->dar();
-
-            // Deselect current effect / transition
-            m_effectStack->slotClipItemSelected(NULL, 0);
-            m_transitionConfig->slotTransitionItemSelected(NULL, 0, QPoint(), false);
-            m_clipMonitor->slotSetXml(NULL);
-            bool updateFps = m_activeDocument->setProfilePath(profile);
-            KdenliveSettings::setCurrent_profile(profile);
-            KdenliveSettings::setProject_fps(m_activeDocument->fps());
-            setCaption(m_activeDocument->description(), m_activeDocument->isModified());
-
-            m_activeDocument->clipManager()->clearUnusedProducers();
-            m_monitorManager->resetProfiles(m_activeDocument->timecode());
-
-            m_transitionConfig->updateProjectFormat(m_activeDocument->mltProfile(), m_activeDocument->timecode(), m_activeDocument->tracksList());
-            m_effectStack->updateProjectFormat(m_activeDocument->mltProfile(), m_activeDocument->timecode());
-            m_projectList->updateProjectFormat(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());
-            if (dar != m_activeDocument->dar()) m_projectList->reloadClipThumbnails();
-            if (updateFps) m_activeTimeline->updateProjectFps();
-            m_activeDocument->setModified(true);
-            m_commandStack->activeStack()->clear();
-            //Update the mouse position display so it will display in DF/NDF format by default based on the project setting.
-            slotUpdateMousePosition(0);
-            // We need to desactivate & reactivate monitors to get a refresh
-            //m_monitorManager->switchMonitors();
+        if (m_activeDocument->profilePath() != profile) slotUpdateProjectProfile(profile);
+        if (m_activeDocument->getDocumentProperty("proxyparams") != w->proxyParams()) {
+            m_activeDocument->setModified();
+            m_activeDocument->setDocumentProperty("proxyparams", w->proxyParams());
+            if (m_activeDocument->clipManager()->clipsCount() > 0 && KMessageBox::questionYesNo(this, i18n("You have changed the proxy parameters. Do you want to recreate all proxy clips for this project?")) == KMessageBox::Yes) {
+                //TODO: rebuild all proxies
+                //m_projectList->rebuildProxies();
+            }
+        }
+        if (m_activeDocument->getDocumentProperty("proxyextension") != w->proxyExtension()) {
+            m_activeDocument->setModified();
+            m_activeDocument->setDocumentProperty("proxyextension", w->proxyExtension());
+        }
+        if (m_activeDocument->getDocumentProperty("generateproxy") != QString::number((int) w->generateProxy())) {
+            m_activeDocument->setModified();
+            m_activeDocument->setDocumentProperty("generateproxy", QString::number((int) w->generateProxy()));
+        }
+        if (m_activeDocument->getDocumentProperty("proxyminsize") != QString::number(w->proxyMinSize())) {
+            m_activeDocument->setModified();
+            m_activeDocument->setDocumentProperty("proxyminsize", QString::number(w->proxyMinSize()));
+        }
+        if (m_activeDocument->getDocumentProperty("generateimageproxy") != QString::number((int) w->generateImageProxy())) {
+            m_activeDocument->setModified();
+            m_activeDocument->setDocumentProperty("generateimageproxy", QString::number((int) w->generateImageProxy()));
+        }
+        if (m_activeDocument->getDocumentProperty("proxyimageminsize") != QString::number(w->proxyImageMinSize())) {
+            m_activeDocument->setModified();
+            m_activeDocument->setDocumentProperty("proxyimageminsize", QString::number(w->proxyImageMinSize()));
+        }
+        if (QString::number((int) w->useProxy()) != m_activeDocument->getDocumentProperty("enableproxy")) {
+            m_activeDocument->setDocumentProperty("enableproxy", QString::number((int) w->useProxy()));
+            m_activeDocument->setModified();
+            slotUpdateProxySettings();
         }
     }
     delete w;
 }
 
+void MainWindow::slotDisableProxies()
+{
+    m_activeDocument->setDocumentProperty("enableproxy", QString::number((int) false));
+    m_activeDocument->setModified();
+    slotUpdateProxySettings();
+}
+
+void MainWindow::slotUpdateProjectProfile(const QString &profile)
+{
+    // Recreate the stopmotion widget if profile changes
+    if (m_stopmotion) {
+        delete m_stopmotion;
+        m_stopmotion = NULL;
+    }
+
+    // Deselect current effect / transition
+    m_effectStack->slotClipItemSelected(NULL, 0);
+    m_transitionConfig->slotTransitionItemSelected(NULL, 0, QPoint(), false);
+    m_clipMonitor->slotSetClipProducer(NULL);
+    bool updateFps = m_activeDocument->setProfilePath(profile);
+    KdenliveSettings::setCurrent_profile(profile);
+    KdenliveSettings::setProject_fps(m_activeDocument->fps());
+    setCaption(m_activeDocument->description(), m_activeDocument->isModified());
+
+    m_activeDocument->clipManager()->clearUnusedProducers();
+    m_monitorManager->resetProfiles(m_activeDocument->timecode());
+    m_transitionConfig->updateProjectFormat(m_activeDocument->mltProfile(), m_activeDocument->timecode(), m_activeDocument->tracksList());
+    m_effectStack->updateProjectFormat(m_activeDocument->mltProfile(), m_activeDocument->timecode());
+    m_projectList->updateProjectFormat(m_activeDocument->timecode());
+    if (m_renderWidget) m_renderWidget->setProfile(m_activeDocument->mltProfile());
+    m_timelineArea->setTabText(m_timelineArea->currentIndex(), m_activeDocument->description());
+    if (updateFps) m_activeTimeline->updateProjectFps();
+    m_activeDocument->clipManager()->clearCache();
+    m_activeTimeline->updateProfile();
+    m_activeDocument->setModified(true);
+    m_commandStack->activeStack()->clear();
+    //Update the mouse position display so it will display in DF/NDF format by default based on the project setting.
+    slotUpdateMousePosition(0);
+    // We need to desactivate & reactivate monitors to get a refresh
+    //m_monitorManager->switchMonitors();
+}
+
 
 void MainWindow::slotRenderProject()
 {
     if (!m_renderWidget) {
         QString projectfolder = m_activeDocument ? m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash) : KdenliveSettings::defaultprojectfolder();
-        m_renderWidget = new RenderWidget(projectfolder, this);
+        m_renderWidget = new RenderWidget(projectfolder, m_projectList->useProxy(), 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 &)));
@@ -1901,31 +2344,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()
@@ -1980,35 +2428,41 @@ 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_notesWidget, SIGNAL(textChanged()), 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()));
+            disconnect(m_projectList, SIGNAL(updateProfile(const QString &)), this, SLOT(slotUpdateProjectProfile(const QString &)));
+
+            disconnect(m_projectMonitor->render, SIGNAL(refreshDocumentProducers(bool, bool)), m_activeDocument, SLOT(checkProjectClips(bool, bool)));
 
             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(resetProjectList()), m_projectList, SLOT(slotResetProjectList()));
-            disconnect(m_activeDocument, SIGNAL(signalDeleteProjectClip(const QString &)), m_projectList, SLOT(slotDeleteClip(const QString &)));
+            disconnect(m_activeDocument, SIGNAL(signalDeleteProjectClip(const QString &)), this, 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 &)));
-            disconnect(m_activeDocument, SIGNAL(deleteTimelineClip(const QString &)), m_activeTimeline, SLOT(slotDeleteClip(const QString &)));
-            disconnect(m_activeTimeline->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), m_effectStack, SLOT(slotClipItemSelected(ClipItem*, int)));
-            disconnect(m_activeTimeline->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), this, SLOT(slotActivateEffectStackView()));
+            disconnect(m_activeTimeline->projectView(), SIGNAL(clipItemSelected(ClipItem*, int, bool)), m_effectStack, SLOT(slotClipItemSelected(ClipItem*, int)));
+            disconnect(m_activeTimeline->projectView(), SIGNAL(clipItemSelected(ClipItem*, int, bool)), this, SLOT(slotActivateEffectStackView(ClipItem*, int, bool)));
+            disconnect(m_activeTimeline->projectView(), SIGNAL(clipItemSelected(ClipItem*, int, bool)), m_projectMonitor, SLOT(slotSetSelectedClip(ClipItem*)));
             disconnect(m_activeTimeline->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, bool)), m_transitionConfig, SLOT(slotTransitionItemSelected(Transition*, int, QPoint, bool)));
             disconnect(m_activeTimeline->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, bool)), this, SLOT(slotActivateTransitionView(Transition *)));
+            disconnect(m_activeTimeline->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, bool)), m_projectMonitor, SLOT(slotSetSelectedClip(Transition*)));
             disconnect(m_activeTimeline->projectView(), SIGNAL(playMonitor()), m_projectMonitor, SLOT(slotPlay()));
-            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 *, QPoint, const int)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *, QPoint, const int)));
+            disconnect(m_activeTimeline->projectView(), SIGNAL(showClipFrame(DocClipBase *, QPoint, const int)), m_clipMonitor, SLOT(slotSetClipProducer(DocClipBase *, QPoint, const int)));
             disconnect(m_activeTimeline, SIGNAL(cursorMoved()), m_projectMonitor, SLOT(activateMonitor()));
             disconnect(m_activeTimeline, SIGNAL(insertTrack(int)), this, SLOT(slotInsertTrack(int)));
             disconnect(m_activeTimeline, SIGNAL(deleteTrack(int)), this, SLOT(slotDeleteTrack(int)));
-            disconnect(m_activeTimeline, SIGNAL(changeTrack(int)), this, SLOT(slotChangeTrack(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()));
@@ -2016,83 +2470,95 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc)   //cha
             disconnect(m_projectList, SIGNAL(loadingIsOver()), m_activeTimeline->projectView(), SLOT(slotUpdateAllThumbs()));
             disconnect(m_projectList, SIGNAL(displayMessage(const QString&, int)), this, SLOT(slotGotProgressInfo(const QString&, int)));
             disconnect(m_projectList, SIGNAL(updateRenderStatus()), this, SLOT(slotCheckRenderStatus()));
-            disconnect(m_projectList, SIGNAL(clipNeedsReload(const QString&, bool)), m_activeTimeline->projectView(), SLOT(slotUpdateClip(const QString &, bool)));
+            disconnect(m_projectList, SIGNAL(clipNeedsReload(const QString&)), this, SLOT(slotUpdateClip(const QString &)));
+            disconnect(m_projectList, SIGNAL(refreshClip(const QString &)), m_activeTimeline->projectView(), SLOT(slotRefreshThumbs(const QString &)));
             m_effectStack->clear();
         }
         //m_activeDocument->setRenderer(NULL);
-        disconnect(m_projectList, SIGNAL(clipSelected(DocClipBase *)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *)));
-        disconnect(m_projectList, SIGNAL(refreshClip()), m_clipMonitor, SLOT(refreshMonitor()));
+        disconnect(m_projectList, SIGNAL(refreshClip(const QString &, bool)), m_monitorManager, SLOT(slotRefreshCurrentMonitor()));
         m_clipMonitor->stop();
     }
     KdenliveSettings::setCurrent_profile(doc->profilePath());
     KdenliveSettings::setProject_fps(doc->fps());
     m_monitorManager->resetProfiles(doc->timecode());
+    m_clipMonitorDock->raise();
     m_projectList->setDocument(doc);
     m_transitionConfig->updateProjectFormat(doc->mltProfile(), doc->timecode(), doc->tracksList());
     m_effectStack->updateProjectFormat(doc->mltProfile(), doc->timecode());
-    connect(m_projectList, SIGNAL(clipSelected(DocClipBase *, QPoint)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *, QPoint)));
-    connect(m_projectList, SIGNAL(refreshClip()), m_clipMonitor, SLOT(refreshMonitor()));
-    connect(m_projectList, SIGNAL(clipNeedsReload(const QString&, bool)), trackView->projectView(), SLOT(slotUpdateClip(const QString &, bool)));
+    connect(m_projectList, SIGNAL(refreshClip(const QString &, bool)), m_monitorManager, SLOT(slotRefreshCurrentMonitor()));
+    connect(m_projectList, SIGNAL(refreshClip(const QString &, bool)), trackView->projectView(), SLOT(slotRefreshThumbs(const QString &, bool)));
+    connect(m_projectList, SIGNAL(clipNeedsReload(const QString&)),this, SLOT(slotUpdateClip(const QString &)));
 
     connect(m_projectList, SIGNAL(projectModified()), doc, SLOT(setModified()));
+    connect(m_projectList, SIGNAL(updateProfile(const QString &)), this, SLOT(slotUpdateProjectProfile(const QString &)));
     connect(m_projectList, SIGNAL(clipNameChanged(const QString, const QString)), trackView->projectView(), SLOT(clipNameChanged(const QString, const QString)));
 
     connect(m_projectList, SIGNAL(findInTimeline(const QString&)), this, SLOT(slotClipInTimeline(const QString&)));
 
 
-    connect(trackView, SIGNAL(cursorMoved()), m_projectMonitor, SLOT(activateMonitor()));
+    //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)));
-    connect(trackView, SIGNAL(changeTrack(int)), this, SLOT(slotChangeTrack(int)));
+    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()));
+    connect(m_projectMonitor->render, SIGNAL(refreshDocumentProducers(bool, bool)), doc, SLOT(checkProjectClips(bool, bool)));
 
     connect(doc, SIGNAL(addProjectClip(DocClipBase *, bool)), m_projectList, SLOT(slotAddClip(DocClipBase *, bool)));
     connect(doc, SIGNAL(resetProjectList()), m_projectList, SLOT(slotResetProjectList()));
-    connect(doc, SIGNAL(signalDeleteProjectClip(const QString &)), m_projectList, SLOT(slotDeleteClip(const QString &)));
+    connect(doc, SIGNAL(signalDeleteProjectClip(const QString &)), this, 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 &)));
 
-    connect(doc, SIGNAL(deleteTimelineClip(const QString &)), trackView, SLOT(slotDeleteClip(const QString &)));
     connect(doc, SIGNAL(docModified(bool)), this, SLOT(slotUpdateDocumentState(bool)));
     connect(doc, SIGNAL(guidesUpdated()), this, SLOT(slotGuidesUpdated()));
+    connect(doc, SIGNAL(saveTimelinePreview(const QString &)), trackView, SLOT(slotSaveTimelinePreview(const QString)));
+    
+    connect(m_notesWidget, SIGNAL(textChanged()), doc, SLOT(setModified()));
 
-
-    connect(trackView->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), m_effectStack, SLOT(slotClipItemSelected(ClipItem*, int)));
+    connect(trackView->projectView(), SIGNAL(clipItemSelected(ClipItem*, int, bool)), 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(clipItemSelected(ClipItem*, int, bool)), this, SLOT(slotActivateEffectStackView(ClipItem*, int, bool)));
     connect(trackView->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, bool)), m_transitionConfig, SLOT(slotTransitionItemSelected(Transition*, int, QPoint, bool)));
     connect(trackView->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, bool)), this, SLOT(slotActivateTransitionView(Transition *)));
     m_zoomSlider->setValue(doc->zoom().x());
-    connect(m_zoomSlider, SIGNAL(valueChanged(int)), trackView, SLOT(slotChangeZoom(int)));
     connect(trackView->projectView(), SIGNAL(zoomIn()), this, SLOT(slotZoomIn()));
     connect(trackView->projectView(), SIGNAL(zoomOut()), this, SLOT(slotZoomOut()));
     connect(trackView, SIGNAL(setZoom(int)), this, SLOT(slotSetZoom(int)));
     connect(trackView->projectView(), SIGNAL(displayMessage(const QString&, MessageType)), m_messageLabel, SLOT(setMessage(const QString&, MessageType)));
 
-    connect(trackView->projectView(), SIGNAL(showClipFrame(DocClipBase *, QPoint, const int)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *, QPoint, const int)));
+    connect(trackView->projectView(), SIGNAL(showClipFrame(DocClipBase *, QPoint, const int)), m_clipMonitor, SLOT(slotSetClipProducer(DocClipBase *, QPoint, const int)));
     connect(trackView->projectView(), SIGNAL(playMonitor()), m_projectMonitor, SLOT(slotPlay()));
 
+    connect(trackView->projectView(), SIGNAL(clipItemSelected(ClipItem*, int, bool)), m_projectMonitor, SLOT(slotSetSelectedClip(ClipItem*)));
+    connect(trackView->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, bool)), m_projectMonitor, SLOT(slotSetSelectedClip(Transition*)));
 
-    connect(m_effectStack, SIGNAL(updateClipEffect(ClipItem*, QDomElement, QDomElement, int)), trackView->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, QDomElement, QDomElement, int)));
-    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(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*, 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)));
     connect(m_projectList, SIGNAL(loadingIsOver()), trackView->projectView(), SLOT(slotUpdateAllThumbs()));
+    connect(m_projectList, SIGNAL(loadingIsOver()), this, SLOT(slotElapsedTime()));
     connect(m_projectList, SIGNAL(displayMessage(const QString&, int)), this, SLOT(slotGotProgressInfo(const QString&, int)));
     connect(m_projectList, SIGNAL(updateRenderStatus()), this, SLOT(slotCheckRenderStatus()));
 
@@ -2104,7 +2570,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());
@@ -2121,9 +2587,12 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc)   //cha
     m_activeDocument = doc;
     m_activeTimeline->updateProjectFps();
     m_activeDocument->checkProjectClips();
-    if (KdenliveSettings::dropbframes()) slotUpdatePreviewSettings();
+#ifndef   Q_WS_MAC
+    m_recMonitor->slotUpdateCaptureFolder(m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash));
+#endif
     //Update the mouse position display so it will display in DF/NDF format by default based on the project setting.
     slotUpdateMousePosition(0);
+    m_monitorManager->activateMonitor("clip");
     // set tool to select tool
     m_buttonSelectTool->setChecked(true);
 }
@@ -2136,14 +2605,26 @@ 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()
+{
+    KShortcutsDialog dialog(KShortcutsEditor::AllActions, KShortcutsEditor::LetterShortcutsAllowed, this);
+    dialog.addCollection(actionCollection(), i18nc("general keyboard shortcuts", "General"));
+    dialog.addCollection(m_effectsActionCollection, i18nc("effects and transitions keyboard shortcuts", "Effects & Transitions"));
+    dialog.configure();
 }
 
 void MainWindow::slotPreferences(int page, int option)
 {
-    //An instance of your dialog could be already created and could be
-    // cached, in which case you want to display the cached dialog
-    // instead of creating another one
+    /*
+     * An instance of your dialog could be already created and could be
+     * cached, in which case you want to display the cached dialog
+     * instead of creating another one
+     */
+    if (m_stopmotion) m_stopmotion->slotLive(false);
     if (KConfigDialog::showDialog("settings")) {
         KdenliveSettingsDialog* d = static_cast <KdenliveSettingsDialog*>(KConfigDialog::exists("settings"));
         if (page != -1) d->showPage(page, option);
@@ -2152,25 +2633,31 @@ void MainWindow::slotPreferences(int page, int option)
 
     // KConfigDialog didn't find an instance of this dialog, so lets
     // create it :
-    KdenliveSettingsDialog* dialog = new KdenliveSettingsDialog(this);
+    
+    // Get the mappable actions in localized form
+    QMap<QString, QString> actions;
+    KActionCollection* collection = actionCollection();
+    foreach (const QString& action_name, m_action_names) {
+        actions[collection->action(action_name)->text()] = action_name;
+    }
+    
+    KdenliveSettingsDialog* dialog = new KdenliveSettingsDialog(actions, this);
     connect(dialog, SIGNAL(settingsChanged(const QString&)), this, SLOT(updateConfiguration()));
-    //connect(dialog, SIGNAL(doResetProfile()), this, SLOT(slotDetectAudioDriver()));
     connect(dialog, SIGNAL(doResetProfile()), m_monitorManager, SLOT(slotResetProfiles()));
-    connect(dialog, SIGNAL(updatePreviewSettings()), this, SLOT(slotUpdatePreviewSettings()));
 #ifndef Q_WS_MAC
-    connect(dialog, SIGNAL(updateCaptureFolder()), m_recMonitor, SLOT(slotUpdateCaptureFolder()));
+    connect(dialog, SIGNAL(updateCaptureFolder()), this, SLOT(slotUpdateCaptureFolder()));
 #endif
-    //connect(dialog, SIGNAL(updatePreviewSettings()), this, SLOT(slotUpdatePreviewSettings()));
     dialog->show();
     if (page != -1) dialog->showPage(page, option);
 }
 
-void MainWindow::slotUpdatePreviewSettings()
+void MainWindow::slotUpdateCaptureFolder()
 {
-    if (m_activeDocument) {
-        m_clipMonitor->slotSetXml(NULL);
-        m_activeDocument->updatePreviewSettings();
-    }
+
+#ifndef   Q_WS_MAC
+    if (m_activeDocument) m_recMonitor->slotUpdateCaptureFolder(m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash));
+    else m_recMonitor->slotUpdateCaptureFolder(KdenliveSettings::defaultprojectfolder());
+#endif
 }
 
 void MainWindow::updateConfiguration()
@@ -2179,11 +2666,14 @@ void MainWindow::updateConfiguration()
     if (m_activeTimeline) {
         m_activeTimeline->refresh();
         m_activeTimeline->projectView()->checkAutoScroll();
-        m_activeTimeline->projectView()->checkTrackHeight();
-        if (m_activeDocument) m_activeDocument->clipManager()->checkAudioThumbs();
+        m_activeTimeline->checkTrackHeight();
+        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
     loadTranscoders();
@@ -2193,13 +2683,17 @@ void MainWindow::updateConfiguration()
 
 }
 
+void MainWindow::slotSwitchSplitAudio()
+{
+    KdenliveSettings::setSplitaudio(!KdenliveSettings::splitaudio());
+    m_buttonAutomaticSplitAudio->setChecked(KdenliveSettings::splitaudio());
+}
 
 void MainWindow::slotSwitchVideoThumbs()
 {
     KdenliveSettings::setVideothumbnails(!KdenliveSettings::videothumbnails());
-    if (m_activeTimeline) {
+    if (m_activeTimeline)
         m_activeTimeline->projectView()->slotUpdateAllThumbs();
-    }
     m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails());
 }
 
@@ -2209,7 +2703,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());
 }
@@ -2217,9 +2712,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());
 }
 
@@ -2232,29 +2726,32 @@ 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 if (QApplication::focusWidget()
-        && QApplication::focusWidget()->parentWidget()
-        && QApplication::focusWidget()->parentWidget()->parentWidget()
-        && QApplication::focusWidget()->parentWidget()->parentWidget()->parentWidget()
-        && QApplication::focusWidget()->parentWidget()->parentWidget()->parentWidget()->parentWidget()
-        && QApplication::focusWidget()->parentWidget()->parentWidget()->parentWidget()->parentWidget() == m_effectStackDock) {
-        // TODO: also delete effect when an effect widget (slider, geomtryval, ...) has focus
-        m_effectStack->slotItemDel();
-    
-    } else if (m_activeTimeline) {
-        m_activeTimeline->projectView()->deleteSelectedClips();
+    } else {
+        QWidget *widget = QApplication::focusWidget();
+        while (widget) {
+            if (widget == m_effectStackDock) {
+                m_effectStack->slotItemDel();
+                return;
+            }
+            widget = widget->parentWidget();
+        }
+
+        // effect stack has no focus
+        if (m_activeTimeline)
+            m_activeTimeline->projectView()->deleteSelectedClips();
     }
 }
 
 void MainWindow::slotUpdateClipMarkers(DocClipBase *clip)
 {
-    if (m_clipMonitor->isActive()) m_clipMonitor->checkOverlay();
+    if (m_clipMonitor->isActive())
+        m_clipMonitor->checkOverlay();
     m_clipMonitor->updateMarkers(clip);
 }
 
@@ -2281,9 +2778,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()
@@ -2375,6 +2871,26 @@ void MainWindow::slotEditClipMarker()
     }
 }
 
+void MainWindow::slotAddMarkerGuideQuickly()
+{
+    if (!m_activeTimeline || !m_activeDocument)
+        return;
+
+    if (m_clipMonitor->isActive()) {
+        DocClipBase *clip = m_clipMonitor->activeClip();
+        GenTime pos = m_clipMonitor->position();
+
+        if (!clip) {
+            m_messageLabel->setMessage(i18n("Cannot find clip to add marker"), ErrorMessage);
+            return;
+        }
+
+        m_activeTimeline->projectView()->slotAddClipMarker(clip->getId(), pos, m_activeDocument->timecode().getDisplayTimecode(pos, false));
+    } else {
+        m_activeTimeline->projectView()->slotAddGuide(false);
+    }
+}
+
 void MainWindow::slotAddGuide()
 {
     if (m_activeTimeline)
@@ -2411,11 +2927,13 @@ void MainWindow::slotDeleteTrack(int ix)
         m_transitionConfig->updateProjectFormat(m_activeDocument->mltProfile(), m_activeDocument->timecode(), m_activeDocument->tracksList());
 }
 
-void MainWindow::slotChangeTrack(int ix)
+void MainWindow::slotConfigTrack(int ix)
 {
     m_projectMonitor->activateMonitor();
     if (m_activeTimeline)
-        m_activeTimeline->projectView()->slotChangeTrack(ix);
+        m_activeTimeline->projectView()->slotConfigTracks(ix);
+    if (m_activeDocument)
+        m_transitionConfig->updateProjectFormat(m_activeDocument->mltProfile(), m_activeDocument->timecode(), m_activeDocument->tracksList());
 }
 
 void MainWindow::slotEditGuide()
@@ -2438,9 +2956,8 @@ void MainWindow::slotDeleteAllGuides()
 
 void MainWindow::slotCutTimelineClip()
 {
-    if (m_activeTimeline) {
+    if (m_activeTimeline)
         m_activeTimeline->projectView()->cutSelectedClips();
-    }
 }
 
 void MainWindow::slotInsertClipOverwrite()
@@ -2453,65 +2970,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)
@@ -2520,6 +3028,12 @@ void MainWindow::slotAddProjectClip(KUrl url)
         m_activeDocument->slotAddClipFile(url, QString());
 }
 
+void MainWindow::slotAddProjectClipList(KUrl::List urls)
+{
+    if (m_activeDocument)
+        m_activeDocument->slotAddClipList(urls, QString());
+}
+
 void MainWindow::slotAddTransition(QAction *result)
 {
     if (!result) return;
@@ -2534,60 +3048,84 @@ void MainWindow::slotAddTransition(QAction *result)
 void MainWindow::slotAddVideoEffect(QAction *result)
 {
     if (!result) return;
+    const int EFFECT_VIDEO = 1;
+    const int EFFECT_AUDIO = 2;
     QStringList info = result->data().toStringList();
-    if (info.isEmpty()) return;
-    QDomElement effect = videoEffects.getEffectByTag(info.at(1), info.at(2));
-    slotAddEffect(effect);
-}
 
-void MainWindow::slotAddAudioEffect(QAction *result)
-{
-    if (!result) return;
-    QStringList info = result->data().toStringList();
-    if (info.isEmpty()) return;
-    QDomElement effect = audioEffects.getEffectByTag(info.at(1), info.at(2));
-    slotAddEffect(effect);
+    if (info.isEmpty() || info.size() < 3) return;
+    QDomElement effect ;
+    if (info.at(2) == QString::number((int) EFFECT_VIDEO))
+            effect = videoEffects.getEffectByTag(info.at(0), info.at(1));
+    else if (info.at(2) == QString::number((int) EFFECT_AUDIO))
+            effect = audioEffects.getEffectByTag(info.at(0), info.at(1));
+    else
+            effect = customEffects.getEffectByTag(info.at(0), info.at(1));
+    if (!effect.isNull()) slotAddEffect(effect);
+    else m_messageLabel->setMessage(i18n("Cannot find effect %1 / %2").arg(info.at(0)).arg(info.at(1)), ErrorMessage);
 }
 
-void MainWindow::slotAddCustomEffect(QAction *result)
-{
-    if (!result) return;
-    QStringList info = result->data().toStringList();
-    if (info.isEmpty()) return;
-    QDomElement effect = customEffects.getEffectByTag(info.at(1), info.at(2));
-    slotAddEffect(effect);
-}
 
 void MainWindow::slotZoomIn()
 {
     m_zoomSlider->setValue(m_zoomSlider->value() - 1);
+    slotShowZoomSliderToolTip();
 }
 
 void MainWindow::slotZoomOut()
 {
     m_zoomSlider->setValue(m_zoomSlider->value() + 1);
+    slotShowZoomSliderToolTip();
 }
 
 void MainWindow::slotFitZoom()
 {
-    if (m_activeTimeline) {
+    if (m_activeTimeline)
         m_zoomSlider->setValue(m_activeTimeline->fitZoom());
-    }
 }
 
 void MainWindow::slotSetZoom(int value)
 {
+    value = qMax(m_zoomSlider->minimum(), value);
+    value = qMin(m_zoomSlider->maximum(), value);
+
+    if (m_activeTimeline)
+        m_activeTimeline->slotChangeZoom(value);
+
+    m_zoomOut->setEnabled(value < m_zoomSlider->maximum());
+    m_zoomIn->setEnabled(value > m_zoomSlider->minimum());
+    slotUpdateZoomSliderToolTip(value);
+
+    m_zoomSlider->blockSignals(true);
     m_zoomSlider->setValue(value);
+    m_zoomSlider->blockSignals(false);
+}
+
+void MainWindow::slotShowZoomSliderToolTip(int zoomlevel)
+{
+    if (zoomlevel != -1)
+        slotUpdateZoomSliderToolTip(zoomlevel);
+
+    QPoint global = m_zoomSlider->rect().topLeft();
+    global.ry() += m_zoomSlider->height() / 2;
+    QHelpEvent toolTipEvent(QEvent::ToolTip, QPoint(0, 0), m_zoomSlider->mapToGlobal(global));
+    QApplication::sendEvent(m_zoomSlider, &toolTipEvent);
+}
+
+void MainWindow::slotUpdateZoomSliderToolTip(int zoomlevel)
+{
+    m_zoomSlider->setToolTip(i18n("Zoom Level: %1/13", (13 - zoomlevel)));
 }
 
 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);
@@ -2665,6 +3203,17 @@ void MainWindow::slotShowClipProperties(DocClipBase *clip)
             if (dia_ui->outPoint() != clip->duration().frames(m_activeDocument->fps()) - 1) {
                 // duration changed, we need to update duration
                 newprops.insert("out", QString::number(dia_ui->outPoint()));
+                int currentLength = QString(clip->producerProperty("length")).toInt();
+                if (currentLength <= dia_ui->outPoint())
+                        newprops.insert("length", QString::number(dia_ui->outPoint() + 1));
+                else newprops.insert("length", clip->producerProperty("length"));
+            }
+            if (!path.isEmpty()) {
+                // we are editing an external file, asked if we want to detach from that file or save the result to that title file.
+                if (KMessageBox::questionYesNo(this, i18n("You are editing an external title clip (%1). Do you want to save your changes to the title file or save the changes for this project only?", path), i18n("Save Title"), KGuiItem(i18n("Save to title file")), KGuiItem(i18n("Save in project only"))) == KMessageBox::Yes) {
+                    // save to external file
+                    dia_ui->saveTitle(path);
+                } else newprops.insert("resource", QString());
             }
             EditClipCommand *command = new EditClipCommand(m_projectList, clip->getId(), clip->properties(), newprops, true);
             m_activeDocument->commandStack()->push(command);
@@ -2676,18 +3225,26 @@ void MainWindow::slotShowClipProperties(DocClipBase *clip)
         //m_activeDocument->editTextClip(clip->getProperty("xml"), clip->getId());
         return;
     }
-    ClipProperties dia(clip, m_activeDocument->timecode(), m_activeDocument->fps(), this);
-    connect(&dia, SIGNAL(addMarker(const QString &, GenTime, QString)), m_activeTimeline->projectView(), SLOT(slotAddClipMarker(const QString &, GenTime, QString)));
-    if (dia.exec() == QDialog::Accepted) {
-        QMap <QString, QString> newprops = dia.properties();
-        if (newprops.isEmpty()) return;
-        EditClipCommand *command = new EditClipCommand(m_projectList, clip->getId(), clip->properties(), newprops, true);
-        m_activeDocument->commandStack()->push(command);
 
-        if (dia.needsTimelineRefresh()) {
-            // update clip occurences in timeline
-            m_activeTimeline->projectView()->slotUpdateClip(clip->getId(), dia.needsTimelineReload());
-        }
+    // any type of clip but a title
+    ClipProperties *dia = new ClipProperties(clip, m_activeDocument->timecode(), m_activeDocument->fps(), this);
+    connect(dia, SIGNAL(addMarker(const QString &, GenTime, QString)), m_activeTimeline->projectView(), SLOT(slotAddClipMarker(const QString &, GenTime, QString)));
+    connect(dia, SIGNAL(deleteProxy(const QString)), m_projectList, SLOT(slotDeleteProxy(const QString)));
+    connect(dia, SIGNAL(applyNewClipProperties(const QString, QMap <QString, QString> , QMap <QString, QString> , bool, bool)), this, SLOT(slotApplyNewClipProperties(const QString, QMap <QString, QString> , QMap <QString, QString> , bool, bool)));
+    dia->show();
+}
+
+
+void MainWindow::slotApplyNewClipProperties(const QString id, QMap <QString, QString> props, QMap <QString, QString> newprops, bool refresh, bool reload)
+{
+    if (newprops.isEmpty()) return;
+    EditClipCommand *command = new EditClipCommand(m_projectList, id, props, newprops, true);
+    m_activeDocument->commandStack()->push(command);
+    m_activeDocument->setModified();
+
+    if (refresh) {
+        // update clip occurences in timeline
+        m_activeTimeline->projectView()->slotUpdateClip(id, reload);
     }
 }
 
@@ -2698,31 +3255,42 @@ void MainWindow::slotShowClipProperties(QList <DocClipBase *> cliplist, QMap<QSt
     if (dia.exec() == QDialog::Accepted) {
         QUndoCommand *command = new QUndoCommand();
         command->setText(i18n("Edit clips"));
+        QMap <QString, QString> newImageProps = dia.properties();
+        // Transparency setting applies only for images
+        QMap <QString, QString> newProps = newImageProps;
+        newProps.remove("transparency");
+
         for (int i = 0; i < cliplist.count(); i++) {
             DocClipBase *clip = cliplist.at(i);
-            new EditClipCommand(m_projectList, clip->getId(), clip->properties(), dia.properties(), true, command);
+            if (clip->clipType() == IMAGE)
+                new EditClipCommand(m_projectList, clip->getId(), clip->properties(), newImageProps, true, command);
+            else 
+                new EditClipCommand(m_projectList, clip->getId(), clip->properties(), newProps, 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()
+void MainWindow::slotActivateEffectStackView(ClipItem* item, int ix, bool raise)
 {
-    m_effectStack->raiseWindow(m_effectStackDock);
+    Q_UNUSED(item)
+    Q_UNUSED(ix)
+
+    if (raise)
+        m_effectStack->raiseWindow(m_effectStackDock);
 }
 
 void MainWindow::slotActivateTransitionView(Transition *t)
 {
-    if (t) m_transitionConfig->raiseWindow(m_transitionConfigDock);
+    if (t)
+        m_transitionConfig->raiseWindow(m_transitionConfigDock);
 }
 
 void MainWindow::slotSnapRewind()
@@ -2730,7 +3298,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()
@@ -2738,7 +3308,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()
@@ -2759,29 +3331,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)
@@ -2807,20 +3391,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()
@@ -2837,11 +3421,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);
 }
 
@@ -2889,7 +3472,6 @@ void MainWindow::slotClipInTimeline(const QString &clipId)
                 j++;
             }
             actionList.insert(j, a);
-
         }
         inTimelineMenu->addActions(actionList);
 
@@ -2904,16 +3486,28 @@ 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();
     }
 }
 
+/*void MainWindow::slotClipToProjectTree()
+{
+    if (m_activeTimeline) {
+    const QList<ClipItem *> clips =  m_activeTimeline->projectView()->selectedClipItems();
+        if (clips.isEmpty()) return;
+        for (int i = 0; i < clips.count(); i++) {
+        m_projectList->slotAddXmlClip(clips.at(i)->itemXml());
+        }
+        //m_projectList->selectItemById(clipIds.at(i));
+    }
+}*/
+
 void MainWindow::slotSelectClipInTimeline()
 {
     if (m_activeTimeline) {
@@ -2929,11 +3523,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();
@@ -2951,16 +3544,17 @@ void MainWindow::keyPressEvent(QKeyEvent *ke)
             ke->accept();
             return;
         }
-    } else KXmlGuiWindow::keyPressEvent(ke);
+    } else {
+        KXmlGuiWindow::keyPressEvent(ke);
+    }
 }
 
 
 /** Gets called when the window gets hidden */
 void MainWindow::hideEvent(QHideEvent */*event*/)
 {
-    if (isMinimized())
-        if (m_monitorManager)
-            m_monitorManager->stopActiveMonitor();
+    if (isMinimized() && m_monitorManager)
+        m_monitorManager->stopActiveMonitor();
 }
 
 bool MainWindow::eventFilter(QObject *obj, QEvent *event)
@@ -2971,7 +3565,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);
@@ -2979,7 +3575,7 @@ bool MainWindow::eventFilter(QObject *obj, QEvent *event)
 }
 
 
-void MainWindow::slotSaveZone(Render *render, QPoint zone)
+void MainWindow::slotSaveZone(Render *render, QPoint zone, DocClipBase *baseClip, KUrl path)
 {
     KDialog *dialog = new KDialog(this);
     dialog->setCaption("Save clip zone");
@@ -2990,10 +3586,15 @@ void MainWindow::slotSaveZone(Render *render, QPoint zone)
 
     QVBoxLayout *vbox = new QVBoxLayout(widget);
     QLabel *label1 = new QLabel(i18n("Save clip zone as:"), this);
-    QString path = m_activeDocument->projectFolder().path();
-    path.append("/");
-    path.append("untitled.mlt");
-    KUrlRequester *url = new KUrlRequester(KUrl(path), this);
+    if (path.isEmpty()) {
+        QString tmppath = m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash);
+        if (baseClip == NULL) tmppath.append("untitled.mlt");
+        else {
+            tmppath.append((baseClip->name().isEmpty() ? baseClip->fileURL().fileName() : baseClip->name()) + "-" + QString::number(zone.x()).rightJustified(4, '0') + ".mlt");
+        }
+        path = KUrl(tmppath);
+    }
+    KUrlRequester *url = new KUrlRequester(path, this);
     url->setFilter("video/mlt-playlist");
     QLabel *label2 = new QLabel(i18n("Description:"), this);
     KLineEdit *edit = new KLineEdit(this);
@@ -3001,7 +3602,35 @@ 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) {
+        if (QFile::exists(url->url().path())) {
+            if (KMessageBox::questionYesNo(this, i18n("File %1 already exists.\nDo you want to overwrite it?", url->url().path())) == KMessageBox::No) {
+                slotSaveZone(render, zone, baseClip, url->url());
+                return;
+            }
+        }
+        if (baseClip && !baseClip->fileURL().isEmpty()) {
+            // create zone from clip url, so that we don't have problems with proxy clips
+            QProcess p;
+#if QT_VERSION >= 0x040600
+            QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+            env.remove("MLT_PROFILE");
+            p.setProcessEnvironment(env);
+#else
+            QStringList env = QProcess::systemEnvironment();
+            env << "MLT_PROFILE='\0'";
+            p.setEnvironment(env);
+#endif
+            p.start(KdenliveSettings::rendererpath(), QStringList() << baseClip->fileURL().path() << "in=" + QString::number(zone.x()) << "out=" + QString::number(zone.y()) << "-consumer" << "xml:" + url->url().path());
+            if (!p.waitForStarted(3000)) {
+                KMessageBox::sorry(this, i18n("Cannot start MLT's renderer:\n%1", KdenliveSettings::rendererpath()));
+            }
+            else if (!p.waitForFinished(5000)) {
+                KMessageBox::sorry(this, i18n("Timeout while creating xml output"));
+            }
+        }
+        else render->saveZone(url->url(), edit->text(), zone);
+    }
 
 }
 
@@ -3009,56 +3638,49 @@ void MainWindow::slotSetInPoint()
 {
     if (m_clipMonitor->isActive()) {
         m_clipMonitor->slotSetZoneStart();
-    } else m_projectMonitor->slotSetZoneStart();
-    //else m_activeTimeline->projectView()->setInPoint();
+    } else {
+        m_projectMonitor->slotSetZoneStart();
+    }
 }
 
 void MainWindow::slotSetOutPoint()
 {
     if (m_clipMonitor->isActive()) {
         m_clipMonitor->slotSetZoneEnd();
-    } else m_projectMonitor->slotSetZoneEnd();
-    // else m_activeTimeline->projectView()->setOutPoint();
+    } else {
+        m_projectMonitor->slotSetZoneEnd();
+    }
 }
 
 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)
 {
     KNS3::Entry::List entries;
-#if KDE_IS_VERSION(4,3,80)
     KNS3::DownloadDialog dialog(configFile);
     dialog.exec();
     entries = dialog.changedEntries();
-    foreach(const KNS3::Entry &entry, entries) {
+    foreach(const KNS3::Entry & entry, entries) {
         if (entry.status() == KNS3::Entry::Installed)
             kDebug() << "// Installed files: " << entry.installedFiles();
     }
-#else
-    KNS::Engine engine(0);
-    if (engine.init(configFile))
-        entries = engine.downloadDialogModal(this);
-    foreach(KNS::Entry *entry, entries) {
-        if (entry->status() == KNS::Entry::Installed)
-            kDebug() << "// Installed files: " << entry->installedFiles();
-    }
-#endif /* KDE_IS_VERSION(4,3,80) */
     return entries.size();
 }
 
 void MainWindow::slotGetNewTitleStuff()
 {
-    if (getNewStuff("kdenlive_titles.knsrc") > 0) {
+    if (getNewStuff("kdenlive_titles.knsrc") > 0)
         TitleWidget::refreshTitleTemplates();
-    }
 }
 
 void MainWindow::slotGetNewLumaStuff()
@@ -3071,10 +3693,9 @@ void MainWindow::slotGetNewLumaStuff()
 
 void MainWindow::slotGetNewRenderStuff()
 {
-    if (getNewStuff("kdenlive_renderprofiles.knsrc") > 0) {
+    if (getNewStuff("kdenlive_renderprofiles.knsrc") > 0)
         if (m_renderWidget)
             m_renderWidget->reloadProfiles();
-    }
 }
 
 void MainWindow::slotGetNewMltProfileStuff()
@@ -3089,12 +3710,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)
@@ -3127,22 +3750,15 @@ void MainWindow::slotShowTimeline(bool show)
     }
 }
 
-void MainWindow::slotMaximizeCurrent(bool /*show*/)
+void MainWindow::slotMaximizeCurrent(bool)
 {
     //TODO: is there a way to maximize current widget?
-    //if (show == true)
-    {
-        m_timelineState = saveState();
-        QWidget *par = focusWidget()->parentWidget();
-        while (par->parentWidget() && par->parentWidget() != this) {
-            par = par->parentWidget();
-        }
-        kDebug() << "CURRENT WIDGET: " << par->objectName();
-    }
-    /*else {
-    //centralWidget()->setHidden(false);
-    //restoreState(m_timelineState);
-    }*/
+
+    m_timelineState = saveState();
+    QWidget *par = focusWidget()->parentWidget();
+    while (par->parentWidget() && par->parentWidget() != this)
+        par = par->parentWidget();
+    kDebug() << "CURRENT WIDGET: " << par->objectName();
 }
 
 void MainWindow::loadTranscoders()
@@ -3160,9 +3776,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()));
     }
 }
@@ -3198,13 +3813,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);
 }
 
@@ -3216,7 +3832,7 @@ void MainWindow::slotPrepareRendering(bool scriptExport, bool zoneOnly, const QS
     QString playlistPath;
     if (scriptExport) {
         bool ok;
-        QString scriptsFolder = m_activeDocument->projectFolder().path() + "/scripts/";
+        QString scriptsFolder = m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash) + "scripts/";
         QString path = m_renderWidget->getFreeScriptName();
         scriptPath = QInputDialog::getText(this, i18n("Create Render Script"), i18n("Script name (will be saved in: %1)", scriptsFolder), QLineEdit::Normal, KUrl(path).fileName(), &ok);
         if (!ok || scriptPath.isEmpty()) return;
@@ -3227,16 +3843,14 @@ void MainWindow::slotPrepareRendering(bool scriptExport, bool zoneOnly, const QS
                 return;
         }
         playlistPath = scriptPath + ".mlt";
-        m_projectMonitor->saveSceneList(playlistPath);
     } else {
         KTemporaryFile temp;
         temp.setAutoRemove(false);
         temp.setSuffix(".mlt");
         temp.open();
         playlistPath = temp.fileName();
-        m_projectMonitor->saveSceneList(playlistPath);
     }
-
+    QString playlistContent = m_projectMonitor->sceneList();
     if (!chapterFile.isEmpty()) {
         int in = 0;
         int out;
@@ -3287,8 +3901,88 @@ 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();
+
+    // Set playlist audio volume to 100%
+    QDomDocument doc;
+    doc.setContent(playlistContent);
+    QDomElement tractor = doc.documentElement().firstChildElement("tractor");
+    if (!tractor.isNull()) {
+        QDomNodeList props = tractor.elementsByTagName("property");
+        for (int i = 0; i < props.count(); i++) {
+            if (props.at(i).toElement().attribute("name") == "meta.volume") {
+                props.at(i).firstChild().setNodeValue("1");
+                break;
+            }
+        }
+    }
+    
+    // Do we want proxy rendering
+    if (m_projectList->useProxy() && !m_renderWidget->proxyRendering()) {
+        QString root = doc.documentElement().attribute("root");
+
+        // replace proxy clips with originals
+        QMap <QString, QString> proxies = m_projectList->getProxies();
+
+        QDomNodeList producers = doc.elementsByTagName("producer");
+        QString producerResource;
+        QString suffix;
+        for (uint n = 0; n < producers.length(); n++) {
+            QDomElement e = producers.item(n).toElement();
+            producerResource = EffectsList::property(e, "resource");
+            if (producerResource.isEmpty()) continue;
+            if (!producerResource.startsWith("/")) {
+                producerResource.prepend(root + "/");
+            }
+            if (producerResource.contains('?')) {
+                // slowmotion producer
+                suffix = "?" + producerResource.section('?', 1);
+                producerResource = producerResource.section('?', 0, 0);
+            }
+            else suffix.clear();
+            if (!producerResource.isEmpty()) {
+                if (proxies.contains(producerResource)) {
+                    EffectsList::setProperty(e, "resource", proxies.value(producerResource) + suffix);
+                    // We need to delete the "aspect_ratio" property because proxy clips
+                    // sometimes have different ratio than original clips
+                    EffectsList::removeProperty(e, "aspect_ratio");
+                    EffectsList::removeMetaProperties(e);
+                }
+            }
+        }
+        
+        /*QMapIterator<QString, QString> i(proxies);
+        while (i.hasNext()) {
+            i.next();
+            // Replace all keys with their values (proxy path with original path)
+            QString key = i.key();
+            playlistContent.replace(key, i.value());
+            if (!root.isEmpty() && key.startsWith(root)) {
+                // in case the resource path in MLT playlist is relative
+                key.remove(0, root.count() + 1);
+                playlistContent.replace(key, i.value());
+            }
+        }*/
+    }
+    playlistContent = doc.toString();
+    
+    // Do save scenelist
+    QFile file(playlistPath);
+    if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+        m_messageLabel->setMessage(i18n("Cannot write to file %1").arg(playlistPath), ErrorMessage);
+        return;
+    }
+    file.write(playlistContent.toUtf8());
+    if (file.error() != QFile::NoError) {
+        m_messageLabel->setMessage(i18n("Cannot write to file %1").arg(playlistPath), ErrorMessage);
+        file.close();
+        return;
+    }
+    file.close();
+    m_renderWidget->slotExport(scriptExport, m_activeTimeline->inPoint(), m_activeTimeline->outPoint(), playlistPath, scriptPath, exportAudio);
 }
 
 void MainWindow::slotUpdateTimecodeFormat(int ix)
@@ -3296,7 +3990,10 @@ void MainWindow::slotUpdateTimecodeFormat(int ix)
     KdenliveSettings::setFrametimecode(ix == 1);
     m_clipMonitor->updateTimecodeFormat();
     m_projectMonitor->updateTimecodeFormat();
-    m_activeTimeline->projectView()->clearSelection();
+    m_transitionConfig->updateTimecodeFormat();
+    m_effectStack->updateTimecodeFormat();
+    //m_activeTimeline->projectView()->clearSelection();
+    m_activeTimeline->updateRuler();
 }
 
 void MainWindow::slotRemoveFocus()
@@ -3309,8 +4006,8 @@ void MainWindow::slotRevert()
 {
     if (KMessageBox::warningContinueCancel(this, i18n("This will delete all changes made since you last saved your project. Are you sure you want to continue?"), i18n("Revert to last saved version")) == KMessageBox::Cancel) return;
     KUrl url = m_activeDocument->url();
-    closeCurrentDocument(false);
-    doOpenFile(url, NULL);
+    if (closeCurrentDocument(false))
+        doOpenFile(url, NULL);
 }
 
 
@@ -3342,26 +4039,68 @@ void MainWindow::slotChangePalette(QAction *action, const QString &themename)
     else theme = action->data().toString();
     KdenliveSettings::setColortheme(theme);
     // Make palette for all widgets.
-    QPalette plt;
-    if (theme.isEmpty())
+    QPalette plt = kapp->palette();
+    if (theme.isEmpty()) {
         plt = QApplication::desktop()->palette();
-    else {
+    else {
         KSharedConfigPtr config = KSharedConfig::openConfig(theme);
-        plt = KGlobalSettings::createApplicationPalette(config);
+
+#if KDE_IS_VERSION(4,6,3)
+        plt = KGlobalSettings::createNewApplicationPalette(config);
+#else
+        // Since there was a bug in createApplicationPalette in KDE < 4.6.3 we need
+        // to do the palette loading stuff ourselves. (https://bugs.kde.org/show_bug.cgi?id=263497)     
+        QPalette::ColorGroup states[3] = { QPalette::Active, QPalette::Inactive,
+                                            QPalette::Disabled };
+        // TT thinks tooltips shouldn't use active, so we use our active colors for all states
+        KColorScheme schemeTooltip(QPalette::Active, KColorScheme::Tooltip, config);
+        for ( int i = 0; i < 3 ; i++ ) {
+            QPalette::ColorGroup state = states[i];
+            KColorScheme schemeView(state, KColorScheme::View, config);
+            KColorScheme schemeWindow(state, KColorScheme::Window, config);
+            KColorScheme schemeButton(state, KColorScheme::Button, config);
+            KColorScheme schemeSelection(state, KColorScheme::Selection, config);
+            plt.setBrush( state, QPalette::WindowText, schemeWindow.foreground() );
+            plt.setBrush( state, QPalette::Window, schemeWindow.background() );
+            plt.setBrush( state, QPalette::Base, schemeView.background() );
+            plt.setBrush( state, QPalette::Text, schemeView.foreground() );
+            plt.setBrush( state, QPalette::Button, schemeButton.background() );
+            plt.setBrush( state, QPalette::ButtonText, schemeButton.foreground() );
+            plt.setBrush( state, QPalette::Highlight, schemeSelection.background() );
+            plt.setBrush( state, QPalette::HighlightedText, schemeSelection.foreground() );
+            plt.setBrush( state, QPalette::ToolTipBase, schemeTooltip.background() );
+            plt.setBrush( state, QPalette::ToolTipText, schemeTooltip.foreground() );
+            plt.setColor( state, QPalette::Light, schemeWindow.shade( KColorScheme::LightShade ) );
+            plt.setColor( state, QPalette::Midlight, schemeWindow.shade( KColorScheme::MidlightShade ) );
+            plt.setColor( state, QPalette::Mid, schemeWindow.shade( KColorScheme::MidShade ) );
+            plt.setColor( state, QPalette::Dark, schemeWindow.shade( KColorScheme::DarkShade ) );
+            plt.setColor( state, QPalette::Shadow, schemeWindow.shade( KColorScheme::ShadowShade ) );
+            plt.setBrush( state, QPalette::AlternateBase, schemeView.background( KColorScheme::AlternateBackground) );
+            plt.setBrush( state, QPalette::Link, schemeView.foreground( KColorScheme::LinkText ) );
+            plt.setBrush( state, QPalette::LinkVisited, schemeView.foreground( KColorScheme::VisitedText ) );
+        }
+#endif
     }
 
     kapp->setPalette(plt);
     const QObjectList children = statusBar()->children();
 
-    foreach(QObject *child, children) {
+    foreach(QObject * child, children) {
         if (child->isWidgetType())
             ((QWidget*)child)->setPalette(plt);
         const QObjectList subchildren = child->children();
-        foreach(QObject *subchild, subchildren) {
+        foreach(QObject * subchild, subchildren) {
             if (subchild->isWidgetType())
                 ((QWidget*)subchild)->setPalette(plt);
         }
     }
+    if (m_activeTimeline) {
+        m_activeTimeline->projectView()->updatePalette();
+    }
 }
 
 
@@ -3412,6 +4151,12 @@ void MainWindow::slotSwitchMonitors()
     else m_projectList->focusTree();
 }
 
+void MainWindow::slotSwitchFullscreen()
+{
+    if (m_projectMonitor->isActive()) m_projectMonitor->slotSwitchFullScreen();
+    else m_clipMonitor->slotSwitchFullScreen();
+}
+
 void MainWindow::slotInsertZoneToTree()
 {
     if (!m_clipMonitor->isActive() || m_clipMonitor->activeClip() == NULL) return;
@@ -3429,38 +4174,30 @@ void MainWindow::slotInsertZoneToTimeline()
 
 void MainWindow::slotDeleteProjectClips(QStringList ids, QMap<QString, QString> folderids)
 {
-    for (int i = 0; i < ids.size(); ++i) {
-        m_activeTimeline->slotDeleteClip(ids.at(i));
+    if (m_activeDocument && m_activeTimeline) {
+        if (!ids.isEmpty()) {
+            for (int i = 0; i < ids.size(); ++i) {
+                m_activeTimeline->slotDeleteClip(ids.at(i));
+            }
+            m_activeDocument->clipManager()->slotDeleteClips(ids);
+        }
+        if (!folderids.isEmpty()) m_projectList->deleteProjectFolder(folderids);
+        m_activeDocument->setModified(true);
     }
-    m_activeDocument->clipManager()->slotDeleteClips(ids);
-    if (!folderids.isEmpty()) m_projectList->deleteProjectFolder(folderids);
-
 }
 
 void MainWindow::slotShowTitleBars(bool show)
 {
-    if (show) {
-        m_effectStackDock->setTitleBarWidget(0);
-        m_clipMonitorDock->setTitleBarWidget(0);
-        m_projectMonitorDock->setTitleBarWidget(0);
-#ifndef Q_WS_MAC
-        m_recMonitorDock->setTitleBarWidget(0);
-#endif
-        m_effectListDock->setTitleBarWidget(0);
-        m_transitionConfigDock->setTitleBarWidget(0);
-        m_projectListDock->setTitleBarWidget(0);
-        m_undoViewDock->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));
-#ifndef Q_WS_MAC
-        if (!m_recMonitorDock->isFloating()) m_recMonitorDock->setTitleBarWidget(new QWidget(this));
-#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));
+    QList <QDockWidget *> docks = findChildren<QDockWidget *>();
+    for (int i = 0; i < docks.count(); i++) {
+        QDockWidget* dock = docks.at(i);
+        if (show) {
+            dock->setTitleBarWidget(0);
+        } else {
+            if (!dock->isFloating()) {
+                dock->setTitleBarWidget(new QWidget);
+            }
+        }
     }
     KdenliveSettings::setShowtitlebars(show);
 }
@@ -3470,5 +4207,204 @@ void MainWindow::slotSwitchTitles()
     slotShowTitleBars(!KdenliveSettings::showtitlebars());
 }
 
+QString MainWindow::getMimeType(bool open)
+{
+    QString mimetype = "application/x-kdenlive";
+    KMimeType::Ptr mime = KMimeType::mimeType(mimetype);
+    if (!mime) {
+        mimetype = "*.kdenlive";
+        if (open) mimetype.append(" *.tar.gz");
+    }
+    else if (open) mimetype.append(" application/x-compressed-tar");
+    return mimetype;
+}
+
+void MainWindow::slotMonitorRequestRenderFrame(bool request)
+{
+    if (request) {
+        m_projectMonitor->render->sendFrameForAnalysis = true;
+        return;
+    } else {
+        for (int i = 0; i < m_gfxScopesList.count(); i++) {
+            if (m_gfxScopesList.at(i)->isVisible() && tabifiedDockWidgets(m_gfxScopesList.at(i)).isEmpty() && static_cast<AbstractGfxScopeWidget *>(m_gfxScopesList.at(i)->widget())->autoRefreshEnabled()) {
+                request = true;
+                break;
+            }
+        }
+    }
+#ifdef DEBUG_MAINW
+    qDebug() << "Any scope accepting new frames? " << request;
+#endif
+    if (!request) {
+        m_projectMonitor->render->sendFrameForAnalysis = false;
+    }
+}
+
+void MainWindow::slotUpdateGfxScopeFrameRequest()
+{
+    // We need a delay to make sure widgets are hidden after a close event for example
+    QTimer::singleShot(500, this, SLOT(slotDoUpdateGfxScopeFrameRequest()));
+}
+
+void MainWindow::slotDoUpdateGfxScopeFrameRequest()
+{
+    // Check scopes
+    bool request = false;
+    for (int i = 0; i < m_gfxScopesList.count(); i++) {
+        if (!m_gfxScopesList.at(i)->widget()->visibleRegion().isEmpty() && static_cast<AbstractGfxScopeWidget *>(m_gfxScopesList.at(i)->widget())->autoRefreshEnabled()) {
+            kDebug() << "SCOPE VISIBLE: " << static_cast<AbstractGfxScopeWidget *>(m_gfxScopesList.at(i)->widget())->widgetName();
+            request = true;
+            break;
+        }
+    }
+    if (!request) {
+        if (!m_projectMonitor->effectSceneDisplayed()) {
+            m_projectMonitor->render->sendFrameForAnalysis = false;
+        }
+        m_clipMonitor->render->sendFrameForAnalysis = false;
+        if (m_recMonitor)
+            m_recMonitor->analyseFrames(false);
+    } else {
+        m_projectMonitor->render->sendFrameForAnalysis = true;
+        m_clipMonitor->render->sendFrameForAnalysis = true;
+        if (m_recMonitor)
+            m_recMonitor->analyseFrames(true);
+    }
+}
+
+void MainWindow::slotUpdateAudioScopeFrameRequest()
+{
+    QTimer::singleShot(500, this, SLOT(slotDoUpdateAudioScopeFrameRequest()));
+}
+
+void MainWindow::slotDoUpdateAudioScopeFrameRequest()
+{
+    bool request = false;
+    for (int i = 0; i < m_audioScopesList.count(); i++) {
+        if (!m_audioScopesList.at(i)->visibleRegion().isEmpty() && m_audioScopesList.at(i)->autoRefreshEnabled()) {
+            kDebug() << "AUDIO SCOPE VISIBLE: " << m_audioScopesList.at(i)->widgetName();
+            request = true;
+            break;
+        }
+    }
+    // Handle audio signal separately (no common interface)
+    if (!m_audiosignal->visibleRegion().isEmpty() && m_audiosignal->monitoringEnabled()) {
+        kDebug() << "AUDIO SCOPE VISIBLE: " << "audiosignal";
+        request = true;
+    }
+#ifdef DEBUG_MAINW
+    qDebug() << "Scopes Requesting Audio data: " << request;
+#endif
+    KdenliveSettings::setMonitor_audio(request);
+    m_monitorManager->slotUpdateAudioMonitoring();
+}
+
+void MainWindow::slotUpdateColorScopes()
+{
+    bool request = false;
+    kDebug()<<"// UPDATE SCOPES";
+    for (int i = 0; i < m_gfxScopesList.count(); i++) {
+        // Check if we need the renderer to send a new frame for update
+        if (!m_gfxScopesList.at(i)->widget()->visibleRegion().isEmpty() && !(static_cast<AbstractGfxScopeWidget *>(m_gfxScopesList.at(i)->widget())->autoRefreshEnabled())) request = true;
+        static_cast<AbstractGfxScopeWidget *>(m_gfxScopesList.at(i)->widget())->slotActiveMonitorChanged();
+    }
+    if (request && m_monitorManager->activeRenderer()) {
+        m_monitorManager->activeRenderer()->sendFrameUpdate();
+    }
+}
+
+void MainWindow::slotClearColorScopes()
+{
+    for (int i = 0; i < m_gfxScopesList.count(); i++) {
+        static_cast<AbstractGfxScopeWidget *>(m_gfxScopesList.at(i)->widget())->slotClearMonitor();
+    }
+}
+
+void MainWindow::slotOpenStopmotion()
+{
+    if (m_stopmotion == NULL) {
+        m_stopmotion = new StopmotionWidget(m_monitorManager, m_activeDocument->projectFolder(), m_stopmotion_actions->actions(), this);
+        connect(m_stopmotion, SIGNAL(addOrUpdateSequence(const QString &)), m_projectList, SLOT(slotAddOrUpdateSequence(const QString)));
+        //for (int i = 0; i < m_gfxScopesList.count(); i++) {
+            // Check if we need the renderer to send a new frame for update
+            /*if (!m_scopesList.at(i)->widget()->visibleRegion().isEmpty() && !(static_cast<AbstractScopeWidget *>(m_scopesList.at(i)->widget())->autoRefreshEnabled())) request = true;*/
+            //connect(m_stopmotion, SIGNAL(gotFrame(QImage)), static_cast<AbstractGfxScopeWidget *>(m_gfxScopesList.at(i)->widget()), SLOT(slotRenderZoneUpdated(QImage)));
+            //static_cast<AbstractScopeWidget *>(m_scopesList.at(i)->widget())->slotMonitorCapture();
+        //}
+    }
+    m_stopmotion->show();
+}
+
+void MainWindow::slotDeleteClip(const QString &id)
+{
+    QList <ClipProperties *> list = findChildren<ClipProperties *>();
+    for (int i = 0; i < list.size(); ++i) {
+        list.at(i)->disableClipId(id);
+    }
+    m_projectList->slotDeleteClip(id);
+}
+
+void MainWindow::slotUpdateProxySettings()
+{
+    if (m_renderWidget) m_renderWidget->updateProxyConfig(m_projectList->useProxy());
+    if (KdenliveSettings::enableproxy())
+        KStandardDirs::makeDir(m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash) + "proxy/");
+    m_projectList->updateProxyConfig();
+}
+
+void MainWindow::slotInsertNotesTimecode()
+{
+    int frames = m_projectMonitor->render->seekPosition().frames(m_activeDocument->fps());
+    QString position = m_activeDocument->timecode().getTimecodeFromFrames(frames);
+    m_notesWidget->insertHtml("<a href=\"" + QString::number(frames) + "\">" + position + "</a> ");
+}
+
+void MainWindow::slotArchiveProject()
+{
+    QList <DocClipBase*> list = m_projectList->documentClipList();
+    QDomDocument doc = m_activeDocument->xmlSceneList(m_projectMonitor->sceneList(), m_projectList->expandedFolders());
+    ArchiveWidget *d = new ArchiveWidget(m_activeDocument->url().fileName(), doc, list, m_activeTimeline->projectView()->extractTransitionsLumas(), this);
+    d->exec();
+}
+
+
+void MainWindow::slotOpenBackupDialog(const KUrl url)
+{
+    KUrl projectFile;
+    KUrl projectFolder;
+    QString projectId;
+    kDebug()<<"// BACKUP URL: "<<url.path();
+    if (!url.isEmpty()) {
+        // we could not open the project file, guess where the backups are
+        projectFolder = KUrl(KdenliveSettings::defaultprojectfolder());
+        projectFile = url;
+    }
+    else {
+        projectFolder = m_activeDocument->projectFolder();
+        projectFile = m_activeDocument->url();
+        projectId = m_activeDocument->getDocumentProperty("documentid");
+    }
+
+    BackupWidget *dia = new BackupWidget(projectFile, projectFolder, projectId, this);
+    if (dia->exec() == QDialog::Accepted) {
+        QString requestedBackup = dia->selectedFile();
+        m_activeDocument->backupLastSavedVersion(projectFile.path());
+        closeCurrentDocument(false);
+        doOpenFile(KUrl(requestedBackup), NULL);
+        m_activeDocument->setUrl(projectFile);
+        m_activeDocument->setModified(true);
+        setCaption(m_activeDocument->description());
+    }
+    delete dia;
+}
+
+void MainWindow::slotElapsedTime()
+{
+    kDebug()<<"-----------------------------------------\n"<<"Time elapsed: "<<m_timer.elapsed()<<"\n-------------------------";
+}
+
 #include "mainwindow.moc"
 
+#ifdef DEBUG_MAINW
+#undef DEBUG_MAINW
+#endif