X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmainwindow.cpp;h=7990b3b6cd7da381bd0c7ad40687009866de81c9;hb=6f8f092f36ef2a23f4d4cf44f75a48f219fcecc6;hp=66bbb10ae921deaea9ac52d18b1b272917936fc0;hpb=ffede793e6c2d7b7c94bfd74681486d0bbcd8bf5;p=kdenlive diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 66bbb10a..7990b3b6 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -176,22 +176,23 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent addDockWidget(Qt::TopDockWidgetArea, m_transitionConfigDock); KdenliveSettings::setCurrent_profile(KdenliveSettings::default_profile()); - m_fileOpenRecent = KStandardAction::openRecent(this, SLOT(openFile(const KUrl &)), - actionCollection()); + m_fileOpenRecent = KStandardAction::openRecent(this, SLOT(openFile(const KUrl &)), actionCollection()); readOptions(); + m_fileRevert = KStandardAction::revert(this, SLOT(slotRevert()), actionCollection()); + m_fileRevert->setEnabled(false); //slotDetectAudioDriver(); m_clipMonitorDock = new QDockWidget(i18n("Clip Monitor"), this); m_clipMonitorDock->setObjectName("clip_monitor"); - m_clipMonitor = new Monitor("clip", m_monitorManager, this); + m_clipMonitor = new Monitor("clip", m_monitorManager, QString(), this); m_clipMonitorDock->setWidget(m_clipMonitor); addDockWidget(Qt::TopDockWidgetArea, m_clipMonitorDock); //m_clipMonitor->stop(); m_projectMonitorDock = new QDockWidget(i18n("Project Monitor"), this); m_projectMonitorDock->setObjectName("project_monitor"); - m_projectMonitor = new Monitor("project", m_monitorManager, this); + m_projectMonitor = new Monitor("project", m_monitorManager, QString(), this); m_projectMonitorDock->setWidget(m_projectMonitor); addDockWidget(Qt::TopDockWidgetArea, m_projectMonitorDock); @@ -371,13 +372,12 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent // precedence, then "openlastproject", then just a plain empty file. // If opening Url fails, openlastproject will _not_ be used. if (!Url.isEmpty()) { - openFile(Url); - } else { - if (KdenliveSettings::openlastproject()) { - openLastFile(); - } - } - if (m_timelineArea->count() == 0) { + // delay loading so that the window shows up + m_startUrl = Url; + QTimer::singleShot(500, this, SLOT(openFile())); + } else if (KdenliveSettings::openlastproject()) { + QTimer::singleShot(500, this, SLOT(openLastFile())); + } else { //if (m_timelineArea->count() == 0) { newFile(false); } @@ -412,7 +412,7 @@ bool MainWindow::queryClose() if (m_renderWidget) { int waitingJobs = m_renderWidget->waitingJobsCount(); if (waitingJobs > 0) { - switch (KMessageBox::warningYesNoCancel(this, i18n("You have %1 rendering jobs waiting in the queue.\nWhat do you want to do with these jobs?", waitingJobs), QString(), KGuiItem(i18n("Start them now")), KGuiItem(i18n("Delete them")))) { + switch (KMessageBox::warningYesNoCancel(this, i18np("You have 1 rendering job waiting in the queue.\nWhat do you want to do with this job?", "You have %1 rendering jobs waiting in the queue.\nWhat do you want to do with these jobs?", waitingJobs), QString(), KGuiItem(i18n("Start them now")), KGuiItem(i18n("Delete them")))) { case KMessageBox::Yes : // create script with waiting jobs and start it if (m_renderWidget->startWaitingRenderJobs() == false) return false; @@ -637,7 +637,7 @@ void MainWindow::slotConnectMonitors() { m_projectList->setRenderer(m_projectMonitor->render); - connect(m_projectList, SIGNAL(receivedClipDuration(const QString &)), this, SLOT(slotUpdateClip(const QString &))); + //connect(m_projectList, SIGNAL(receivedClipDuration(const QString &)), this, SLOT(slotUpdateClip(const QString &))); connect(m_projectList, SIGNAL(showClipProperties(DocClipBase *)), this, SLOT(slotShowClipProperties(DocClipBase *))); connect(m_projectList, SIGNAL(getFileProperties(const QDomElement, const QString &, bool)), m_projectMonitor->render, SLOT(getFileProperties(const QDomElement, const QString &, bool))); connect(m_projectMonitor->render, SIGNAL(replyGetImage(const QString &, const QPixmap &)), m_projectList, SLOT(slotReplyGetImage(const QString &, const QPixmap &))); @@ -684,7 +684,7 @@ void MainWindow::setupActions() m_statusProgressBar->setMaximumWidth(150); m_statusProgressBar->setVisible(false); - KToolBar *toolbar = new KToolBar("statusToolBar", this, Qt::BottomToolBarArea); + KToolBar *toolbar = new KToolBar("statusToolBar", this, Qt::BottomToolBarArea); toolbar->setMovable(false); m_toolGroup = new QActionGroup(this); statusBar()->setStyleSheet(QString("QStatusBar QLabel {font-size:%1pt;} QStatusBar::item { border: 0px; font-size:%1pt;padding:0px; }").arg(statusBar()->font().pointSize())); @@ -853,6 +853,10 @@ void MainWindow::setupActions() projectRender->setShortcut(Qt::CTRL + Qt::Key_Return); connect(projectRender, SIGNAL(triggered(bool)), this, SLOT(slotRenderProject())); + KAction* projectClean = new KAction(KIcon("edit-clear"), i18n("Clean Project"), this); + collection->addAction("project_clean", projectClean); + connect(projectClean, SIGNAL(triggered(bool)), this, SLOT(slotCleanProject())); + KAction* monitorPlay = new KAction(KIcon("media-playback-start"), i18n("Play"), this); KShortcut playShortcut; playShortcut.setPrimary(Qt::Key_Space); @@ -875,7 +879,7 @@ void MainWindow::setupActions() collection->addAction("dvd_wizard", dvdWizard); connect(dvdWizard, SIGNAL(triggered(bool)), this, SLOT(slotDvdWizard())); - KAction *transcodeClip = new KAction(KIcon("edit-copy"), i18n("Transcode Clip"), this); + KAction *transcodeClip = new KAction(KIcon("edit-copy"), i18n("Transcode Clips"), this); collection->addAction("transcode_clip", transcodeClip); connect(transcodeClip, SIGNAL(triggered(bool)), this, SLOT(slotTranscodeClip())); @@ -1247,6 +1251,7 @@ void MainWindow::slotRunWizard() void MainWindow::newFile(bool showProjectSettings) { if (!m_timelineArea->isEnabled()) return; + m_fileRevert->setEnabled(false); QString profileName; KUrl projectFolder; QPoint projectTracks(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks()); @@ -1255,7 +1260,7 @@ void MainWindow::newFile(bool showProjectSettings) profileName = KdenliveSettings::default_profile(); projectFolder = KdenliveSettings::defaultprojectfolder(); } else { - ProjectSettings *w = new ProjectSettings(projectTracks.x(), projectTracks.y(), KdenliveSettings::defaultprojectfolder(), false, this); + ProjectSettings *w = new ProjectSettings(NULL, projectTracks.x(), projectTracks.y(), KdenliveSettings::defaultprojectfolder(), false, true, this); if (w->exec() != QDialog::Accepted) return; if (!KdenliveSettings::activatetabs()) closeCurrentDocument(); KdenliveSettings::setVideothumbnails(w->enableVideoThumbs()); @@ -1296,7 +1301,7 @@ void MainWindow::activateDocument() connectDocument(currentTab, currentDoc); } -void MainWindow::closeCurrentDocument() +void MainWindow::closeCurrentDocument(bool saveChanges) { QWidget *w = m_timelineArea->currentWidget(); if (!w) return; @@ -1306,7 +1311,7 @@ void MainWindow::closeCurrentDocument() m_timelineArea->setCurrentIndex(ix); TrackView *tabToClose = (TrackView *) w; KdenliveDoc *docToClose = tabToClose->document(); - if (docToClose && docToClose->isModified()) { + if (docToClose && docToClose->isModified() && saveChanges) { switch (KMessageBox::warningYesNoCancel(this, i18n("Save changes to document?"))) { case KMessageBox::Yes : // save document here. If saving fails, return false; @@ -1361,6 +1366,7 @@ bool MainWindow::saveFileAs(const QString &outputFileName) m_timelineArea->setTabToolTip(m_timelineArea->currentIndex(), m_activeDocument->url().path()); m_activeDocument->setModified(false); m_fileOpenRecent->addUrl(KUrl(outputFileName)); + m_fileRevert->setEnabled(true); return true; } @@ -1393,6 +1399,11 @@ bool MainWindow::saveFile() void MainWindow::openFile() { + if (!m_startUrl.isEmpty()) { + openFile(m_startUrl); + m_startUrl = KUrl(); + return; + } // Check that the Kdenlive mime type is correctly installed QString mimetype = "application/x-kdenlive"; KMimeType::Ptr mime = KMimeType::mimeType(mimetype); @@ -1450,12 +1461,15 @@ void MainWindow::openFile(const KUrl &url) } } if (!KdenliveSettings::activatetabs()) closeCurrentDocument(); + m_messageLabel->setMessage(i18n("Opening file %1", url.path()), InformationMessage); + qApp->processEvents(); doOpenFile(url, NULL); } void MainWindow::doOpenFile(const KUrl &url, KAutoSaveFile *stale) { if (!m_timelineArea->isEnabled()) return; + m_fileRevert->setEnabled(true); KdenliveDoc *doc = new KdenliveDoc(url, KdenliveSettings::defaultprojectfolder(), m_commandStack, KdenliveSettings::default_profile(), QPoint(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks()), m_projectMonitor->render, this); if (stale == NULL) { stale = new KAutoSaveFile(url, doc); @@ -1613,9 +1627,13 @@ void MainWindow::slotDetectAudioDriver() void MainWindow::slotEditProjectSettings() { QPoint p = m_activeDocument->getTracksCount(); - ProjectSettings *w = new ProjectSettings(p.x(), p.y(), m_activeDocument->projectFolder().path(), true, this); + ProjectSettings *w = new ProjectSettings(m_activeDocument->clipManager(), p.x(), p.y(), m_activeDocument->projectFolder().path(), true, !m_activeDocument->isModified(), this); if (w->exec() == QDialog::Accepted) { + if (w->deleteUnused()) { + // we are going to trash the unused clips + m_projectList->trashUnusedClips(); + } QString profile = w->selectedProfile(); m_activeDocument->setProjectFolder(w->selectedFolder()); if (m_renderWidget) m_renderWidget->setDocumentPath(w->selectedFolder().path(KUrl::AddTrailingSlash)); @@ -1627,7 +1645,7 @@ void MainWindow::slotEditProjectSettings() m_effectStack->slotClipItemSelected(NULL, 0); m_transitionConfig->slotTransitionItemSelected(NULL, 0, QPoint(), false); m_clipMonitor->slotSetXml(NULL, 0); - m_activeDocument->setProfilePath(profile); + bool updateFps = m_activeDocument->setProfilePath(profile); KdenliveSettings::setCurrent_profile(profile); KdenliveSettings::setProject_fps(m_activeDocument->fps()); setCaption(m_activeDocument->description(), m_activeDocument->isModified()); @@ -1641,8 +1659,9 @@ void MainWindow::slotEditProjectSettings() m_timelineArea->setTabText(m_timelineArea->currentIndex(), m_activeDocument->description()); //m_activeDocument->clipManager()->resetProducersList(m_projectMonitor->render->producersList()); if (dar != m_activeDocument->dar()) m_projectList->reloadClipThumbnails(); - m_activeTimeline->updateProjectFps(); - + if (updateFps) m_activeTimeline->updateProjectFps(); + m_activeDocument->setModified(true); + m_commandStack->activeStack()->clear(); // We need to desactivate & reactivate monitors to get a refresh //m_monitorManager->switchMonitors(); } @@ -1650,11 +1669,13 @@ void MainWindow::slotEditProjectSettings() delete w; } + void MainWindow::slotRenderProject() { if (!m_renderWidget) { QString projectfolder = m_activeDocument ? m_activeDocument->projectFolder().path(KUrl::AddTrailingSlash) : KdenliveSettings::defaultprojectfolder(); m_renderWidget = new RenderWidget(projectfolder, this); + connect(m_renderWidget, SIGNAL(shutdown()), this, SLOT(slotShutdown())); connect(m_renderWidget, SIGNAL(selectedRenderProfile(const QString &, const QString &, const QString&)), this, SLOT(slotSetDocumentRenderProfile(const QString &, const QString &, const QString&))); connect(m_renderWidget, SIGNAL(prepareRenderingData(bool, bool, const QString&)), this, SLOT(slotPrepareRendering(bool, bool, const QString&))); connect(m_renderWidget, SIGNAL(abortProcess(const QString &)), this, SIGNAL(abortRenderJob(const QString &))); @@ -1683,6 +1704,12 @@ void MainWindow::setRenderingFinished(const QString &url, int status, const QStr if (m_renderWidget) m_renderWidget->setRenderStatus(url, status, error); } +void MainWindow::slotCleanProject() +{ + if (KMessageBox::warningContinueCancel(this, i18n("This will remove all unused clips from your project."), i18n("Clean up project")) == KMessageBox::Cancel) return; + m_projectList->cleanup(); +} + void MainWindow::slotUpdateMousePosition(int pos) { if (m_activeDocument) @@ -1762,6 +1789,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha disconnect(m_activeTimeline->projectView(), SIGNAL(activateDocumentMonitor()), m_projectMonitor, SLOT(activateMonitor())); disconnect(m_activeTimeline, SIGNAL(zoneMoved(int, int)), this, SLOT(slotZoneMoved(int, int))); disconnect(m_projectList, SIGNAL(loadingIsOver()), m_activeTimeline->projectView(), SLOT(slotUpdateAllThumbs())); + disconnect(m_projectList, SIGNAL(displayMessage(const QString&, int)), this, SLOT(slotGotProgressInfo(const QString&, int))); m_effectStack->clear(); } //m_activeDocument->setRenderer(NULL); @@ -1803,6 +1831,8 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha connect(trackView->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), m_effectStack, SLOT(slotClipItemSelected(ClipItem*, int))); + connect(trackView->projectView(), SIGNAL(updateClipMarkers(DocClipBase *)), this, SLOT(slotUpdateClipMarkers(DocClipBase*))); + connect(trackView->projectView(), SIGNAL(clipItemSelected(ClipItem*, int)), this, SLOT(slotActivateEffectStackView())); connect(trackView->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, bool)), m_transitionConfig, SLOT(slotTransitionItemSelected(Transition*, int, QPoint, bool))); connect(trackView->projectView(), SIGNAL(transitionItemSelected(Transition*, int, QPoint, bool)), this, SLOT(slotActivateTransitionView(Transition *))); @@ -1810,6 +1840,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha 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(trackView, SIGNAL(setZoom(int)), this, SLOT(slotSetZoom(int))); connect(trackView->projectView(), SIGNAL(displayMessage(const QString&, MessageType)), m_messageLabel, SLOT(setMessage(const QString&, MessageType))); connect(trackView->projectView(), SIGNAL(showClipFrame(DocClipBase *, const int)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *, const int))); @@ -1827,6 +1858,8 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha connect(trackView->projectView(), SIGNAL(activateDocumentMonitor()), m_projectMonitor, SLOT(activateMonitor())); connect(trackView, SIGNAL(zoneMoved(int, int)), this, SLOT(slotZoneMoved(int, int))); connect(m_projectList, SIGNAL(loadingIsOver()), trackView->projectView(), SLOT(slotUpdateAllThumbs())); + connect(m_projectList, SIGNAL(displayMessage(const QString&, int)), this, SLOT(slotGotProgressInfo(const QString&, int))); + trackView->projectView()->setContextMenu(m_timelineContextMenu, m_timelineContextClipMenu, m_timelineContextTransitionMenu, m_clipTypeGroup); m_activeTimeline = trackView; @@ -1849,7 +1882,7 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) //cha m_saveAction->setEnabled(doc->isModified()); m_activeDocument = doc; m_activeTimeline->updateProjectFps(); - m_projectList->updateAllClips(); + m_activeDocument->checkProjectClips(); if (KdenliveSettings::dropbframes()) slotUpdatePreviewSettings(); // set tool to select tool @@ -1966,6 +1999,12 @@ void MainWindow::slotDeleteTimelineClip() } } +void MainWindow::slotUpdateClipMarkers(DocClipBase *clip) +{ + if (m_clipMonitor->isActive()) m_clipMonitor->checkOverlay(); + m_clipMonitor->updateMarkers(clip); +} + void MainWindow::slotAddClipMarker() { DocClipBase *clip = NULL; @@ -1974,7 +2013,7 @@ void MainWindow::slotAddClipMarker() if (m_activeTimeline) { ClipItem *item = m_activeTimeline->projectView()->getActiveClipUnderCursor(); if (item) { - pos = (m_projectMonitor->position() - item->startPos() + item->cropStart()) / item->speed(); + pos = GenTime((int)((m_projectMonitor->position() - item->startPos() + item->cropStart()).frames(m_activeDocument->fps()) * item->speed() + 0.5), m_activeDocument->fps()); clip = item->baseClip(); } } @@ -1992,7 +2031,6 @@ void MainWindow::slotAddClipMarker() 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() @@ -2023,8 +2061,6 @@ void MainWindow::slotDeleteClipMarker() return; } m_activeTimeline->projectView()->slotDeleteClipMarker(comment, id, pos); - if (m_clipMonitor->isActive()) m_clipMonitor->checkOverlay(); - } void MainWindow::slotDeleteAllClipMarkers() @@ -2045,7 +2081,6 @@ void MainWindow::slotDeleteAllClipMarkers() return; } m_activeTimeline->projectView()->slotDeleteAllClipMarkers(clip->getId()); - if (m_clipMonitor->isActive()) m_clipMonitor->checkOverlay(); } void MainWindow::slotEditClipMarker() @@ -2084,7 +2119,6 @@ void MainWindow::slotEditClipMarker() // remove old marker m_activeTimeline->projectView()->slotAddClipMarker(id, pos, QString()); } - if (m_clipMonitor->isActive()) m_clipMonitor->checkOverlay(); } } @@ -2227,6 +2261,11 @@ void MainWindow::slotFitZoom() } } +void MainWindow::slotSetZoom(int value) +{ + m_zoomSlider->setValue(value); +} + void MainWindow::slotGotProgressInfo(const QString &message, int progress) { m_statusProgressBar->setValue(progress); @@ -2304,7 +2343,10 @@ void MainWindow::slotShowClipProperties(DocClipBase *clip) if (dia_ui->exec() == QDialog::Accepted) { QMap newprops; newprops.insert("xmldata", dia_ui->xml().toString()); - newprops.insert("out", QString::number(dia_ui->duration())); + if (dia_ui->duration() != clip->duration().frames(m_activeDocument->fps()) - 1) { + // duration changed, we need to update duration + newprops.insert("out", QString::number(dia_ui->duration())); + } EditClipCommand *command = new EditClipCommand(m_projectList, clip->getId(), clip->properties(), newprops, true); m_activeDocument->commandStack()->push(command); m_activeTimeline->projectView()->slotUpdateClip(clip->getId()); @@ -2321,10 +2363,9 @@ void MainWindow::slotShowClipProperties(DocClipBase *clip) EditClipCommand *command = new EditClipCommand(m_projectList, clip->getId(), 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(clip->getId()); + m_activeTimeline->projectView()->slotUpdateClip(clip->getId(), dia.needsTimelineReload()); } } } @@ -2388,6 +2429,19 @@ void MainWindow::slotSetTool(PROJECTTOOL tool) { if (m_activeDocument && m_activeTimeline) { //m_activeDocument->setTool(tool); + QString message; + switch (tool) { + case SPACERTOOL: + message = i18n("Ctrl + click to use spacer on current track only"); + break; + case RAZORTOOL: + message = i18n("Click on a clip to cut it"); + break; + default: + message = i18n("Shift + click to create a selection rectangle, Ctrl + click to add an item to selection"); + break; + } + m_messageLabel->setMessage(message, InformationMessage); m_activeTimeline->projectView()->setTool(tool); } } @@ -2640,8 +2694,12 @@ void MainWindow::slotUpdateClipType(QAction *action) void MainWindow::slotDvdWizard(const QString &url, const QString &profile) { - DvdWizard *w = new DvdWizard(url, profile, this); - w->exec(); + // We must stop the monitors since we create a new on in the dvd wizard + m_clipMonitor->stop(); + m_projectMonitor->stop(); + DvdWizard w(url, profile, this); + w.exec(); + m_projectMonitor->start(); } void MainWindow::slotShowTimeline(bool show) @@ -2818,7 +2876,24 @@ void MainWindow::slotRemoveFocus() statusBar()->clearFocus(); } +void MainWindow::slotRevert() +{ + if (KMessageBox::warningContinueCancel(this, i18n("This will delete all changes made since you last saved your project. Are you sure you want to continue?"), i18n("Revert to last saved version")) == KMessageBox::Cancel) return; + KUrl url = m_activeDocument->url(); + closeCurrentDocument(false); + doOpenFile(url, NULL); +} +void MainWindow::slotShutdown() +{ + if (m_activeDocument) m_activeDocument->setModified(false); + // Call shutdown + QDBusConnectionInterface* interface = QDBusConnection::sessionBus().interface(); + if (interface && interface->isServiceRegistered("org.kde.ksmserver")) { + QDBusInterface smserver("org.kde.ksmserver", "/KSMServer", "org.kde.KSMServerInterface"); + smserver.call("logout", 1, 2, 2); + } +} #include "mainwindow.moc"