]> git.sesse.net Git - kdenlive/blobdiff - src/mainwindow.cpp
Make monitor context menu consistent with "Monitor" menu
[kdenlive] / src / mainwindow.cpp
index 67316c90a5a44fcf6626a89d708b3bc526885c26..02ee44abd154d95579bec2aa1b601e85a5d43fac 100644 (file)
@@ -17,7 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-
+#include <stdlib.h>
 
 #include <QTextStream>
 #include <QTimer>
@@ -49,6 +49,8 @@
 #include <locale.h>
 #include <ktogglefullscreenaction.h>
 #include <KFileItem>
+#include <KNotification>
+#include <KNotifyConfigWidget>
 
 #include <mlt++/Mlt.h>
 
@@ -59,7 +61,6 @@
 #include "profilesdialog.h"
 #include "projectsettings.h"
 #include "events.h"
-#include "renderjob.h"
 #include "clipmanager.h"
 #include "projectlist.h"
 #include "monitor.h"
@@ -95,12 +96,12 @@ EffectsList MainWindow::audioEffects;
 EffectsList MainWindow::customEffects;
 EffectsList MainWindow::transitions;
 
-MainWindow::MainWindow(QWidget *parent)
+MainWindow::MainWindow(const QString &MltPath, QWidget *parent)
         : KXmlGuiWindow(parent),
         m_activeDocument(NULL), m_activeTimeline(NULL), m_renderWidget(NULL), m_jogProcess(NULL), m_findActivated(false), m_initialized(false) {
     setlocale(LC_NUMERIC, "POSIX");
     setFont(KGlobalSettings::toolBarFont());
-    parseProfiles();
+    parseProfiles(MltPath);
     m_commandStack = new QUndoGroup;
     m_timelineArea = new KTabWidget(this);
     m_timelineArea->setTabReorderingEnabled(true);
@@ -118,6 +119,8 @@ MainWindow::MainWindow(QWidget *parent)
     m_findTimer.setSingleShot(true);
 
     initEffects::parseEffectFiles();
+    //initEffects::parseCustomEffectsFile();
+
     m_monitorManager = new MonitorManager();
 
     projectListDock = new QDockWidget(i18n("Project Tree"), this);
@@ -200,32 +203,67 @@ MainWindow::MainWindow(QWidget *parent)
     setCentralWidget(m_timelineArea);
 
     setupGUI(Default, NULL /*"kdenliveui.rc"*/);
-    kDebug() << factory() << " " << factory()->container("video_effects_menu", this);
+    //kDebug() << factory() << " " << factory()->container("video_effects_menu", this);
+
+    m_projectMonitor->setupMenu(static_cast<QMenu*>(factory()->container("monitor_go", this)));
+    m_clipMonitor->setupMenu(static_cast<QMenu*>(factory()->container("monitor_go", this)));
 
     // build effects menus
     QAction *action;
     QMenu *videoEffectsMenu = static_cast<QMenu*>(factory()->container("video_effects_menu", this));
-    QStringList effects = videoEffects.effectNames();
-    foreach(const QString &name, effects) {
-        action = new QAction(name, this);
-        action->setData(name);
+
+    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(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));
-    effects = audioEffects.effectNames();
-    foreach(const QString &name, effects) {
-        action = new QAction(name, this);
-        action->setData(name);
+
+
+    effectsList.clear();
+    for (int ix = 0; ix < audioEffects.count(); ix++) {
+        effectInfo = audioEffects.effectIdInfo(ix);
+        effectsList.insert(effectInfo.at(0).toLower(), effectInfo);
+    }
+
+    foreach(QStringList value, effectsList) {
+        action = new QAction(value.at(0), this);
+        action->setData(value);
         audioEffectsMenu->addAction(action);
     }
+
     m_customEffectsMenu = static_cast<QMenu*>(factory()->container("custom_effects_menu", this));
-    effects = customEffects.effectNames();
-    foreach(const QString &name, effects) {
-        action = new QAction(name, this);
-        action->setData(name);
+
+    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(QStringList value, effectsList) {
+        action = new QAction(value.at(0), this);
+        action->setData(value);
         m_customEffectsMenu->addAction(action);
     }
 
+    QMenu *newEffect = new QMenu(this);
+    newEffect->addMenu(videoEffectsMenu);
+    newEffect->addMenu(audioEffectsMenu);
+    newEffect->addMenu(m_customEffectsMenu);
+    effectStack->setMenu(newEffect);
+
+
     QMenu *viewMenu = static_cast<QMenu*>(factory()->container("dockwindows", this));
     const QList<QAction *> viewActions = createPopupMenu()->actions();
     viewMenu->insertActions(NULL, viewActions);
@@ -240,7 +278,7 @@ MainWindow::MainWindow(QWidget *parent)
 
 
     QMenu *transitionsMenu = new QMenu(i18n("Add Transition"), this);
-    effects = transitions.effectNames();
+    QStringList effects = transitions.effectNames();
     foreach(const QString &name, effects) {
         action = new QAction(name, this);
         action->setData(name);
@@ -261,6 +299,7 @@ MainWindow::MainWindow(QWidget *parent)
     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_timelineContextTransitionMenu->addAction(actionCollection()->action("delete_timeline_clip"));
@@ -304,6 +343,7 @@ void MainWindow::queryQuit() {
 //virtual
 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 ?"))) {
         case KMessageBox::Yes :
@@ -336,6 +376,9 @@ void MainWindow::slotReloadEffects() {
     m_customEffectsMenu->clear();
     const QStringList effects = customEffects.effectNames();
     QAction *action;
+    if (effects.isEmpty()) m_customEffectsMenu->setEnabled(false);
+    else m_customEffectsMenu->setEnabled(true);
+
     foreach(const QString &name, effects) {
         action = new QAction(name, this);
         action->setData(name);
@@ -390,6 +433,10 @@ void MainWindow::slotShuttleAction(int code) {
     }
 }
 
+void MainWindow::configureNotifications() {
+    KNotifyConfigWidget::configure(this);
+}
+
 void MainWindow::slotFullScreen() {
     //KToggleFullScreenAction::setFullScreen(this, actionCollection()->action("fullscreen")->isChecked());
 }
@@ -401,7 +448,7 @@ void MainWindow::slotAddEffect(QDomElement effect, GenTime pos, int track) {
         return;
     }
     TrackView *currentTimeLine = (TrackView *) m_timelineArea->currentWidget();
-    currentTimeLine->projectView()->slotAddEffect(effect, pos, track);
+    currentTimeLine->projectView()->slotAddEffect(effect.cloneNode().toElement(), pos, track);
 }
 
 void MainWindow::slotRaiseMonitor(bool clipMonitor) {
@@ -448,6 +495,7 @@ void MainWindow::slotAdjustProjectMonitor() {
 
 void MainWindow::setupActions() {
 
+    KActionCollection* collection = actionCollection();
     m_timecodeFormat = new KComboBox(this);
     m_timecodeFormat->addItem(i18n("hh:mm:ss::ff"));
     m_timecodeFormat->addItem(i18n("Frames"));
@@ -512,11 +560,12 @@ void MainWindow::setupActions() {
     m_zoomSlider->setMinimumWidth(100);
 
     const int contentHeight = QFontMetrics(w->font()).height() + 8;
+
     QString style = "QSlider::groove:horizontal { background-color: rgba(230, 230, 230, 220);border: 1px solid #999999;height: 8px;border-radius: 3px;margin-top:3px }";
     style.append("QSlider::handle:horizontal {  background-color: white; border: 1px solid #999999;width: 9px;margin: -2px 0;border-radius: 3px; }");
+
     m_zoomSlider->setStyleSheet(style);
 
-    //m_zoomSlider->setMaximumHeight(contentHeight);
     //m_zoomSlider->height() + 5;
     statusBar()->setMinimumHeight(contentHeight);
 
@@ -572,36 +621,36 @@ void MainWindow::setupActions() {
     statusBar()->setMaximumHeight(statusBar()->font().pointSize() * 4);
     m_messageLabel->hide();
 
-    actionCollection()->addAction("select_tool", m_buttonSelectTool);
-    actionCollection()->addAction("razor_tool", m_buttonRazorTool);
+    collection->addAction("select_tool", m_buttonSelectTool);
+    collection->addAction("razor_tool", m_buttonRazorTool);
 
-    actionCollection()->addAction("show_video_thumbs", m_buttonVideoThumbs);
-    actionCollection()->addAction("show_audio_thumbs", m_buttonAudioThumbs);
-    actionCollection()->addAction("show_markers", m_buttonShowMarkers);
-    actionCollection()->addAction("snap", m_buttonSnap);
-    actionCollection()->addAction("zoom_fit", m_buttonFitZoom);
+    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);
 
     m_projectSearch = new KAction(KIcon("edit-find"), i18n("Find"), this);
-    actionCollection()->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);
-    actionCollection()->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 Profiles"), this);
-    actionCollection()->addAction("manage_profiles", profilesAction);
+    collection->addAction("manage_profiles", profilesAction);
     connect(profilesAction, SIGNAL(triggered(bool)), this, SLOT(slotEditProfiles()));
 
     KAction* projectAction = new KAction(KIcon("configure"), i18n("Project Settings"), this);
-    actionCollection()->addAction("project_settings", projectAction);
+    collection->addAction("project_settings", projectAction);
     connect(projectAction, SIGNAL(triggered(bool)), this, SLOT(slotEditProjectSettings()));
 
     KAction* projectRender = new KAction(KIcon("media-record"), i18n("Render"), this);
-    actionCollection()->addAction("project_render", projectRender);
+    collection->addAction("project_render", projectRender);
     connect(projectRender, SIGNAL(triggered(bool)), this, SLOT(slotRenderProject()));
 
     KAction* monitorPlay = new KAction(KIcon("media-playback-start"), i18n("Play"), this);
@@ -609,158 +658,160 @@ void MainWindow::setupActions() {
     playShortcut.setPrimary(Qt::Key_Space);
     playShortcut.setAlternate(Qt::Key_K);
     monitorPlay->setShortcut(playShortcut);
-    actionCollection()->addAction("monitor_play", monitorPlay);
+    collection->addAction("monitor_play", monitorPlay);
     connect(monitorPlay, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotPlay()));
 
-    KAction *markIn = actionCollection()->addAction("mark_in");
-    markIn->setText(i18n("Set in point"));
+    KAction *markIn = collection->addAction("mark_in");
+    markIn->setText(i18n("Set In Point"));
     markIn->setShortcut(Qt::Key_I);
     connect(markIn, SIGNAL(triggered(bool)), this, SLOT(slotSetInPoint()));
 
-    KAction *markOut = actionCollection()->addAction("mark_out");
-    markOut->setText(i18n("Set in point"));
+    KAction *markOut = collection->addAction("mark_out");
+    markOut->setText(i18n("Set Out Point"));
     markOut->setShortcut(Qt::Key_O);
     connect(markOut, SIGNAL(triggered(bool)), this, SLOT(slotSetOutPoint()));
 
     KAction* monitorSeekBackward = new KAction(KIcon("media-seek-backward"), i18n("Rewind"), this);
     monitorSeekBackward->setShortcut(Qt::Key_J);
-    actionCollection()->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);
-    actionCollection()->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* monitorSeekSnapBackward = new KAction(KIcon("media-seek-backward"), i18n("Go to Previous Snap Point"), this);
     monitorSeekSnapBackward->setShortcut(Qt::ALT + Qt::Key_Left);
-    actionCollection()->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);
-    actionCollection()->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);
-    actionCollection()->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);
-    actionCollection()->addAction("seek_clip_end", clipEnd);
+    collection->addAction("seek_clip_end", clipEnd);
     connect(clipEnd, SIGNAL(triggered(bool)), this, SLOT(slotClipEnd()));
 
-    KAction* projectStart = new KAction(KIcon("media-seek-backward"), i18n("Go to Project Start"), this);
+    KAction* projectStart = new KAction(KIcon("go-first"), i18n("Go to Project Start"), this);
     projectStart->setShortcut(Qt::CTRL + Qt::Key_Home);
-    actionCollection()->addAction("seek_start", projectStart);
+    collection->addAction("seek_start", projectStart);
     connect(projectStart, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotStart()));
 
-    KAction* projectEnd = new KAction(KIcon("media-seek-forward"), i18n("Go to Project End"), this);
+    KAction* projectEnd = new KAction(KIcon("go-last"), i18n("Go to Project End"), this);
     projectEnd->setShortcut(Qt::CTRL + Qt::Key_End);
-    actionCollection()->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);
-    actionCollection()->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* monitorSeekSnapForward = new KAction(KIcon("media-seek-forward"), i18n("Go to Next Snap Point"), this);
     monitorSeekSnapForward->setShortcut(Qt::ALT + Qt::Key_Right);
-    actionCollection()->addAction("monitor_seek_snap_forward", monitorSeekSnapForward);
+    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);
-    actionCollection()->addAction("delete_timeline_clip", deleteTimelineClip);
+    collection->addAction("delete_timeline_clip", deleteTimelineClip);
     connect(deleteTimelineClip, SIGNAL(triggered(bool)), this, SLOT(slotDeleteTimelineClip()));
 
-    KAction* editTimelineClipSpeed = new KAction(KIcon("edit-delete"), i18n("Change Clip Speed"), this);
-    actionCollection()->addAction("change_clip_speed", editTimelineClipSpeed);
+    KAction* editTimelineClipSpeed = new KAction(i18n("Change Clip Speed"), this);
+    collection->addAction("change_clip_speed", editTimelineClipSpeed);
     connect(editTimelineClipSpeed, SIGNAL(triggered(bool)), this, SLOT(slotChangeClipSpeed()));
 
     KAction* cutTimelineClip = new KAction(KIcon("edit-cut"), i18n("Cut Clip"), this);
     cutTimelineClip->setShortcut(Qt::SHIFT + Qt::Key_R);
-    actionCollection()->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 to Clip"), this);
-    actionCollection()->addAction("add_clip_marker", addClipMarker);
+    KAction* addClipMarker = new KAction(KIcon("bookmark-new"), i18n("Add Marker"), this);
+    collection->addAction("add_clip_marker", addClipMarker);
     connect(addClipMarker, SIGNAL(triggered(bool)), this, SLOT(slotAddClipMarker()));
 
-    KAction* deleteClipMarker = new KAction(KIcon("edit-delete"), i18n("Delete Marker from Clip"), this);
-    actionCollection()->addAction("delete_clip_marker", deleteClipMarker);
+    KAction* deleteClipMarker = new KAction(KIcon("edit-delete"), i18n("Delete Marker"), this);
+    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 from Clip"), this);
-    actionCollection()->addAction("delete_all_clip_markers", deleteAllClipMarkers);
+    KAction* deleteAllClipMarkers = new KAction(KIcon("edit-delete"), i18n("Delete All Markers"), this);
+    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);
-    actionCollection()->addAction("edit_clip_marker", editClipMarker);
+    collection->addAction("edit_clip_marker", editClipMarker);
     connect(editClipMarker, SIGNAL(triggered(bool)), this, SLOT(slotEditClipMarker()));
 
     KAction *addGuide = new KAction(KIcon("document-new"), i18n("Add Guide"), this);
