]> git.sesse.net Git - kdenlive/blobdiff - src/mainwindow.cpp
Save vertical zoom in project:
[kdenlive] / src / mainwindow.cpp
index a4667f0b0498cfaeda6b1952ad41329824dfd49d..ef285aa56a2e89a857a11d2ffc31cd033b5a3a22 100644 (file)
@@ -50,6 +50,8 @@
 #include "clipitem.h"
 #include "interfaces.h"
 #include "kdenlive-config.h"
+#include "cliptranscode.h"
+#include "ui_templateclip_ui.h"
 
 #include <KApplication>
 #include <KAction>
@@ -69,6 +71,7 @@
 #include <kstandarddirs.h>
 #include <KUrlRequesterDialog>
 #include <KTemporaryFile>
+#include <KProcess>
 #include <KActionMenu>
 #include <KMenu>
 #include <locale.h>
@@ -83,6 +86,7 @@
 #include <QTimer>
 #include <QAction>
 #include <QKeyEvent>
+#include <QInputDialog>
 
 #include <stdlib.h>
 
@@ -172,6 +176,8 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent
                        actionCollection());
     readOptions();
 
+    slotDetectAudioDriver();
+
     m_clipMonitorDock = new QDockWidget(i18n("Clip Monitor"), this);
     m_clipMonitorDock->setObjectName("clip_monitor");
     m_clipMonitor = new Monitor("clip", m_monitorManager, this);
@@ -226,11 +232,12 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent
     guiFactory()->addClient(sp);*/
 
     loadPlugins();
+    loadTranscoders();
     //kDebug() << factory() << " " << factory()->container("video_effects_menu", this);
 
     m_projectMonitor->setupMenu(static_cast<QMenu*>(factory()->container("monitor_go", this)), m_playZone, m_loopZone);
     m_clipMonitor->setupMenu(static_cast<QMenu*>(factory()->container("monitor_go", this)), m_playZone, m_loopZone, static_cast<QMenu*>(factory()->container("marker_menu", this)));
-    m_projectList->setupGeneratorMenu(static_cast<QMenu*>(factory()->container("generators", this)));
+    m_projectList->setupGeneratorMenu(static_cast<QMenu*>(factory()->container("generators", this)), static_cast<QMenu*>(factory()->container("transcoders", this)));
 
     // build effects menus
     QAction *action;
