X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmainwindow.cpp;h=e6004ae82db805611779fc44072b5e7c10088a9e;hb=bb32a23e9e4ed5b55320c7074b3eca686ef8c0c5;hp=070d36f6e816ac5f5dcd296e5fcac45fb50d2759;hpb=ecef07220acdeb49fd3228d4ca62aab1eec034b0;p=kdenlive

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 070d36f6..e6004ae8 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -52,13 +52,16 @@
 #include "kdenlive-config.h"
 #include "cliptranscode.h"
 #include "ui_templateclip_ui.h"
+#include "vectorscope.h"
 
 #include <KApplication>
 #include <KAction>
 #include <KLocale>
 #include <KGlobal>
 #include <KActionCollection>
+#include <KActionCategory>
 #include <KStandardAction>
+#include <KShortcutsDialog>
 #include <KFileDialog>
 #include <KMessageBox>
 #include <KDebug>
@@ -138,6 +141,8 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent
     m_timelineArea = new KTabWidget(this);
     m_timelineArea->setTabReorderingEnabled(true);
     m_timelineArea->setTabBarHidden(true);
+    m_timelineArea->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
+    m_timelineArea->setMinimumHeight(200);
 
     QToolButton *closeTabButton = new QToolButton;
     connect(closeTabButton, SIGNAL(clicked()), this, SLOT(closeCurrentDocument()));
@@ -156,23 +161,18 @@ 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_projectListDock->setWidget(m_projectList);
     addDockWidget(Qt::TopDockWidgetArea, m_projectListDock);
 
-    m_shortcutRemoveFocus = new QShortcut(QKeySequence("Esc"), this);
-    connect(m_shortcutRemoveFocus, SIGNAL(activated()), this, SLOT(slotRemoveFocus()));
-
-    m_effectListDock = new QDockWidget(i18n("Effect List"), this);
-    m_effectListDock->setObjectName("effect_list");
-    m_effectList = new EffectsListView();
-
-    //m_effectList = new KListWidget(this);
-    m_effectListDock->setWidget(m_effectList);
-    addDockWidget(Qt::TopDockWidgetArea, m_effectListDock);
-
     m_effectStackDock = new QDockWidget(i18n("Effect Stack"), this);
     m_effectStackDock->setObjectName("effect_stack");
     m_effectStack = new EffectStackView(this);
@@ -185,20 +185,11 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent
     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);
-
-    //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");
@@ -217,6 +208,19 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent
     connect(m_recMonitor, SIGNAL(showConfigDialog(int, int)), this, SLOT(slotPreferences(int, int)));
 #endif
 
+    m_effectListDock = new QDockWidget(i18n("Effect List"), this);
+    m_effectListDock->setObjectName("effect_list");
+    m_effectList = new EffectsListView();
+    m_effectListDock->setWidget(m_effectList);
+    addDockWidget(Qt::TopDockWidgetArea, m_effectListDock);
+
+    m_vectorscope = new Vectorscope(m_projectMonitor->render, this);
+    m_vectorscopeDock = new QDockWidget(i18n("Vectorscope"), this);
+    m_vectorscopeDock->setObjectName("vectorscope");
+    m_vectorscopeDock->setWidget(m_vectorscope);
+    addDockWidget(Qt::TopDockWidgetArea, m_vectorscopeDock);
+
+
     m_undoViewDock = new QDockWidget(i18n("Undo History"), this);
     m_undoViewDock->setObjectName("undo_history");
     m_undoView = new QUndoView(this);
@@ -232,20 +236,36 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent
     //overviewDock->setWidget(m_overView);
     //addDockWidget(Qt::TopDockWidgetArea, overviewDock);
 
+
     setupActions();
-    //tabifyDockWidget(projectListDock, effectListDock);
+
+    /// Tabify Widgets ///
     tabifyDockWidget(m_projectListDock, m_effectStackDock);
     tabifyDockWidget(m_projectListDock, m_transitionConfigDock);
-    //tabifyDockWidget(projectListDock, undoViewDock);
 
 
     tabifyDockWidget(m_clipMonitorDock, m_projectMonitorDock);
 #ifndef Q_WS_MAC
     tabifyDockWidget(m_clipMonitorDock, m_recMonitorDock);
 #endif
+
+    tabifyDockWidget(m_vectorscopeDock, m_undoViewDock);
+    tabifyDockWidget(m_vectorscopeDock, m_effectListDock);
+
+
     setCentralWidget(m_timelineArea);
