X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmainwindow.cpp;h=69c24e9dce2897faf7846e4cbfeabf079ed864cc;hb=010c83463c93a1cbf2658cced5d93b6d49a38bbc;hp=d214cd2f10d6b4dc6a78a148286519ad8c0526fc;hpb=b2a49357aaba842416da302dcc932b8eb94b7d18;p=kdenlive diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index d214cd2f..69c24e9d 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -81,6 +81,8 @@ #include "wizard.h" #include "editclipcommand.h" #include "titlewidget.h" +#include "markerdialog.h" +#include "clipitem.h" static const int ID_STATUS_MSG = 1; static const int ID_EDITMODE_MSG = 2; @@ -212,7 +214,7 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent //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_clipMonitor->setupMenu(static_cast(factory()->container("monitor_go", this)), static_cast(factory()->container("marker_menu", this))); // build effects menus QAction *action; @@ -285,13 +287,21 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent QMenu *transitionsMenu = new QMenu(i18n("Add Transition"), this); QStringList effects = transitions.effectNames(); - foreach(const QString &name, effects) { - action = new QAction(name, this); - action->setData(name); + + effectsList.clear(); + for (int ix = 0; ix < transitions.count(); ix++) { + effectInfo = transitions.effectIdInfo(ix); + effectsList.insert(effectInfo.at(0).toLower(), effectInfo); + } + foreach(QStringList value, effectsList) { + action = new QAction(value.at(0), this); + action->setData(value); transitionsMenu->addAction(action); } 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")); @@ -354,8 +364,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 @@ -446,7 +455,7 @@ void MainWindow::configureNotifications() { } void MainWindow::slotFullScreen() { - //KToggleFullScreenAction::setFullScreen(this, actionCollection()->action("fullscreen")->isChecked()); + KToggleFullScreenAction::setFullScreen(this, actionCollection()->action("fullscreen")->isChecked()); } void MainWindow::slotAddEffect(QDomElement effect, GenTime pos, int track) { @@ -536,8 +545,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); @@ -550,6 +565,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 *))); @@ -638,6 +657,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); @@ -645,6 +665,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())); @@ -767,6 +797,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())); @@ -850,6 +900,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()); @@ -860,12 +917,12 @@ void MainWindow::readOptions() { 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(); @@ -923,12 +980,17 @@ 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) { - m_projectMonitor->saveSceneList(outputFileName, m_activeDocument->documentInfoXml()); +bool MainWindow::saveFileAs(const QString &outputFileName) { + QDomDocument currentSceneList = m_projectMonitor->sceneList(); + if (m_activeDocument->saveSceneList(outputFileName, currentSceneList) == false) + 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); @@ -938,28 +1000,41 @@ 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() { - QString outputFile = KFileDialog::getSaveFileName(KUrl(), "*.kdenlive|Kdenlive project files (*.kdenlive)"); +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; } } void MainWindow::openFile() { - KUrl url = KFileDialog::getOpenUrl(KUrl(), "*.kdenlive|Kdenlive project files (*.kdenlive)\n*.westley|MLT project files (*.westley)"); + // Check that the Kdenlive mime type is correctly installed + QString mimetype = "application/x-kdenlive"; + KMimeType::Ptr mime = KMimeType::mimeType(mimetype); + if (!mime) mimetype = "*.kdenlive"; + + KUrl url = KFileDialog::getOpenUrl(KUrl(), mimetype); if (url.isEmpty()) return; m_fileOpenRecent->addUrl(url); openFile(url); @@ -1121,19 +1196,25 @@ 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->setDocumentStandard(m_activeDocument->getDocumentStandard()); - 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()); + + // We need to desactivate & reactivate monitors to get a refresh + m_monitorManager->switchMonitors(); + } } delete w; } @@ -1142,7 +1223,10 @@ 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))); - if (m_activeDocument) m_renderWidget->setGuides(m_activeDocument->guidesXml(), m_activeDocument->projectDuration()); + if (m_activeDocument) { + m_renderWidget->setProfile(m_activeDocument->mltProfile()); + m_renderWidget->setGuides(m_activeDocument->guidesXml(), m_activeDocument->projectDuration()); + } } /*TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget(); if (currentTab) m_renderWidget->setTimeline(currentTab); @@ -1232,8 +1316,10 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha 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(addProjectClip(DocClipBase *, bool)), m_projectList, SLOT(slotAddClip(DocClipBase *, bool))); 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 &))); @@ -1241,12 +1327,15 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha 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())); 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))); @@ -1255,6 +1344,7 @@ 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))); @@ -1269,16 +1359,19 @@ 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()); - effectStack->updateProjectFormat(doc->mltProfile()); + 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(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(addProjectClip(DocClipBase *, bool)), m_projectList, SLOT(slotAddClip(DocClipBase *, bool))); 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 &))); @@ -1291,8 +1384,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())); m_zoomSlider->setValue(doc->zoom()); connect(m_zoomSlider, SIGNAL(valueChanged(int)), trackView, SLOT(slotChangeZoom(int))); connect(trackView->projectView(), SIGNAL(zoomIn()), this, SLOT(slotZoomIn())); @@ -1308,6 +1401,7 @@ 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())); @@ -1317,7 +1411,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha trackView->projectView()->setContextMenu(m_timelineContextMenu, m_timelineContextClipMenu, m_timelineContextTransitionMenu); m_activeTimeline = trackView; - if (m_renderWidget) m_renderWidget->setDocumentStandard(doc->getDocumentStandard()); + if (m_renderWidget) m_renderWidget->setProfile(doc->mltProfile()); doc->setRenderer(m_projectMonitor->render); m_commandStack->setActiveStack(doc->commandStack()); KdenliveSettings::setProject_display_ratio(doc->dar()); @@ -1342,7 +1436,9 @@ void MainWindow::slotPreferences(int page, int option) { // cached, in which case you want to display the cached dialog // instead of creating another one if (KConfigDialog::showDialog("settings")) { - if (page != -1) static_cast (KConfigDialog::exists("settings"))->showPage(page, option); + KdenliveSettingsDialog* d = static_cast (KConfigDialog::exists("settings")); + if (page != -1) d->showPage(page, option); + d->checkProfile(); return; } @@ -1417,26 +1513,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(); } } @@ -1445,6 +1635,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(); @@ -1473,9 +1691,11 @@ void MainWindow::slotAddProjectClip(KUrl url) { void MainWindow::slotAddTransition(QAction *result) { if (!result) return; - QDomElement effect = transitions.getEffectByName(result->data().toString()); - if (m_activeTimeline) { - m_activeTimeline->projectView()->slotAddTransitionToSelectedClips(effect); + QStringList info = result->data().toStringList(); + if (info.isEmpty()) return; + QDomElement transition = transitions.getEffectByTag(info.at(1), info.at(2)); + if (m_activeTimeline && !transition.isNull()) { + m_activeTimeline->projectView()->slotAddTransitionToSelectedClips(transition.cloneNode().toElement()); } } @@ -1585,14 +1805,14 @@ 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() { @@ -1612,6 +1832,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) { @@ -1768,4 +1989,5 @@ void MainWindow::slotSetOutPoint() { } else m_activeTimeline->projectView()->setOutPoint(); } + #include "mainwindow.moc"