@@ -375,12 +382,31 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent
 void MainWindow::queryQuit()
 {
     kDebug() << "----- SAVING CONFUIG";
-    if (queryClose()) kapp->quit();
+    if (queryClose()) {
+        Mlt::Factory::close();
+        kapp->quit();
+    }
 }
 
 //virtual
 bool MainWindow::queryClose()
 {
+    if (m_renderWidget) {
+        int waitingJobs = m_renderWidget->waitingJobsCount();
+        if (waitingJobs > 0) {
+            switch (KMessageBox::warningYesNoCancel(this, i18n("You have %1 rendering jobs waiting in the queue.\nWhat do you want to do with these jobs?", waitingJobs), QString(), KGuiItem(i18n("Start them now")), KGuiItem(i18n("Delete them")))) {
+            case KMessageBox::Yes :
+                // create script with waiting jobs and start it
+                if (m_renderWidget->startWaitingRenderJobs() == false) return false;
+                break;
+            case KMessageBox::No :
+                // Don't do anything, jobs will be deleted
+                break;
+            default:
+                return false;
+            }
+        }
+    }
     saveOptions();
     if (m_monitorManager) m_monitorManager->stopActiveMonitor();
     if (m_activeDocument && m_activeDocument->isModified()) {
@@ -593,7 +619,7 @@ void MainWindow::slotConnectMonitors()
     connect(m_projectMonitor->render, SIGNAL(replyGetImage(const QString &, const QPixmap &)), m_projectList, SLOT(slotReplyGetImage(const QString &, const QPixmap &)));
     connect(m_projectMonitor->render, SIGNAL(replyGetFileProperties(const QString &, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &, bool)), m_projectList, SLOT(slotReplyGetFileProperties(const QString &, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &, bool)));
 
-    connect(m_projectMonitor->render, SIGNAL(removeInvalidClip(const QString &)), m_projectList, SLOT(slotRemoveInvalidClip(const QString &)));
+    connect(m_projectMonitor->render, SIGNAL(removeInvalidClip(const QString &, bool)), m_projectList, SLOT(slotRemoveInvalidClip(const QString &, bool)));
 
     connect(m_clipMonitor, SIGNAL(refreshClipThumbnail(const QString &)), m_projectList, SLOT(slotRefreshClipThumbnail(const QString &)));
 
@@ -799,7 +825,7 @@ void MainWindow::setupActions()
     collection->addAction("manage_profiles", profilesAction);
     connect(profilesAction, SIGNAL(triggered(bool)), this, SLOT(slotEditProfiles()));
 
-    KNS::standardAction(i18n("Download New Lumas..."), this, SLOT(slotGetNewLumaStuff()), actionCollection(), "get_new_lumas");
+    KNS::standardAction(i18n("Download New Wipes..."), this, SLOT(slotGetNewLumaStuff()), actionCollection(), "get_new_lumas");
 
     KNS::standardAction(i18n("Download New Render Profiles..."), this, SLOT(slotGetNewRenderStuff()), actionCollection(), "get_new_profiles");
 
@@ -840,6 +866,10 @@ void MainWindow::setupActions()
     collection->addAction("dvd_wizard", dvdWizard);
     connect(dvdWizard, SIGNAL(triggered(bool)), this, SLOT(slotDvdWizard()));
 
+    KAction *transcodeClip =  new KAction(KIcon("edit-copy"), i18n("Transcode Clip"), this);
+    collection->addAction("transcode_clip", transcodeClip);
+    connect(transcodeClip, SIGNAL(triggered(bool)), this, SLOT(slotTranscodeClip()));
+
     KAction *markIn = collection->addAction("mark_in");
     markIn->setText(i18n("Set In Point"));
     markIn->setShortcut(Qt::Key_I);
@@ -928,11 +958,13 @@ void MainWindow::setupActions()
     connect(stickTransition, SIGNAL(triggered(bool)), this, SLOT(slotAutoTransition()));
 
     KAction* groupClip = new KAction(KIcon("object-group"), i18n("Group Clips"), this);
+    groupClip->setShortcut(Qt::CTRL + Qt::Key_G);
     collection->addAction("group_clip", groupClip);
     connect(groupClip, SIGNAL(triggered(bool)), this, SLOT(slotGroupClips()));
 
     KAction* ungroupClip = new KAction(KIcon("object-ungroup"), i18n("Ungroup Clips"), this);
     collection->addAction("ungroup_clip", ungroupClip);
+    ungroupClip->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_G);
     ungroupClip->setData("ungroup_clip");
     connect(ungroupClip, SIGNAL(triggered(bool)), this, SLOT(slotUnGroupClips()));
 
@@ -1089,6 +1121,10 @@ void MainWindow::setupActions()
     collection->addAction("add_text_clip", addTitleClip);
     connect(addTitleClip , SIGNAL(triggered()), m_projectList, SLOT(slotAddTitleClip()));
 
+    QAction *addTitleTemplateClip = new KAction(KIcon("kdenlive-add-text-clip"), i18n("Add Template Title"), this);
+    collection->addAction("add_text_template_clip", addTitleTemplateClip);
+    connect(addTitleTemplateClip , SIGNAL(triggered()), m_projectList, SLOT(slotAddTitleTemplateClip()));
+
     QAction *addFolderButton = new KAction(KIcon("folder-new"), i18n("Create Folder"), this);
     collection->addAction("add_folder", addFolderButton);
     connect(addFolderButton , SIGNAL(triggered()), m_projectList, SLOT(slotAddFolder()));
@@ -1122,6 +1158,7 @@ void MainWindow::setupActions()
     addClips->addAction(addColorClip);
     addClips->addAction(addSlideClip);
     addClips->addAction(addTitleClip);
+    addClips->addAction(addTitleTemplateClip);
     addClips->addAction(addFolderButton);
 
     addClips->addAction(reloadClip);
@@ -1163,7 +1200,7 @@ void MainWindow::readOptions()
             //Add new settings from 0.7.1
             if (KdenliveSettings::defaultprojectfolder().isEmpty()) {
                 QString path = QDir::homePath() + "/kdenlive";
-                if (KStandardDirs::makeDir(path)  == false) kDebug() << "/// ERROR CREATING PROJECT FOLDER: " << path;
+                if (KStandardDirs::makeDir(path)  == false) kDebug() << "/// ERROR CREATING PROJECT FOLDER: " << path;
                 KdenliveSettings::setDefaultprojectfolder(path);
             }
         }
@@ -1204,6 +1241,7 @@ void MainWindow::newFile(bool showProjectSettings)
     if (!showProjectSettings && m_timelineArea->count() == 0) {
         if (!KdenliveSettings::activatetabs()) closeCurrentDocument();
         profileName = KdenliveSettings::default_profile();
+        projectFolder = KdenliveSettings::defaultprojectfolder();
     } else {
         ProjectSettings *w = new ProjectSettings(projectTracks.x(), projectTracks.y(), KdenliveSettings::defaultprojectfolder(), false, this);
         if (w->exec() != QDialog::Accepted) return;
@@ -1255,6 +1293,7 @@ void MainWindow::closeCurrentDocument()
             break;
         case KMessageBox::Cancel :
             return;
+            break;
         default:
             break;
         }
@@ -1264,13 +1303,16 @@ void MainWindow::closeCurrentDocument()
         m_timelineArea->setTabBarHidden(true);
         m_closeAction->setEnabled(false);
     }