-    actionCollection()->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);
-    actionCollection()->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);
-    actionCollection()->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);
-    actionCollection()->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);
-    actionCollection()->addAction("paste_effects", pasteEffects);
+    collection->addAction("paste_effects", pasteEffects);
     connect(pasteEffects , SIGNAL(triggered()), this, SLOT(slotPasteEffects()));
 
     KStandardAction::quit(this, SLOT(queryQuit()),
-                          actionCollection());
+                          collection);
 
     KStandardAction::open(this, SLOT(openFile()),
-                          actionCollection());
+                          collection);
 
     m_saveAction = KStandardAction::save(this, SLOT(saveFile()),
-                                         actionCollection());
+                                         collection);
 
     KStandardAction::saveAs(this, SLOT(saveFileAs()),
-                            actionCollection());
+                            collection);
 
     KStandardAction::openNew(this, SLOT(newFile()),
-                             actionCollection());
+                             collection);
 
     KStandardAction::preferences(this, SLOT(slotPreferences()),
-                                 actionCollection());
+                                 collection);
+
+    KStandardAction::configureNotifications(this , SLOT(configureNotifications()) , collection);
 
     KStandardAction::copy(this, SLOT(slotCopy()),
-                          actionCollection());
+                          collection);
 
     KStandardAction::paste(this, SLOT(slotPaste()),
-                           actionCollection());
+                           collection);
 
     KAction *undo = KStandardAction::undo(m_commandStack, SLOT(undo()),
-                                          actionCollection());
+                                          collection);
     undo->setEnabled(false);
     connect(m_commandStack, SIGNAL(canUndoChanged(bool)), undo, SLOT(setEnabled(bool)));
 
     KAction *redo = KStandardAction::redo(m_commandStack, SLOT(redo()),
-                                          actionCollection());
+                                          collection);
     redo->setEnabled(false);
     connect(m_commandStack, SIGNAL(canRedoChanged(bool)), redo, SLOT(setEnabled(bool)));
 