+
+
+    KdenliveSettings::setCurrent_profile(KdenliveSettings::default_profile());
+    m_fileOpenRecent = KStandardAction::openRecent(this, SLOT(openFile(const KUrl &)), actionCollection());
+    readOptions();
+    m_fileRevert = KStandardAction::revert(this, SLOT(slotRevert()), actionCollection());
+    m_fileRevert->setEnabled(false);
+
+
     setupGUI();
 
+
     // Find QDockWidget tab bars and show / hide widget title bars on right click
     QList <QTabBar *> tabs = findChildren<QTabBar *>();
     for (int i = 0; i < tabs.count(); i++) {
@@ -262,21 +282,23 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent
 
     m_projectMonitor->setupMenu(static_cast<QMenu*>(factory()->container("monitor_go", this)), m_playZone, m_loopZone);
     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));
+    clipInTimeline->setIcon(KIcon("go-jump"));
     m_projectList->setupGeneratorMenu(static_cast<QMenu*>(factory()->container("generators", this)),
                                       static_cast<QMenu*>(factory()->container("transcoders", this)),
-                                      static_cast<QMenu*>(factory()->container("clip_in_timeline", this)));
+                                      clipInTimeline);
 
-    QAction *action;
+    KAction *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) {
@@ -289,7 +311,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);
@@ -297,11 +319,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)
@@ -316,95 +333,51 @@ 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_videoEffectsMenu = static_cast<QMenu*>(factory()->container("video_effects_menu", this));
+    for (int i = 0; i < videoEffects.count(); ++i)
+        m_videoEffectsMenu->addAction(m_videoEffects[i]);
+    m_audioEffectsMenu = static_cast<QMenu*>(factory()->container("audio_effects_menu", this));
+    for (int i = 0; i < audioEffects.count(); ++i)
+        m_audioEffectsMenu->addAction(m_audioEffects[i]);
     m_customEffectsMenu = static_cast<QMenu*>(factory()->container("custom_effects_menu", this));
-
-    if (customEffects.isEmpty()) m_customEffectsMenu->setEnabled(false);
-    else m_customEffectsMenu->setEnabled(true);
-
-    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);
-    }
+    if (customEffects.isEmpty())
+        m_customEffectsMenu->setEnabled(false);
+    else
+        m_customEffectsMenu->setEnabled(true);
+    for (int i = 0; i < customEffects.count(); ++i)
+        m_customEffectsMenu->addAction(m_customEffects[i]);
+    m_transitionsMenu = new QMenu(i18n("Add Transition"), this);
+    for (int i = 0; i < transitions.count(); ++i)
+        m_transitionsMenu->addAction(m_transitions[i]);
+
+    connect(m_videoEffectsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddVideoEffect(QAction *)));
+    connect(m_audioEffectsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddAudioEffect(QAction *)));
+    connect(m_customEffectsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddCustomEffect(QAction *)));
+    connect(m_transitionsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddTransition(QAction *)));
 
     QMenu *newEffect = new QMenu(this);
-    newEffect->addMenu(videoEffectsMenu);
-    newEffect->addMenu(audioEffectsMenu);
+    newEffect->addMenu(m_videoEffectsMenu);
+    newEffect->addMenu(m_audioEffectsMenu);
     newEffect->addMenu(m_customEffectsMenu);
     m_effectStack->setMenu(newEffect);
 
-
     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_timeline_clip"));
+    m_timelineContextClipMenu->addAction(actionCollection()->action("delete_item"));
     m_timelineContextClipMenu->addAction(actionCollection()->action("group_clip"));
     m_timelineContextClipMenu->addAction(actionCollection()->action("ungroup_clip"));
     m_timelineContextClipMenu->addAction(actionCollection()->action("cut_timeline_clip"));
@@ -414,14 +387,14 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent
 
     QMenu *markersMenu = (QMenu*)(factory()->container("marker_menu", this));
     m_timelineContextClipMenu->addMenu(markersMenu);
-    m_timelineContextClipMenu->addMenu(transitionsMenu);
-    m_timelineContextClipMenu->addMenu(videoEffectsMenu);
-    m_timelineContextClipMenu->addMenu(audioEffectsMenu);
+    m_timelineContextClipMenu->addMenu(m_transitionsMenu);
+    m_timelineContextClipMenu->addMenu(m_videoEffectsMenu);
+    m_timelineContextClipMenu->addMenu(m_audioEffectsMenu);
     //TODO: re-enable custom effects menu when it is implemented
     m_timelineContextClipMenu->addMenu(m_customEffectsMenu);
 
     m_timelineContextTransitionMenu->addAction(actionCollection()->action("edit_item_duration"));