-    delete docToClose;
-    delete w;
-    if (m_timelineArea->count() == 0) {
+    if (docToClose == m_activeDocument) {
+        delete m_activeDocument;
         m_activeDocument = NULL;
         m_effectStack->clear();
-        m_transitionConfig->slotTransitionItemSelected(NULL, false);
-    }
+        m_transitionConfig->slotTransitionItemSelected(NULL, 0, QPoint(), false);
+    } else delete docToClose;
+    if (w == m_activeTimeline) {
+        delete m_activeTimeline;
+        m_activeTimeline = NULL;
+    } else delete w;
 }
 
 bool MainWindow::saveFileAs(const QString &outputFileName)
@@ -1392,7 +1434,7 @@ void MainWindow::openFile(const KUrl &url)
 
 void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale)
 {
-    KdenliveDoc *doc = new KdenliveDoc(url, KUrl(), m_commandStack, QString(), QPoint(3, 2), m_projectMonitor->render, this);
+    KdenliveDoc *doc = new KdenliveDoc(url, KdenliveSettings::defaultprojectfolder(), m_commandStack, KdenliveSettings::default_profile(), QPoint(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks()), m_projectMonitor->render, this);
     if (stale == NULL) {
         stale = new KAutoSaveFile(url, doc);
         doc->m_autosave = stale;
@@ -1436,29 +1478,29 @@ void MainWindow::recoverFiles(QList<KAutoSaveFile *> staleFiles)
 
 void MainWindow::parseProfiles(const QString &mltPath)
 {
-    //kdDebug()<<" + + YOUR MLT INSTALL WAS FOUND IN: "<< MLT_PREFIX <<endl;
+    // 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/inigo");
+        KdenliveSettings::setRendererpath(mltPath + "/bin/melt");
     }
 
     if (KdenliveSettings::mltpath().isEmpty()) {
         KdenliveSettings::setMltpath(QString(MLT_PREFIX) + QString("/share/mlt/profiles/"));
     }
-    if (KdenliveSettings::rendererpath().isEmpty()) {
-        QString inigoPath = QString(MLT_PREFIX) + QString("/bin/inigo");
-        if (!QFile::exists(inigoPath))
-            inigoPath = KStandardDirs::findExe("inigo");
-        else KdenliveSettings::setRendererpath(inigoPath);
+    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);
     }
     QStringList profilesFilter;
     profilesFilter << "*";
     QStringList profilesList = QDir(KdenliveSettings::mltpath()).entryList(profilesFilter, QDir::Files);
 
     if (profilesList.isEmpty()) {
-        // Cannot find MLT path, try finding inigo
+        // Cannot find MLT path, try finding melt
         QString profilePath = KdenliveSettings::rendererpath();
         if (!profilePath.isEmpty()) {
             profilePath = profilePath.section('/', 0, -3);
@@ -1476,14 +1518,14 @@ void MainWindow::parseProfiles(const QString &mltPath)
             KUrl mltPath = getUrl->selectedUrl();
             delete getUrl;
             if (mltPath.isEmpty()) ::exit(0);
-            KdenliveSettings::setMltpath(mltPath.path());
+            KdenliveSettings::setMltpath(mltPath.path(KUrl::AddTrailingSlash));
             QStringList profilesList = QDir(KdenliveSettings::mltpath()).entryList(profilesFilter, QDir::Files);
         }
     }
 
     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);
+        // 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);
         }
@@ -1510,6 +1552,31 @@ void MainWindow::slotEditProfiles()
     delete w;
 }
 
