#include <KFileItem>
#include <KNotification>
#include <KNotifyConfigWidget>
+#if KDE_IS_VERSION(4,3,80)
+#include <knewstuff3/downloaddialog.h>
+#include <knewstuff3/knewstuffaction.h>
+#else
#include <knewstuff2/engine.h>
#include <knewstuff2/ui/knewstuffaction.h>
+#define KNS3 KNS
+#endif /* KDE_IS_VERSION(4,3,80) */
#include <KToolBar>
#include <KColorScheme>
m_monitorManager->initMonitors(m_clipMonitor, m_projectMonitor);
slotConnectMonitors();
+ // Disable drop B frames, see Kdenlive issue #1330, see also kdenlivesettingsdialog.cpp
+ KdenliveSettings::setDropbframes(false);
+
// Open or create a file. Command line argument passed in Url has
// precedence, then "openlastproject", then just a plain empty file.
// If opening Url fails, openlastproject will _not_ be used.
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(deleteProjectClips(QStringList, QMap<QString, QString>)), this, SLOT(slotDeleteProjectClips(QStringList, QMap<QString, 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)));
statusBar()->setStyleSheet(QString("QStatusBar QLabel {font-size:%1pt;} QStatusBar::item { border: 0px; font-size:%1pt;padding:0px; }").arg(statusBar()->font().pointSize()));
QString style1 = "QToolBar { border: 0px } QToolButton { border-style: inset; border:1px solid #999999;border-radius: 3px;margin: 0px 3px;padding: 0px;} QToolButton:checked { background-color: rgba(224, 224, 0, 100); border-style: inset; border:1px solid #cc6666;border-radius: 3px;}";
- // create edit mode buttons
+ //create edit mode buttons
m_normalEditTool = new KAction(KIcon("kdenlive-normal-edit"), i18n("Normal mode"), this);
m_normalEditTool->setShortcut(i18nc("Normal editing", "n"));
toolbar->addAction(m_normalEditTool);
collection->addAction("manage_profiles", profilesAction);
connect(profilesAction, SIGNAL(triggered(bool)), this, SLOT(slotEditProfiles()));
- KNS::standardAction(i18n("Download New Wipes..."), this, SLOT(slotGetNewLumaStuff()), actionCollection(), "get_new_lumas");
+ KNS3::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");
+ KNS3::standardAction(i18n("Download New Render Profiles..."), this, SLOT(slotGetNewRenderStuff()), actionCollection(), "get_new_profiles");
- KNS::standardAction(i18n("Download New Project Profiles..."), this, SLOT(slotGetNewMltProfileStuff()), actionCollection(), "get_new_mlt_profiles");
+ KNS3::standardAction(i18n("Download New Project Profiles..."), this, SLOT(slotGetNewMltProfileStuff()), actionCollection(), "get_new_mlt_profiles");
KAction* wizAction = new KAction(KIcon("configure"), i18n("Run Config Wizard"), this);
collection->addAction("run_wizard", wizAction);
connectDocumentInfo(doc);
connectDocument(trackView, doc);
} else m_timelineArea->setTabBarHidden(false);
+ m_monitorManager->activateMonitor("clip");
m_closeAction->setEnabled(m_timelineArea->count() > 1);
}
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 (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, 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(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()));
connect(m_projectList, SIGNAL(displayMessage(const QString&, int)), this, SLOT(slotGotProgressInfo(const QString&, int)));
- trackView->projectView()->setContextMenu(m_timelineContextMenu, m_timelineContextClipMenu, m_timelineContextTransitionMenu, m_clipTypeGroup);
+ trackView->projectView()->setContextMenu(m_timelineContextMenu, m_timelineContextClipMenu, m_timelineContextTransitionMenu, m_clipTypeGroup, (QMenu*)(factory()->container("marker_menu", this)));
m_activeTimeline = trackView;
if (m_renderWidget) {
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());
command->setText(i18n("Edit clips"));
for (int i = 0; i < cliplist.count(); i++) {
DocClipBase *clip = cliplist.at(i);
- new EditClipCommand(m_projectList, clip->getId(), commonproperties, dia.properties(), true, command);
+ 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++) {
if (m_activeTimeline) m_activeTimeline->projectView()->setOutPoint();
}
+int MainWindow::getNewStuff(const QString &configFile)
+{
+ KNS3::Entry::List entries;
+#if KDE_IS_VERSION(4,3,80)
+ KNS3::DownloadDialog dialog(configFile);
+ dialog.exec();
+ entries = dialog.changedEntries();
+ foreach(const KNS3::Entry &entry, entries) {
+ if (entry.status() == KNS3::Entry::Installed)
+ kDebug() << "// Installed files: " << entry.installedFiles();
+ }
+#else
+ KNS::Engine engine(0);
+ if (engine.init(configFile))
+ entries = engine.downloadDialogModal(this);
+ foreach(KNS::Entry *entry, entries) {
+ if (entry->status() == KNS::Entry::Installed)
+ kDebug() << "// Installed files: " << entry->installedFiles();
+ }
+#endif /* KDE_IS_VERSION(4,3,80) */
+ return entries.size();
+}
+
void MainWindow::slotGetNewLumaStuff()
{
- //KNS::Entry::List download();
- KNS::Entry::List entries = KNS::Engine::download();
- // list of changed entries
- kDebug() << "// PARSING KNS";
- foreach(KNS::Entry* entry, entries) {
- // care only about installed ones
- if (entry->status() == KNS::Entry::Installed) {
- foreach(const QString &file, entry->installedFiles()) {
- kDebug() << "// CURRENTLY INSTALLED: " << file;
- }
- }
+ if (getNewStuff("kdenlive_wipes.knsrc") > 0) {
+ initEffects::refreshLumas();
+ m_activeTimeline->projectView()->reloadTransitionLumas();
}
- qDeleteAll(entries);
- initEffects::refreshLumas();
- m_activeTimeline->projectView()->reloadTransitionLumas();
}
void MainWindow::slotGetNewRenderStuff()
{
- //KNS::Entry::List download();
-
- KNS::Engine engine(0);
- if (engine.init("kdenlive_render.knsrc")) {
- KNS::Entry::List entries = engine.downloadDialogModal(this);
-
- if (entries.size() > 0) {
- foreach(KNS::Entry* entry, entries) {
- // care only about installed ones
- if (entry->status() == KNS::Entry::Installed) {
- foreach(const QString &file, entry->installedFiles()) {
- kDebug() << "// CURRENTLY INSTALLED: " << file;
- }
- }
- }
- }
- if (m_renderWidget) m_renderWidget->reloadProfiles();
+ if (getNewStuff("kdenlive_renderprofiles.knsrc") > 0) {
+ if (m_renderWidget)
+ m_renderWidget->reloadProfiles();
}
}
void MainWindow::slotGetNewMltProfileStuff()
{
- //KNS::Entry::List download();
-
- KNS::Engine engine(0);
- if (engine.init("kdenlive_mltprofiles.knsrc")) {
- KNS::Entry::List entries = engine.downloadDialogModal(this);
-
- if (entries.size() > 0) {
- foreach(KNS::Entry* entry, entries) {
- // care only about installed ones
- if (entry->status() == KNS::Entry::Installed) {
- foreach(const QString &file, entry->installedFiles()) {
- kDebug() << "// CURRENTLY INSTALLED: " << file;
- }
- }
- }
-
- // update the list of profiles in settings dialog
- KdenliveSettingsDialog* d = static_cast <KdenliveSettingsDialog*>(KConfigDialog::exists("settings"));
- if (d) d->checkProfile();
- }
+ if (getNewStuff("kdenlive_projectprofiles.knsrc") > 0) {
+ // update the list of profiles in settings dialog
+ KdenliveSettingsDialog* d = static_cast <KdenliveSettingsDialog*>(KConfigDialog::exists("settings"));
+ if (d)
+ d->checkProfile();
}
}
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);
KdenliveSettings::setFrametimecode(ix == 1);
m_clipMonitor->updateTimecodeFormat();
m_projectMonitor->updateTimecodeFormat();
+ m_activeTimeline->projectView()->clearSelection();
}
void MainWindow::slotRemoveFocus()
void MainWindow::slotSwitchMonitors()
{
- m_monitorManager->slotSwitchMonitors();
+ m_monitorManager->slotSwitchMonitors(m_clipMonitor->isActive());
if (m_projectMonitor->isActive()) m_activeTimeline->projectView()->setFocus();
else m_projectList->focusTree();
}
m_activeTimeline->projectView()->insertClipCut(m_clipMonitor->activeClip(), info.at(1).toInt(), info.at(2).toInt());
}
+
+void MainWindow::slotDeleteProjectClips(QStringList ids, QMap<QString, QString> folderids)
+{
+ for (int i = 0; i < ids.size(); ++i) {
+ m_activeTimeline->slotDeleteClip(ids.at(i));
+ }
+ m_activeDocument->clipManager()->slotDeleteClips(ids);
+ if (!folderids.isEmpty()) m_projectList->deleteProjectFolder(folderids);
+
+}
+
#include "mainwindow.moc"
projects / kdenlive / blobdiff