X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmainwindow.cpp;h=e66e0b4882a8683c5d581a8c85f74c4806e8da3e;hb=4e1438fe486d77af1afb75825f3aa1f766715e6f;hp=33e1e48401ba824f2eebe60f37af7bb0a60f181b;hpb=9ed8626d1ec2fa5dc12f38ad2fed17d50ed4cd3c;p=kdenlive

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 33e1e484..e66e0b48 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -504,8 +504,8 @@ bool MainWindow::queryClose()
     if (m_monitorManager) m_monitorManager->stopActiveMonitor();
     // warn the user to save if document is modified and we have clips in our project list
     if (m_activeDocument && m_activeDocument->isModified() &&
-        ((m_projectList->documentClipList().isEmpty() && !m_activeDocument->url().isEmpty()) ||
-            !m_projectList->documentClipList().isEmpty())) {
+            ((m_projectList->documentClipList().isEmpty() && !m_activeDocument->url().isEmpty()) ||
+             !m_projectList->documentClipList().isEmpty())) {
         QString message;
         if (m_activeDocument->url().fileName().isEmpty())
             message = i18n("Save changes to document?");
@@ -1681,8 +1681,10 @@ bool MainWindow::saveFileAs(const QString &outputFileName)
 
 bool MainWindow::saveFileAs()
 {
-    QString outputFile = KFileDialog::getSaveFileName(KUrl(), getMimeType());
-    if (outputFile.isEmpty()) return false;
+    QString outputFile = KFileDialog::getSaveFileName(m_activeDocument->projectFolder(), getMimeType());
+    if (outputFile.isEmpty()) {
+        return false;
+    }
     if (QFile::exists(outputFile)) {
         // Show the file dialog again if the user does not want to overwrite the file
         if (KMessageBox::questionYesNo(this, i18n("File already exists.\nDo you want to overwrite it?")) == KMessageBox::No)
@@ -1975,7 +1977,7 @@ void MainWindow::slotRenderProject()
         QString projectfolder = m_activeDocument ? m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash) : KdenliveSettings::defaultprojectfolder();
         m_renderWidget = new RenderWidget(projectfolder, this);
         connect(m_renderWidget, SIGNAL(shutdown()), this, SLOT(slotShutdown()));
-        connect(m_renderWidget, SIGNAL(selectedRenderProfile(const QString &, const QString &, const QString &, const QString&)), this, SLOT(slotSetDocumentRenderProfile(const QString &, const QString &, const QString &, const QString&)));
+        connect(m_renderWidget, SIGNAL(selectedRenderProfile(const QString &, const QString &, const QString &, const QString&, bool, bool, int, int)), this, SLOT(slotSetDocumentRenderProfile(const QString &, const QString &, const QString &, const QString&, bool, bool, int, int)));
         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 &)));
@@ -1983,13 +1985,10 @@ void MainWindow::slotRenderProject()
             m_renderWidget->setProfile(m_activeDocument->mltProfile());
             m_renderWidget->setGuides(m_activeDocument->guidesXml(), m_activeDocument->projectDuration());
             m_renderWidget->setDocumentPath(m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash));
-            m_renderWidget->setRenderProfile(m_activeDocument->getDocumentProperty("renderdestination"), m_activeDocument->getDocumentProperty("rendercategory"), m_activeDocument->getDocumentProperty("renderprofile"), m_activeDocument->getDocumentProperty("renderurl"));
+            m_renderWidget->setRenderProfile(m_activeDocument->getDocumentProperty("renderdestination"), m_activeDocument->getDocumentProperty("rendercategory"), m_activeDocument->getDocumentProperty("renderprofile"), m_activeDocument->getDocumentProperty("renderurl"), m_activeDocument->getDocumentProperty("renderzone") == "1", m_activeDocument->getDocumentProperty("renderguide") == "1", m_activeDocument->getDocumentProperty("startguide").toInt(), m_activeDocument->getDocumentProperty("endguide").toInt());
         }
     }
     slotCheckRenderStatus();