-    m_timelineContextTransitionMenu->addAction(actionCollection()->action("delete_timeline_clip"));
+    m_timelineContextTransitionMenu->addAction(actionCollection()->action("delete_item"));
     m_timelineContextTransitionMenu->addAction(actionCollection()->action(KStandardAction::name(KStandardAction::Copy)));
 
     m_timelineContextTransitionMenu->addAction(actionCollection()->action("auto_transition"));
@@ -498,7 +471,10 @@ bool MainWindow::queryClose()
     }
     saveOptions();
     if (m_monitorManager) m_monitorManager->stopActiveMonitor();
-    if (m_activeDocument && m_activeDocument->isModified()) {
+    // warn the user to save if document is modified and we have clips in our project list
+    if (m_activeDocument && m_activeDocument->isModified() &&
+        ((m_projectList->documentClipList().isEmpty() && !m_activeDocument->url().isEmpty()) ||
+            !m_projectList->documentClipList().isEmpty())) {
         switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document?"))) {
         case KMessageBox::Yes :
             // save document here. If saving fails, return false;
@@ -514,29 +490,36 @@ bool MainWindow::queryClose()
     return true;
 }
 
-
 void MainWindow::loadPlugins()
 {
-    foreach(QObject *plugin, QPluginLoader::staticInstances())
-    populateMenus(plugin);
+    foreach(QObject *plugin, QPluginLoader::staticInstances()) {
+        populateMenus(plugin);
+    }
 
     QStringList directories = KGlobal::dirs()->findDirs("module", QString());
     QStringList filters;
     filters << "libkdenlive*";
     foreach(const QString &folder, directories) {
-        kDebug() << "// PARSING FIOLER: " << folder;
+        kDebug() << "Parsing plugin folder: " << folder;
         QDir pluginsDir(folder);
-        foreach(const QString &fileName, pluginsDir.entryList(filters, QDir::Files)) {
-            kDebug() << "// FOUND PLUGIN: " << fileName << "= " << pluginsDir.absoluteFilePath(fileName);
-            QPluginLoader loader(pluginsDir.absoluteFilePath(fileName));
-            QObject *plugin = loader.instance();
-            if (plugin) {
-                populateMenus(plugin);
-                m_pluginFileNames += fileName;
-            } else kDebug() << "// ERROR LOADING PLUGIN: " << fileName << ", " << loader.errorString();
+        foreach(const QString &fileName,
+                pluginsDir.entryList(filters, QDir::Files)) {
+            /*
+             * Avoid loading the same plugin twice when there is more than one
+             * installation.
+             */
+            if (!m_pluginFileNames.contains(fileName)) {
+                kDebug() << "Found plugin: " << fileName;
+                QPluginLoader loader(pluginsDir.absoluteFilePath(fileName));
+                QObject *plugin = loader.instance();
+                if (plugin) {
+                    populateMenus(plugin);
+                    m_pluginFileNames += fileName;
+                } else
+                    kDebug() << "Error loading plugin: " << fileName << ", " << loader.errorString();
+            }
         }
     }
-    //exit(1);
 }
 
 void MainWindow::populateMenus(QObject *plugin)
@@ -578,7 +561,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);
     }
@@ -607,15 +591,14 @@ void MainWindow::slotReloadEffects()
     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()) {
+    if (effectsList.isEmpty())
         m_customEffectsMenu->setEnabled(false);
-        return;
-    } else m_customEffectsMenu->setEnabled(true);
+    else
+        m_customEffectsMenu->setEnabled(true);
 
     foreach(const QStringList &value, effectsList) {
         action = new QAction(value.at(0), this);
@@ -711,7 +694,6 @@ void MainWindow::slotUpdateClip(const QString &id)
 
 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>)));
@@ -766,6 +748,7 @@ void MainWindow::setupActions()
     toolbar->setMovable(false);
     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 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);
@@ -857,20 +840,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);
@@ -895,6 +912,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);
@@ -928,21 +949,14 @@ void MainWindow::setupActions()
     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);
-
-    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("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);
@@ -959,13 +973,10 @@ void MainWindow::setupActions()
     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);
