#include "vectorscope.h"
#include "waveform.h"
#include "rgbparade.h"
+#include "histogram.h"
#include <KApplication>
#include <KAction>
m_projectListDock->setWidget(m_projectList);
addDockWidget(Qt::TopDockWidgetArea, m_projectListDock);
- m_effectStackDock = new QDockWidget(i18n("Effect Stack"), this);
- m_effectStackDock->setObjectName("effect_stack");
- m_effectStack = new EffectStackView(this);
- m_effectStackDock->setWidget(m_effectStack);
- addDockWidget(Qt::TopDockWidgetArea, m_effectStackDock);
-
- m_transitionConfigDock = new QDockWidget(i18n("Transition"), this);
- m_transitionConfigDock->setObjectName("transition");
- m_transitionConfig = new TransitionSettings(this);
- m_transitionConfigDock->setWidget(m_transitionConfig);
- addDockWidget(Qt::TopDockWidgetArea, m_transitionConfigDock);
-
m_clipMonitorDock = new QDockWidget(i18n("Clip Monitor"), this);
m_clipMonitorDock->setObjectName("clip_monitor");
m_clipMonitor = new Monitor("clip", m_monitorManager, QString(), this);
connect(m_recMonitor, SIGNAL(showConfigDialog(int, int)), this, SLOT(slotPreferences(int, int)));
#endif
+ m_effectStackDock = new QDockWidget(i18n("Effect Stack"), this);
+ m_effectStackDock->setObjectName("effect_stack");
+ m_effectStack = new EffectStackView(m_projectMonitor, this);
+ m_effectStackDock->setWidget(m_effectStack);
+ addDockWidget(Qt::TopDockWidgetArea, m_effectStackDock);
+
+ m_transitionConfigDock = new QDockWidget(i18n("Transition"), this);
+ m_transitionConfigDock->setObjectName("transition");
+ m_transitionConfig = new TransitionSettings(m_projectMonitor, this);
+ m_transitionConfigDock->setWidget(m_transitionConfig);
+ addDockWidget(Qt::TopDockWidgetArea, m_transitionConfigDock);
+
m_effectListDock = new QDockWidget(i18n("Effect List"), this);
m_effectListDock->setObjectName("effect_list");
m_effectList = new EffectsListView();
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_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);
m_undoViewDock->setObjectName("undo_history");
tabifyDockWidget(m_vectorscopeDock, m_waveformDock);
tabifyDockWidget(m_vectorscopeDock, m_RGBParadeDock);
+ tabifyDockWidget(m_vectorscopeDock, m_histogramDock);
tabifyDockWidget(m_vectorscopeDock, m_undoViewDock);
tabifyDockWidget(m_vectorscopeDock, m_effectListDock);
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_histogram, SLOT(slotActiveMonitorChanged(bool)));
connect(m_effectList, SIGNAL(addEffect(const QDomElement)), this, SLOT(slotAddEffect(const QDomElement)));
connect(m_effectList, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects()));
if (queryClose()) {
if (m_projectMonitor) m_projectMonitor->stop();
if (m_clipMonitor) m_clipMonitor->stop();
- delete m_effectStack;
delete m_activeTimeline;
#ifndef Q_WS_MAC
// This sometimes causes crash on exit on OS X for some reason.
delete m_projectMonitor;
delete m_clipMonitor;
#endif
+ delete m_effectStack;
delete m_activeDocument;
delete m_shortcutRemoveFocus;
Mlt::Factory::close();
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?");
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)
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 <QString, QString>)), this, SLOT(slotSetDocumentRenderProfile(QMap <QString, 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 &)));
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;
}
disconnect(m_effectStack, SIGNAL(changeEffectPosition(ClipItem*, int, int)), m_activeTimeline->projectView(), SLOT(slotChangeEffectPosition(ClipItem*, int, int)));
disconnect(m_effectStack, SIGNAL(refreshEffectStack(ClipItem*)), m_activeTimeline->projectView(), SLOT(slotRefreshEffects(ClipItem*)));
disconnect(m_effectStack, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects()));
+ disconnect(m_effectStack, SIGNAL(displayMessage(const QString&, int)), this, SLOT(slotGotProgressInfo(const QString&, int)));
disconnect(m_transitionConfig, SIGNAL(transitionUpdated(Transition *, QDomElement)), m_activeTimeline->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement)));
disconnect(m_transitionConfig, SIGNAL(seekTimeline(int)), m_activeTimeline->projectView() , SLOT(setCursorPos(int)));
disconnect(m_activeTimeline->projectView(), SIGNAL(activateDocumentMonitor()), m_projectMonitor, SLOT(activateMonitor()));
connect(trackView, SIGNAL(configTrack(int)), this, SLOT(slotConfigTrack(int)));
connect(trackView, SIGNAL(updateTracksInfo()), this, SLOT(slotUpdateTrackInfo()));
connect(trackView, SIGNAL(mousePosition(int)), this, SLOT(slotUpdateMousePosition(int)));
+ connect(trackView->projectView(), SIGNAL(forceClipProcessing(const QString &)), m_projectList, SLOT(slotForceProcessing(const QString &)));
connect(m_projectMonitor, SIGNAL(renderPosition(int)), trackView, SLOT(moveCursorPos(int)));
connect(m_projectMonitor, SIGNAL(zoneUpdated(QPoint)), trackView, SLOT(slotSetZone(QPoint)));
connect(m_clipMonitor, SIGNAL(zoneUpdated(QPoint)), m_projectList, SLOT(slotUpdateClipCut(QPoint)));
connect(m_transitionConfig, SIGNAL(seekTimeline(int)), trackView->projectView() , SLOT(setCursorPos(int)));
connect(m_effectStack, SIGNAL(seekTimeline(int)), trackView->projectView() , SLOT(setCursorPos(int)));
connect(m_effectStack, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects()));
+ connect(m_effectStack, SIGNAL(displayMessage(const QString&, int)), this, SLOT(slotGotProgressInfo(const QString&, int)));
connect(trackView->projectView(), SIGNAL(activateDocumentMonitor()), m_projectMonitor, SLOT(activateMonitor()));
connect(trackView, SIGNAL(zoneMoved(int, int)), this, SLOT(slotZoneMoved(int, int)));
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());
}
m_buttonAudioThumbs->setChecked(KdenliveSettings::audiothumbnails());
m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails());
+ m_buttonShowMarkers->setChecked(KdenliveSettings::showmarkers());
m_buttonAutomaticSplitAudio->setChecked(KdenliveSettings::splitaudio());
// Update list of transcoding profiles
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 {
slotTranscode(urls);
}
-void MainWindow::slotSetDocumentRenderProfile(const QString &dest, const QString &group, const QString &name, const QString &file)
+void MainWindow::slotSetDocumentRenderProfile(QMap <QString, QString> 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<QString, QString> i(props);
+ while (i.hasNext()) {
+ i.next();
+ m_activeDocument->setDocumentProperty(i.key(), i.value());
+ }
m_activeDocument->setModified(true);
}
}
}
}
-
- 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)
m_vectorscopeDock->setTitleBarWidget(0);
m_waveformDock->setTitleBarWidget(0);
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_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);
}
projects / kdenlive / blobdiff