-    /*TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget();
-    if (currentTab) m_renderWidget->setTimeline(currentTab);
-    m_renderWidget->setDocument(m_activeDocument);*/
     m_renderWidget->show();
     m_renderWidget->showNormal();
 
@@ -2197,7 +2196,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc)   //cha
         m_renderWidget->setProfile(doc->mltProfile());
         m_renderWidget->setGuides(doc->guidesXml(), doc->projectDuration());
         m_renderWidget->setDocumentPath(doc->projectFolder().path(KUrl::AddTrailingSlash));
-        m_renderWidget->setRenderProfile(doc->getDocumentProperty("renderdestination"), doc->getDocumentProperty("rendercategory"), doc->getDocumentProperty("renderprofile"), doc->getDocumentProperty("renderurl"));
+        m_renderWidget->setRenderProfile(doc->getDocumentProperty("renderdestination"), doc->getDocumentProperty("rendercategory"), doc->getDocumentProperty("renderprofile"), doc->getDocumentProperty("renderurl"), doc->getDocumentProperty("renderzone") == "1", doc->getDocumentProperty("renderguide") == "1", doc->getDocumentProperty("startguide").toInt(), doc->getDocumentProperty("endguide").toInt());
     }
     //doc->setRenderer(m_projectMonitor->render);
     m_commandStack->setActiveStack(doc->commandStack());
@@ -2341,9 +2340,9 @@ void MainWindow::slotSwitchSnap()
 void MainWindow::slotDeleteItem()
 {
     if (QApplication::focusWidget() &&
-        QApplication::focusWidget()->parentWidget() &&
-        QApplication::focusWidget()->parentWidget()->parentWidget() &&
-        QApplication::focusWidget()->parentWidget()->parentWidget() == m_projectListDock) {
+            QApplication::focusWidget()->parentWidget() &&
+            QApplication::focusWidget()->parentWidget()->parentWidget() &&
+            QApplication::focusWidget()->parentWidget()->parentWidget() == m_projectListDock) {
         m_projectList->slotRemoveClip();
 
     } else {
@@ -3359,13 +3358,17 @@ void MainWindow::slotTranscodeClip()
     slotTranscode(urls);
 }
 
-void MainWindow::slotSetDocumentRenderProfile(const QString &dest, const QString &group, const QString &name, const QString &file)
+void MainWindow::slotSetDocumentRenderProfile(const QString &dest, const QString &group, const QString &name, const QString &file, bool renderZone, bool renderGuide, int startGuide, int endGuide)
 {
     if (m_activeDocument == NULL) return;
     m_activeDocument->setDocumentProperty("renderdestination", dest);
     m_activeDocument->setDocumentProperty("rendercategory", group);
     m_activeDocument->setDocumentProperty("renderprofile", name);
     m_activeDocument->setDocumentProperty("renderurl", file);
+    m_activeDocument->setDocumentProperty("renderzone", QString::number(renderZone));
+    m_activeDocument->setDocumentProperty("renderguide", QString::number(renderGuide));
+    m_activeDocument->setDocumentProperty("startguide", QString::number(startGuide));
+    m_activeDocument->setDocumentProperty("endguide", QString::number(endGuide));
     m_activeDocument->setModified(true);
 }
 
@@ -3448,8 +3451,11 @@ void MainWindow::slotPrepareRendering(bool scriptExport, bool zoneOnly, const QS
             }
         }
     }
-
-    m_renderWidget->slotExport(scriptExport, m_activeTimeline->inPoint(), m_activeTimeline->outPoint(), playlistPath, scriptPath);
+    bool exportAudio;
+    if (m_renderWidget->automaticAudioExport()) {
+        exportAudio = m_activeTimeline->checkProjectAudio();
+    } else exportAudio = m_renderWidget->selectedAudioExport();
+    m_renderWidget->slotExport(scriptExport, m_activeTimeline->inPoint(), m_activeTimeline->outPoint(), playlistPath, scriptPath, exportAudio);
 }
 
 void MainWindow::slotUpdateTimecodeFormat(int ix)