@@ -1115,10 +1126,10 @@ void MainWindow::setupActions()
     collection->addAction("monitor_seek_snap_forward", monitorSeekSnapForward);
     connect(monitorSeekSnapForward, SIGNAL(triggered(bool)), this, SLOT(slotSnapForward()));
 
-    KAction* deleteTimelineClip = new KAction(KIcon("edit-delete"), i18n("Delete Selected Item"), this);
-    deleteTimelineClip->setShortcut(Qt::Key_Delete);
-    collection->addAction("delete_timeline_clip", deleteTimelineClip);
-    connect(deleteTimelineClip, SIGNAL(triggered(bool)), this, SLOT(slotDeleteTimelineClip()));
+    KAction* deleteItem = new KAction(KIcon("edit-delete"), i18n("Delete Selected Item"), this);
+    deleteItem->setShortcut(Qt::Key_Delete);
+    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);
@@ -1147,6 +1158,14 @@ void MainWindow::setupActions()
     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);
+    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);
@@ -1245,9 +1264,9 @@ void MainWindow::setupActions()
     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);
@@ -1289,26 +1308,19 @@ void MainWindow::setupActions()
     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(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);
+    // 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);
@@ -1318,8 +1330,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*)),
@@ -1388,6 +1398,50 @@ void MainWindow::setupActions()
     addClips->addAction(deleteClip);
     m_projectList->setupMenu(addClips, addClip);
 
+    // Setup effects and transitions actions.
+    m_effectsActionCollection = new KActionCollection(this, KGlobal::mainComponent());
+    //KActionCategory *videoEffectActions = new KActionCategory(i18n("Video Effects"), m_effectsActionCollection);
+    KActionCategory *videoEffectActions = new KActionCategory(i18n("Video Effects"), collection);
+    m_videoEffects = new KAction*[videoEffects.count()];
+    for (int i = 0; i < videoEffects.count(); ++i) {
+        QStringList effectInfo = videoEffects.effectIdInfo(i);
+        m_videoEffects[i] = new KAction(KIcon("kdenlive-show-video"), effectInfo.at(0), this);
+        m_videoEffects[i]->setData(effectInfo);
+        m_videoEffects[i]->setIconVisibleInMenu(false);
+        videoEffectActions->addAction("video_effect_" + effectInfo.at(0), m_videoEffects[i]);
+    }
+    //KActionCategory *audioEffectActions = new KActionCategory(i18n("Audio Effects"), m_effectsActionCollection);
+    KActionCategory *audioEffectActions = new KActionCategory(i18n("Audio Effects"), collection);
+    m_audioEffects = new KAction*[audioEffects.count()];
+    for (int i = 0; i < audioEffects.count(); ++i) {
+        QStringList effectInfo = audioEffects.effectIdInfo(i);
+        m_audioEffects[i] = new KAction(KIcon("kdenlive-show-audio"), effectInfo.at(0), this);
+        m_audioEffects[i]->setData(effectInfo);
+        m_audioEffects[i]->setIconVisibleInMenu(false);
+        audioEffectActions->addAction("audio_effect_" + effectInfo.at(0), m_audioEffects[i]);
+    }
+    //KActionCategory *customEffectActions = new KActionCategory(i18n("Custom Effects"), m_effectsActionCollection);
+    KActionCategory *customEffectActions = new KActionCategory(i18n("Custom Effects"), collection);
+    m_customEffects = new KAction*[customEffects.count()];
+    for (int i = 0; i < customEffects.count(); ++i) {
+        QStringList effectInfo = customEffects.effectIdInfo(i);
+        m_customEffects[i] = new KAction(KIcon("kdenlive-custom-effect"), effectInfo.at(0), this);
+        m_customEffects[i]->setData(effectInfo);
+        m_customEffects[i]->setIconVisibleInMenu(false);
+        customEffectActions->addAction("custom_effect_" + effectInfo.at(0), m_customEffects[i]);
+    }
+    //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);
+        transitionActions->addAction("transition_" + effectInfo.at(0), m_transitions[i]);
+    }
+    m_effectsActionCollection->readSettings();
+
     //connect(collection, SIGNAL( clearStatusText() ),
     //statusBar(), SLOT( clear() ) );
 }
@@ -1582,15 +1636,12 @@ bool MainWindow::saveFileAs(const QString &outputFileName)
 
 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);
+    QString outputFile = KFileDialog::getSaveFileName(KUrl(), getMimeType());
     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 already exists.\nDo you want to overwrite it?")) == KMessageBox::No)