+void MainWindow::slotDetectAudioDriver()
+{
+    //decide which audio driver is really best, in some cases SDL is wrong
+    if (KdenliveSettings::audiodrivername().isEmpty()) {
+        QString driver;
+        KProcess readProcess;
+        //PulseAudio needs to be selected if it exists, the ALSA pulse pcm device is not fast enough.
+        if (!KStandardDirs::findExe("pactl").isEmpty()) {
+            readProcess.setOutputChannelMode(KProcess::OnlyStdoutChannel);
+            readProcess.setProgram("pactl", QStringList() << "stat");
+            readProcess.execute(2000); // Kill it after 2 seconds
+
+            QString result = QString(readProcess.readAllStandardOutput());
+            kDebug() << "// / / / / / READING PACTL: ";
+            kDebug() << result;
+            if (!result.isEmpty()) {
+                driver = "pulse";
+                kDebug() << "// / / / / PULSEAUDIO DETECTED";
+            }
+        }
+        //put others here
+        KdenliveSettings::setAutoaudiodrivername(driver);
+    }
+}
+
 void MainWindow::slotEditProjectSettings()
 {
     QPoint p = m_activeDocument->getTracksCount();
@@ -1518,9 +1585,10 @@ void MainWindow::slotEditProjectSettings()
     if (w->exec() == QDialog::Accepted) {
         QString profile = w->selectedProfile();
         m_activeDocument->setProjectFolder(w->selectedFolder());
-        if (m_renderWidget) m_renderWidget->setDocumentPath(w->selectedFolder().path());
+        if (m_renderWidget) m_renderWidget->setDocumentPath(w->selectedFolder().path(KUrl::AddTrailingSlash));
         if (m_activeDocument->profilePath() != profile) {
             // Profile was changed
+            double dar = m_activeDocument->dar();
             m_activeDocument->setProfilePath(profile);
             KdenliveSettings::setCurrent_profile(profile);
             KdenliveSettings::setProject_fps(m_activeDocument->fps());
@@ -1529,7 +1597,7 @@ void MainWindow::slotEditProjectSettings()
             if (m_renderWidget) m_renderWidget->setProfile(m_activeDocument->mltProfile());
             m_timelineArea->setTabText(m_timelineArea->currentIndex(), m_activeDocument->description());
             m_activeDocument->clipManager()->resetProducersList(m_projectMonitor->render->producersList());
-
+            if (dar != m_activeDocument->dar()) m_projectList->reloadClipThumbnails();
             // We need to desactivate & reactivate monitors to get a refresh
             m_monitorManager->switchMonitors();
         }
@@ -1540,114 +1608,24 @@ void MainWindow::slotEditProjectSettings()
 void MainWindow::slotRenderProject()
 {
     if (!m_renderWidget) {
-        QString projectfolder = m_activeDocument ? m_activeDocument->projectFolder().path() : KdenliveSettings::defaultprojectfolder();
+        QString projectfolder = m_activeDocument ? m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash) : KdenliveSettings::defaultprojectfolder();
         m_renderWidget = new RenderWidget(projectfolder, this);
-        connect(m_renderWidget, SIGNAL(doRender(const QString&, const QString&, const QStringList &, const QStringList &, bool, bool, double, double, bool, const QString &)), this, SLOT(slotDoRender(const QString&, const QString&, const QStringList &, const QStringList &, bool, bool, double, double, bool, const QString &)));
+        connect(m_renderWidget, SIGNAL(selectedRenderProfile(const QString &, const QString &)), this, SLOT(slotSetDocumentRenderProfile(const QString &, const QString &)));
+        connect(m_renderWidget, SIGNAL(prepareRenderingData(bool, bool, const QString&)), this, SLOT(slotPrepareRendering(bool, bool, const QString&)));
         connect(m_renderWidget, SIGNAL(abortProcess(const QString &)), this, SIGNAL(abortRenderJob(const QString &)));
         connect(m_renderWidget, SIGNAL(openDvdWizard(const QString &, const QString &)), this, SLOT(slotDvdWizard(const QString &, const QString &)));
         if (m_activeDocument) {
             m_renderWidget->setProfile(m_activeDocument->mltProfile());
             m_renderWidget->setGuides(m_activeDocument->guidesXml(), m_activeDocument->projectDuration());
+            m_renderWidget->setRenderProfile(m_activeDocument->getDocumentProperty("renderdestination"), m_activeDocument->getDocumentProperty("renderprofile"));
+            m_renderWidget->setDocumentPath(m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash));
         }
     }
     /*TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget();
     if (currentTab) m_renderWidget->setTimeline(currentTab);
     m_renderWidget->setDocument(m_activeDocument);*/
     m_renderWidget->show();
-}
-
-void MainWindow::slotDoRender(const QString &dest, const QString &render, const QStringList &overlay_args, const QStringList &avformat_args, bool zoneOnly, bool playAfter, double guideStart, double guideEnd, bool resizeProfile, const QString &scriptExport)
-{
-    kDebug() << "// SCRIPT EXPORT: " << scriptExport;
-    if (dest.isEmpty()) return;
-    int in = 0;
-    int out = 0;
-
-    if (m_activeTimeline && zoneOnly) {
-        in = m_activeTimeline->inPoint();
-        out = m_activeTimeline->outPoint();
-    }
-    KTemporaryFile temp;
-    temp.setAutoRemove(false);
-    temp.setSuffix(".westley");
-    if (!scriptExport.isEmpty() || temp.open()) {
-        if (KdenliveSettings::dropbframes()) {
-            KdenliveSettings::setDropbframes(false);
-            m_activeDocument->clipManager()->updatePreviewSettings();
-            if (!scriptExport.isEmpty()) m_projectMonitor->saveSceneList(scriptExport + ".westley");
-            else m_projectMonitor->saveSceneList(temp.fileName());
-            KdenliveSettings::setDropbframes(true);
-            m_activeDocument->clipManager()->updatePreviewSettings();
-        } else {
-            if (!scriptExport.isEmpty()) m_projectMonitor->saveSceneList(scriptExport + ".westley");
-            else m_projectMonitor->saveSceneList(temp.fileName());
-        }
-
-        QStringList args;
-        if (scriptExport.isEmpty()) args << "-erase";
-        if (KdenliveSettings::usekuiserver()) args << "-kuiserver";
-        if (zoneOnly) args << "in=" + QString::number(in) << "out=" + QString::number(out);
-        else if (guideStart != -1) {
-            args << "in=" + QString::number(GenTime(guideStart).frames(m_activeDocument->fps())) << "out=" + QString::number(GenTime(guideEnd).frames(m_activeDocument->fps()));
-        }
-        if (!overlay_args.isEmpty()) args << "preargs=" + overlay_args.join(" ");
-        QString videoPlayer = "-";
-        if (playAfter) {
-            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)"));
-            setRenderingProgress(dest, -3);
-            return;
-        }
-        args << KdenliveSettings::rendererpath() << m_activeDocument->profilePath() << render << videoPlayer;
-
-        for (int i = 0; i < avformat_args.count(); i++) {
-            if (avformat_args.at(i).startsWith("profile=")) {
-                if (avformat_args.at(i).section('=', 1) != m_activeDocument->profilePath()) resizeProfile = true;
-                break;
-            }
-        }
-
-        if (resizeProfile) {
-            // The rendering profile is different from project profile, so use MLT's special producer_consumer
-            if (scriptExport.isEmpty()) args << "consumer:" + temp.fileName();
-            else args << "consumer:$SOURCE";
-        } else {
-            if (scriptExport.isEmpty()) args << temp.fileName();
-            else args << "$SOURCE";
-        }
-        if (scriptExport.isEmpty()) args << dest;
-        else args << "$TARGET";
-        args << avformat_args;
-        QString renderer = QCoreApplication::applicationDirPath() + QString("/kdenlive_render");
-        if (!QFile::exists(renderer)) renderer = "kdenlive_render";
-        if (scriptExport.isEmpty()) {
-            QProcess::startDetached(renderer, args);
-            KNotification::event("RenderStarted", i18n("Rendering <i>%1</i> started", dest), QPixmap(), this);
-        } else {
-            // Generate script file
-            QFile file(scriptExport);
-            if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
-                KMessageBox::error(this, i18n("Cannot write to file %1", scriptExport));
-                return;
-            }
-
-            QTextStream out(&file);
-            out << "#! /bin/sh" << "\n" << "\n";
-            out << "SOURCE=" << "\"" + scriptExport + ".westley\"" << "\n";
-            out << "TARGET=" << "\"" + dest + "\"" << "\n";
-            out << renderer << " " << args.join(" ") << "\n" << "\n";
-            if (file.error() != QFile::NoError) {
-                KMessageBox::error(this, i18n("Cannot write to file %1", scriptExport));
-                file.close();
-                return;
-            }
-            file.close();
-            QFile::setPermissions(scriptExport, file.permissions() | QFile::ExeUser);
-        }
-    }
+    m_renderWidget->showNormal();
 }
 
 void MainWindow::setRenderingProgress(const QString &url, int progress)