-    KStandardAction::fullScreen(this, SLOT(slotFullScreen()), this, actionCollection());
+    KStandardAction::fullScreen(this, SLOT(slotFullScreen()), this, collection);
 
-    connect(actionCollection(), SIGNAL(actionHovered(QAction*)),
+    connect(collection, SIGNAL(actionHovered(QAction*)),
             this, SLOT(slotDisplayActionMessage(QAction*)));
-    //connect(actionCollection(), SIGNAL( clearStatusText() ),
+    //connect(collection, SIGNAL( clearStatusText() ),
     //statusBar(), SLOT( clear() ) );
 }
 
@@ -787,9 +838,7 @@ void MainWindow::readOptions() {
             initialGroup.writeEntry("version", "0.7");
             delete w;
         } else {
-            delete w;
-            // TODO: find a better way to exit application faster
-            QTimer::singleShot(1000, this, SLOT(queryQuit()));
+            ::exit(1);
         }
     }
 }
@@ -849,7 +898,11 @@ void MainWindow::closeCurrentDocument() {
     if (m_timelineArea->count() == 1) m_timelineArea->setTabBarHidden(true);
     delete docToClose;
     delete w;
-    if (m_timelineArea->count() == 0) m_activeDocument = NULL;
+    if (m_timelineArea->count() == 0) {
+        m_activeDocument = NULL;
+        effectStack->clear();
+        transitionConfig->slotTransitionItemSelected(NULL);
+    }
 }
 
 void MainWindow::saveFileAs(const QString &outputFileName) {
@@ -898,6 +951,23 @@ void MainWindow::openLastFile() {
 }
 
 void MainWindow::openFile(const KUrl &url) {
+    // Check if the document is already opened
+    const int ct = m_timelineArea->count();
+    bool isOpened = false;
+    int i;
+    for (i = 0; i < ct; i++) {
+        TrackView *tab = (TrackView *) m_timelineArea->widget(i);
+        KdenliveDoc *doc = tab->document();
+        if (doc->url() == url) {
+            isOpened = true;
+            break;
+        }
+    }
+    if (isOpened) {
+        m_timelineArea->setCurrentIndex(i);
+        return;
+    }
+
     // Check for backup file
     QList<KAutoSaveFile *> staleFiles = KAutoSaveFile::staleFiles(url);
     if (!staleFiles.isEmpty()) {
@@ -957,15 +1027,23 @@ void MainWindow::recoverFiles(QList<KAutoSaveFile *> staleFiles) {
 }
 
 
-void MainWindow::parseProfiles() {
+void MainWindow::parseProfiles(const QString &mltPath) {
     //kdDebug()<<" + + YOUR MLT INSTALL WAS FOUND IN: "<< MLT_PREFIX <<endl;
 
     //KdenliveSettings::setDefaulttmpfolder();
+    if (!mltPath.isEmpty()) {
+        KdenliveSettings::setMltpath(mltPath + "/share/mlt/profiles/");
+        KdenliveSettings::setRendererpath(mltPath + "/bin/inigo");
+    }
+
     if (KdenliveSettings::mltpath().isEmpty()) {
         KdenliveSettings::setMltpath(QString(MLT_PREFIX) + QString("/share/mlt/profiles/"));
     }
     if (KdenliveSettings::rendererpath().isEmpty()) {
-        KdenliveSettings::setRendererpath(KStandardDirs::findExe("inigo"));
+        QString inigoPath = QString(MLT_PREFIX) + QString("/bin/inigo");
+        if (!QFile::exists(inigoPath))
+            inigoPath = KStandardDirs::findExe("inigo");
+        else KdenliveSettings::setRendererpath(inigoPath);
     }
     QStringList profilesFilter;
     profilesFilter << "*";
@@ -984,10 +1062,12 @@ void MainWindow::parseProfiles() {
             // 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);
             getUrl->fileDialog()->setMode(KFile::Directory);
-            getUrl->exec();
+            if (getUrl->exec() == QDialog::Rejected) {
+                ::exit(0);
+            }
             KUrl mltPath = getUrl->selectedUrl();
             delete getUrl;
-            if (mltPath.isEmpty()) kapp->quit();
+            if (mltPath.isEmpty()) ::exit(0);
             KdenliveSettings::setMltpath(mltPath.path());
             QStringList profilesList = QDir(KdenliveSettings::mltpath()).entryList(profilesFilter, QDir::Files);
         }
@@ -996,10 +1076,12 @@ void MainWindow::parseProfiles() {
     if (KdenliveSettings::rendererpath().isEmpty()) {
         // Cannot find the MLT inigo renderer, ask for location
         KUrlRequesterDialog *getUrl = new KUrlRequesterDialog(QString(), i18n("Cannot find the inigo program required for rendering (part of Mlt)"), this);
-        getUrl->exec();
+        if (getUrl->exec() == QDialog::Rejected) {
+            ::exit(0);
+        }
         KUrl rendererPath = getUrl->selectedUrl();
         delete getUrl;
-        if (rendererPath.isEmpty()) kapp->quit();
+        if (rendererPath.isEmpty()) ::exit(0);
         KdenliveSettings::setRendererpath(rendererPath.path());
     }
 
@@ -1072,9 +1154,16 @@ void MainWindow::slotDoRender(const QString &dest, const QString &render, const
             videoPlayer = KdenliveSettings::defaultplayerapp();
             if (videoPlayer.isEmpty()) KMessageBox::sorry(this, i18n("Cannot play video after rendering because the default video player application is not set.\nPlease define it in Kdenlive settings dialog."));
         }
+        if (!QFile::exists(KdenliveSettings::rendererpath())) {
+            KMessageBox::sorry(this, i18n("Cannot find the inigo program required for rendering (part of Mlt)"));
+            return;
+        }
         args << KdenliveSettings::rendererpath() << m_activeDocument->profilePath() << render << videoPlayer << temp.fileName() << dest << avformat_args;
-        QProcess::startDetached("kdenlive_render", args);
-        kDebug() << "///  STARTING RENDER PROCESS\n\nARGS:\n" << args;
+        QString renderer = QCoreApplication::applicationDirPath() + QString("/kdenlive_render");
+        if (!QFile::exists(renderer)) renderer = "kdenlive_render";
+        QProcess::startDetached(renderer, args);
+
+        KNotification::event("RenderStarted", i18n("Rendering <i>%1</i> started", dest), QPixmap(), this);
     }
 }
 
@@ -1117,7 +1206,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha
         m_activeDocument->backupMltPlaylist();
         if (m_activeTimeline) {
             disconnect(m_projectMonitor, SIGNAL(renderPosition(int)), m_activeTimeline, SLOT(moveCursorPos(int)));
-            disconnect(m_projectMonitor, SIGNAL(zoneUpdated(QPoint)), trackView, SLOT(slotSetZone(QPoint)));
+            disconnect(m_projectMonitor, SIGNAL(zoneUpdated(QPoint)), m_activeTimeline, SLOT(slotSetZone(QPoint)));
             disconnect(m_projectMonitor, SIGNAL(durationChanged(int)), m_activeTimeline, SLOT(setDuration(int)));
             disconnect(m_projectList, SIGNAL(projectModified()), m_activeDocument, SLOT(setModified()));
             disconnect(m_activeDocument, SIGNAL(guidesUpdated()), this, SLOT(slotGuidesUpdated()));
@@ -1139,13 +1228,14 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha
             disconnect(effectStack, SIGNAL(updateClipEffect(ClipItem*, QDomElement, QDomElement, int)), m_activeTimeline->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, QDomElement, QDomElement, int)));
             disconnect(effectStack, SIGNAL(removeEffect(ClipItem*, QDomElement)), m_activeTimeline->projectView(), SLOT(slotDeleteEffect(ClipItem*, QDomElement)));
             disconnect(effectStack, SIGNAL(changeEffectState(ClipItem*, int, bool)), m_activeTimeline->projectView(), SLOT(slotChangeEffectState(ClipItem*, int, bool)));
-            disconnect(effectStack, SIGNAL(changeEffectPosition(ClipItem*, int, int)), trackView->projectView(), SLOT(slotChangeEffectPosition(ClipItem*, int, int)));
+            disconnect(effectStack, SIGNAL(changeEffectPosition(ClipItem*, int, int)), m_activeTimeline->projectView(), SLOT(slotChangeEffectPosition(ClipItem*, int, int)));
             disconnect(effectStack, SIGNAL(refreshEffectStack(ClipItem*)), m_activeTimeline->projectView(), SLOT(slotRefreshEffects(ClipItem*)));
             disconnect(effectStack, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects()));
-            disconnect(transitionConfig, SIGNAL(transitionUpdated(Transition *, QDomElement)), trackView->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement)));
-            disconnect(transitionConfig, SIGNAL(seekTimeline(int)), trackView->projectView() , SLOT(setCursorPos(int)));
+            disconnect(transitionConfig, SIGNAL(transitionUpdated(Transition *, QDomElement)), m_activeTimeline->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement)));
+            disconnect(transitionConfig, SIGNAL(seekTimeline(int)), m_activeTimeline->projectView() , SLOT(setCursorPos(int)));
             disconnect(m_activeTimeline->projectView(), SIGNAL(activateDocumentMonitor()), m_projectMonitor, SLOT(activateMonitor()));