+            return saveFileAs();
     }
     return saveFileAs(outputFile);
 }
@@ -1614,12 +1665,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);
@@ -1730,42 +1776,50 @@ void MainWindow::recoverFiles(QList<KAutoSaveFile *> staleFiles)
     }
 }
 
-
 void MainWindow::parseProfiles(const QString &mltPath)
 {
-    // kDebug()<<" + + YOUR MLT INSTALL WAS FOUND IN: "<< MLT_PREFIX <<endl;
-
     //KdenliveSettings::setDefaulttmpfolder();
     if (!mltPath.isEmpty()) {
         KdenliveSettings::setMltpath(mltPath + "/share/mlt/profiles/");
         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");
         if (!QFile::exists(meltPath))
             meltPath = KStandardDirs::findExe("melt");
         KdenliveSettings::setRendererpath(meltPath);
     }
+
+    if (KdenliveSettings::rendererpath().isEmpty()) {
+        // Cannot find the MLT melt renderer, ask for location
+        KUrlRequesterDialog *getUrl = new KUrlRequesterDialog(QString(), i18n("Cannot find the melt program required for rendering (part of MLT)"), this);
+        if (getUrl->exec() == QDialog::Rejected) {
+            ::exit(0);
+        }
+        KUrl rendererPath = getUrl->selectedUrl();
+        delete getUrl;
+        if (rendererPath.isEmpty()) ::exit(0);
+        KdenliveSettings::setRendererpath(rendererPath.path());
+    }
+
     QStringList profilesFilter;
     profilesFilter << "*";
     QStringList profilesList = QDir(KdenliveSettings::mltpath()).entryList(profilesFilter, QDir::Files);
-
     if (profilesList.isEmpty()) {
         // Cannot find MLT path, try finding melt
         QString profilePath = KdenliveSettings::rendererpath();
         if (!profilePath.isEmpty()) {
             profilePath = profilePath.section('/', 0, -3);
             KdenliveSettings::setMltpath(profilePath + "/share/mlt/profiles/");
-            QStringList profilesList = QDir(KdenliveSettings::mltpath()).entryList(profilesFilter, QDir::Files);
+            profilesList = QDir(KdenliveSettings::mltpath()).entryList(profilesFilter, QDir::Files);
         }
-
         if (profilesList.isEmpty()) {
             // Cannot find the MLT profiles, ask for location
-            KUrlRequesterDialog *getUrl = new KUrlRequesterDialog(KdenliveSettings::mltpath(), i18n("Cannot find your Mlt profiles, please give the path"), this);
+            KUrlRequesterDialog *getUrl = new KUrlRequesterDialog(KdenliveSettings::mltpath(), i18n("Cannot find your MLT profiles, please give the path"), this);
             getUrl->fileDialog()->setMode(KFile::Directory);
             if (getUrl->exec() == QDialog::Rejected) {
                 ::exit(0);
@@ -1774,25 +1828,13 @@ void MainWindow::parseProfiles(const QString &mltPath)
             delete getUrl;
             if (mltPath.isEmpty()) ::exit(0);
             KdenliveSettings::setMltpath(mltPath.path(KUrl::AddTrailingSlash));
-            QStringList profilesList = QDir(KdenliveSettings::mltpath()).entryList(profilesFilter, QDir::Files);
+            profilesList = QDir(KdenliveSettings::mltpath()).entryList(profilesFilter, QDir::Files);
         }
     }
 
-    if (KdenliveSettings::rendererpath().isEmpty()) {
-        // Cannot find the MLT melt renderer, ask for location
-        KUrlRequesterDialog *getUrl = new KUrlRequesterDialog(QString(), i18n("Cannot find the melt program required for rendering (part of Mlt)"), this);
-        if (getUrl->exec() == QDialog::Rejected) {
-            ::exit(0);
-        }
-        KUrl rendererPath = getUrl->selectedUrl();
-        delete getUrl;
-        if (rendererPath.isEmpty()) ::exit(0);
-        KdenliveSettings::setRendererpath(rendererPath.path());
-    }
-
     kDebug() << "RESULTING MLT PATH: " << KdenliveSettings::mltpath();
 
-    // Parse MLT profiles to build a list of available video formats
+    // Parse again MLT profiles to build a list of available video formats
     if (profilesList.isEmpty()) parseProfiles();
 }
 
@@ -1905,22 +1947,29 @@ void MainWindow::slotRenderProject()
     m_renderWidget->setDocument(m_activeDocument);*/
     m_renderWidget->show();
     m_renderWidget->showNormal();
+
+    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()
@@ -1990,13 +2039,12 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc)   //cha
             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(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, 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)));