@@ -1719,8 +1697,8 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc)   //cha
             disconnect(m_activeDocument, SIGNAL(deleteTimelineClip(const QString &)), m_activeTimeline, SLOT(slotDeleteClip(const QString &)));
             disconnect(m_activeTimeline->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), m_effectStack, SLOT(slotClipItemSelected(ClipItem*, int)));
             disconnect(m_activeTimeline->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), this, SLOT(slotActivateEffectStackView()));
-            disconnect(m_activeTimeline, SIGNAL(transitionItemSelected(Transition*, bool)), m_transitionConfig, SLOT(slotTransitionItemSelected(Transition*, bool)));
-            disconnect(m_activeTimeline, SIGNAL(transitionItemSelected(Transition*, bool)), this, SLOT(slotActivateTransitionView(Transition *)));
+            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_zoomSlider, SIGNAL(valueChanged(int)), m_activeTimeline, SLOT(slotChangeZoom(int)));
             disconnect(m_activeTimeline->projectView(), SIGNAL(displayMessage(const QString&, MessageType)), m_messageLabel, SLOT(setMessage(const QString&, MessageType)));
             disconnect(m_activeTimeline->projectView(), SIGNAL(showClipFrame(DocClipBase *, const int)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *, const int)));
@@ -1744,6 +1722,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc)   //cha
         }
         //m_activeDocument->setRenderer(NULL);
         disconnect(m_projectList, SIGNAL(clipSelected(DocClipBase *)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *)));
+        disconnect(m_projectList, SIGNAL(refreshClip()), m_clipMonitor, SLOT(refreshMonitor()));
         m_clipMonitor->stop();
     }
     KdenliveSettings::setCurrent_profile(doc->profilePath());
@@ -1753,6 +1732,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc)   //cha
     m_transitionConfig->updateProjectFormat(doc->mltProfile(), doc->timecode(), trackView->tracksNumber());
     m_effectStack->updateProjectFormat(doc->mltProfile(), doc->timecode());
     connect(m_projectList, SIGNAL(clipSelected(DocClipBase *)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *)));
