X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmainwindow.cpp;h=5b2878e7cef485a724b041f0999898e210f24223;hb=890932ce1fb3c925b54b7e486575380f2d6e67e0;hp=1273c558f8e0bed595f6fe8fff48e15e42efb18e;hpb=89a0939d4a987b534bc5de36b2233bcadf51462f;p=kdenlive diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 1273c558..5b2878e7 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -51,10 +51,13 @@ #include #include #include +#include +#include + -#include #include "mainwindow.h" +#include "mainwindowadaptor.h" #include "kdenlivesettings.h" #include "kdenlivesettingsdialog.h" #include "initeffects.h" @@ -81,6 +84,12 @@ #include "wizard.h" #include "editclipcommand.h" #include "titlewidget.h" +#include "markerdialog.h" +#include "clipitem.h" + +#include "interfaces.h" + +// #include "scriptingpart.h" static const int ID_STATUS_MSG = 1; static const int ID_EDITMODE_MSG = 2; @@ -105,6 +114,12 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent m_jogProcess(NULL), #endif /* NO_JOGSHUTTLE */ m_findActivated(false), m_initialized(false) { + + // Create DBus interface + new MainWindowAdaptor(this); + QDBusConnection dbus = QDBusConnection::sessionBus(); + dbus.registerObject("/MainWindow", this); + setlocale(LC_NUMERIC, "POSIX"); setFont(KGlobalSettings::toolBarFont()); parseProfiles(MltPath); @@ -208,11 +223,17 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent tabifyDockWidget(clipMonitorDock, recMonitorDock); setCentralWidget(m_timelineArea); + setupGUI(); + /*ScriptingPart* sp = new ScriptingPart(this, QStringList()); + guiFactory()->addClient(sp);*/ + + loadPlugins(); //kDebug() << factory() << " " << factory()->container("video_effects_menu", this); - m_projectMonitor->setupMenu(static_cast(factory()->container("monitor_go", this))); - m_clipMonitor->setupMenu(static_cast(factory()->container("monitor_go", this))); + m_projectMonitor->setupMenu(static_cast(factory()->container("monitor_go", this)), m_playZone, m_loopZone); + m_clipMonitor->setupMenu(static_cast(factory()->container("monitor_go", this)), m_playZone, m_loopZone, static_cast(factory()->container("marker_menu", this))); + m_projectList->setupGeneratorMenu(static_cast(factory()->container("generators", this))); // build effects menus QAction *action; @@ -298,6 +319,8 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent } connect(transitionsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddTransition(QAction *))); + m_timelineContextMenu->addAction(actionCollection()->action("insert_space")); + m_timelineContextMenu->addAction(actionCollection()->action("delete_space")); m_timelineContextMenu->addAction(actionCollection()->action(KStandardAction::name(KStandardAction::Paste))); m_timelineContextClipMenu->addAction(actionCollection()->action("delete_timeline_clip")); @@ -317,6 +340,8 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent m_timelineContextTransitionMenu->addAction(actionCollection()->action("delete_timeline_clip")); m_timelineContextTransitionMenu->addAction(actionCollection()->action(KStandardAction::name(KStandardAction::Copy))); + m_timelineContextTransitionMenu->addAction(actionCollection()->action("auto_transition")); + 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())); @@ -360,8 +385,7 @@ bool MainWindow::queryClose() { switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document ?"))) { case KMessageBox::Yes : // save document here. If saving fails, return false; - saveFile(); - return true; + return saveFile(); case KMessageBox::No : return true; default: // cancel @@ -371,6 +395,71 @@ bool MainWindow::queryClose() { return true; } + +void MainWindow::loadPlugins() { + foreach(QObject *plugin, QPluginLoader::staticInstances()) + populateMenus(plugin); + + QStringList directories = KGlobal::dirs()->findDirs("module", QString()); + QStringList filters; + filters << "libkdenlive*"; + foreach(const QString &folder, directories) { + kDebug() << "// PARSING FIOLER: " << folder; + QDir pluginsDir(folder); + foreach(QString fileName, pluginsDir.entryList(filters, QDir::Files)) { + kDebug() << "// FOUND PLUGIN: " << fileName << "= " << pluginsDir.absoluteFilePath(fileName); + QPluginLoader loader(pluginsDir.absoluteFilePath(fileName)); + QObject *plugin = loader.instance(); + if (plugin) { + populateMenus(plugin); + m_pluginFileNames += fileName; + } else kDebug() << "// ERROR LOADING PLUGIN: " << fileName << ", " << loader.errorString(); + } + } + //exit(1); +} + +void MainWindow::populateMenus(QObject *plugin) { + QMenu *addMenu = static_cast(factory()->container("generators", this)); + ClipGenerator *iGenerator = qobject_cast(plugin); + if (iGenerator) + addToMenu(plugin, iGenerator->generators(), addMenu, SLOT(generateClip()), + NULL); +} + +void MainWindow::addToMenu(QObject *plugin, const QStringList &texts, + QMenu *menu, const char *member, + QActionGroup *actionGroup) { + kDebug() << "// ADD to MENU" << texts; + foreach(QString text, texts) { + QAction *action = new QAction(text, plugin); + action->setData(text); + connect(action, SIGNAL(triggered()), this, member); + menu->addAction(action); + + if (actionGroup) { + action->setCheckable(true); + actionGroup->addAction(action); + } + } +} + +void MainWindow::aboutPlugins() { + //PluginDialog dialog(pluginsDir.path(), m_pluginFileNames, this); + //dialog.exec(); +} + + +void MainWindow::generateClip() { + QAction *action = qobject_cast(sender()); + ClipGenerator *iGenerator = qobject_cast(action->parent()); + + KUrl clipUrl = iGenerator->generatedClip(action->data().toString(), m_activeDocument->projectFolder(), QStringList(), QStringList(), 25, 720, 576); + if (!clipUrl.isEmpty()) { + m_projectList->slotAddClip(clipUrl); + } +} + void MainWindow::saveProperties(KConfig*) { // save properties here,used by session management saveFile(); @@ -477,14 +566,14 @@ void MainWindow::slotSetClipDuration(const QString &id, int duration) { void MainWindow::slotConnectMonitors() { - m_projectList->setRenderer(m_clipMonitor->render); + m_projectList->setRenderer(m_projectMonitor->render); 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 &, 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_projectList, SIGNAL(getFileProperties(const QDomElement &, const QString &)), m_projectMonitor->render, SLOT(getFileProperties(const QDomElement &, const QString &))); + connect(m_projectMonitor->render, SIGNAL(replyGetImage(const QString &, int, const QPixmap &, int, int)), m_projectList, SLOT(slotReplyGetImage(const QString &, int, const QPixmap &, int, int))); + connect(m_projectMonitor->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_projectMonitor->render, SIGNAL(removeInvalidClip(const QString &)), m_projectList, SLOT(slotRemoveInvalidClip(const QString &))); connect(m_clipMonitor, SIGNAL(refreshClipThumbnail(const QString &)), m_projectList, SLOT(slotRefreshClipThumbnail(const QString &))); @@ -542,8 +631,14 @@ void MainWindow::setupActions() { m_buttonRazorTool->setCheckable(true); m_buttonRazorTool->setChecked(false); + m_buttonSpacerTool = new KAction(KIcon("kdenlive-spacer-tool"), i18n("Spacer tool"), this); + toolbar->addAction(m_buttonSpacerTool); + m_buttonSpacerTool->setCheckable(true); + m_buttonSpacerTool->setChecked(false); + m_toolGroup->addAction(m_buttonSelectTool); m_toolGroup->addAction(m_buttonRazorTool); + m_toolGroup->addAction(m_buttonSpacerTool); m_toolGroup->setExclusive(true); toolbar->setToolButtonStyle(Qt::ToolButtonIconOnly); @@ -556,6 +651,10 @@ void MainWindow::setupActions() { actionWidget->setMaximumWidth(24); actionWidget->setMinimumHeight(17); + actionWidget = toolbar->widgetForAction(m_buttonSpacerTool); + actionWidget->setMaximumWidth(24); + actionWidget->setMinimumHeight(17); + toolbar->setStyleSheet(style1); connect(m_toolGroup, SIGNAL(triggered(QAction *)), this, SLOT(slotChangeTool(QAction *))); @@ -644,6 +743,7 @@ void MainWindow::setupActions() { collection->addAction("select_tool", m_buttonSelectTool); collection->addAction("razor_tool", m_buttonRazorTool); + collection->addAction("spacer_tool", m_buttonSpacerTool); collection->addAction("show_video_thumbs", m_buttonVideoThumbs); collection->addAction("show_audio_thumbs", m_buttonAudioThumbs); @@ -651,6 +751,16 @@ void MainWindow::setupActions() { collection->addAction("snap", m_buttonSnap); collection->addAction("zoom_fit", m_buttonFitZoom); + KAction* zoomIn = new KAction(KIcon("zoom-in"), i18n("Zoom In"), this); + collection->addAction("zoom_in", zoomIn); + connect(zoomIn, SIGNAL(triggered(bool)), this, SLOT(slotZoomIn())); + zoomIn->setShortcut(Qt::CTRL + Qt::Key_Plus); + + KAction* zoomOut = new KAction(KIcon("zoom-out"), i18n("Zoom Out"), this); + collection->addAction("zoom_out", zoomOut); + connect(zoomOut, SIGNAL(triggered(bool)), this, SLOT(slotZoomOut())); + zoomOut->setShortcut(Qt::CTRL + Qt::Key_Minus); + m_projectSearch = new KAction(KIcon("edit-find"), i18n("Find"), this); collection->addAction("project_find", m_projectSearch); connect(m_projectSearch, SIGNAL(triggered(bool)), this, SLOT(slotFind())); @@ -666,6 +776,12 @@ void MainWindow::setupActions() { collection->addAction("manage_profiles", profilesAction); connect(profilesAction, SIGNAL(triggered(bool)), this, SLOT(slotEditProfiles())); + KAction* fileGHNS = KNS::standardAction(i18n("Download New Lumas..."), this, SLOT(slotGetNewStuff()), actionCollection(), "get_new_stuff"); + + KAction* wizAction = new KAction(KIcon("configure"), i18n("Run Config Wizard"), this); + collection->addAction("run_wizard", wizAction); + connect(wizAction, SIGNAL(triggered(bool)), this, SLOT(slotRunWizard())); + KAction* projectAction = new KAction(KIcon("configure"), i18n("Project Settings"), this); collection->addAction("project_settings", projectAction); connect(projectAction, SIGNAL(triggered(bool)), this, SLOT(slotEditProjectSettings())); @@ -683,6 +799,20 @@ void MainWindow::setupActions() { collection->addAction("monitor_play", monitorPlay); connect(monitorPlay, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotPlay())); + m_playZone = new KAction(KIcon("media-playback-start"), i18n("Play Zone"), this); + m_playZone->setShortcut(Qt::CTRL + Qt::Key_Space); + collection->addAction("monitor_play_zone", m_playZone); + connect(m_playZone, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotPlayZone())); + + m_loopZone = new KAction(KIcon("media-playback-start"), i18n("Loop Zone"), this); + m_loopZone->setShortcut(Qt::ALT + Qt::Key_Space); + collection->addAction("monitor_loop_zone", m_loopZone); + connect(m_loopZone, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotLoopZone())); + + KAction *dvdWizard = new KAction(KIcon("media-optical"), i18n("Dvd Wizard"), this); + collection->addAction("dvd_wizard", dvdWizard); + connect(dvdWizard, SIGNAL(triggered(bool)), this, SLOT(slotDvdWizard())); + KAction *markIn = collection->addAction("mark_in"); markIn->setText(i18n("Set In Point")); markIn->setShortcut(Qt::Key_I); @@ -703,6 +833,11 @@ void MainWindow::setupActions() { collection->addAction("monitor_seek_backward-one-frame", monitorSeekBackwardOneFrame); connect(monitorSeekBackwardOneFrame, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotRewindOneFrame())); + KAction* monitorSeekBackwardOneSecond = new KAction(KIcon("media-skip-backward"), i18n("Rewind 1 Second"), this); + monitorSeekBackwardOneSecond->setShortcut(Qt::SHIFT + Qt::Key_Left); + collection->addAction("monitor_seek_backward-one-second", monitorSeekBackwardOneSecond); + connect(monitorSeekBackwardOneSecond, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotRewindOneSecond())); + KAction* monitorSeekSnapBackward = new KAction(KIcon("media-seek-backward"), i18n("Go to Previous Snap Point"), this); monitorSeekSnapBackward->setShortcut(Qt::ALT + Qt::Key_Left); collection->addAction("monitor_seek_snap_backward", monitorSeekSnapBackward); @@ -738,6 +873,11 @@ void MainWindow::setupActions() { collection->addAction("monitor_seek_forward-one-frame", monitorSeekForwardOneFrame); connect(monitorSeekForwardOneFrame, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotForwardOneFrame())); + KAction* monitorSeekForwardOneSecond = new KAction(KIcon("media-skip-forward"), i18n("Forward 1 Second"), this); + monitorSeekForwardOneSecond->setShortcut(Qt::SHIFT + Qt::Key_Right); + collection->addAction("monitor_seek_forward-one-second", monitorSeekForwardOneSecond); + connect(monitorSeekForwardOneSecond, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotForwardOneSecond())); + KAction* monitorSeekSnapForward = new KAction(KIcon("media-seek-forward"), i18n("Go to Next Snap Point"), this); monitorSeekSnapForward->setShortcut(Qt::ALT + Qt::Key_Right); collection->addAction("monitor_seek_snap_forward", monitorSeekSnapForward); @@ -752,6 +892,13 @@ void MainWindow::setupActions() { collection->addAction("change_clip_speed", editTimelineClipSpeed); connect(editTimelineClipSpeed, SIGNAL(triggered(bool)), this, SLOT(slotChangeClipSpeed())); + KAction *stickTransition = collection->addAction("auto_transition"); + stickTransition->setData(QString("auto")); + stickTransition->setCheckable(true); + stickTransition->setEnabled(false); + stickTransition->setText(i18n("Automatic Transition")); + connect(stickTransition, SIGNAL(triggered(bool)), this, SLOT(slotAutoTransition())); + KAction* cutTimelineClip = new KAction(KIcon("edit-cut"), i18n("Cut Clip"), this); cutTimelineClip->setShortcut(Qt::SHIFT + Qt::Key_R); collection->addAction("cut_timeline_clip", cutTimelineClip); @@ -773,6 +920,26 @@ void MainWindow::setupActions() { collection->addAction("edit_clip_marker", editClipMarker); connect(editClipMarker, SIGNAL(triggered(bool)), this, SLOT(slotEditClipMarker())); + KAction *insertSpace = new KAction(KIcon(), i18n("Insert Space"), this); + collection->addAction("insert_space", insertSpace); + connect(insertSpace, SIGNAL(triggered()), this, SLOT(slotInsertSpace())); + + KAction *removeSpace = new KAction(KIcon(), i18n("Remove Space"), this); + collection->addAction("delete_space", removeSpace); + connect(removeSpace, SIGNAL(triggered()), this, SLOT(slotRemoveSpace())); + + KAction *insertTrack = new KAction(KIcon(), i18n("Insert Track"), this); + collection->addAction("insert_track", insertTrack); + connect(insertTrack, SIGNAL(triggered()), this, SLOT(slotInsertTrack())); + + KAction *deleteTrack = new KAction(KIcon(), i18n("Delete Track"), this); + collection->addAction("delete_track", deleteTrack); + connect(deleteTrack, SIGNAL(triggered()), this, SLOT(slotDeleteTrack())); + + KAction *changeTrack = new KAction(KIcon(), i18n("Change Track"), this); + collection->addAction("change_track", changeTrack); + connect(changeTrack, SIGNAL(triggered()), this, SLOT(slotChangeTrack())); + KAction *addGuide = new KAction(KIcon("document-new"), i18n("Add Guide"), this); collection->addAction("add_guide", addGuide); connect(addGuide, SIGNAL(triggered()), this, SLOT(slotAddGuide())); @@ -825,6 +992,36 @@ void MainWindow::setupActions() { connect(collection, SIGNAL(actionHovered(QAction*)), this, SLOT(slotDisplayActionMessage(QAction*))); + + + QAction *addClip = new KAction(KIcon("kdenlive-add-clip"), i18n("Add Clip"), this); + collection->addAction("add_clip", addClip); + connect(addClip , SIGNAL(triggered()), m_projectList, SLOT(slotAddClip())); + + QAction *addColorClip = new KAction(KIcon("kdenlive-add-color-clip"), i18n("Add Color Clip"), this); + collection->addAction("add_color_clip", addColorClip); + connect(addColorClip , SIGNAL(triggered()), m_projectList, SLOT(slotAddColorClip())); + + QAction *addSlideClip = new KAction(KIcon("kdenlive-add-slide-clip"), i18n("Add Slideshow Clip"), this); + collection->addAction("add_slide_clip", addSlideClip); + connect(addSlideClip , SIGNAL(triggered()), m_projectList, SLOT(slotAddSlideshowClip())); + + QAction *addTitleClip = new KAction(KIcon("kdenlive-add-text-clip"), i18n("Add Title Clip"), this); + collection->addAction("add_text_clip", addTitleClip); + connect(addTitleClip , SIGNAL(triggered()), m_projectList, SLOT(slotAddTitleClip())); + + QAction *addFolderButton = new KAction(KIcon("folder-new"), i18n("Create Folder"), this); + collection->addAction("add_folder", addFolderButton); + connect(addFolderButton , SIGNAL(triggered()), m_projectList, SLOT(slotAddFolder())); + + QMenu *addClips = new QMenu(); + addClips->addAction(addClip); + addClips->addAction(addColorClip); + addClips->addAction(addSlideClip); + addClips->addAction(addTitleClip); + addClips->addAction(addFolderButton); + m_projectList->setupMenu(addClips, addClip); + //connect(collection, SIGNAL( clearStatusText() ), //statusBar(), SLOT( clear() ) ); } @@ -856,6 +1053,13 @@ void MainWindow::readOptions() { } else { ::exit(1); } + } else if (initialGroup.readEntry("version") == "0.7") { + //Add new settings from 0.7.1 + if (KdenliveSettings::defaultprojectfolder().isEmpty()) { + QString path = QDir::homePath() + "/kdenlive"; + if (KStandardDirs::makeDir(path) == false) kDebug() << "/// ERROR CREATING PROJECT FOLDER: " << path; + KdenliveSettings::setDefaultprojectfolder(path); + } } KConfigGroup treecolumns(config, "Project Tree"); const QByteArray state = treecolumns.readEntry("columns", QByteArray()); @@ -863,15 +1067,23 @@ void MainWindow::readOptions() { m_projectList->setHeaderInfo(state); } +void MainWindow::slotRunWizard() { + Wizard *w = new Wizard(this); + if (w->exec() == QDialog::Accepted && w->isOk()) { + w->adjustSettings(); + } + delete w; +} + void MainWindow::newFile(bool showProjectSettings) { QString profileName; KUrl projectFolder; - QPoint projectTracks(3, 2); + QPoint projectTracks(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks()); if (!showProjectSettings && m_timelineArea->count() == 0) { if (!KdenliveSettings::activatetabs()) closeCurrentDocument(); profileName = KdenliveSettings::default_profile(); } else { - ProjectSettings *w = new ProjectSettings; + ProjectSettings *w = new ProjectSettings(projectTracks.x(), projectTracks.y(), KdenliveSettings::defaultprojectfolder(), false, this); if (w->exec() != QDialog::Accepted) return; if (!KdenliveSettings::activatetabs()) closeCurrentDocument(); profileName = w->selectedProfile(); @@ -879,7 +1091,7 @@ void MainWindow::newFile(bool showProjectSettings) { projectTracks = w->tracks(); delete w; } - KdenliveDoc *doc = new KdenliveDoc(KUrl(), projectFolder, m_commandStack, profileName, projectTracks, this); + KdenliveDoc *doc = new KdenliveDoc(KUrl(), projectFolder, m_commandStack, profileName, projectTracks, m_projectMonitor->render, this); doc->m_autosave = new KAutoSaveFile(KUrl(), doc); TrackView *trackView = new TrackView(doc, this); m_timelineArea->addTab(trackView, KIcon("kdenlive"), doc->description()); @@ -929,14 +1141,25 @@ void MainWindow::closeCurrentDocument() { if (m_timelineArea->count() == 0) { m_activeDocument = NULL; effectStack->clear(); - transitionConfig->slotTransitionItemSelected(NULL); + transitionConfig->slotTransitionItemSelected(NULL, false); } } -void MainWindow::saveFileAs(const QString &outputFileName) { - QDomDocument currentSceneList = m_projectMonitor->sceneList(); +bool MainWindow::saveFileAs(const QString &outputFileName) { + QDomDocument currentSceneList; + if (KdenliveSettings::dropbframes()) { + KdenliveSettings::setDropbframes(false); + m_activeDocument->clipManager()->updatePreviewSettings(); + currentSceneList = m_projectMonitor->sceneList(); + KdenliveSettings::setDropbframes(true); + m_activeDocument->clipManager()->updatePreviewSettings(); + } else currentSceneList = m_projectMonitor->sceneList(); + if (m_activeDocument->saveSceneList(outputFileName, currentSceneList) == false) - return; + return false; + + // Save timeline thumbnails + m_activeTimeline->projectView()->saveThumbnails(); m_activeDocument->setUrl(KUrl(outputFileName)); if (m_activeDocument->m_autosave == NULL) { m_activeDocument->m_autosave = new KAutoSaveFile(KUrl(outputFileName), this); @@ -946,28 +1169,31 @@ void MainWindow::saveFileAs(const QString &outputFileName) { m_timelineArea->setTabToolTip(m_timelineArea->currentIndex(), m_activeDocument->url().path()); m_activeDocument->setModified(false); m_fileOpenRecent->addUrl(KUrl(outputFileName)); + return true; } -void MainWindow::saveFileAs() { +bool MainWindow::saveFileAs() { // Check that the Kdenlive mime type is correctly installed QString mimetype = "application/x-kdenlive"; KMimeType::Ptr mime = KMimeType::mimeType(mimetype); if (!mime) mimetype = "*.kdenlive"; QString outputFile = KFileDialog::getSaveFileName(KUrl(), mimetype); + if (outputFile.isEmpty()) return false; if (QFile::exists(outputFile)) { - if (KMessageBox::questionYesNo(this, i18n("File already exists.\nDo you want to overwrite it ?")) == KMessageBox::No) return; + if (KMessageBox::questionYesNo(this, i18n("File already exists.\nDo you want to overwrite it ?")) == KMessageBox::No) return false; } - saveFileAs(outputFile); + return saveFileAs(outputFile); } -void MainWindow::saveFile() { - if (!m_activeDocument) return; +bool MainWindow::saveFile() { + if (!m_activeDocument) return true; if (m_activeDocument->url().isEmpty()) { - saveFileAs(); + return saveFileAs(); } else { - saveFileAs(m_activeDocument->url().path()); + bool result = saveFileAs(m_activeDocument->url().path()); m_activeDocument->m_autosave->resize(0); + return result; } } @@ -986,6 +1212,7 @@ void MainWindow::openFile() { void MainWindow::openLastFile() { KSharedConfigPtr config = KGlobal::config(); KUrl::List urls = m_fileOpenRecent->urls(); + //WARNING: this is buggy, we get a random url, not the last one. Bug in KRecentFileAction ? if (urls.isEmpty()) newFile(false); else openFile(urls.last()); } @@ -1030,8 +1257,7 @@ void MainWindow::openFile(const KUrl &url) { } void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale) { - KdenliveDoc *doc; - doc = new KdenliveDoc(url, KUrl(), m_commandStack, QString(), QPoint(3, 2), this); + KdenliveDoc *doc = new KdenliveDoc(url, KUrl(), m_commandStack, QString(), QPoint(3, 2), m_projectMonitor->render, this); if (stale == NULL) { stale = new KAutoSaveFile(url, doc); doc->m_autosave = stale; @@ -1045,9 +1271,14 @@ void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale) { 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()); + trackView->setDuration(trackView->duration()); + trackView->projectView()->initCursorPos(m_projectMonitor->render->seekPosition().frames(doc->fps())); + 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()); } void MainWindow::recoverFiles(QList staleFiles) { @@ -1139,19 +1370,26 @@ void MainWindow::slotEditProfiles() { } void MainWindow::slotEditProjectSettings() { - ProjectSettings *w = new ProjectSettings; + QPoint p = m_activeDocument->getTracksCount(); + ProjectSettings *w = new ProjectSettings(p.x(), p.y(), m_activeDocument->projectFolder().path(), true, this); + if (w->exec() == QDialog::Accepted) { QString profile = w->selectedProfile(); - m_activeDocument->setProfilePath(profile); - 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->setProfile(m_activeDocument->mltProfile()); - m_timelineArea->setTabText(m_timelineArea->currentIndex(), m_activeDocument->description()); - - // We need to desactivate & reactivate monitors to get a refresh - m_monitorManager->switchMonitors(); + m_activeDocument->setProjectFolder(w->selectedFolder()); + if (m_activeDocument->profilePath() != profile) { + // Profile was changed + m_activeDocument->setProfilePath(profile); + 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->setProfile(m_activeDocument->mltProfile()); + m_timelineArea->setTabText(m_timelineArea->currentIndex(), m_activeDocument->description()); + m_activeDocument->clipManager()->resetProducersList(m_projectMonitor->render->producersList()); + + // We need to desactivate & reactivate monitors to get a refresh + m_monitorManager->switchMonitors(); + } } delete w; } @@ -1159,7 +1397,9 @@ void MainWindow::slotEditProjectSettings() { void MainWindow::slotRenderProject() { if (!m_renderWidget) { m_renderWidget = new RenderWidget(this); - connect(m_renderWidget, SIGNAL(doRender(const QString&, const QString&, const QStringList &, const QStringList &, bool, bool, double, double)), this, SLOT(slotDoRender(const QString&, const QString&, const QStringList &, const QStringList &, bool, bool, double, double))); + connect(m_renderWidget, SIGNAL(doRender(const QString&, const QString&, const QStringList &, const QStringList &, bool, bool, double, double, bool)), this, SLOT(slotDoRender(const QString&, const QString&, const QStringList &, const QStringList &, bool, bool, double, double, bool))); + 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 &))); if (m_activeDocument) { m_renderWidget->setProfile(m_activeDocument->mltProfile()); m_renderWidget->setGuides(m_activeDocument->guidesXml(), m_activeDocument->projectDuration()); @@ -1171,7 +1411,7 @@ void MainWindow::slotRenderProject() { m_renderWidget->show(); } -void MainWindow::slotDoRender(const QString &dest, const QString &render, const QStringList &overlay_args, const QStringList &avformat_args, bool zoneOnly, bool playAfter, double guideStart, double guideEnd) { +void MainWindow::slotDoRender(const QString &dest, const QString &render, const QStringList &overlay_args, const QStringList &avformat_args, bool zoneOnly, bool playAfter, double guideStart, double guideEnd, bool resizeProfile) { if (dest.isEmpty()) return; int in; int out; @@ -1184,9 +1424,18 @@ void MainWindow::slotDoRender(const QString &dest, const QString &render, const temp.setAutoRemove(false); temp.setSuffix(".westley"); if (temp.open()) { - m_projectMonitor->saveSceneList(temp.fileName()); + + if (KdenliveSettings::dropbframes()) { + KdenliveSettings::setDropbframes(false); + m_activeDocument->clipManager()->updatePreviewSettings(); + m_projectMonitor->saveSceneList(temp.fileName()); + KdenliveSettings::setDropbframes(true); + m_activeDocument->clipManager()->updatePreviewSettings(); + } else m_projectMonitor->saveSceneList(temp.fileName()); + QStringList args; args << "-erase"; + if (KdenliveSettings::usekuiserver()) args << "-kuiserver"; if (zoneOnly) args << "in=" + QString::number(in) << "out=" + QString::number(out); else if (guideStart != -1) { args << "in=" + QString::number(GenTime(guideStart).frames(m_activeDocument->fps())) << "out=" + QString::number(GenTime(guideEnd).frames(m_activeDocument->fps())); @@ -1199,9 +1448,23 @@ void MainWindow::slotDoRender(const QString &dest, const QString &render, const } if (!QFile::exists(KdenliveSettings::rendererpath())) { KMessageBox::sorry(this, i18n("Cannot find the inigo program required for rendering (part of Mlt)")); + setRenderingProgress(dest, -3); return; } - args << KdenliveSettings::rendererpath() << m_activeDocument->profilePath() << render << videoPlayer << temp.fileName() << dest << avformat_args; + args << KdenliveSettings::rendererpath() << m_activeDocument->profilePath() << render << videoPlayer; + + for (int i = 0; i < avformat_args.count(); i++) { + if (avformat_args.at(i).startsWith("profile=")) { + if (avformat_args.at(i).section('=', 1) != m_activeDocument->profilePath()) resizeProfile = true; + break; + } + } + + if (resizeProfile) { + // The rendering profile is different from project profile, so use MLT's special producer_consumer + args << "consumer:" + temp.fileName(); + } else args << temp.fileName(); + args << dest << avformat_args; QString renderer = QCoreApplication::applicationDirPath() + QString("/kdenlive_render"); if (!QFile::exists(renderer)) renderer = "kdenlive_render"; QProcess::startDetached(renderer, args); @@ -1210,6 +1473,14 @@ void MainWindow::slotDoRender(const QString &dest, const QString &render, const } } +void MainWindow::setRenderingProgress(const QString &url, int progress) { + if (m_renderWidget) m_renderWidget->setRenderJob(url, progress); +} + +void MainWindow::setRenderingFinished(const QString &url, int status, const QString &error) { + if (m_renderWidget) m_renderWidget->setRenderStatus(url, status, error); +} + void MainWindow::slotUpdateMousePosition(int pos) { if (m_activeDocument) switch (m_timecodeFormat->currentIndex()) { @@ -1222,6 +1493,7 @@ void MainWindow::slotUpdateMousePosition(int pos) { } void MainWindow::slotUpdateDocumentState(bool modified) { + if (!m_activeDocument) return; setCaption(m_activeDocument->description(), modified); m_saveAction->setEnabled(modified); if (modified) { @@ -1247,27 +1519,31 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha kDebug() << "/////////////////// CONNECTING DOC TO PROJECT VIEW ////////////////"; if (m_activeDocument) { if (m_activeDocument == doc) return; - m_activeDocument->backupMltPlaylist(); if (m_activeTimeline) { disconnect(m_projectMonitor, SIGNAL(renderPosition(int)), m_activeTimeline, SLOT(moveCursorPos(int))); disconnect(m_projectMonitor, SIGNAL(zoneUpdated(QPoint)), m_activeTimeline, 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(guidesUpdated()), this, SLOT(slotGuidesUpdated())); - disconnect(m_activeDocument, SIGNAL(addProjectClip(DocClipBase *)), m_projectList, SLOT(slotAddClip(DocClipBase *))); - 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(addProjectClip(DocClipBase *, bool)), m_projectList, SLOT(slotAddClip(DocClipBase *, bool))); + disconnect(m_activeDocument, SIGNAL(resetProjectList()), m_projectList, SLOT(slotResetProjectList())); 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->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), effectStack, SLOT(slotClipItemSelected(ClipItem*, int))); disconnect(m_activeTimeline->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), this, SLOT(slotActivateEffectStackView())); - disconnect(m_activeTimeline, SIGNAL(transitionItemSelected(Transition*)), transitionConfig, SLOT(slotTransitionItemSelected(Transition*))); - disconnect(m_activeTimeline, SIGNAL(transitionItemSelected(Transition*)), this, SLOT(slotActivateTransitionView())); + disconnect(m_activeTimeline, SIGNAL(transitionItemSelected(Transition*, bool)), transitionConfig, SLOT(slotTransitionItemSelected(Transition*, bool))); + disconnect(m_activeTimeline, SIGNAL(transitionItemSelected(Transition*, bool)), this, SLOT(slotActivateTransitionView(Transition *))); 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 *, const int)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *, const int))); - + disconnect(m_activeTimeline, SIGNAL(cursorMoved()), m_projectMonitor, SLOT(activateMonitor())); + disconnect(m_activeTimeline, SIGNAL(insertTrack(int)), this, SLOT(slotInsertTrack(int))); + disconnect(m_activeTimeline, SIGNAL(deleteTrack(int)), this, SLOT(slotDeleteTrack(int))); + disconnect(m_activeTimeline, SIGNAL(changeTrack(int)), this, SLOT(slotChangeTrack(int))); disconnect(m_activeDocument, SIGNAL(docModified(bool)), this, SLOT(slotUpdateDocumentState(bool))); disconnect(effectStack, SIGNAL(updateClipEffect(ClipItem*, QDomElement, QDomElement, int)), m_activeTimeline->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, QDomElement, QDomElement, int))); disconnect(effectStack, SIGNAL(removeEffect(ClipItem*, QDomElement)), m_activeTimeline->projectView(), SLOT(slotDeleteEffect(ClipItem*, QDomElement))); @@ -1276,13 +1552,14 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha disconnect(effectStack, SIGNAL(refreshEffectStack(ClipItem*)), m_activeTimeline->projectView(), SLOT(slotRefreshEffects(ClipItem*))); disconnect(effectStack, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects())); disconnect(transitionConfig, SIGNAL(transitionUpdated(Transition *, QDomElement)), m_activeTimeline->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement))); + disconnect(transitionConfig, SIGNAL(transitionTrackUpdated(Transition *, int)), m_activeTimeline->projectView() , SLOT(slotTransitionTrackUpdated(Transition *, int))); disconnect(transitionConfig, SIGNAL(seekTimeline(int)), m_activeTimeline->projectView() , SLOT(setCursorPos(int))); disconnect(m_activeTimeline->projectView(), SIGNAL(activateDocumentMonitor()), m_projectMonitor, SLOT(activateMonitor())); - disconnect(m_activeTimeline, SIGNAL(zoneMoved(int, int)), m_projectMonitor, SLOT(slotZoneMoved(int, int))); + disconnect(m_activeTimeline, SIGNAL(zoneMoved(int, int)), this, SLOT(slotZoneMoved(int, int))); disconnect(m_projectList, SIGNAL(loadingIsOver()), m_activeTimeline->projectView(), SLOT(slotUpdateAllThumbs())); effectStack->clear(); } - m_activeDocument->setRenderer(NULL); + //m_activeDocument->setRenderer(NULL); disconnect(m_projectList, SIGNAL(clipSelected(DocClipBase *)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *))); m_clipMonitor->stop(); } @@ -1290,17 +1567,23 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha KdenliveSettings::setProject_fps(doc->fps()); m_monitorManager->resetProfiles(doc->timecode()); m_projectList->setDocument(doc); - transitionConfig->updateProjectFormat(doc->mltProfile(), doc->timecode()); + transitionConfig->updateProjectFormat(doc->mltProfile(), doc->timecode(), trackView->tracksNumber()); effectStack->updateProjectFormat(doc->mltProfile(), doc->timecode()); connect(m_projectList, SIGNAL(clipSelected(DocClipBase *)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *))); 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, SIGNAL(cursorMoved()), m_projectMonitor, SLOT(activateMonitor())); + connect(trackView, SIGNAL(insertTrack(int)), this, SLOT(slotInsertTrack(int))); + connect(trackView, SIGNAL(deleteTrack(int)), this, SLOT(slotDeleteTrack(int))); + connect(trackView, SIGNAL(changeTrack(int)), this, SLOT(slotChangeTrack(int))); 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, const QString &, bool, bool)), m_projectList, SLOT(slotAddFolder(const QString, const QString &, bool, bool))); + connect(doc, SIGNAL(addProjectClip(DocClipBase *, bool)), m_projectList, SLOT(slotAddClip(DocClipBase *, bool))); + connect(doc, SIGNAL(resetProjectList()), m_projectList, SLOT(slotResetProjectList())); 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 &))); @@ -1312,8 +1595,8 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha connect(trackView->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), effectStack, SLOT(slotClipItemSelected(ClipItem*, int))); connect(trackView->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), this, SLOT(slotActivateEffectStackView())); - connect(trackView, SIGNAL(transitionItemSelected(Transition*)), transitionConfig, SLOT(slotTransitionItemSelected(Transition*))); - connect(trackView, SIGNAL(transitionItemSelected(Transition*)), this, SLOT(slotActivateTransitionView())); + connect(trackView, SIGNAL(transitionItemSelected(Transition*, bool)), transitionConfig, SLOT(slotTransitionItemSelected(Transition*, bool))); + connect(trackView, SIGNAL(transitionItemSelected(Transition*, bool)), this, SLOT(slotActivateTransitionView(Transition *))); m_zoomSlider->setValue(doc->zoom()); connect(m_zoomSlider, SIGNAL(valueChanged(int)), trackView, SLOT(slotChangeZoom(int))); connect(trackView->projectView(), SIGNAL(zoomIn()), this, SLOT(slotZoomIn())); @@ -1329,17 +1612,18 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha 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(transitionTrackUpdated(Transition *, int)), trackView->projectView() , SLOT(slotTransitionTrackUpdated(Transition *, int))); 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))); + connect(trackView, SIGNAL(zoneMoved(int, int)), this, SLOT(slotZoneMoved(int, int))); connect(m_projectList, SIGNAL(loadingIsOver()), trackView->projectView(), SLOT(slotUpdateAllThumbs())); trackView->projectView()->setContextMenu(m_timelineContextMenu, m_timelineContextClipMenu, m_timelineContextTransitionMenu); m_activeTimeline = trackView; if (m_renderWidget) m_renderWidget->setProfile(doc->mltProfile()); - doc->setRenderer(m_projectMonitor->render); + //doc->setRenderer(m_projectMonitor->render); m_commandStack->setActiveStack(doc->commandStack()); KdenliveSettings::setProject_display_ratio(doc->dar()); m_projectList->updateAllClips(); @@ -1352,6 +1636,15 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha setCaption(doc->description(), doc->isModified()); m_saveAction->setEnabled(doc->isModified()); m_activeDocument = doc; + if (KdenliveSettings::dropbframes()) slotUpdatePreviewSettings(); + + // set tool to select tool + m_buttonSelectTool->setChecked(true); +} + +void MainWindow::slotZoneMoved(int start, int end) { + m_activeDocument->setZone(start, end); + m_projectMonitor->slotZoneMoved(start, end); } void MainWindow::slotGuidesUpdated() { @@ -1374,10 +1667,19 @@ void MainWindow::slotPreferences(int page, int option) { KdenliveSettingsDialog* dialog = new KdenliveSettingsDialog(this); connect(dialog, SIGNAL(settingsChanged(const QString&)), this, SLOT(updateConfiguration())); connect(dialog, SIGNAL(doResetProfile()), m_monitorManager, SLOT(slotResetProfiles())); + connect(dialog, SIGNAL(updatePreviewSettings()), this, SLOT(slotUpdatePreviewSettings())); + //connect(dialog, SIGNAL(updatePreviewSettings()), this, SLOT(slotUpdatePreviewSettings())); dialog->show(); if (page != -1) dialog->showPage(page, option); } +void MainWindow::slotUpdatePreviewSettings() { + if (m_activeDocument) { + m_clipMonitor->slotSetXml(NULL, 0); + m_activeDocument->updatePreviewSettings(); + } +} + void MainWindow::updateConfiguration() { //TODO: we should apply settings to all projects, not only the current one if (m_activeTimeline) { @@ -1394,10 +1696,11 @@ void MainWindow::updateConfiguration() { } + void MainWindow::slotSwitchVideoThumbs() { KdenliveSettings::setVideothumbnails(!KdenliveSettings::videothumbnails()); if (m_activeTimeline) { - m_activeTimeline->refresh(); + m_activeTimeline->projectView()->slotUpdateAllThumbs(); } m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails()); } @@ -1440,26 +1743,120 @@ void MainWindow::slotChangeClipSpeed() { } void MainWindow::slotAddClipMarker() { - if (m_activeTimeline) { - m_activeTimeline->projectView()->slotAddClipMarker(); + DocClipBase *clip = NULL; + GenTime pos; + if (m_projectMonitor->isActive()) { + if (m_activeTimeline) { + ClipItem *item = m_activeTimeline->projectView()->getActiveClipUnderCursor(); + if (item) { + pos = m_projectMonitor->position() - item->startPos() + item->cropStart(); + clip = item->baseClip(); + } + } + } else { + clip = m_clipMonitor->activeClip(); + pos = m_clipMonitor->position(); + } + if (!clip) { + m_messageLabel->setMessage(i18n("Cannot find clip to add marker"), ErrorMessage); + return; + } + QString id = clip->getId(); + CommentedTime marker(pos, i18n("Marker")); + MarkerDialog d(clip, marker, m_activeDocument->timecode(), i18n("Add Marker"), this); + if (d.exec() == QDialog::Accepted) { + m_activeTimeline->projectView()->slotAddClipMarker(id, d.newMarker().time(), d.newMarker().comment()); } + if (m_clipMonitor->isActive()) m_clipMonitor->checkOverlay(); } void MainWindow::slotDeleteClipMarker() { - if (m_activeTimeline) { - m_activeTimeline->projectView()->slotDeleteClipMarker(); + DocClipBase *clip = NULL; + GenTime pos; + if (m_projectMonitor->isActive()) { + if (m_activeTimeline) { + ClipItem *item = m_activeTimeline->projectView()->getActiveClipUnderCursor(); + if (item) { + pos = m_projectMonitor->position() - item->startPos() + item->cropStart(); + clip = item->baseClip(); + } + } + } else { + clip = m_clipMonitor->activeClip(); + pos = m_clipMonitor->position(); + } + if (!clip) { + m_messageLabel->setMessage(i18n("Cannot find clip to remove marker"), ErrorMessage); + return; + } + + QString id = clip->getId(); + QString comment = clip->markerComment(pos); + if (comment.isEmpty()) { + m_messageLabel->setMessage(i18n("No marker found at cursor time"), ErrorMessage); + return; } + m_activeTimeline->projectView()->slotDeleteClipMarker(comment, id, pos); + if (m_clipMonitor->isActive()) m_clipMonitor->checkOverlay(); + } void MainWindow::slotDeleteAllClipMarkers() { - if (m_activeTimeline) { - m_activeTimeline->projectView()->slotDeleteAllClipMarkers(); + DocClipBase *clip = NULL; + if (m_projectMonitor->isActive()) { + if (m_activeTimeline) { + ClipItem *item = m_activeTimeline->projectView()->getActiveClipUnderCursor(); + if (item) { + clip = item->baseClip(); + } + } + } else { + clip = m_clipMonitor->activeClip(); } + if (!clip) { + m_messageLabel->setMessage(i18n("Cannot find clip to remove marker"), ErrorMessage); + return; + } + m_activeTimeline->projectView()->slotDeleteAllClipMarkers(clip->getId()); + if (m_clipMonitor->isActive()) m_clipMonitor->checkOverlay(); } void MainWindow::slotEditClipMarker() { - if (m_activeTimeline) { - m_activeTimeline->projectView()->slotEditClipMarker(); + DocClipBase *clip = NULL; + GenTime pos; + if (m_projectMonitor->isActive()) { + if (m_activeTimeline) { + ClipItem *item = m_activeTimeline->projectView()->getActiveClipUnderCursor(); + if (item) { + pos = m_projectMonitor->position() - item->startPos() + item->cropStart(); + clip = item->baseClip(); + } + } + } else { + clip = m_clipMonitor->activeClip(); + pos = m_clipMonitor->position(); + } + if (!clip) { + m_messageLabel->setMessage(i18n("Cannot find clip to remove marker"), ErrorMessage); + return; + } + + QString id = clip->getId(); + QString oldcomment = clip->markerComment(pos); + if (oldcomment.isEmpty()) { + m_messageLabel->setMessage(i18n("No marker found at cursor time"), ErrorMessage); + return; + } + + CommentedTime marker(pos, oldcomment); + MarkerDialog d(clip, marker, m_activeDocument->timecode(), i18n("Edit Marker"), this); + if (d.exec() == QDialog::Accepted) { + m_activeTimeline->projectView()->slotAddClipMarker(id, d.newMarker().time(), d.newMarker().comment()); + if (d.newMarker().time() != pos) { + // remove old marker + m_activeTimeline->projectView()->slotAddClipMarker(id, pos, QString()); + } + if (m_clipMonitor->isActive()) m_clipMonitor->checkOverlay(); } } @@ -1468,6 +1865,34 @@ void MainWindow::slotAddGuide() { m_activeTimeline->projectView()->slotAddGuide(); } +void MainWindow::slotInsertSpace() { + if (m_activeTimeline) + m_activeTimeline->projectView()->slotInsertSpace(); +} + +void MainWindow::slotRemoveSpace() { + if (m_activeTimeline) + m_activeTimeline->projectView()->slotRemoveSpace(); +} + +void MainWindow::slotInsertTrack(int ix) { + m_projectMonitor->activateMonitor(); + if (m_activeTimeline) + m_activeTimeline->projectView()->slotInsertTrack(ix); +} + +void MainWindow::slotDeleteTrack(int ix) { + m_projectMonitor->activateMonitor(); + if (m_activeTimeline) + m_activeTimeline->projectView()->slotDeleteTrack(ix); +} + +void MainWindow::slotChangeTrack(int ix) { + m_projectMonitor->activateMonitor(); + if (m_activeTimeline) + m_activeTimeline->projectView()->slotChangeTrack(ix); +} + void MainWindow::slotEditGuide() { if (m_activeTimeline) m_activeTimeline->projectView()->slotEditGuide(); @@ -1562,7 +1987,7 @@ void MainWindow::slotShowClipProperties(DocClipBase *clip) { doc.setContent(clip->getProperty("xmldata")); dia_ui->setXml(doc); if (dia_ui->exec() == QDialog::Accepted) { - QPixmap pix = dia_ui->renderedPixmap(); + QImage pix = dia_ui->renderedPixmap(); pix.save(path); //slotAddClipFile(KUrl("/tmp/kdenlivetitle.png"), QString(), -1); //m_clipManager->slotEditTextClipFile(id, dia_ui->xml().toString()); @@ -1602,22 +2027,22 @@ void MainWindow::slotActivateEffectStackView() { effectStack->raiseWindow(effectStackDock); } -void MainWindow::slotActivateTransitionView() { - transitionConfig->raiseWindow(transitionConfigDock); +void MainWindow::slotActivateTransitionView(Transition *t) { + if (t) transitionConfig->raiseWindow(transitionConfigDock); } void MainWindow::slotSnapRewind() { if (m_projectMonitor->isActive()) { if (m_activeTimeline) m_activeTimeline->projectView()->slotSeekToPreviousSnap(); - } + } else m_clipMonitor->slotSeekToPreviousSnap(); } void MainWindow::slotSnapForward() { if (m_projectMonitor->isActive()) { if (m_activeTimeline) m_activeTimeline->projectView()->slotSeekToNextSnap(); - } + } else m_clipMonitor->slotSeekToNextSnap(); } void MainWindow::slotClipStart() { @@ -1637,6 +2062,7 @@ void MainWindow::slotClipEnd() { void MainWindow::slotChangeTool(QAction * action) { if (action == m_buttonSelectTool) slotSetTool(SELECTTOOL); else if (action == m_buttonRazorTool) slotSetTool(RAZORTOOL); + else if (action == m_buttonSpacerTool) slotSetTool(SPACERTOOL); } void MainWindow::slotSetTool(PROJECTTOOL tool) { @@ -1793,4 +2219,32 @@ void MainWindow::slotSetOutPoint() { } else m_activeTimeline->projectView()->setOutPoint(); } +void MainWindow::slotGetNewStuff() { + //KNS::Entry::List download(); + KNS::Entry::List entries = KNS::Engine::download(); + int numberInstalled = 0; + // 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; + } + } + } + qDeleteAll(entries); + initEffects::refreshLumas(); +} + +void MainWindow::slotAutoTransition() { + m_activeTimeline->projectView()->autoTransition(); +} + +void MainWindow::slotDvdWizard(const QString &url, const QString &profile) { + DvdWizard *w = new DvdWizard(url, profile, this); + w->exec(); +} + + #include "mainwindow.moc"