@@ -2038,7 +2086,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc)   //cha
     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(m_projectMonitor, SIGNAL(renderPosition(int)), trackView, SLOT(moveCursorPos(int)));
@@ -2065,7 +2113,6 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc)   //cha
     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)));
@@ -2076,6 +2123,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc)   //cha
 
 
     connect(m_effectStack, SIGNAL(updateClipEffect(ClipItem*, QDomElement, QDomElement, int)), trackView->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, QDomElement, QDomElement, int)));
+    connect(m_effectStack, SIGNAL(updateClipRegion(ClipItem*, int, QString)), trackView->projectView(), SLOT(slotUpdateClipRegion(ClipItem*, int, QString)));
     connect(m_effectStack, SIGNAL(removeEffect(ClipItem*, QDomElement)), trackView->projectView(), SLOT(slotDeleteEffect(ClipItem*, QDomElement)));
     connect(m_effectStack, SIGNAL(changeEffectState(ClipItem*, int, bool)), trackView->projectView(), SLOT(slotChangeEffectState(ClipItem*, int, bool)));
     connect(m_effectStack, SIGNAL(changeEffectPosition(ClipItem*, int, int)), trackView->projectView(), SLOT(slotChangeEffectPosition(ClipItem*, int, int)));
@@ -2131,7 +2179,16 @@ 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)
@@ -2175,10 +2232,12 @@ void MainWindow::updateConfiguration()
         m_activeTimeline->refresh();
         m_activeTimeline->projectView()->checkAutoScroll();
         m_activeTimeline->projectView()->checkTrackHeight();
-        if (m_activeDocument) m_activeDocument->clipManager()->checkAudioThumbs();
+        if (m_activeDocument)
+            m_activeDocument->clipManager()->checkAudioThumbs();
     }
     m_buttonAudioThumbs->setChecked(KdenliveSettings::audiothumbnails());
     m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails());
+    m_buttonAutomaticSplitAudio->setChecked(KdenliveSettings::splitaudio());
 
     // Update list of transcoding profiles
     loadTranscoders();
@@ -2188,13 +2247,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());
 }
 
@@ -2204,7 +2267,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());
 }
@@ -2212,9 +2276,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());
 }
 
@@ -2225,17 +2288,34 @@ void MainWindow::slotSwitchSnap()
 }
 
 
-void MainWindow::slotDeleteTimelineClip()
+void MainWindow::slotDeleteItem()
 {
-    if (QApplication::focusWidget() && QApplication::focusWidget()->parentWidget() && QApplication::focusWidget()->parentWidget()->parentWidget() && QApplication::focusWidget()->parentWidget()->parentWidget() == m_projectListDock) m_projectList->slotRemoveClip();
-    else if (m_activeTimeline) {
-        m_activeTimeline->projectView()->deleteSelectedClips();
+    if (QApplication::focusWidget() &&
+        QApplication::focusWidget()->parentWidget() &&
+        QApplication::focusWidget()->parentWidget()->parentWidget() &&
+        QApplication::focusWidget()->parentWidget()->parentWidget() == m_projectListDock) {
+        m_projectList->slotRemoveClip();
+
+    } 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);
 }
 
@@ -2262,9 +2342,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()
@@ -2392,11 +2471,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()
@@ -2419,9 +2500,8 @@ void MainWindow::slotDeleteAllGuides()
 
 void MainWindow::slotCutTimelineClip()
 {
-    if (m_activeTimeline) {
+    if (m_activeTimeline)
         m_activeTimeline->projectView()->cutSelectedClips();
-    }
 }
 
 void MainWindow::slotInsertClipOverwrite()
@@ -2434,65 +2514,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)
@@ -2542,33 +2613,61 @@ void MainWindow::slotAddCustomEffect(QAction *result)
 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)
 {
+    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);
@@ -2684,17 +2783,15 @@ void MainWindow::slotShowClipProperties(QList <DocClipBase *> cliplist, QMap<QSt
             new EditClipCommand(m_projectList, clip->getId(), clip->properties(), dia.properties(), true, command);
         }
         m_activeDocument->commandStack()->push(command);