@@ -3625,20 +3631,44 @@ void MainWindow::slotShowTitleBars(bool show)
         m_RGBParadeDock->setTitleBarWidget(0);
         m_histogramDock->setTitleBarWidget(0);
     } else {
-        if (!m_effectStackDock->isFloating()) { m_effectStackDock->setTitleBarWidget(new QWidget(this)); }
-        if (!m_clipMonitorDock->isFloating()) { m_clipMonitorDock->setTitleBarWidget(new QWidget(this)); }
-        if (!m_projectMonitorDock->isFloating()) { m_projectMonitorDock->setTitleBarWidget(new QWidget(this)); }
+        if (!m_effectStackDock->isFloating()) {
+            m_effectStackDock->setTitleBarWidget(new QWidget);
+        }
+        if (!m_clipMonitorDock->isFloating()) {
+            m_clipMonitorDock->setTitleBarWidget(new QWidget);
+        }
+        if (!m_projectMonitorDock->isFloating()) {
+            m_projectMonitorDock->setTitleBarWidget(new QWidget);
+        }
 #ifndef Q_WS_MAC
-        if (!m_recMonitorDock->isFloating()) { m_recMonitorDock->setTitleBarWidget(new QWidget(this)); }
+        if (!m_recMonitorDock->isFloating()) {
+            m_recMonitorDock->setTitleBarWidget(new QWidget);
+        }
 #endif
-        if (!m_effectListDock->isFloating()) { m_effectListDock->setTitleBarWidget(new QWidget(this)); }
-        if (!m_transitionConfigDock->isFloating()) { m_transitionConfigDock->setTitleBarWidget(new QWidget(this)); }
-        if (!m_projectListDock->isFloating()) { m_projectListDock->setTitleBarWidget(new QWidget(this)); }
-        if (!m_undoViewDock->isFloating()) { m_undoViewDock->setTitleBarWidget(new QWidget(this)); }
-        if (!m_vectorscopeDock->isFloating()) { m_vectorscopeDock->setTitleBarWidget(new QWidget(this)); }
-        if (!m_waveformDock->isFloating()) { m_waveformDock->setTitleBarWidget(new QWidget(this)); }
-        if (!m_RGBParadeDock->isFloating()) { m_RGBParadeDock->setTitleBarWidget(new QWidget(this)); }
-        if (!m_histogramDock->isFloating()) { m_histogramDock->setTitleBarWidget(new QWidget(this)); }
+        if (!m_effectListDock->isFloating()) {
+            m_effectListDock->setTitleBarWidget(new QWidget);
+        }
+        if (!m_transitionConfigDock->isFloating()) {
+            m_transitionConfigDock->setTitleBarWidget(new QWidget);
+        }
+        if (!m_projectListDock->isFloating()) {
+            m_projectListDock->setTitleBarWidget(new QWidget);
+        }
+        if (!m_undoViewDock->isFloating()) {
+            m_undoViewDock->setTitleBarWidget(new QWidget);
+        }
+        if (!m_vectorscopeDock->isFloating()) {
+            m_vectorscopeDock->setTitleBarWidget(new QWidget);
+        }
+        if (!m_waveformDock->isFloating()) {
+            m_waveformDock->setTitleBarWidget(new QWidget);
+        }
+        if (!m_RGBParadeDock->isFloating()) {
+            m_RGBParadeDock->setTitleBarWidget(new QWidget(this));
+        }
+        if (!m_histogramDock->isFloating()) {
+            m_histogramDock->setTitleBarWidget(new QWidget(this));
+        }
     }
     KdenliveSettings::setShowtitlebars(show);
 }