X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmainwindow.cpp;h=f2fa6c322f2d26823d83c031a9ac94e3a4e44627;hb=7bdee3646c2dfbd8366093c8c9c6b8d675fa5bf1;hp=40a4d2c18b4f917fa954ec82cb9349a0e8da5389;hpb=c5e9fb057510f0595832ea3dad6e6ba96ea24eeb;p=kdenlive diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 40a4d2c1..f2fa6c32 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -74,11 +74,15 @@ #include "transitionsettings.h" #include "renderwidget.h" #include "renderer.h" +#ifndef NO_JOGSHUTTLE #include "jogshuttle.h" +#endif /* NO_JOGSHUTTLE */ #include "clipproperties.h" #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; @@ -96,9 +100,13 @@ EffectsList MainWindow::audioEffects; EffectsList MainWindow::customEffects; EffectsList MainWindow::transitions; -MainWindow::MainWindow(const QString &MltPath, QWidget *parent) +MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent) : KXmlGuiWindow(parent), - m_activeDocument(NULL), m_activeTimeline(NULL), m_renderWidget(NULL), m_jogProcess(NULL), m_findActivated(false), m_initialized(false) { + m_activeDocument(NULL), m_activeTimeline(NULL), m_renderWidget(NULL), +#ifndef NO_JOGSHUTTLE + m_jogProcess(NULL), +#endif /* NO_JOGSHUTTLE */ + m_findActivated(false), m_initialized(false) { setlocale(LC_NUMERIC, "POSIX"); setFont(KGlobalSettings::toolBarFont()); parseProfiles(MltPath); @@ -202,46 +210,59 @@ MainWindow::MainWindow(const QString &MltPath, QWidget *parent) tabifyDockWidget(clipMonitorDock, recMonitorDock); setCentralWidget(m_timelineArea); - setupGUI(Default, NULL /*"kdenliveui.rc"*/); - kDebug() << factory() << " " << factory()->container("video_effects_menu", this); + setupGUI(); + //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)), static_cast(factory()->container("marker_menu", this))); // build effects menus QAction *action; QMenu *videoEffectsMenu = static_cast(factory()->container("video_effects_menu", this)); - int ix = 0; - QStringList effects = videoEffects.effectNames(); QStringList effectInfo; - foreach(const QString &name, effects) { - action = new QAction(name, this); + QMap effectsList; + for (int ix = 0; ix < videoEffects.count(); ix++) { effectInfo = videoEffects.effectIdInfo(ix); - action->setData(effectInfo); + effectsList.insert(effectInfo.at(0).toLower(), effectInfo); + } + + foreach(QStringList value, effectsList) { + action = new QAction(value.at(0), this); + action->setData(value); videoEffectsMenu->addAction(action); - ix++; } + QMenu *audioEffectsMenu = static_cast(factory()->container("audio_effects_menu", this)); - ix = 0; - effects = audioEffects.effectNames(); - foreach(const QString &name, effects) { - action = new QAction(name, this); + + effectsList.clear(); + for (int ix = 0; ix < audioEffects.count(); ix++) { effectInfo = audioEffects.effectIdInfo(ix); - action->setData(effectInfo); + effectsList.insert(effectInfo.at(0).toLower(), effectInfo); + } + + foreach(QStringList value, effectsList) { + action = new QAction(value.at(0), this); + action->setData(value); audioEffectsMenu->addAction(action); - ix++; } + m_customEffectsMenu = static_cast(factory()->container("custom_effects_menu", this)); - effects = customEffects.effectNames(); - if (effects.isEmpty()) m_customEffectsMenu->setEnabled(false); + + if (customEffects.isEmpty()) m_customEffectsMenu->setEnabled(false); else m_customEffectsMenu->setEnabled(true); - ix = 0; - foreach(const QString &name, effects) { - action = new QAction(name, this); - effectInfo = videoEffects.effectIdInfo(ix); - action->setData(effectInfo); + effectsList.clear(); + for (int ix = 0; ix < customEffects.count(); ix++) { + effectInfo = customEffects.effectIdInfo(ix); + effectsList.insert(effectInfo.at(0).toLower(), effectInfo); + } + + foreach(QStringList value, effectsList) { + action = new QAction(value.at(0), this); + action->setData(value); m_customEffectsMenu->addAction(action); - ix++; } QMenu *newEffect = new QMenu(this); @@ -265,14 +286,22 @@ MainWindow::MainWindow(const QString &MltPath, QWidget *parent) QMenu *transitionsMenu = new QMenu(i18n("Add Transition"), this); - effects = transitions.effectNames(); - foreach(const QString &name, effects) { - action = new QAction(name, this); - action->setData(name); + QStringList effects = transitions.effectNames(); + + 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")); @@ -302,23 +331,23 @@ MainWindow::MainWindow(const QString &MltPath, QWidget *parent) m_monitorManager->initMonitors(m_clipMonitor, m_projectMonitor); slotConnectMonitors(); - setAutoSaveSettings(); - - if (KdenliveSettings::openlastproject()) { - openLastFile(); + // Open or create a file. Command line argument passed in Url has + // precedence, then "openlastproject", then just a plain empty file. + // If opening Url fails, openlastproject will _not_ be used. + if (!Url.isEmpty()) { + openFile(Url); } else { - /*QList staleFiles = KAutoSaveFile::allStaleFiles(); - if (!staleFiles.isEmpty()) { - if (KMessageBox::questionYesNo(this, i18n("Auto-saved files exist. Do you want to recover them now?"), i18n("File Recovery"), KGuiItem(i18n("Recover")), KGuiItem(i18n("Don't recover"))) == KMessageBox::Yes) { - recoverFiles(staleFiles); - } - else newFile(); + if (KdenliveSettings::openlastproject()) { + openLastFile(); } - else*/ - newFile(); + } + if (m_timelineArea->count() == 0) { + newFile(false); } +#ifndef NO_JOGSHUTTLE activateShuttleDevice(); +#endif /* NO_JOGSHUTTLE */ projectListDock->raise(); } @@ -335,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 @@ -374,6 +402,7 @@ void MainWindow::slotReloadEffects() { m_effectList->reloadEffectList(); } +#ifndef NO_JOGSHUTTLE void MainWindow::activateShuttleDevice() { if (m_jogProcess) delete m_jogProcess; m_jogProcess = NULL; @@ -419,13 +448,14 @@ void MainWindow::slotShuttleAction(int code) { break; } } +#endif /* NO_JOGSHUTTLE */ void MainWindow::configureNotifications() { KNotifyConfigWidget::configure(this); } 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) { @@ -435,7 +465,7 @@ void MainWindow::slotAddEffect(QDomElement effect, GenTime pos, int track) { return; } TrackView *currentTimeLine = (TrackView *) m_timelineArea->currentWidget(); - currentTimeLine->projectView()->slotAddEffect(effect, pos, track); + currentTimeLine->projectView()->slotAddEffect(effect.cloneNode().toElement(), pos, track); } void MainWindow::slotRaiseMonitor(bool clipMonitor) { @@ -505,16 +535,24 @@ void MainWindow::setupActions() { QString style1 = "QToolButton {background-color: rgba(230, 230, 230, 220); border-style: inset; border:1px solid #999999;border-radius: 3px;margin: 0px 3px;padding: 0px;} QToolButton:checked { background-color: rgba(224, 224, 0, 100); border-style: inset; border:1px solid #cc6666;border-radius: 3px;}"; - m_buttonSelectTool = toolbar->addAction(KIcon("kdenlive-select-tool"), i18n("Selection tool")); + m_buttonSelectTool = new KAction(KIcon("kdenlive-select-tool"), i18n("Selection tool"), this); + toolbar->addAction(m_buttonSelectTool); m_buttonSelectTool->setCheckable(true); m_buttonSelectTool->setChecked(true); - m_buttonRazorTool = toolbar->addAction(KIcon("edit-cut"), i18n("Razor tool")); + m_buttonRazorTool = new KAction(KIcon("edit-cut"), i18n("Razor tool"), this); + toolbar->addAction(m_buttonRazorTool); 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); @@ -527,11 +565,16 @@ 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 *))); toolbar->addSeparator(); - m_buttonFitZoom = toolbar->addAction(KIcon("zoom-fit-best"), i18n("Fit zoom to project")); + m_buttonFitZoom = new KAction(KIcon("zoom-fit-best"), i18n("Fit zoom to project"), this); + toolbar->addAction(m_buttonFitZoom); m_buttonFitZoom->setCheckable(false); connect(m_buttonFitZoom, SIGNAL(triggered()), this, SLOT(slotFitZoom())); @@ -559,22 +602,26 @@ void MainWindow::setupActions() { toolbar->addWidget(m_zoomSlider); - m_buttonVideoThumbs = toolbar->addAction(KIcon("kdenlive-show-videothumb"), i18n("Show video thumbnails")); + m_buttonVideoThumbs = new KAction(KIcon("kdenlive-show-videothumb"), i18n("Show video thumbnails"), this); + toolbar->addAction(m_buttonVideoThumbs); m_buttonVideoThumbs->setCheckable(true); m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails()); connect(m_buttonVideoThumbs, SIGNAL(triggered()), this, SLOT(slotSwitchVideoThumbs())); - m_buttonAudioThumbs = toolbar->addAction(KIcon("kdenlive-show-audiothumb"), i18n("Show audio thumbnails")); + m_buttonAudioThumbs = new KAction(KIcon("kdenlive-show-audiothumb"), i18n("Show audio thumbnails"), this); + toolbar->addAction(m_buttonAudioThumbs); m_buttonAudioThumbs->setCheckable(true); m_buttonAudioThumbs->setChecked(KdenliveSettings::audiothumbnails()); connect(m_buttonAudioThumbs, SIGNAL(triggered()), this, SLOT(slotSwitchAudioThumbs())); - m_buttonShowMarkers = toolbar->addAction(KIcon("kdenlive-show-markers"), i18n("Show markers comments")); + m_buttonShowMarkers = new KAction(KIcon("kdenlive-show-markers"), i18n("Show markers comments"), this); + toolbar->addAction(m_buttonShowMarkers); m_buttonShowMarkers->setCheckable(true); m_buttonShowMarkers->setChecked(KdenliveSettings::showmarkers()); connect(m_buttonShowMarkers, SIGNAL(triggered()), this, SLOT(slotSwitchMarkersComments())); - m_buttonSnap = toolbar->addAction(KIcon("kdenlive-snap"), i18n("Snap")); + m_buttonSnap = new KAction(KIcon("kdenlive-snap"), i18n("Snap"), this); + toolbar->addAction(m_buttonSnap); m_buttonSnap->setCheckable(true); m_buttonSnap->setChecked(KdenliveSettings::snaptopoints()); connect(m_buttonSnap, SIGNAL(triggered()), this, SLOT(slotSwitchSnap())); @@ -610,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); @@ -617,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())); @@ -638,6 +696,7 @@ void MainWindow::setupActions() { KAction* projectRender = new KAction(KIcon("media-record"), i18n("Render"), this); collection->addAction("project_render", projectRender); + projectRender->setShortcut(Qt::CTRL + Qt::Key_Return); connect(projectRender, SIGNAL(triggered(bool)), this, SLOT(slotRenderProject())); KAction* monitorPlay = new KAction(KIcon("media-playback-start"), i18n("Play"), this); @@ -688,12 +747,12 @@ void MainWindow::setupActions() { collection->addAction("seek_clip_end", clipEnd); connect(clipEnd, SIGNAL(triggered(bool)), this, SLOT(slotClipEnd())); - KAction* projectStart = new KAction(KIcon("media-seek-backward"), i18n("Go to Project Start"), this); + KAction* projectStart = new KAction(KIcon("go-first"), i18n("Go to Project Start"), this); projectStart->setShortcut(Qt::CTRL + Qt::Key_Home); collection->addAction("seek_start", projectStart); connect(projectStart, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotStart())); - KAction* projectEnd = new KAction(KIcon("media-seek-forward"), i18n("Go to Project End"), this); + KAction* projectEnd = new KAction(KIcon("go-last"), i18n("Go to Project End"), this); projectEnd->setShortcut(Qt::CTRL + Qt::Key_End); collection->addAction("seek_end", projectEnd); connect(projectEnd, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotEnd())); @@ -722,15 +781,15 @@ void MainWindow::setupActions() { collection->addAction("cut_timeline_clip", cutTimelineClip); connect(cutTimelineClip, SIGNAL(triggered(bool)), this, SLOT(slotCutTimelineClip())); - KAction* addClipMarker = new KAction(KIcon("bookmark-new"), i18n("Add Marker to Clip"), this); + KAction* addClipMarker = new KAction(KIcon("bookmark-new"), i18n("Add Marker"), this); collection->addAction("add_clip_marker", addClipMarker); connect(addClipMarker, SIGNAL(triggered(bool)), this, SLOT(slotAddClipMarker())); - KAction* deleteClipMarker = new KAction(KIcon("edit-delete"), i18n("Delete Marker from Clip"), this); + KAction* deleteClipMarker = new KAction(KIcon("edit-delete"), i18n("Delete Marker"), this); collection->addAction("delete_clip_marker", deleteClipMarker); connect(deleteClipMarker, SIGNAL(triggered(bool)), this, SLOT(slotDeleteClipMarker())); - KAction* deleteAllClipMarkers = new KAction(KIcon("edit-delete"), i18n("Delete All Markers from Clip"), this); + KAction* deleteAllClipMarkers = new KAction(KIcon("edit-delete"), i18n("Delete All Markers"), this); collection->addAction("delete_all_clip_markers", deleteAllClipMarkers); connect(deleteAllClipMarkers, SIGNAL(triggered(bool)), this, SLOT(slotDeleteAllClipMarkers())); @@ -738,6 +797,14 @@ 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 *addGuide = new KAction(KIcon("document-new"), i18n("Add Guide"), this); collection->addAction("add_guide", addGuide); connect(addGuide, SIGNAL(triggered()), this, SLOT(slotAddGuide())); @@ -758,39 +825,31 @@ void MainWindow::setupActions() { collection->addAction("paste_effects", pasteEffects); connect(pasteEffects , SIGNAL(triggered()), this, SLOT(slotPasteEffects())); - KStandardAction::quit(this, SLOT(queryQuit()), - collection); + m_closeAction = KStandardAction::close(this, SLOT(closeCurrentDocument()), collection); + + KStandardAction::quit(this, SLOT(queryQuit()), collection); - KStandardAction::open(this, SLOT(openFile()), - collection); + KStandardAction::open(this, SLOT(openFile()), collection); - m_saveAction = KStandardAction::save(this, SLOT(saveFile()), - collection); + m_saveAction = KStandardAction::save(this, SLOT(saveFile()), collection); - KStandardAction::saveAs(this, SLOT(saveFileAs()), - collection); + KStandardAction::saveAs(this, SLOT(saveFileAs()), collection); - KStandardAction::openNew(this, SLOT(newFile()), - collection); + KStandardAction::openNew(this, SLOT(newFile()), collection); - KStandardAction::preferences(this, SLOT(slotPreferences()), - collection); + KStandardAction::preferences(this, SLOT(slotPreferences()), collection); - KStandardAction::configureNotifications(this , SLOT(configureNotifications()) , collection); + KStandardAction::configureNotifications(this , SLOT(configureNotifications()), collection); - KStandardAction::copy(this, SLOT(slotCopy()), - collection); + KStandardAction::copy(this, SLOT(slotCopy()), collection); - KStandardAction::paste(this, SLOT(slotPaste()), - collection); + KStandardAction::paste(this, SLOT(slotPaste()), collection); - KAction *undo = KStandardAction::undo(m_commandStack, SLOT(undo()), - collection); + KAction *undo = KStandardAction::undo(m_commandStack, SLOT(undo()), collection); undo->setEnabled(false); connect(m_commandStack, SIGNAL(canUndoChanged(bool)), undo, SLOT(setEnabled(bool))); - KAction *redo = KStandardAction::redo(m_commandStack, SLOT(redo()), - collection); + KAction *redo = KStandardAction::redo(m_commandStack, SLOT(redo()), collection); redo->setEnabled(false); connect(m_commandStack, SIGNAL(canRedoChanged(bool)), redo, SLOT(setEnabled(bool))); @@ -810,6 +869,8 @@ void MainWindow::saveOptions() { KdenliveSettings::self()->writeConfig(); KSharedConfigPtr config = KGlobal::config(); m_fileOpenRecent->saveEntries(KConfigGroup(config, "Recent Files")); + KConfigGroup treecolumns(config, "Project Tree"); + treecolumns.writeEntry("columns", m_projectList->headerInfo()); config->sync(); } @@ -828,16 +889,23 @@ void MainWindow::readOptions() { ::exit(1); } } + KConfigGroup treecolumns(config, "Project Tree"); + const QByteArray state = treecolumns.readEntry("columns", QByteArray()); + if (!state.isEmpty()) + m_projectList->setHeaderInfo(state); } -void MainWindow::newFile() { +void MainWindow::newFile(bool showProjectSettings) { QString profileName; KUrl projectFolder; QPoint projectTracks(3, 2); - if (m_timelineArea->count() == 0) profileName = KdenliveSettings::default_profile(); - else { + if (!showProjectSettings && m_timelineArea->count() == 0) { + if (!KdenliveSettings::activatetabs()) closeCurrentDocument(); + profileName = KdenliveSettings::default_profile(); + } else { ProjectSettings *w = new ProjectSettings; if (w->exec() != QDialog::Accepted) return; + if (!KdenliveSettings::activatetabs()) closeCurrentDocument(); profileName = w->selectedProfile(); projectFolder = w->selectedFolder(); projectTracks = w->tracks(); @@ -851,6 +919,7 @@ void MainWindow::newFile() { connectDocumentInfo(doc); connectDocument(trackView, doc); } else m_timelineArea->setTabBarHidden(false); + m_closeAction->setEnabled(m_timelineArea->count() > 1); } void MainWindow::activateDocument() { @@ -863,6 +932,7 @@ void MainWindow::activateDocument() { void MainWindow::closeCurrentDocument() { QWidget *w = m_timelineArea->currentWidget(); + if (!w) return; // closing current document int ix = m_timelineArea->currentIndex() + 1; if (ix == m_timelineArea->count()) ix = 0; @@ -882,14 +952,23 @@ void MainWindow::closeCurrentDocument() { } } m_timelineArea->removeTab(m_timelineArea->indexOf(w)); - if (m_timelineArea->count() == 1) m_timelineArea->setTabBarHidden(true); + if (m_timelineArea->count() == 1) { + m_timelineArea->setTabBarHidden(true); + m_closeAction->setEnabled(false); + } delete docToClose; delete w; - if (m_timelineArea->count() == 0) m_activeDocument = NULL; + if (m_timelineArea->count() == 0) { + m_activeDocument = NULL; + effectStack->clear(); + 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; m_activeDocument->setUrl(KUrl(outputFileName)); if (m_activeDocument->m_autosave == NULL) { m_activeDocument->m_autosave = new KAutoSaveFile(KUrl(outputFileName), this); @@ -899,28 +978,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); @@ -929,11 +1021,28 @@ void MainWindow::openFile() { void MainWindow::openLastFile() { KSharedConfigPtr config = KGlobal::config(); KUrl::List urls = m_fileOpenRecent->urls(); - if (urls.isEmpty()) newFile(); + if (urls.isEmpty()) newFile(false); else openFile(urls.last()); } void MainWindow::openFile(const KUrl &url) { + // Check if the document is already opened + const int ct = m_timelineArea->count(); + bool isOpened = false; + int i; + for (i = 0; i < ct; i++) { + TrackView *tab = (TrackView *) m_timelineArea->widget(i); + KdenliveDoc *doc = tab->document(); + if (doc->url() == url) { + isOpened = true; + break; + } + } + if (isOpened) { + m_timelineArea->setCurrentIndex(i); + return; + } + // Check for backup file QList staleFiles = KAutoSaveFile::staleFiles(url); if (!staleFiles.isEmpty()) { @@ -1073,7 +1182,7 @@ void MainWindow::slotEditProjectSettings() { 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()); + 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 @@ -1086,7 +1195,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); @@ -1166,6 +1278,7 @@ void MainWindow::connectDocumentInfo(KdenliveDoc *doc) { void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //changed //m_projectMonitor->stop(); + m_closeAction->setEnabled(m_timelineArea->count() > 1); kDebug() << "/////////////////// CONNECTING DOC TO PROJECT VIEW ////////////////"; if (m_activeDocument) { if (m_activeDocument == doc) return; @@ -1182,10 +1295,10 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha disconnect(m_activeDocument, SIGNAL(updateClipDisplay(const QString &)), m_projectList, SLOT(slotUpdateClip(const QString &))); disconnect(m_activeDocument, SIGNAL(selectLastAddedClip(const QString &)), m_projectList, SLOT(slotSelectClip(const QString &))); disconnect(m_activeDocument, SIGNAL(deleteTimelineClip(const QString &)), m_activeTimeline, SLOT(slotDeleteClip(const QString &))); - disconnect(m_activeTimeline, SIGNAL(clipItemSelected(ClipItem*)), effectStack, SLOT(slotClipItemSelected(ClipItem*))); - disconnect(m_activeTimeline, SIGNAL(clipItemSelected(ClipItem*)), this, SLOT(slotActivateEffectStackView())); - disconnect(m_activeTimeline, SIGNAL(transitionItemSelected(Transition*)), transitionConfig, SLOT(slotTransitionItemSelected(Transition*))); - disconnect(m_activeTimeline, SIGNAL(transitionItemSelected(Transition*)), this, SLOT(slotActivateTransitionView())); + 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*, 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))); @@ -1198,6 +1311,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))); @@ -1212,8 +1326,8 @@ 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())); @@ -1232,10 +1346,10 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha connect(doc, SIGNAL(guidesUpdated()), this, SLOT(slotGuidesUpdated())); - connect(trackView, SIGNAL(clipItemSelected(ClipItem*)), effectStack, SLOT(slotClipItemSelected(ClipItem*))); - connect(trackView, SIGNAL(clipItemSelected(ClipItem*)), this, SLOT(slotActivateEffectStackView())); - connect(trackView, SIGNAL(transitionItemSelected(Transition*)), transitionConfig, SLOT(slotTransitionItemSelected(Transition*))); - connect(trackView, SIGNAL(transitionItemSelected(Transition*)), this, SLOT(slotActivateTransitionView())); + 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*, 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())); @@ -1251,6 +1365,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())); @@ -1260,12 +1375,12 @@ 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()); m_projectList->updateAllClips(); - doc->clipManager()->checkAudioThumbs(); + //doc->clipManager()->checkAudioThumbs(); //m_overView->setScene(trackView->projectScene()); //m_overView->scale(m_overView->width() / trackView->duration(), m_overView->height() / (50 * trackView->tracksNumber())); @@ -1285,7 +1400,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; } @@ -1308,7 +1425,9 @@ void MainWindow::updateConfiguration() { } m_buttonAudioThumbs->setChecked(KdenliveSettings::audiothumbnails()); m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails()); +#ifndef NO_JOGSHUTTLE activateShuttleDevice(); +#endif /* NO_JOGSHUTTLE */ } @@ -1340,7 +1459,7 @@ void MainWindow::slotSwitchMarkersComments() { void MainWindow::slotSwitchSnap() { KdenliveSettings::setSnaptopoints(!KdenliveSettings::snaptopoints()); - m_buttonShowMarkers->setChecked(KdenliveSettings::snaptopoints()); + m_buttonSnap->setChecked(KdenliveSettings::snaptopoints()); } @@ -1358,26 +1477,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(); } } @@ -1386,6 +1599,16 @@ 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::slotEditGuide() { if (m_activeTimeline) m_activeTimeline->projectView()->slotEditGuide(); @@ -1414,9 +1637,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()); } } @@ -1526,14 +1751,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() { @@ -1553,6 +1778,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) { @@ -1647,6 +1873,17 @@ void MainWindow::keyPressEvent(QKeyEvent *ke) { } else KXmlGuiWindow::keyPressEvent(ke); } + +/** Gets called when the window gets hidden */ +void MainWindow::hideEvent(QHideEvent *event) { + // kDebug() << "I was hidden"; + // issue http://www.kdenlive.org/mantis/view.php?id=231 + if (this->isMinimized()) { + // kDebug() << "I am minimized"; + if (m_monitorManager) m_monitorManager->stopActiveMonitor(); + } +} + bool MainWindow::eventFilter(QObject *obj, QEvent *event) { if (m_findActivated) { if (event->type() == QEvent::ShortcutOverride) { @@ -1698,4 +1935,5 @@ void MainWindow::slotSetOutPoint() { } else m_activeTimeline->projectView()->setOutPoint(); } + #include "mainwindow.moc"