-            disconnect(trackView, SIGNAL(zoneMoved(int, int)), m_projectMonitor, SLOT(slotZoneMoved(int, int)));
+            disconnect(m_activeTimeline, SIGNAL(zoneMoved(int, int)), m_projectMonitor, SLOT(slotZoneMoved(int, int)));
+            disconnect(m_projectList, SIGNAL(loadingIsOver()), m_activeTimeline->projectView(), SLOT(slotUpdateAllThumbs()));
             effectStack->clear();
         }
         m_activeDocument->setRenderer(NULL);
@@ -1157,6 +1247,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha
     m_monitorManager->resetProfiles(doc->timecode());
     m_projectList->setDocument(doc);
     transitionConfig->updateProjectFormat(doc->mltProfile());
+    effectStack->updateProjectFormat(doc->mltProfile());
     connect(m_projectList, SIGNAL(clipSelected(DocClipBase *)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *)));
     connect(m_projectList, SIGNAL(projectModified()), doc, SLOT(setModified()));
     connect(trackView, SIGNAL(cursorMoved()), m_projectMonitor, SLOT(activateMonitor()));
@@ -1199,6 +1290,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha
 
     connect(trackView->projectView(), SIGNAL(activateDocumentMonitor()), m_projectMonitor, SLOT(activateMonitor()));
     connect(trackView, SIGNAL(zoneMoved(int, int)), m_projectMonitor, SLOT(slotZoneMoved(int, int)));
