X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmainwindow.cpp;h=8281194a4a2835e6f0bba450497a3aeb6db7fed2;hb=7c066a50b5c795b85b4e94d489dfb18458d7ce7b;hp=69e8ad1d74782951bd6b571600e5514c6cbbdf8d;hpb=a52b75720d327a5e892550d92904136d55e7d8b3;p=kdenlive diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 69e8ad1d..8281194a 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -55,7 +55,7 @@ #include "vectorscope.h" #include "waveform.h" #include "rgbparade.h" -#include "levels.h" +#include "histogram.h" #include #include @@ -229,16 +229,16 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent addDockWidget(Qt::TopDockWidgetArea, m_waveformDock); m_RGBParade = new RGBParade(m_projectMonitor, m_clipMonitor, this); - m_RGBParadeDock = new QDockWidget("RGB Parade", this); + m_RGBParadeDock = new QDockWidget(i18n("RGB Parade"), this); m_RGBParadeDock->setObjectName(m_RGBParade->widgetName()); m_RGBParadeDock->setWidget(m_RGBParade); addDockWidget(Qt::TopDockWidgetArea, m_RGBParadeDock); - m_levels = new Levels(m_projectMonitor, m_clipMonitor, this); - m_levelsDock = new QDockWidget("Levels", this); - m_levelsDock->setObjectName(m_levels->widgetName()); - m_levelsDock->setWidget(m_levels); - addDockWidget(Qt::TopDockWidgetArea, m_levelsDock); + m_histogram = new Histogram(m_projectMonitor, m_clipMonitor, this); + m_histogramDock = new QDockWidget(i18n("Histogram"), this); + m_histogramDock->setObjectName(m_histogram->widgetName()); + m_histogramDock->setWidget(m_histogram); + addDockWidget(Qt::TopDockWidgetArea, m_histogramDock); m_undoViewDock = new QDockWidget(i18n("Undo History"), this); @@ -271,7 +271,7 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent tabifyDockWidget(m_vectorscopeDock, m_waveformDock); tabifyDockWidget(m_vectorscopeDock, m_RGBParadeDock); - tabifyDockWidget(m_vectorscopeDock, m_levelsDock); + tabifyDockWidget(m_vectorscopeDock, m_histogramDock); tabifyDockWidget(m_vectorscopeDock, m_undoViewDock); tabifyDockWidget(m_vectorscopeDock, m_effectListDock); @@ -433,7 +433,7 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent connect(m_monitorManager, SIGNAL(raiseClipMonitor(bool)), m_vectorscope, SLOT(slotActiveMonitorChanged(bool))); connect(m_monitorManager, SIGNAL(raiseClipMonitor(bool)), m_waveform, SLOT(slotActiveMonitorChanged(bool))); connect(m_monitorManager, SIGNAL(raiseClipMonitor(bool)), m_RGBParade, SLOT(slotActiveMonitorChanged(bool))); - connect(m_monitorManager, SIGNAL(raiseClipMonitor(bool)), m_levels, SLOT(slotActiveMonitorChanged(bool))); + connect(m_monitorManager, SIGNAL(raiseClipMonitor(bool)), m_histogram, SLOT(slotActiveMonitorChanged(bool))); connect(m_effectList, SIGNAL(addEffect(const QDomElement)), this, SLOT(slotAddEffect(const QDomElement))); connect(m_effectList, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects())); @@ -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(QMap )), this, SLOT(slotSetDocumentRenderProfile(QMap ))); 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,18 +1985,16 @@ void MainWindow::slotRenderProject() m_renderWidget->setProfile(m_activeDocument->mltProfile()); m_renderWidget->setGuides(m_activeDocument->guidesXml(), m_activeDocument->projectDuration()); m_renderWidget->setDocumentPath(m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash)); - m_renderWidget->setRenderProfile(m_activeDocument->getDocumentProperty("renderdestination"), m_activeDocument->getDocumentProperty("rendercategory"), m_activeDocument->getDocumentProperty("renderprofile"), m_activeDocument->getDocumentProperty("renderurl")); + m_renderWidget->setRenderProfile(m_activeDocument->getRenderProperties()); } } slotCheckRenderStatus(); - /*TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget(); - if (currentTab) m_renderWidget->setTimeline(currentTab); - m_renderWidget->setDocument(m_activeDocument);*/ m_renderWidget->show(); m_renderWidget->showNormal(); - m_activeTimeline->tracksNumber(); - m_renderWidget->enableAudio(false); + // What are the following lines supposed to do? + //m_activeTimeline->tracksNumber(); + //m_renderWidget->enableAudio(false); //m_renderWidget->export_audio; } @@ -2196,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->getRenderProperties()); } //doc->setRenderer(m_projectMonitor->render); m_commandStack->setActiveStack(doc->commandStack()); @@ -2340,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 { @@ -3358,13 +3358,14 @@ void MainWindow::slotTranscodeClip() slotTranscode(urls); } -void MainWindow::slotSetDocumentRenderProfile(const QString &dest, const QString &group, const QString &name, const QString &file) +void MainWindow::slotSetDocumentRenderProfile(QMap props) { if (m_activeDocument == NULL) return; - m_activeDocument->setDocumentProperty("renderdestination", dest); - m_activeDocument->setDocumentProperty("rendercategory", group); - m_activeDocument->setDocumentProperty("renderprofile", name); - m_activeDocument->setDocumentProperty("renderurl", file); + QMapIterator i(props); + while (i.hasNext()) { + i.next(); + m_activeDocument->setDocumentProperty(i.key(), i.value()); + } m_activeDocument->setModified(true); } @@ -3447,8 +3448,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) @@ -3622,22 +3626,46 @@ void MainWindow::slotShowTitleBars(bool show) m_vectorscopeDock->setTitleBarWidget(0); m_waveformDock->setTitleBarWidget(0); m_RGBParadeDock->setTitleBarWidget(0); - m_levelsDock->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_levelsDock->isFloating()) { m_levelsDock->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); }