#include <KMenu>
#include <locale.h>
#include <ktogglefullscreenaction.h>
+#include <KFileItem>
#include <mlt++/Mlt.h>
#include "renderer.h"
#include "jogshuttle.h"
#include "clipproperties.h"
+#include "wizard.h"
+#include "editclipcommand.h"
+#include "titlewidget.h"
-#define ID_STATUS_MSG 1
-#define ID_EDITMODE_MSG 2
-#define ID_TIMELINE_MSG 3
-#define ID_TIMELINE_BUTTONS 5
-#define ID_TIMELINE_POS 6
-#define ID_TIMELINE_FORMAT 7
+static const int ID_STATUS_MSG = 1;
+static const int ID_EDITMODE_MSG = 2;
+static const int ID_TIMELINE_MSG = 3;
+static const int ID_TIMELINE_BUTTONS = 5;
+static const int ID_TIMELINE_POS = 6;
+static const int ID_TIMELINE_FORMAT = 7;
+
+namespace Mlt {
+class Producer;
+};
EffectsList MainWindow::videoEffects;
EffectsList MainWindow::audioEffects;
MainWindow::MainWindow(QWidget *parent)
: KXmlGuiWindow(parent),
- m_activeDocument(NULL), m_activeTimeline(NULL), m_renderWidget(NULL), m_jogProcess(NULL), m_findActivated(false) {
+ m_activeDocument(NULL), m_activeTimeline(NULL), m_renderWidget(NULL), m_jogProcess(NULL), m_findActivated(false), m_initialized(false) {
setlocale(LC_NUMERIC, "POSIX");
- parseProfiles();
setFont(KGlobalSettings::toolBarFont());
+ parseProfiles();
m_commandStack = new QUndoGroup;
m_timelineArea = new KTabWidget(this);
m_timelineArea->setTabReorderingEnabled(true);
m_timelineArea->setTabBarHidden(true);
QToolButton *closeTabButton = new QToolButton;
- connect(closeTabButton, SIGNAL(clicked()), this, SLOT(slotRemoveTab()));
+ connect(closeTabButton, SIGNAL(clicked()), this, SLOT(closeCurrentDocument()));
closeTabButton->setIcon(KIcon("tab-close"));
closeTabButton->adjustSize();
closeTabButton->setToolTip(i18n("Close the current tab"));
transitionConfigDock->setWidget(transitionConfig);
addDockWidget(Qt::TopDockWidgetArea, transitionConfigDock);
+ KdenliveSettings::setCurrent_profile(KdenliveSettings::default_profile());
+ m_fileOpenRecent = KStandardAction::openRecent(this, SLOT(openFile(const KUrl &)),
+ actionCollection());
+ readOptions();
clipMonitorDock = new QDockWidget(i18n("Clip Monitor"), this);
clipMonitorDock->setObjectName("clip_monitor");
addDockWidget(Qt::TopDockWidgetArea, recMonitorDock);
connect(m_recMonitor, SIGNAL(addProjectClip(KUrl)), this, SLOT(slotAddProjectClip(KUrl)));
+ connect(m_recMonitor, SIGNAL(showConfigDialog(int, int)), this, SLOT(slotPreferences(int, int)));
undoViewDock = new QDockWidget(i18n("Undo History"), this);
undoViewDock->setObjectName("undo_history");
tabifyDockWidget(projectListDock, effectStackDock);
tabifyDockWidget(projectListDock, transitionConfigDock);
//tabifyDockWidget(projectListDock, undoViewDock);
- projectListDock->raise();
+
tabifyDockWidget(clipMonitorDock, projectMonitorDock);
tabifyDockWidget(clipMonitorDock, recMonitorDock);
// build effects menus
QAction *action;
- QMenu *videoEffectsMenu = (QMenu*)(factory()->container("video_effects_menu", this));
+ QMenu *videoEffectsMenu = static_cast<QMenu*>(factory()->container("video_effects_menu", this));
QStringList effects = videoEffects.effectNames();
foreach(const QString &name, effects) {
action = new QAction(name, this);
action->setData(name);
videoEffectsMenu->addAction(action);
}
- QMenu *audioEffectsMenu = (QMenu*)(factory()->container("audio_effects_menu", this));
+ QMenu *audioEffectsMenu = static_cast<QMenu*>(factory()->container("audio_effects_menu", this));
effects = audioEffects.effectNames();
foreach(const QString &name, effects) {
action = new QAction(name, this);
action->setData(name);
audioEffectsMenu->addAction(action);
}
- QMenu *customEffectsMenu = (QMenu*)(factory()->container("custom_effects_menu", this));
+ m_customEffectsMenu = static_cast<QMenu*>(factory()->container("custom_effects_menu", this));
effects = customEffects.effectNames();
foreach(const QString &name, effects) {
action = new QAction(name, this);
action->setData(name);
- customEffectsMenu->addAction(action);
+ m_customEffectsMenu->addAction(action);
}
+ QMenu *viewMenu = static_cast<QMenu*>(factory()->container("dockwindows", this));
+ const QList<QAction *> viewActions = createPopupMenu()->actions();
+ viewMenu->insertActions(NULL, viewActions);
+
connect(videoEffectsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddVideoEffect(QAction *)));
connect(audioEffectsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddAudioEffect(QAction *)));
- connect(customEffectsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddCustomEffect(QAction *)));
+ connect(m_customEffectsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddCustomEffect(QAction *)));
m_timelineContextMenu = new QMenu(this);
m_timelineContextClipMenu = new QMenu(this);
}
connect(transitionsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddTransition(QAction *)));
+ m_timelineContextMenu->addAction(actionCollection()->action(KStandardAction::name(KStandardAction::Paste)));
+
m_timelineContextClipMenu->addAction(actionCollection()->action("delete_timeline_clip"));
+ m_timelineContextClipMenu->addAction(actionCollection()->action("change_clip_speed"));
m_timelineContextClipMenu->addAction(actionCollection()->action("cut_timeline_clip"));
+ m_timelineContextClipMenu->addAction(actionCollection()->action(KStandardAction::name(KStandardAction::Copy)));
+ m_timelineContextClipMenu->addAction(actionCollection()->action("paste_effects"));
QMenu *markersMenu = (QMenu*)(factory()->container("marker_menu", this));
m_timelineContextClipMenu->addMenu(markersMenu);
m_timelineContextClipMenu->addMenu(transitionsMenu);
m_timelineContextClipMenu->addMenu(videoEffectsMenu);
m_timelineContextClipMenu->addMenu(audioEffectsMenu);
- m_timelineContextClipMenu->addMenu(customEffectsMenu);
+ m_timelineContextClipMenu->addMenu(m_customEffectsMenu);
m_timelineContextTransitionMenu->addAction(actionCollection()->action("delete_timeline_clip"));
+ m_timelineContextTransitionMenu->addAction(actionCollection()->action(KStandardAction::name(KStandardAction::Copy)));
connect(projectMonitorDock, SIGNAL(visibilityChanged(bool)), m_projectMonitor, SLOT(refreshMonitor(bool)));
connect(clipMonitorDock, SIGNAL(visibilityChanged(bool)), m_clipMonitor, SLOT(refreshMonitor(bool)));
//connect(m_monitorManager, SIGNAL(connectMonitors()), this, SLOT(slotConnectMonitors()));
connect(m_monitorManager, SIGNAL(raiseClipMonitor(bool)), this, SLOT(slotRaiseMonitor(bool)));
connect(m_effectList, SIGNAL(addEffect(QDomElement)), this, SLOT(slotAddEffect(QDomElement)));
+ connect(m_effectList, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects()));
+
m_monitorManager->initMonitors(m_clipMonitor, m_projectMonitor);
slotConnectMonitors();
setAutoSaveSettings();
if (KdenliveSettings::openlastproject()) {
- KSharedConfigPtr config = KGlobal::config();
- QString Lastproject = config->group("Recent Files").readPathEntry("File1", QString());
- openFile(KUrl(Lastproject));
-
- } else newFile();
+ openLastFile();
+ } else {
+ /*QList<KAutoSaveFile *> staleFiles = KAutoSaveFile::allStaleFiles();
+ if (!staleFiles.isEmpty()) {
+ if (KMessageBox::questionYesNo(this, i18n("Auto-saved files exist. Do you want to recover them now?"), i18n("File Recovery"), KGuiItem(i18n("Recover")), KGuiItem(i18n("Don't recover"))) == KMessageBox::Yes) {
+ recoverFiles(staleFiles);
+ }
+ else newFile();
+ }
+ else*/
+ newFile();
+ }
activateShuttleDevice();
+ projectListDock->raise();
}
void MainWindow::queryQuit() {
switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document ?"))) {
case KMessageBox::Yes :
// save document here. If saving fails, return false;
+ saveFile();
return true;
case KMessageBox::No :
return true;
return true;
}
+void MainWindow::saveProperties(KConfig*) {
+ // save properties here,used by session management
+ saveFile();
+}
+
+
+void MainWindow::readProperties(KConfig *config) {
+ // read properties here,used by session management
+ QString Lastproject = config->group("Recent Files").readPathEntry("File1", QString());
+ openFile(KUrl(Lastproject));
+}
+
+void MainWindow::slotReloadEffects() {
+ initEffects::parseCustomEffectsFile();
+ m_customEffectsMenu->clear();
+ const QStringList effects = customEffects.effectNames();
+ QAction *action;
+ foreach(const QString &name, effects) {
+ action = new QAction(name, this);
+ action->setData(name);
+ m_customEffectsMenu->addAction(action);
+ }
+ m_effectList->reloadEffectList();
+}
+
void MainWindow::activateShuttleDevice() {
if (m_jogProcess) delete m_jogProcess;
m_jogProcess = NULL;
else projectMonitorDock->raise();
}
-void MainWindow::slotSetClipDuration(int id, int duration) {
+void MainWindow::slotSetClipDuration(const QString &id, int duration) {
if (!m_activeDocument) return;
m_activeDocument->setProducerDuration(id, duration);
}
void MainWindow::slotConnectMonitors() {
m_projectList->setRenderer(m_clipMonitor->render);
- connect(m_projectList, SIGNAL(receivedClipDuration(int, int)), this, SLOT(slotSetClipDuration(int, int)));
+ connect(m_projectList, SIGNAL(receivedClipDuration(const QString &, int)), this, SLOT(slotSetClipDuration(const QString &, int)));
connect(m_projectList, SIGNAL(showClipProperties(DocClipBase *)), this, SLOT(slotShowClipProperties(DocClipBase *)));
- connect(m_projectList, SIGNAL(getFileProperties(const QDomElement &, int)), m_clipMonitor->render, SLOT(getFileProperties(const QDomElement &, int)));
- connect(m_clipMonitor->render, SIGNAL(replyGetImage(int, int, const QPixmap &, int, int)), m_projectList, SLOT(slotReplyGetImage(int, int, const QPixmap &, int, int)));
- connect(m_clipMonitor->render, SIGNAL(replyGetFileProperties(int, const QMap < QString, QString > &, const QMap < QString, QString > &)), m_projectList, SLOT(slotReplyGetFileProperties(int, const QMap < QString, QString > &, const QMap < QString, QString > &)));
- connect(m_clipMonitor, SIGNAL(refreshClipThumbnail(int)), m_projectList, SLOT(slotRefreshClipThumbnail(int)));
+ connect(m_projectList, SIGNAL(getFileProperties(const QDomElement &, const QString &)), m_clipMonitor->render, SLOT(getFileProperties(const QDomElement &, const QString &)));
+ connect(m_clipMonitor->render, SIGNAL(replyGetImage(const QString &, int, const QPixmap &, int, int)), m_projectList, SLOT(slotReplyGetImage(const QString &, int, const QPixmap &, int, int)));
+ connect(m_clipMonitor->render, SIGNAL(replyGetFileProperties(const QString &, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &)), m_projectList, SLOT(slotReplyGetFileProperties(const QString &, Mlt::Producer*, const QMap < QString, QString > &, const QMap < QString, QString > &)));
+
+ connect(m_clipMonitor->render, SIGNAL(removeInvalidClip(const QString &)), m_projectList, SLOT(slotRemoveInvalidClip(const QString &)));
+
+ connect(m_clipMonitor, SIGNAL(refreshClipThumbnail(const QString &)), m_projectList, SLOT(slotRefreshClipThumbnail(const QString &)));
+
+ connect(m_clipMonitor, SIGNAL(adjustMonitorSize()), this, SLOT(slotAdjustClipMonitor()));
+ connect(m_projectMonitor, SIGNAL(adjustMonitorSize()), this, SLOT(slotAdjustProjectMonitor()));
+}
+
+void MainWindow::slotAdjustClipMonitor() {
+ clipMonitorDock->updateGeometry();
+ clipMonitorDock->adjustSize();
+ m_clipMonitor->resetSize();
+}
+
+void MainWindow::slotAdjustProjectMonitor() {
+ projectMonitorDock->updateGeometry();
+ projectMonitorDock->adjustSize();
+ m_projectMonitor->resetSize();
}
void MainWindow::setupActions() {
m_zoomSlider = new QSlider(Qt::Horizontal, this);
m_zoomSlider->setMaximum(13);
+ m_zoomSlider->setPageStep(1);
m_zoomSlider->setMaximumWidth(150);
m_zoomSlider->setMinimumWidth(100);
actionCollection()->addAction("delete_timeline_clip", deleteTimelineClip);
connect(deleteTimelineClip, SIGNAL(triggered(bool)), this, SLOT(slotDeleteTimelineClip()));
+ KAction* editTimelineClipSpeed = new KAction(KIcon("edit-delete"), i18n("Change Clip Speed"), this);
+ actionCollection()->addAction("change_clip_speed", editTimelineClipSpeed);
+ connect(editTimelineClipSpeed, SIGNAL(triggered(bool)), this, SLOT(slotChangeClipSpeed()));
+
KAction* cutTimelineClip = new KAction(KIcon("edit-cut"), i18n("Cut Clip"), this);
cutTimelineClip->setShortcut(Qt::SHIFT + Qt::Key_R);
actionCollection()->addAction("cut_timeline_clip", cutTimelineClip);
actionCollection()->addAction("delete_all_guides", delAllGuides);
connect(delAllGuides, SIGNAL(triggered()), this, SLOT(slotDeleteAllGuides()));
+ QAction *pasteEffects = new KAction(KIcon("edit-paste"), i18n("Paste Effects"), this);
+ actionCollection()->addAction("paste_effects", pasteEffects);
+ connect(pasteEffects , SIGNAL(triggered()), this, SLOT(slotPasteEffects()));
+
KStandardAction::quit(this, SLOT(queryQuit()),
actionCollection());
KStandardAction::open(this, SLOT(openFile()),
actionCollection());
- m_fileOpenRecent = KStandardAction::openRecent(this, SLOT(openFile(const KUrl &)),
- actionCollection());
-
- KStandardAction::save(this, SLOT(saveFile()),
- actionCollection());
+ m_saveAction = KStandardAction::save(this, SLOT(saveFile()),
+ actionCollection());
KStandardAction::saveAs(this, SLOT(saveFileAs()),
actionCollection());
KStandardAction::preferences(this, SLOT(slotPreferences()),
actionCollection());
- KStandardAction::undo(this, SLOT(undo()),
+ KStandardAction::copy(this, SLOT(slotCopy()),
actionCollection());
- KStandardAction::redo(this, SLOT(redo()),
- actionCollection());
+ KStandardAction::paste(this, SLOT(slotPaste()),
+ actionCollection());
+
+ KAction *undo = KStandardAction::undo(m_commandStack, SLOT(undo()),
+ actionCollection());
+ undo->setEnabled(false);
+ connect(m_commandStack, SIGNAL(canUndoChanged(bool)), undo, SLOT(setEnabled(bool)));
+
+ KAction *redo = KStandardAction::redo(m_commandStack, SLOT(redo()),
+ actionCollection());
+ redo->setEnabled(false);
+ connect(m_commandStack, SIGNAL(canRedoChanged(bool)), redo, SLOT(setEnabled(bool)));
KStandardAction::fullScreen(this, SLOT(slotFullScreen()), this, actionCollection());
this, SLOT(slotDisplayActionMessage(QAction*)));
//connect(actionCollection(), SIGNAL( clearStatusText() ),
//statusBar(), SLOT( clear() ) );
-
- readOptions();
-}
-
-void MainWindow::undo() {
- m_commandStack->undo();
-}
-
-void MainWindow::redo() {
- m_commandStack->redo();
}
void MainWindow::slotDisplayActionMessage(QAction *a) {
void MainWindow::readOptions() {
KSharedConfigPtr config = KGlobal::config();
m_fileOpenRecent->loadEntries(KConfigGroup(config, "Recent Files"));
+ KConfigGroup initialGroup(config, "version");
+ if (!initialGroup.exists()) {
+ // this is our first run, show Wizard
+ Wizard *w = new Wizard(this);
+ if (w->exec() == QDialog::Accepted) {
+ w->adjustSettings();
+ initialGroup.writeEntry("version", "0.7");
+ }
+ delete w;
+ }
}
void MainWindow::newFile() {
QString profileName;
KUrl projectFolder;
+ QPoint projectTracks(3, 2);
if (m_timelineArea->count() == 0) profileName = KdenliveSettings::default_profile();
else {
ProjectSettings *w = new ProjectSettings;
if (w->exec() != QDialog::Accepted) return;
profileName = w->selectedProfile();
projectFolder = w->selectedFolder();
+ projectTracks = w->tracks();
delete w;
}
- MltVideoProfile prof;
- if (!profileName.isEmpty()) prof = ProfilesDialog::getVideoProfile(profileName);
- else prof = ProfilesDialog::getVideoProfile("dv_pal");
- if (prof.width == 0) prof = ProfilesDialog::getVideoProfile("dv_pal");
- KdenliveDoc *doc = new KdenliveDoc(KUrl(), projectFolder, prof, m_commandStack, this);
+ KdenliveDoc *doc = new KdenliveDoc(KUrl(), projectFolder, m_commandStack, profileName, projectTracks, this);
+ doc->m_autosave = new KAutoSaveFile(KUrl(), doc);
TrackView *trackView = new TrackView(doc, this);
- m_timelineArea->addTab(trackView, KIcon("kdenlive"), i18n("Untitled") + " / " + prof.description);
+ m_timelineArea->addTab(trackView, KIcon("kdenlive"), doc->description());
if (m_timelineArea->count() == 1) {
connectDocumentInfo(doc);
connectDocument(trackView, doc);
}
void MainWindow::activateDocument() {
+ if (m_timelineArea->currentWidget() == NULL) return;
TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget();
KdenliveDoc *currentDoc = currentTab->document();
connectDocumentInfo(currentDoc);
connectDocument(currentTab, currentDoc);
}
-void MainWindow::slotRemoveTab() {
+void MainWindow::closeCurrentDocument() {
QWidget *w = m_timelineArea->currentWidget();
// closing current document
int ix = m_timelineArea->currentIndex() + 1;
m_timelineArea->setCurrentIndex(ix);
TrackView *tabToClose = (TrackView *) w;
KdenliveDoc *docToClose = tabToClose->document();
+ if (docToClose && docToClose->isModified()) {
+ switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document ?"))) {
+ case KMessageBox::Yes :
+ // save document here. If saving fails, return false;
+ saveFile();
+ break;
+ case KMessageBox::Cancel :
+ return;
+ default:
+ break;
+ }
+ }
m_timelineArea->removeTab(m_timelineArea->indexOf(w));
if (m_timelineArea->count() == 1) m_timelineArea->setTabBarHidden(true);
delete docToClose;
delete w;
+ if (m_timelineArea->count() == 0) m_activeDocument = NULL;
}
void MainWindow::saveFileAs(const QString &outputFileName) {
- m_projectMonitor->saveSceneList(outputFileName, m_activeDocument->documentInfoXml(m_activeTimeline->projectView()->xmlInfo()));
+ m_projectMonitor->saveSceneList(outputFileName, m_activeDocument->documentInfoXml());
m_activeDocument->setUrl(KUrl(outputFileName));
+ if (m_activeDocument->m_autosave == NULL) {
+ m_activeDocument->m_autosave = new KAutoSaveFile(KUrl(outputFileName), this);
+ } else m_activeDocument->m_autosave->setManagedFile(KUrl(outputFileName));
setCaption(m_activeDocument->description());
m_timelineArea->setTabText(m_timelineArea->currentIndex(), m_activeDocument->description());
m_timelineArea->setTabToolTip(m_timelineArea->currentIndex(), m_activeDocument->url().path());
m_activeDocument->setModified(false);
+ m_fileOpenRecent->addUrl(KUrl(outputFileName));
}
void MainWindow::saveFileAs() {
saveFileAs();
} else {
saveFileAs(m_activeDocument->url().path());
+ m_activeDocument->m_autosave->resize(0);
}
}
-void MainWindow::openFile() { //changed
+void MainWindow::openFile() {
KUrl url = KFileDialog::getOpenUrl(KUrl(), "*.kdenlive|Kdenlive project files (*.kdenlive)\n*.westley|MLT project files (*.westley)");
if (url.isEmpty()) return;
m_fileOpenRecent->addUrl(url);
openFile(url);
}
-void MainWindow::openFile(const KUrl &url) { //new
- //TODO: get video profile from url before opening it
- MltVideoProfile prof = ProfilesDialog::getVideoProfile(KdenliveSettings::default_profile());
- if (prof.width == 0) prof = ProfilesDialog::getVideoProfile("dv_pal");
- KdenliveDoc *doc = new KdenliveDoc(url, KUrl(), prof, m_commandStack, this);
+void MainWindow::openLastFile() {
+ KSharedConfigPtr config = KGlobal::config();
+ KUrl::List urls = m_fileOpenRecent->urls();
+ if (urls.isEmpty()) newFile();
+ else openFile(urls.last());
+}
+
+void MainWindow::openFile(const KUrl &url) {
+ // Check for backup file
+ QList<KAutoSaveFile *> staleFiles = KAutoSaveFile::staleFiles(url);
+ if (!staleFiles.isEmpty()) {
+ if (KMessageBox::questionYesNo(this,
+ i18n("Auto-saved files exist. Do you want to recover them now?"),
+ i18n("File Recovery"),
+ KGuiItem(i18n("Recover")), KGuiItem(i18n("Don't recover"))) == KMessageBox::Yes) {
+ recoverFiles(staleFiles);
+ return;
+ } else {
+ // remove the stale files
+ foreach(KAutoSaveFile *stale, staleFiles) {
+ stale->open(QIODevice::ReadWrite);
+ delete stale;
+ }
+ }
+ }
+ if (!KdenliveSettings::activatetabs()) closeCurrentDocument();
+ doOpenFile(url, NULL);
+}
+
+void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale) {
+ KdenliveDoc *doc;
+ doc = new KdenliveDoc(url, KUrl(), m_commandStack, QString(), QPoint(3, 2), this);
+ if (stale == NULL) {
+ stale = new KAutoSaveFile(url, doc);
+ doc->m_autosave = stale;
+ } else {
+ doc->m_autosave = stale;
+ doc->setUrl(stale->managedFile());
+ doc->setModified(true);
+ stale->setParent(doc);
+ }
connectDocumentInfo(doc);
TrackView *trackView = new TrackView(doc, this);
m_timelineArea->setCurrentIndex(m_timelineArea->addTab(trackView, KIcon("kdenlive"), doc->description()));
m_timelineArea->setTabToolTip(m_timelineArea->currentIndex(), doc->url().path());
if (m_timelineArea->count() > 1) m_timelineArea->setTabBarHidden(false);
slotGotProgressInfo(QString(), -1);
- //connectDocument(trackView, doc);
+ m_clipMonitor->refreshMonitor(true);
+}
+
+void MainWindow::recoverFiles(QList<KAutoSaveFile *> staleFiles) {
+ if (!KdenliveSettings::activatetabs()) closeCurrentDocument();
+ foreach(KAutoSaveFile *stale, staleFiles) {
+ /*if (!stale->open(QIODevice::QIODevice::ReadOnly)) {
+ // show an error message; we could not steal the lockfile
+ // maybe another application got to the file before us?
+ delete stale;
+ continue;
+ }*/
+ kDebug() << "// OPENING RECOVERY: " << stale->fileName() << "\nMANAGED: " << stale->managedFile().path();
+ // the stalefiles also contain ".lock" files so we must ignore them... bug in KAutoSaveFile ?
+ if (!stale->fileName().endsWith(".lock")) doOpenFile(KUrl(stale->fileName()), stale);
+ else KIO::NetAccess::del(KUrl(stale->fileName()), this);
+ }
}
if (w->exec() == QDialog::Accepted) {
QString profile = w->selectedProfile();
m_activeDocument->setProfilePath(profile);
- m_monitorManager->resetProfiles(profile);
- setCaption(m_activeDocument->description());
- KdenliveSettings::setCurrent_profile(m_activeDocument->profilePath());
+ KdenliveSettings::setCurrent_profile(profile);
+ KdenliveSettings::setProject_fps(m_activeDocument->fps());
+ setCaption(m_activeDocument->description(), m_activeDocument->isModified());
+ m_monitorManager->resetProfiles(m_activeDocument->timecode());
if (m_renderWidget) m_renderWidget->setDocumentStandard(m_activeDocument->getDocumentStandard());
- m_monitorManager->setTimecode(m_activeDocument->timecode());
m_timelineArea->setTabText(m_timelineArea->currentIndex(), m_activeDocument->description());
// We need to desactivate & reactivate monitors to get a refresh
void MainWindow::slotRenderProject() {
if (!m_renderWidget) {
m_renderWidget = new RenderWidget(this);
- connect(m_renderWidget, SIGNAL(doRender(const QString&, const QString&, const QStringList &, bool, bool)), this, SLOT(slotDoRender(const QString&, const QString&, const QStringList &, bool, bool)));
+ connect(m_renderWidget, SIGNAL(doRender(const QString&, const QString&, const QStringList &, const QStringList &, bool, bool)), this, SLOT(slotDoRender(const QString&, const QString&, const QStringList &, const QStringList &, bool, bool)));
}
/*TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget();
if (currentTab) m_renderWidget->setTimeline(currentTab);
m_renderWidget->show();
}
-void MainWindow::slotDoRender(const QString &dest, const QString &render, const QStringList &avformat_args, bool zoneOnly, bool playAfter) {
+void MainWindow::slotDoRender(const QString &dest, const QString &render, const QStringList &overlay_args, const QStringList &avformat_args, bool zoneOnly, bool playAfter) {
if (dest.isEmpty()) return;
int in;
int out;
QStringList args;
args << "-erase";
if (zoneOnly) args << "in=" + QString::number(in) << "out=" + QString::number(out);
+ if (!overlay_args.isEmpty()) args << "preargs=" + overlay_args.join(" ");
QString videoPlayer = "-";
if (playAfter) {
videoPlayer = KdenliveSettings::defaultplayerapp();
}
args << KdenliveSettings::rendererpath() << m_activeDocument->profilePath() << render << videoPlayer << temp.fileName() << dest << avformat_args;
QProcess::startDetached("kdenlive_render", args);
+ kDebug() << "/// STARTING RENDER PROCESS\n\nARGS:\n" << args;
}
}
void MainWindow::slotUpdateDocumentState(bool modified) {
setCaption(m_activeDocument->description(), modified);
+ m_saveAction->setEnabled(modified);
if (modified) {
m_timelineArea->setTabTextColor(m_timelineArea->currentIndex(), palette().color(QPalette::Link));
m_timelineArea->setTabIcon(m_timelineArea->currentIndex(), KIcon("document-save"));
m_activeDocument->backupMltPlaylist();
if (m_activeTimeline) {
disconnect(m_projectMonitor, SIGNAL(renderPosition(int)), m_activeTimeline, SLOT(moveCursorPos(int)));
+ disconnect(m_projectMonitor, SIGNAL(zoneUpdated(QPoint)), trackView, SLOT(slotSetZone(QPoint)));
disconnect(m_projectMonitor, SIGNAL(durationChanged(int)), m_activeTimeline, SLOT(setDuration(int)));
+ disconnect(m_projectList, SIGNAL(projectModified()), m_activeDocument, SLOT(setModified()));
disconnect(m_activeDocument, SIGNAL(addProjectClip(DocClipBase *)), m_projectList, SLOT(slotAddClip(DocClipBase *)));
- disconnect(m_activeDocument, SIGNAL(addProjectFolder(const QString, int, bool, bool)), m_projectList, SLOT(slotAddFolder(const QString, int, bool, bool)));
- disconnect(m_activeDocument, SIGNAL(signalDeleteProjectClip(int)), m_projectList, SLOT(slotDeleteClip(int)));
- disconnect(m_activeDocument, SIGNAL(updateClipDisplay(int)), m_projectList, SLOT(slotUpdateClip(int)));
- disconnect(m_activeDocument, SIGNAL(refreshClipThumbnail(int)), m_projectList, SLOT(slotRefreshClipThumbnail(int)));
- disconnect(m_activeDocument, SIGNAL(deletTimelineClip(int)), m_activeTimeline, SLOT(slotDeleteClip(int)));
+ disconnect(m_activeDocument, SIGNAL(addProjectFolder(const QString, const QString &, bool, bool)), m_projectList, SLOT(slotAddFolder(const QString, const QString &, bool, bool)));
+ disconnect(m_activeDocument, SIGNAL(signalDeleteProjectClip(const QString &)), m_projectList, SLOT(slotDeleteClip(const QString &)));
+ disconnect(m_activeDocument, SIGNAL(updateClipDisplay(const QString &)), m_projectList, SLOT(slotUpdateClip(const QString &)));
+ disconnect(m_activeDocument, SIGNAL(selectLastAddedClip(const QString &)), m_projectList, SLOT(slotSelectClip(const QString &)));
+ disconnect(m_activeDocument, SIGNAL(deleteTimelineClip(const QString &)), m_activeTimeline, SLOT(slotDeleteClip(const QString &)));
disconnect(m_activeTimeline, SIGNAL(clipItemSelected(ClipItem*)), effectStack, SLOT(slotClipItemSelected(ClipItem*)));
disconnect(m_activeTimeline, SIGNAL(clipItemSelected(ClipItem*)), this, SLOT(slotActivateEffectStackView()));
disconnect(m_activeTimeline, SIGNAL(transitionItemSelected(Transition*)), transitionConfig, SLOT(slotTransitionItemSelected(Transition*)));
disconnect(effectStack, SIGNAL(changeEffectState(ClipItem*, int, bool)), m_activeTimeline->projectView(), SLOT(slotChangeEffectState(ClipItem*, int, bool)));
disconnect(effectStack, SIGNAL(changeEffectPosition(ClipItem*, int, int)), trackView->projectView(), SLOT(slotChangeEffectPosition(ClipItem*, int, int)));
disconnect(effectStack, SIGNAL(refreshEffectStack(ClipItem*)), m_activeTimeline->projectView(), SLOT(slotRefreshEffects(ClipItem*)));
+ disconnect(effectStack, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects()));
disconnect(transitionConfig, SIGNAL(transitionUpdated(Transition *, QDomElement)), trackView->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement)));
+ disconnect(transitionConfig, SIGNAL(seekTimeline(int)), trackView->projectView() , SLOT(setCursorPos(int)));
disconnect(m_activeTimeline->projectView(), SIGNAL(activateDocumentMonitor()), m_projectMonitor, SLOT(activateMonitor()));
+ disconnect(trackView, SIGNAL(zoneMoved(int, int)), m_projectMonitor, SLOT(slotZoneMoved(int, int)));
+ effectStack->clear();
}
m_activeDocument->setRenderer(NULL);
disconnect(m_projectList, SIGNAL(clipSelected(DocClipBase *)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *)));
m_clipMonitor->stop();
}
- m_monitorManager->resetProfiles(doc->profilePath());
+ KdenliveSettings::setCurrent_profile(doc->profilePath());
+ KdenliveSettings::setProject_fps(doc->fps());
+ m_monitorManager->resetProfiles(doc->timecode());
m_projectList->setDocument(doc);
+ transitionConfig->updateProjectFormat(doc->mltProfile());
connect(m_projectList, SIGNAL(clipSelected(DocClipBase *)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *)));
+ connect(m_projectList, SIGNAL(projectModified()), doc, SLOT(setModified()));
connect(trackView, SIGNAL(cursorMoved()), m_projectMonitor, SLOT(activateMonitor()));
connect(trackView, SIGNAL(mousePosition(int)), this, SLOT(slotUpdateMousePosition(int)));
connect(m_projectMonitor, SIGNAL(renderPosition(int)), trackView, SLOT(moveCursorPos(int)));
+ connect(m_projectMonitor, SIGNAL(zoneUpdated(QPoint)), trackView, SLOT(slotSetZone(QPoint)));
connect(m_projectMonitor, SIGNAL(durationChanged(int)), trackView, SLOT(setDuration(int)));
connect(doc, SIGNAL(addProjectClip(DocClipBase *)), m_projectList, SLOT(slotAddClip(DocClipBase *)));
- connect(doc, SIGNAL(addProjectFolder(const QString, int, bool, bool)), m_projectList, SLOT(slotAddFolder(const QString, int, bool, bool)));
- connect(doc, SIGNAL(signalDeleteProjectClip(int)), m_projectList, SLOT(slotDeleteClip(int)));
- connect(doc, SIGNAL(updateClipDisplay(int)), m_projectList, SLOT(slotUpdateClip(int)));
- connect(doc, SIGNAL(refreshClipThumbnail(int)), m_projectList, SLOT(slotRefreshClipThumbnail(int)));
+ connect(doc, SIGNAL(addProjectFolder(const QString, const QString &, bool, bool)), m_projectList, SLOT(slotAddFolder(const QString, const QString &, bool, bool)));
+ connect(doc, SIGNAL(signalDeleteProjectClip(const QString &)), m_projectList, SLOT(slotDeleteClip(const QString &)));
+ connect(doc, SIGNAL(updateClipDisplay(const QString &)), m_projectList, SLOT(slotUpdateClip(const QString &)));
+ connect(doc, SIGNAL(selectLastAddedClip(const QString &)), m_projectList, SLOT(slotSelectClip(const QString &)));
- connect(doc, SIGNAL(deletTimelineClip(int)), trackView, SLOT(slotDeleteClip(int)));
+ connect(doc, SIGNAL(deleteTimelineClip(const QString &)), trackView, SLOT(slotDeleteClip(const QString &)));
connect(doc, SIGNAL(docModified(bool)), this, SLOT(slotUpdateDocumentState(bool)));
connect(trackView, SIGNAL(clipItemSelected(ClipItem*)), this, SLOT(slotActivateEffectStackView()));
connect(trackView, SIGNAL(transitionItemSelected(Transition*)), transitionConfig, SLOT(slotTransitionItemSelected(Transition*)));
connect(trackView, SIGNAL(transitionItemSelected(Transition*)), this, SLOT(slotActivateTransitionView()));
- m_zoomSlider->setValue(trackView->currentZoom());
+ m_zoomSlider->setValue(doc->zoom());
connect(m_zoomSlider, SIGNAL(valueChanged(int)), trackView, SLOT(slotChangeZoom(int)));
connect(trackView->projectView(), SIGNAL(zoomIn()), this, SLOT(slotZoomIn()));
connect(trackView->projectView(), SIGNAL(zoomOut()), this, SLOT(slotZoomOut()));
connect(effectStack, SIGNAL(changeEffectPosition(ClipItem*, int, int)), trackView->projectView(), SLOT(slotChangeEffectPosition(ClipItem*, int, int)));
connect(effectStack, SIGNAL(refreshEffectStack(ClipItem*)), trackView->projectView(), SLOT(slotRefreshEffects(ClipItem*)));
connect(transitionConfig, SIGNAL(transitionUpdated(Transition *, QDomElement)), trackView->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement)));
+ connect(transitionConfig, SIGNAL(seekTimeline(int)), trackView->projectView() , SLOT(setCursorPos(int)));
+ connect(effectStack, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects()));
+
connect(trackView->projectView(), SIGNAL(activateDocumentMonitor()), m_projectMonitor, SLOT(activateMonitor()));
+ connect(trackView, SIGNAL(zoneMoved(int, int)), m_projectMonitor, SLOT(slotZoneMoved(int, int)));
+
trackView->projectView()->setContextMenu(m_timelineContextMenu, m_timelineContextClipMenu, m_timelineContextTransitionMenu);
m_activeTimeline = trackView;
- KdenliveSettings::setCurrent_profile(doc->profilePath());
if (m_renderWidget) m_renderWidget->setDocumentStandard(doc->getDocumentStandard());
- m_monitorManager->setTimecode(doc->timecode());
doc->setRenderer(m_projectMonitor->render);
m_commandStack->setActiveStack(doc->commandStack());
-
+ KdenliveSettings::setProject_display_ratio(doc->dar());
doc->updateAllProjectClips();
- if (m_commandStack->isClean()) kDebug() << "//////////// UNDO STACK IS CLEAN";
- else kDebug() << "//////////// UNDO STACK IS NOT CLEAN*******************";
//m_overView->setScene(trackView->projectScene());
//m_overView->scale(m_overView->width() / trackView->duration(), m_overView->height() / (50 * trackView->tracksNumber()));
//m_overView->fitInView(m_overView->itemAt(0, 50), Qt::KeepAspectRatio);
- setCaption(doc->description());
+ setCaption(doc->description(), doc->isModified());
+ m_saveAction->setEnabled(doc->isModified());
m_activeDocument = doc;
}
-void MainWindow::slotPreferences() {
+void MainWindow::slotPreferences(int page, int option) {
//An instance of your dialog could be already created and could be
// cached, in which case you want to display the cached dialog
// instead of creating another one
- if (KConfigDialog::showDialog("settings"))
+ if (KConfigDialog::showDialog("settings")) {
+ if (page != -1) static_cast <KdenliveSettingsDialog*>(KConfigDialog::exists("settings"))->showPage(page, option);
return;
+ }
// KConfigDialog didn't find an instance of this dialog, so lets
// create it :
KdenliveSettingsDialog* dialog = new KdenliveSettingsDialog(this);
connect(dialog, SIGNAL(settingsChanged(const QString&)), this, SLOT(updateConfiguration()));
+ connect(dialog, SIGNAL(doResetProfile()), m_monitorManager, SLOT(slotResetProfiles()));
dialog->show();
+ if (page != -1) dialog->showPage(page, option);
}
void MainWindow::updateConfiguration() {
}
}
+void MainWindow::slotChangeClipSpeed() {
+ if (m_activeTimeline) {
+ m_activeTimeline->projectView()->changeClipSpeed();
+ }
+}
+
void MainWindow::slotAddClipMarker() {
if (m_activeTimeline) {
m_activeTimeline->projectView()->slotAddClipMarker();
void MainWindow::slotShowClipProperties(DocClipBase *clip) {
if (clip->clipType() == TEXT) {
- m_activeDocument->editTextClip(clip->getProperty("xml"), clip->getId());
+ QString path = clip->getProperty("xml");
+ TitleWidget *dia_ui = new TitleWidget(KUrl()/*path + ".kdenlivetitle")*/, path, m_projectMonitor->render, this);
+ QDomDocument doc;
+ doc.setContent(clip->getProperty("xmldata"));
+ dia_ui->setXml(doc);
+ if (dia_ui->exec() == QDialog::Accepted) {
+ kDebug() << "// UPDATUING CLIP TITLE: " << path;
+ QPixmap pix = dia_ui->renderedPixmap();
+ pix.save(path + ".png");
+ //slotAddClipFile(KUrl("/tmp/kdenlivetitle.png"), QString(), -1);
+ //m_clipManager->slotEditTextClipFile(id, dia_ui->xml().toString());
+ QMap <QString, QString> newprops;
+ newprops.insert("xmldata", dia_ui->xml().toString());
+ EditClipCommand *command = new EditClipCommand(m_projectList, clip->getId(), clip->properties(), newprops, true);
+ m_activeDocument->commandStack()->push(command);
+ //setModified(true);
+ }
+ delete dia_ui;
+
+ //m_activeDocument->editTextClip(clip->getProperty("xml"), clip->getId());
return;
}
ClipProperties dia(clip, m_activeDocument->timecode(), m_activeDocument->fps(), this);
- connect(&dia, SIGNAL(addMarker(int, GenTime, QString)), m_activeTimeline->projectView(), SLOT(slotAddClipMarker(int, GenTime, QString)));
+ connect(&dia, SIGNAL(addMarker(const QString &, GenTime, QString)), m_activeTimeline->projectView(), SLOT(slotAddClipMarker(const QString &, GenTime, QString)));
if (dia.exec() == QDialog::Accepted) {
- m_projectList->slotUpdateClipProperties(dia.clipId(), dia.properties());
+ EditClipCommand *command = new EditClipCommand(m_projectList, dia.clipId(), clip->properties(), dia.properties(), true);
+ m_activeDocument->commandStack()->push(command);
+
+ //m_projectList->slotUpdateClipProperties(dia.clipId(), dia.properties());
if (dia.needsTimelineRefresh()) {
// update clip occurences in timeline
m_activeTimeline->projectView()->slotUpdateClip(dia.clipId());
}
}
+void MainWindow::slotCopy() {
+ if (!m_activeDocument || !m_activeTimeline) return;
+ m_activeTimeline->projectView()->copyClip();
+}
+
+void MainWindow::slotPaste() {
+ if (!m_activeDocument || !m_activeTimeline) return;
+ m_activeTimeline->projectView()->pasteClip();
+}
+
+void MainWindow::slotPasteEffects() {
+ if (!m_activeDocument || !m_activeTimeline) return;
+ m_activeTimeline->projectView()->pasteClipEffects();
+}
+
void MainWindow::slotFind() {
+ if (!m_activeDocument || !m_activeTimeline) return;
m_projectSearch->setEnabled(false);
m_findActivated = true;
m_findString = QString();
- TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget();
- currentTab->projectView()->initSearchStrings();
+ m_activeTimeline->projectView()->initSearchStrings();
statusBar()->showMessage(i18n("Starting -- find text as you type"));
m_findTimer.start(5000);
qApp->installEventFilter(this);
projects / kdenlive / blobdiff