-        for (int i = 0; i < cliplist.count(); i++) {
+        for (int i = 0; i < cliplist.count(); i++)
             m_activeTimeline->projectView()->slotUpdateClip(cliplist.at(i)->getId(), dia.needsTimelineReload());
-        }
     }
 }
 
 void MainWindow::customEvent(QEvent* e)
 {
-    if (e->type() == QEvent::User) {
+    if (e->type() == QEvent::User)
         m_messageLabel->setMessage(static_cast <MltErrorEvent *>(e)->message(), MltError);
-    }
 }
 void MainWindow::slotActivateEffectStackView()
 {
@@ -2703,7 +2800,8 @@ void MainWindow::slotActivateEffectStackView()
 
 void MainWindow::slotActivateTransitionView(Transition *t)
 {
-    if (t) m_transitionConfig->raiseWindow(m_transitionConfigDock);
+    if (t)
+        m_transitionConfig->raiseWindow(m_transitionConfigDock);
 }
 
 void MainWindow::slotSnapRewind()
@@ -2711,7 +2809,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()
@@ -2719,7 +2819,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()
@@ -2740,29 +2842,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)
@@ -2788,20 +2902,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()
@@ -2818,11 +2932,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);
 }
 
@@ -2858,7 +2971,7 @@ void MainWindow::slotClipInTimeline(const QString &clipId)
 
         QList <QAction *> actionList;
 
-        for (int i = 0; i < matching.size(); ++i) {
+        for (int i = 0; i < matching.count(); ++i) {
             QString track = QString::number(matching.at(i).track);
             QString start = m_activeDocument->timecode().getTimecode(matching.at(i).startPos);
             int j = 0;
@@ -2870,7 +2983,6 @@ void MainWindow::slotClipInTimeline(const QString &clipId)
                 j++;
             }
             actionList.insert(j, a);
-
         }
         inTimelineMenu->addActions(actionList);
 
@@ -2881,6 +2993,32 @@ void MainWindow::slotClipInTimeline(const QString &clipId)
     }
 }
 
+void MainWindow::slotClipInProjectTree()
+{
+    if (m_activeTimeline) {
+        const QStringList &clipIds = m_activeTimeline->projectView()->selectedClips();
+        if (clipIds.isEmpty())
+            return;
+        m_projectListDock->raise();
+        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) {
@@ -2896,11 +3034,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();
@@ -2918,19 +3055,18 @@ 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*/)
 {
-    // kDebug() << "I was hidden";
-    // issue http://www.kdenlive.org/mantis/view.php?id=231
-    if (isMinimized()) {
-        // kDebug() << "I am minimized";
-        if (m_monitorManager) m_monitorManager->stopActiveMonitor();
-    }
+    if (isMinimized())
+        if (m_monitorManager)
+            m_monitorManager->stopActiveMonitor();
 }
 
 bool MainWindow::eventFilter(QObject *obj, QEvent *event)
@@ -2941,7 +3077,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);
@@ -2971,34 +3109,39 @@ void MainWindow::slotSaveZone(Render *render, QPoint zone)
     vbox->addWidget(url);
     vbox->addWidget(label2);
     vbox->addWidget(edit);
-    if (dialog->exec() == QDialog::Accepted) render->saveZone(url->url(), edit->text(), zone);
+    if (dialog->exec() == QDialog::Accepted)
+        render->saveZone(url->url(), edit->text(), zone);
 
 }
 
 void MainWindow::slotSetInPoint()
 {
-    if (m_clipMonitor->isActive()) {
+    if (m_clipMonitor->isActive())
         m_clipMonitor->slotSetZoneStart();
-    } else m_projectMonitor->slotSetZoneStart();
+    else
+        m_projectMonitor->slotSetZoneStart();
     //else m_activeTimeline->projectView()->setInPoint();
 }
 
 void MainWindow::slotSetOutPoint()
 {
-    if (m_clipMonitor->isActive()) {
+    if (m_clipMonitor->isActive())
         m_clipMonitor->slotSetZoneEnd();
-    } else m_projectMonitor->slotSetZoneEnd();
+    else
+        m_projectMonitor->slotSetZoneEnd();
     // else m_activeTimeline->projectView()->setOutPoint();
 }
 
 void MainWindow::slotResizeItemStart()
 {
-    if (m_activeTimeline) m_activeTimeline->projectView()->setInPoint();
+    if (m_activeTimeline)
+        m_activeTimeline->projectView()->setInPoint();
 }
 
 void MainWindow::slotResizeItemEnd()
 {
-    if (m_activeTimeline) m_activeTimeline->projectView()->setOutPoint();
+    if (m_activeTimeline)
+        m_activeTimeline->projectView()->setOutPoint();
 }
 
 int MainWindow::getNewStuff(const QString &configFile)