+    connect(m_projectList, SIGNAL(loadingIsOver()), trackView->projectView(), SLOT(slotUpdateAllThumbs()));
 
     trackView->projectView()->setContextMenu(m_timelineContextMenu, m_timelineContextClipMenu, m_timelineContextTransitionMenu);
     m_activeTimeline = trackView;
@@ -1206,8 +1298,8 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha
     doc->setRenderer(m_projectMonitor->render);
     m_commandStack->setActiveStack(doc->commandStack());
     KdenliveSettings::setProject_display_ratio(doc->dar());
-    doc->updateAllProjectClips();
-
+    m_projectList->updateAllClips();
+    //doc->clipManager()->checkAudioThumbs();
 
     //m_overView->setScene(trackView->projectScene());
     //m_overView->scale(m_overView->width() / trackView->duration(), m_overView->height() / (50 * trackView->tracksNumber()));
@@ -1287,7 +1379,8 @@ void MainWindow::slotSwitchSnap() {
 
 
 void MainWindow::slotDeleteTimelineClip() {
-    if (m_activeTimeline) {
+    if (QApplication::focusWidget()->parentWidget()->parentWidget() == projectListDock) m_projectList->slotRemoveClip();
+    else if (m_activeTimeline) {
         m_activeTimeline->projectView()->deleteSelectedClips();
     }
 }
@@ -1363,19 +1456,25 @@ void MainWindow::slotAddTransition(QAction *result) {
 
 void MainWindow::slotAddVideoEffect(QAction *result) {
     if (!result) return;
-    QDomElement effect = videoEffects.getEffectByName(result->data().toString());
+    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;
-    QDomElement effect = audioEffects.getEffectByName(result->data().toString());
+    QStringList info = result->data().toStringList();
+    if (info.isEmpty()) return;
+    QDomElement effect = audioEffects.getEffectByTag(info.at(1), info.at(2));
     slotAddEffect(effect);
 }
 
 void MainWindow::slotAddCustomEffect(QAction *result) {
     if (!result) return;
-    QDomElement effect = customEffects.getEffectByName(result->data().toString());
+    QStringList info = result->data().toStringList();
+    if (info.isEmpty()) return;
+    QDomElement effect = customEffects.getEffectByTag(info.at(1), info.at(2));
     slotAddEffect(effect);
 }
 
@@ -1406,22 +1505,23 @@ void MainWindow::slotGotProgressInfo(const QString &message, int progress) {
 
 void MainWindow::slotShowClipProperties(DocClipBase *clip) {
     if (clip->clipType() == TEXT) {
-        QString path = clip->getProperty("xml");
-        TitleWidget *dia_ui = new TitleWidget(KUrl()/*path + ".kdenlivetitle")*/, path, m_projectMonitor->render, this);
+        QString titlepath = m_activeDocument->projectFolder().path() + "/titles/";
+        QString path = clip->getProperty("resource");
+        TitleWidget *dia_ui = new TitleWidget(KUrl(), titlepath, m_projectMonitor->render, this);
         QDomDocument doc;
         doc.setContent(clip->getProperty("xmldata"));
         dia_ui->setXml(doc);
         if (dia_ui->exec() == QDialog::Accepted) {
-            kDebug() << "//  UPDATUING CLIP TITLE: " << path;
             QPixmap pix = dia_ui->renderedPixmap();
-            pix.save(path + ".png");
+            pix.save(path);
             //slotAddClipFile(KUrl("/tmp/kdenlivetitle.png"), QString(), -1);
             //m_clipManager->slotEditTextClipFile(id, dia_ui->xml().toString());
             QMap <QString, QString> newprops;
             newprops.insert("xmldata", dia_ui->xml().toString());
             EditClipCommand *command = new EditClipCommand(m_projectList, clip->getId(), clip->properties(), newprops, true);
             m_activeDocument->commandStack()->push(command);
-            //setModified(true);
+            m_clipMonitor->refreshMonitor(true);
+            m_activeDocument->setModified(true);
         }
         delete dia_ui;