+    connect(m_projectList, SIGNAL(refreshClip()), m_clipMonitor, SLOT(refreshMonitor()));
     connect(m_projectList, SIGNAL(projectModified()), doc, SLOT(setModified()));
     connect(m_projectList, SIGNAL(clipNameChanged(const QString, const QString)), trackView->projectView(), SLOT(clipNameChanged(const QString, const QString)));
 
@@ -1779,9 +1759,9 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc)   //cha
 
     connect(trackView->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), m_effectStack, SLOT(slotClipItemSelected(ClipItem*, int)));
     connect(trackView->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), this, SLOT(slotActivateEffectStackView()));
-    connect(trackView, SIGNAL(transitionItemSelected(Transition*, bool)), m_transitionConfig, SLOT(slotTransitionItemSelected(Transition*, bool)));
-    connect(trackView, SIGNAL(transitionItemSelected(Transition*, bool)), this, SLOT(slotActivateTransitionView(Transition *)));
-    m_zoomSlider->setValue(doc->zoom());
+    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()));
@@ -1807,7 +1787,9 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc)   //cha
     m_activeTimeline = trackView;
     if (m_renderWidget) {
         m_renderWidget->setProfile(doc->mltProfile());
-        m_renderWidget->setDocumentPath(doc->projectFolder().path());
+        m_renderWidget->setGuides(doc->guidesXml(), doc->projectDuration());
+        m_renderWidget->setDocumentPath(doc->projectFolder().path(KUrl::AddTrailingSlash));
+        m_renderWidget->setRenderProfile(doc->getDocumentProperty("renderdestination"), doc->getDocumentProperty("renderprofile"));
     }
     //doc->setRenderer(m_projectMonitor->render);
     m_commandStack->setActiveStack(doc->commandStack());
@@ -1854,6 +1836,7 @@ void MainWindow::slotPreferences(int page, int option)
     // create it :
     KdenliveSettingsDialog* dialog = new KdenliveSettingsDialog(this);
     connect(dialog, SIGNAL(settingsChanged(const QString&)), this, SLOT(updateConfiguration()));
+    connect(dialog, SIGNAL(doResetProfile()), this, SLOT(slotDetectAudioDriver()));
     connect(dialog, SIGNAL(doResetProfile()), m_monitorManager, SLOT(slotResetProfiles()));
     connect(dialog, SIGNAL(updatePreviewSettings()), this, SLOT(slotUpdatePreviewSettings()));
     connect(dialog, SIGNAL(updateCaptureFolder()), m_recMonitor, SLOT(slotUpdateCaptureFolder()));
@@ -1881,6 +1864,9 @@ void MainWindow::updateConfiguration()
     }
     m_buttonAudioThumbs->setChecked(KdenliveSettings::audiothumbnails());
     m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails());
+
+    // Update list of transcoding profiles
+    loadTranscoders();
 #ifndef NO_JOGSHUTTLE
     activateShuttleDevice();
 #endif /* NO_JOGSHUTTLE */
