void MainWindow::slotReloadEffects()
{
- kDebug() << "START RELOAD; COUNR: " << m_customEffectsMenu->actions().count();
m_customEffectsMenu->clear();
- kDebug() << "START RELOAD; CLR: " << m_customEffectsMenu->actions().count();
initEffects::parseCustomEffectsFile();
- const QStringList effects = customEffects.effectNames();
- kDebug() << "NEW EFFS: " << effects;
QAction *action;
- if (effects.isEmpty()) m_customEffectsMenu->setEnabled(false);
- else m_customEffectsMenu->setEnabled(true);
+ QStringList effectInfo;
+ QMap<QString, QStringList> effectsList;
- foreach(const QString &name, effects) {
- action = new QAction(name, this);
- action->setData(name);
+ for (int ix = 0; ix < customEffects.count(); ix++) {
+ effectInfo = customEffects.effectIdInfo(ix);
+ effectsList.insert(effectInfo.at(0).toLower(), effectInfo);
+ }
+ if (effectsList.isEmpty()) {
+ m_customEffectsMenu->setEnabled(false);
+ return;
+ } else m_customEffectsMenu->setEnabled(true);
+
+ foreach(const QStringList &value, effectsList) {
+ action = new QAction(value.at(0), this);
+ action->setData(value);
m_customEffectsMenu->addAction(action);
}
m_effectList->reloadEffectList();
m_projectList->setRenderer(m_projectMonitor->render);
//connect(m_projectList, SIGNAL(receivedClipDuration(const QString &)), this, SLOT(slotUpdateClip(const QString &)));
connect(m_projectList, SIGNAL(showClipProperties(DocClipBase *)), this, SLOT(slotShowClipProperties(DocClipBase *)));
+ connect(m_projectList, SIGNAL(showClipProperties(QList <DocClipBase *>, QMap<QString, QString>)), this, SLOT(slotShowClipProperties(QList <DocClipBase *>, QMap<QString, QString>)));
connect(m_projectList, SIGNAL(getFileProperties(const QDomElement, const QString &, int, bool)), m_projectMonitor->render, SLOT(getFileProperties(const QDomElement, const QString &, int, bool)));
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)));
switchMon->setShortcut(Qt::Key_T);
connect(switchMon, SIGNAL(triggered(bool)), this, SLOT(slotSwitchMonitors()));
+ KAction *insertTree = collection->addAction("insert_project_tree");
+ insertTree->setText(i18n("Insert zone in project tree"));
+ insertTree->setShortcut(Qt::CTRL + Qt::Key_I);
+ connect(insertTree, SIGNAL(triggered(bool)), this, SLOT(slotInsertZoneToTree()));
+
+ KAction *insertTimeline = collection->addAction("insert_timeline");
+ insertTimeline->setText(i18n("Insert zone in timeline"));
+ insertTimeline->setShortcut(Qt::SHIFT + Qt::CTRL + Qt::Key_I);
+ connect(insertTimeline, SIGNAL(triggered(bool)), this, SLOT(slotInsertZoneToTimeline()));
+
KAction *resizeStart = new KAction(KIcon(), i18n("Resize Item Start"), this);
collection->addAction("resize_timeline_clip_start", resizeStart);
resizeStart->setShortcut(Qt::Key_1);
delete w;
}
-void MainWindow::newFile(bool showProjectSettings)
+void MainWindow::newFile(bool showProjectSettings, bool force)
{
- if (!m_timelineArea->isEnabled()) return;
+ if (!m_timelineArea->isEnabled() && !force) return;
m_fileRevert->setEnabled(false);
QString profileName;
KUrl projectFolder;
QPoint projectTracks(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks());
- if (!showProjectSettings && m_timelineArea->count() == 0) {
+ if (!showProjectSettings) {
if (!KdenliveSettings::activatetabs()) closeCurrentDocument();
profileName = KdenliveSettings::default_profile();
projectFolder = KdenliveSettings::defaultprojectfolder();
projectTracks = w->tracks();
delete w;
}
+ m_timelineArea->setEnabled(true);
+ m_projectList->setEnabled(true);
KdenliveDoc *doc = new KdenliveDoc(KUrl(), projectFolder, m_commandStack, profileName, projectTracks, m_projectMonitor->render, this);
doc->m_autosave = new KAutoSaveFile(KUrl(), doc);
bool ok;
m_timelineArea->addTab(trackView, KIcon("kdenlive"), doc->description());
if (!ok) {
// MLT is broken
- m_timelineArea->setEnabled(false);
- m_projectList->setEnabled(false);
- m_monitorManager->slotBlockMonitors();
+ //m_timelineArea->setEnabled(false);
+ //m_projectList->setEnabled(false);
slotPreferences(6);
return;
}
break;
}
}
+ m_clipMonitor->slotSetXml(NULL);
m_timelineArea->removeTab(m_timelineArea->indexOf(w));
if (m_timelineArea->count() == 1) {
m_timelineArea->setTabBarHidden(true);
bool MainWindow::saveFileAs(const QString &outputFileName)
{
QString currentSceneList;
+ m_monitorManager->stopActiveMonitor();
if (KdenliveSettings::dropbframes()) {
KdenliveSettings::setDropbframes(false);
m_activeDocument->clipManager()->updatePreviewSettings();
}
if (!KdenliveSettings::activatetabs()) closeCurrentDocument();
m_messageLabel->setMessage(i18n("Opening file %1", url.path()), InformationMessage);
- qApp->processEvents();
+ m_messageLabel->repaint();
doOpenFile(url, NULL);
}
if (!ok) {
m_timelineArea->setEnabled(false);
m_projectList->setEnabled(false);
- m_monitorManager->slotBlockMonitors();
- slotPreferences(6);
+ KMessageBox::sorry(this, i18n("Cannot open file %1.\nProject is corrupted.", url.path()));
+ slotGotProgressInfo(QString(), -1);
+ newFile(false, true);
return;
}
m_timelineArea->setTabToolTip(m_timelineArea->currentIndex(), doc->url().path());
if (m_timelineArea->count() > 1) m_timelineArea->setTabBarHidden(false);
slotGotProgressInfo(QString(), -1);
- m_clipMonitor->refreshMonitor(true);
m_projectMonitor->adjustRulerSize(trackView->duration());
m_projectMonitor->slotZoneMoved(trackView->inPoint(), trackView->outPoint());
+ m_clipMonitor->refreshMonitor(true);
}
void MainWindow::recoverFiles(QList<KAutoSaveFile *> staleFiles)
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&)), this, SLOT(slotSetDocumentRenderProfile(const QString &, const QString &, const QString&)));
+ 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(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("renderprofile"), m_activeDocument->getDocumentProperty("renderurl"));
+ m_renderWidget->setRenderProfile(m_activeDocument->getDocumentProperty("renderdestination"), m_activeDocument->getDocumentProperty("rendercategory"), m_activeDocument->getDocumentProperty("renderprofile"), m_activeDocument->getDocumentProperty("renderurl"));
}
}
/*TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget();
disconnect(m_activeTimeline->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), this, SLOT(slotActivateEffectStackView()));
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_activeTimeline->projectView(), SIGNAL(playMonitor()), m_projectMonitor, SLOT(slotPlay()));
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 *, QPoint, const int)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *, QPoint, const int)));
disconnect(m_activeTimeline, SIGNAL(zoneMoved(int, int)), this, SLOT(slotZoneMoved(int, int)));
disconnect(m_projectList, SIGNAL(loadingIsOver()), m_activeTimeline->projectView(), SLOT(slotUpdateAllThumbs()));
disconnect(m_projectList, SIGNAL(displayMessage(const QString&, int)), this, SLOT(slotGotProgressInfo(const QString&, int)));
+ disconnect(m_projectList, SIGNAL(clipNeedsReload(const QString&, bool)), m_activeTimeline->projectView(), SLOT(slotUpdateClip(const QString &, bool)));
m_effectStack->clear();
}
//m_activeDocument->setRenderer(NULL);
m_effectStack->updateProjectFormat(doc->mltProfile(), doc->timecode());
connect(m_projectList, SIGNAL(clipSelected(DocClipBase *, QPoint)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *, QPoint)));
connect(m_projectList, SIGNAL(refreshClip()), m_clipMonitor, SLOT(refreshMonitor()));
+ connect(m_projectList, SIGNAL(clipNeedsReload(const QString&, bool)), trackView->projectView(), SLOT(slotUpdateClip(const QString &, bool)));
+
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)));
connect(trackView->projectView(), SIGNAL(displayMessage(const QString&, MessageType)), m_messageLabel, SLOT(setMessage(const QString&, MessageType)));
connect(trackView->projectView(), SIGNAL(showClipFrame(DocClipBase *, QPoint, const int)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *, QPoint, const int)));
+ connect(trackView->projectView(), SIGNAL(playMonitor()), m_projectMonitor, SLOT(slotPlay()));
connect(m_effectStack, SIGNAL(updateClipEffect(ClipItem*, QDomElement, QDomElement, int)), trackView->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, QDomElement, QDomElement, int)));
connect(m_effectStack, SIGNAL(refreshEffectStack(ClipItem*)), trackView->projectView(), SLOT(slotRefreshEffects(ClipItem*)));
connect(m_transitionConfig, SIGNAL(transitionUpdated(Transition *, QDomElement)), trackView->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement)));
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(trackView->projectView(), SIGNAL(activateDocumentMonitor()), m_projectMonitor, SLOT(activateMonitor()));
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("renderprofile"), doc->getDocumentProperty("renderurl"));
+ m_renderWidget->setRenderProfile(doc->getDocumentProperty("renderdestination"), doc->getDocumentProperty("rendercategory"), doc->getDocumentProperty("renderprofile"), doc->getDocumentProperty("renderurl"));
}
//doc->setRenderer(m_projectMonitor->render);
m_commandStack->setActiveStack(doc->commandStack());
if (description.isEmpty()) description = clip->getProperty("description");
else newprops.insert("templatetext", description);
//newprops.insert("xmldata", m_projectList->generateTemplateXml(newtemplate, description).toString());
-
- EditClipCommand *command = new EditClipCommand(m_projectList, clip->getId(), clip->properties(), newprops, true);
- m_activeDocument->commandStack()->push(command);
+ if (!newprops.isEmpty()) {
+ EditClipCommand *command = new EditClipCommand(m_projectList, clip->getId(), clip->properties(), newprops, true);
+ m_activeDocument->commandStack()->push(command);
+ }
}
+ delete dia;
return;
}
QString path = clip->getProperty("resource");
ClipProperties dia(clip, m_activeDocument->timecode(), m_activeDocument->fps(), this);
connect(&dia, SIGNAL(addMarker(const QString &, GenTime, QString)), m_activeTimeline->projectView(), SLOT(slotAddClipMarker(const QString &, GenTime, QString)));
if (dia.exec() == QDialog::Accepted) {
- EditClipCommand *command = new EditClipCommand(m_projectList, clip->getId(), clip->properties(), dia.properties(), true);
+ QMap <QString, QString> newprops = dia.properties();
+ if (newprops.isEmpty()) return;
+ EditClipCommand *command = new EditClipCommand(m_projectList, clip->getId(), clip->properties(), newprops, true);
m_activeDocument->commandStack()->push(command);
if (dia.needsTimelineRefresh()) {
}
}
+
+void MainWindow::slotShowClipProperties(QList <DocClipBase *> cliplist, QMap<QString, QString> commonproperties)
+{
+ ClipProperties dia(cliplist, m_activeDocument->timecode(), commonproperties, this);
+ if (dia.exec() == QDialog::Accepted) {
+ QUndoCommand *command = new QUndoCommand();
+ command->setText(i18n("Edit clips"));
+ for (int i = 0; i < cliplist.count(); i++) {
+ DocClipBase *clip = cliplist.at(i);
+ new EditClipCommand(m_projectList, clip->getId(), clip->properties(), dia.properties(), true, command);
+ }
+ m_activeDocument->commandStack()->push(command);
+ for (int i = 0; i < cliplist.count(); i++) {
+ m_activeTimeline->projectView()->slotUpdateClip(cliplist.at(i)->getId(), dia.needsTimelineReload());
+ }
+ }
+}
+
void MainWindow::customEvent(QEvent* e)
{
if (e->type() == QEvent::User) {
QMapIterator<QString, QString> i(profiles);
while (i.hasNext()) {
i.next();
+ QStringList data = i.value().split(";", QString::SkipEmptyParts);
QAction *a = transMenu->addAction(i.key());
- a->setData(i.value());
+ a->setData(data);
+ if (data.count() > 1) {
+ a->setToolTip(data.at(1));
+ }
connect(a, SIGNAL(triggered()), this, SLOT(slotTranscode()));
}
}
void MainWindow::slotTranscode(KUrl::List urls)
{
QString params;
+ QString desc;
+ QString condition;
if (urls.isEmpty()) {
- urls.append(m_projectList->currentClipUrl());
QAction *action = qobject_cast<QAction *>(sender());
- params = action->data().toString();
+ QStringList data = action->data().toStringList();
+ params = data.at(0);
+ if (data.count() > 1) desc = data.at(1);
+ if (data.count() > 2) condition = data.at(2);
+ urls << m_projectList->getConditionalUrls(condition);
+ urls.removeAll(KUrl());
}
- if (urls.isEmpty()) return;
- ClipTranscode *d = new ClipTranscode(urls, params);
+ if (urls.isEmpty()) {
+ m_messageLabel->setMessage(i18n("No clip to transcode"), ErrorMessage);
+ return;
+ }
+ ClipTranscode *d = new ClipTranscode(urls, params, desc);
connect(d, SIGNAL(addClip(KUrl)), this, SLOT(slotAddProjectClip(KUrl)));
d->show();
//QProcess::startDetached("ffmpeg", parameters);
slotTranscode(urls);
}
-void MainWindow::slotSetDocumentRenderProfile(const QString &dest, const QString &name, const QString &file)
+void MainWindow::slotSetDocumentRenderProfile(const QString &dest, const QString &group, const QString &name, const QString &file)
{
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->setModified(true);
else m_projectList->focusTree();
}
+void MainWindow::slotInsertZoneToTree()
+{
+ if (!m_clipMonitor->isActive() || m_clipMonitor->activeClip() == NULL) return;
+ QStringList info = m_clipMonitor->getZoneInfo();
+ m_projectList->slotAddClipCut(info.at(0), info.at(1).toInt(), info.at(2).toInt());
+}
+
+void MainWindow::slotInsertZoneToTimeline()
+{
+ if (m_activeTimeline == NULL || m_clipMonitor->activeClip() == NULL) return;
+ QStringList info = m_clipMonitor->getZoneInfo();
+ m_activeTimeline->projectView()->insertClipCut(m_clipMonitor->activeClip(), info.at(1).toInt(), info.at(2).toInt());
+}
+
#include "mainwindow.moc"