@@ -3026,9 +3169,8 @@ int MainWindow::getNewStuff(const QString &configFile)
 
 void MainWindow::slotGetNewTitleStuff()
 {
-    if (getNewStuff("kdenlive_titles.knsrc") > 0) {
+    if (getNewStuff("kdenlive_titles.knsrc") > 0)
         TitleWidget::refreshTitleTemplates();
-    }
 }
 
 void MainWindow::slotGetNewLumaStuff()
@@ -3041,10 +3183,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()
@@ -3059,12 +3200,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)
@@ -3104,9 +3247,8 @@ void MainWindow::slotMaximizeCurrent(bool /*show*/)
     {
         m_timelineState = saveState();
         QWidget *par = focusWidget()->parentWidget();
-        while (par->parentWidget() && par->parentWidget() != this) {
+        while (par->parentWidget() && par->parentWidget() != this)
             par = par->parentWidget();
-        }
         kDebug() << "CURRENT WIDGET: " << par->objectName();
     }
     /*else {
@@ -3130,9 +3272,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()));
     }
 }
@@ -3266,7 +3407,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()
@@ -3332,6 +3476,8 @@ void MainWindow::slotChangePalette(QAction *action, const QString &themename)
                 ((QWidget*)subchild)->setPalette(plt);
         }
     }
+    if (m_activeTimeline)
+        m_activeTimeline->projectView()->updatePalette();
 }
 
 
@@ -3377,7 +3523,7 @@ QPixmap MainWindow::createSchemePreviewIcon(const KSharedConfigPtr &config)
 
 void MainWindow::slotSwitchMonitors()
 {
-    m_monitorManager->slotSwitchMonitors(m_clipMonitor->isActive());
+    m_monitorManager->slotSwitchMonitors(!m_clipMonitor->isActive());
     if (m_projectMonitor->isActive()) m_activeTimeline->projectView()->setFocus();
     else m_projectList->focusTree();
 }
@@ -3399,12 +3545,16 @@ 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)
@@ -3420,17 +3570,19 @@ void MainWindow::slotShowTitleBars(bool show)
         m_transitionConfigDock->setTitleBarWidget(0);
         m_projectListDock->setTitleBarWidget(0);
         m_undoViewDock->setTitleBarWidget(0);
+        m_vectorscopeDock->setTitleBarWidget(0);
     } else {
-        if (!m_effectStackDock->isFloating()) m_effectStackDock->setTitleBarWidget(new QWidget(this));
-        if (!m_clipMonitorDock->isFloating()) m_clipMonitorDock->setTitleBarWidget(new QWidget(this));
-        if (!m_projectMonitorDock->isFloating()) m_projectMonitorDock->setTitleBarWidget(new QWidget(this));
+        if (!m_effectStackDock->isFloating()) { m_effectStackDock->setTitleBarWidget(new QWidget(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));
+        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));
+        if (!m_effectListDock->isFloating()) { m_effectListDock->setTitleBarWidget(new QWidget(this)); }
+        if (!m_transitionConfigDock->isFloating()) { m_transitionConfigDock->setTitleBarWidget(new QWidget(this)); }
+        if (!m_projectListDock->isFloating()) { m_projectListDock->setTitleBarWidget(new QWidget(this)); }
+        if (!m_undoViewDock->isFloating()) { m_undoViewDock->setTitleBarWidget(new QWidget(this)); }
+        if (!m_vectorscopeDock->isFloating()) { m_vectorscopeDock->setTitleBarWidget(new QWidget(this)); }
     }
     KdenliveSettings::setShowtitlebars(show);
 }
@@ -3440,5 +3592,13 @@ void MainWindow::slotSwitchTitles()
     slotShowTitleBars(!KdenliveSettings::showtitlebars());
 }
 
+QString MainWindow::getMimeType()
+{
+    QString mimetype = "application/x-kdenlive";
+    KMimeType::Ptr mime = KMimeType::mimeType(mimetype);
+    if (!mime) mimetype = "*.kdenlive";
+    return mimetype;
+}
+
 #include "mainwindow.moc"