@@ -2215,22 +2201,75 @@ void MainWindow::slotGotProgressInfo(const QString &message, int progress)
 void MainWindow::slotShowClipProperties(DocClipBase *clip)
 {
     if (clip->clipType() == TEXT) {
-        QString titlepath = m_activeDocument->projectFolder().path() + "/titles/";
+        QString titlepath = m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash) + "titles/";
+        if (!clip->getProperty("xmltemplate").isEmpty()) {
+            // template text clip
+
+            // Get the list of existing templates
+            QStringList filter;
+            filter << "*.kdenlivetitle";
+            QStringList templateFiles = QDir(titlepath).entryList(filter, QDir::Files);
+
+            QDialog *dia = new QDialog(this);
+            Ui::TemplateClip_UI dia_ui;
+            dia_ui.setupUi(dia);
+            int ix = -1;
+            const QString templatePath = clip->getProperty("xmltemplate");
+            for (int i = 0; i < templateFiles.size(); ++i) {
+                dia_ui.template_list->comboBox()->addItem(templateFiles.at(i), titlepath + templateFiles.at(i));
+                if (templatePath == KUrl(titlepath + templateFiles.at(i)).path()) ix = i;
+            }
+            if (ix != -1) dia_ui.template_list->comboBox()->setCurrentIndex(ix);
+            else dia_ui.template_list->comboBox()->insertItem(0, templatePath);
+            dia_ui.template_list->fileDialog()->setFilter("*.kdenlivetitle");
+            //warning: setting base directory doesn't work??
+            KUrl startDir(titlepath);
+            dia_ui.template_list->fileDialog()->setUrl(startDir);
+            dia_ui.description->setText(clip->getProperty("description"));
+            dia_ui.clone_clip->setChecked(true);
+            if (dia->exec() == QDialog::Accepted) {
+                QString textTemplate = dia_ui.template_list->comboBox()->itemData(dia_ui.template_list->comboBox()->currentIndex()).toString();
+                if (textTemplate.isEmpty()) textTemplate = dia_ui.template_list->comboBox()->currentText();
+
+                QMap <QString, QString> newprops;
+
+                if (KUrl(textTemplate).path() != templatePath) {
+                    // The template was changed
+                    newprops.insert("xmltemplate", textTemplate);
+                }
+
+                if (dia_ui.description->toPlainText() != clip->getProperty("description")) {
+                    newprops.insert("description", dia_ui.description->toPlainText());
+                }
+
+                QString newtemplate = newprops.value("xmltemplate");
+                if (newtemplate.isEmpty()) newtemplate = templatePath;
+
+                // template modified we need to update xmldata
+                QString description = newprops.value("description");
+                if (description.isEmpty()) description = clip->getProperty("description");
+                newprops.insert("xmldata", m_projectList->generateTemplateXml(newtemplate, description).toString());
+                if (dia_ui.normal_clip->isChecked()) {
+                    // Switch clip to normal clip
+                    newprops.insert("xmltemplate", QString());
+                }
+                EditClipCommand *command = new EditClipCommand(m_projectList, clip->getId(), clip->properties(), newprops, true);
+                m_activeDocument->commandStack()->push(command);
+            }
+            return;
+        }
         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) {
-            QImage pix = dia_ui->renderedPixmap();
-            pix.save(path);
-            //slotAddClipFile(KUrl("/tmp/kdenlivetitle.png"), QString(), -1);
-            //m_clipManager->slotEditTextClipFile(id, dia_ui->xml().toString());
+            QRect rect = dia_ui->renderedRect();
             QMap <QString, QString> newprops;
             newprops.insert("xmldata", dia_ui->xml().toString());
+            newprops.insert("frame_size", QString::number(rect.width()) + 'x' + QString::number(rect.height()));
             EditClipCommand *command = new EditClipCommand(m_projectList, clip->getId(), clip->properties(), newprops, true);
             m_activeDocument->commandStack()->push(command);
-            m_clipMonitor->refreshMonitor(true);
             m_activeDocument->setModified(true);
         }
         delete dia_ui;
@@ -2256,7 +2295,7 @@ void MainWindow::customEvent(QEvent* e)
 {
     if (e->type() == QEvent::User) {
         // The timeline playing position changed...
-        kDebug() << "RECEIVED JOG EVEMNT!!!";
+        kDebug() << "RECEIVED JOG EVEMNT!!!";
     }
 }
 void MainWindow::slotActivateEffectStackView()
@@ -2449,7 +2488,7 @@ void MainWindow::slotSaveZone(Render *render, QPoint zone)
     QLabel *label1 = new QLabel(i18n("Save clip zone as:"), this);
     QString path = m_activeDocument->projectFolder().path();
     path.append("/");
-    path.append("untitled.westley");
+    path.append("untitled.mlt");
     KUrlRequester *url = new KUrlRequester(KUrl(path), this);
     url->setFilter("video/mlt-playlist");
     QLabel *label2 = new QLabel(i18n("Description:"), this);
@@ -2492,6 +2531,7 @@ void MainWindow::slotGetNewLumaStuff()
     }
     qDeleteAll(entries);
     initEffects::refreshLumas();
+    m_activeTimeline->projectView()->reloadTransitionLumas();
 }
 
 void MainWindow::slotGetNewRenderStuff()
@@ -2577,9 +2617,9 @@ void MainWindow::slotShowTimeline(bool show)
     }
 }
 
-void MainWindow::slotMaximizeCurrent(bool show)
+void MainWindow::slotMaximizeCurrent(bool /*show*/)
 {
-    //TODO: is there a way to maximize current widget?
+    //TODO: is there a way to maximize current widget?
     //if (show == true)
     {
         m_timelineState = saveState();
@@ -2595,4 +2635,134 @@ void MainWindow::slotMaximizeCurrent(bool show)
     }*/
 }
 
+void MainWindow::loadTranscoders()
+{
+    QMenu *transMenu = static_cast<QMenu*>(factory()->container("transcoders", this));
+    transMenu->clear();
+
+    KSharedConfigPtr config = KSharedConfig::openConfig("kdenlivetranscodingrc");
+    KConfigGroup transConfig(config, "Transcoding");
+    // read the entries
+    QMap< QString, QString > profiles = transConfig.entryMap();
+    QMapIterator<QString, QString> i(profiles);
+    while (i.hasNext()) {
+        i.next();
+        QAction *a = transMenu->addAction(i.key());
+        a->setData(i.value());
+        connect(a, SIGNAL(triggered()), this, SLOT(slotTranscode()));
+    }
+}
+
+void MainWindow::slotTranscode(KUrl::List urls)
+{
+    QString params;
+    if (urls.isEmpty()) {
+        urls.append(m_projectList->currentClipUrl());
+        QAction *action = qobject_cast<QAction *>(sender());
+        params = action->data().toString();
+    }
+    if (urls.isEmpty()) return;
+    ClipTranscode *d = new ClipTranscode(urls, params);
+    connect(d, SIGNAL(addClip(KUrl)), this, SLOT(slotAddProjectClip(KUrl)));
+    d->show();
+    //QProcess::startDetached("ffmpeg", parameters);
+}
+
+void MainWindow::slotTranscodeClip()
+{
+    KUrl::List urls = KFileDialog::getOpenUrls(KUrl("kfiledialog:///projectfolder"));
+    if (urls.isEmpty()) return;
+    slotTranscode(urls);
+}
+
+void MainWindow::slotSetDocumentRenderProfile(const QString &dest, const QString &name)
+{
+    if (m_activeDocument == NULL) return;
+    m_activeDocument->setDocumentProperty("renderdestination", dest);
+    m_activeDocument->setDocumentProperty("renderprofile", name);
+    m_activeDocument->setModified(true);
+}
+
+
+void MainWindow::slotPrepareRendering(bool scriptExport, bool zoneOnly, const QString &chapterFile)
+{
+    if (m_activeDocument == NULL || m_renderWidget == NULL) return;
+    QString scriptPath;
+    QString playlistPath;
+    if (scriptExport) {
+        bool ok;
+        QString scriptsFolder = m_activeDocument->projectFolder().path() + "/scripts/";
+        QString path = m_renderWidget->getFreeScriptName();
+        scriptPath = QInputDialog::getText(this, i18n("Create Render Script"), i18n("Script name (will be saved in: %1)", scriptsFolder), QLineEdit::Normal, KUrl(path).fileName(), &ok);
+        if (!ok || scriptPath.isEmpty()) return;
+        scriptPath.prepend(scriptsFolder);
+        QFile f(scriptPath);
+        if (f.exists()) {
+            if (KMessageBox::warningYesNo(this, i18n("Script file already exists. Do you want to overwrite it?")) != KMessageBox::Yes)
+                return;
+        }
+        playlistPath = scriptPath + ".mlt";
+        m_projectMonitor->saveSceneList(playlistPath);
+    } else {
+        KTemporaryFile temp;
+        temp.setAutoRemove(false);
+        temp.setSuffix(".mlt");
+        temp.open();
+        playlistPath = temp.fileName();
+        m_projectMonitor->saveSceneList(playlistPath);
+    }
+
+    if (!chapterFile.isEmpty()) {
+        int in = 0;
+        int out;
+        if (!zoneOnly) out = (int) GenTime(m_activeDocument->projectDuration()).frames(m_activeDocument->fps());
+        else {
+            in = m_activeTimeline->inPoint();
+            out = m_activeTimeline->outPoint();
+        }
+        QDomDocument doc;
+        QDomElement chapters = doc.createElement("chapters");
+        chapters.setAttribute("fps", m_activeDocument->fps());
+        doc.appendChild(chapters);
+
+        QDomElement guidesxml = m_activeDocument->guidesXml();
+        QDomNodeList nodes = guidesxml.elementsByTagName("guide");
+        for (int i = 0; i < nodes.count(); i++) {
+            QDomElement e = nodes.item(i).toElement();
+            if (!e.isNull()) {
+                QString comment = e.attribute("comment");
+                int time = (int) GenTime(e.attribute("time").toDouble()).frames(m_activeDocument->fps());
+                if (time >= in && time < out) {
+                    if (zoneOnly) time = time - in;
+                    QDomElement chapter = doc.createElement("chapter");
+                    chapters.appendChild(chapter);
+                    chapter.setAttribute("title", comment);
+                    chapter.setAttribute("time", time);
+                }
+            }
+        }
+        if (chapters.childNodes().count() > 0) {
+            if (m_activeTimeline->projectView()->hasGuide(out, 0) == -1) {
+                // Always insert a guide in pos 0
+                QDomElement chapter = doc.createElement("chapter");
+                chapters.insertBefore(chapter, QDomNode());
+                chapter.setAttribute("title", i18n("Start"));
+                chapter.setAttribute("time", "0");
+            }
+            // save chapters file
+            QFile file(chapterFile);
+            if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+                kWarning() << "//////  ERROR writing DVD CHAPTER file: " << chapterFile;
+            } else {
+                file.write(doc.toString().toUtf8());
+                if (file.error() != QFile::NoError)
+                    kWarning() << "//////  ERROR writing DVD CHAPTER file: " << chapterFile;
+                file.close();
+            }
+        }
+    }
+
+    m_renderWidget->slotExport(scriptExport, m_activeTimeline->inPoint(), m_activeTimeline->outPoint(), playlistPath, scriptPath);
+}
+
 #include "mainwindow.moc"