X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmainwindow.cpp;h=d7107d1a5c2039dd08a03b8c870e84479b184844;hb=a04d51e10a7b1fcfde9407fbab1feb1be6b568e7;hp=a45f030195eff2cfc78686b01986d93fef02ba4f;hpb=059a756716f3d4e91e07a006e4fc343899c310db;p=kdenlive diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index a45f0301..d7107d1a 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -88,7 +89,7 @@ EffectsList MainWindow::transitions; MainWindow::MainWindow(QWidget *parent) : KXmlGuiWindow(parent), - m_activeDocument(NULL), m_activeTimeline(NULL), m_renderWidget(NULL), m_jogProcess(NULL) { + m_activeDocument(NULL), m_activeTimeline(NULL), m_renderWidget(NULL), m_jogProcess(NULL), m_findActivated(false) { setlocale(LC_NUMERIC, "POSIX"); parseProfiles(); setFont(KGlobalSettings::toolBarFont()); @@ -105,6 +106,9 @@ MainWindow::MainWindow(QWidget *parent) m_timelineArea->setCornerWidget(closeTabButton); connect(m_timelineArea, SIGNAL(currentChanged(int)), this, SLOT(activateDocument())); + connect(&m_findTimer, SIGNAL(timeout()), this, SLOT(findTimeout())); + m_findTimer.setSingleShot(true); + initEffects::parseEffectFiles(); m_monitorManager = new MonitorManager(); @@ -165,20 +169,21 @@ MainWindow::MainWindow(QWidget *parent) m_undoView->setGroup(m_commandStack); addDockWidget(Qt::TopDockWidgetArea, undoViewDock); - overviewDock = new QDockWidget(i18n("Project Overview"), this); - overviewDock->setObjectName("project_overview"); + //overviewDock = new QDockWidget(i18n("Project Overview"), this); + //overviewDock->setObjectName("project_overview"); //m_overView = new CustomTrackView(NULL, NULL, this); //overviewDock->setWidget(m_overView); - addDockWidget(Qt::TopDockWidgetArea, overviewDock); + //addDockWidget(Qt::TopDockWidgetArea, overviewDock); setupActions(); - tabifyDockWidget(projectListDock, effectListDock); + //tabifyDockWidget(projectListDock, effectListDock); tabifyDockWidget(projectListDock, effectStackDock); tabifyDockWidget(projectListDock, transitionConfigDock); - tabifyDockWidget(projectListDock, undoViewDock); + //tabifyDockWidget(projectListDock, undoViewDock); projectListDock->raise(); tabifyDockWidget(clipMonitorDock, projectMonitorDock); + tabifyDockWidget(clipMonitorDock, recMonitorDock); setCentralWidget(m_timelineArea); setupGUI(Default, NULL /*"kdenliveui.rc"*/); @@ -216,15 +221,27 @@ MainWindow::MainWindow(QWidget *parent) m_timelineContextClipMenu = new QMenu(this); m_timelineContextTransitionMenu = new QMenu(this); - action = actionCollection()->action("delete_timeline_clip"); - m_timelineContextClipMenu->addAction(action); - action = actionCollection()->action("add_clip_marker"); - m_timelineContextClipMenu->addAction(action); + + QMenu *transitionsMenu = new QMenu(i18n("Add Transition"), this); + effects = transitions.effectNames(); + foreach(const QString &name, effects) { + action = new QAction(name, this); + action->setData(name); + transitionsMenu->addAction(action); + } + connect(transitionsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddTransition(QAction *))); + + m_timelineContextClipMenu->addAction(actionCollection()->action("delete_timeline_clip")); + m_timelineContextClipMenu->addAction(actionCollection()->action("cut_timeline_clip")); + + QMenu *markersMenu = (QMenu*)(factory()->container("marker_menu", this)); + m_timelineContextClipMenu->addMenu(markersMenu); + m_timelineContextClipMenu->addMenu(transitionsMenu); m_timelineContextClipMenu->addMenu(videoEffectsMenu); m_timelineContextClipMenu->addMenu(audioEffectsMenu); m_timelineContextClipMenu->addMenu(customEffectsMenu); - m_timelineContextTransitionMenu->addAction(action); + m_timelineContextTransitionMenu->addAction(actionCollection()->action("delete_timeline_clip")); connect(projectMonitorDock, SIGNAL(visibilityChanged(bool)), m_projectMonitor, SLOT(refreshMonitor(bool))); connect(clipMonitorDock, SIGNAL(visibilityChanged(bool)), m_clipMonitor, SLOT(refreshMonitor(bool))); @@ -235,7 +252,13 @@ MainWindow::MainWindow(QWidget *parent) slotConnectMonitors(); setAutoSaveSettings(); - newFile(); + + if (KdenliveSettings::openlastproject()) { + KSharedConfigPtr config = KGlobal::config(); + QString Lastproject = config->group("Recent Files").readPathEntry("File1", QString()); + openFile(KUrl(Lastproject)); + + } else newFile(); activateShuttleDevice(); } @@ -335,12 +358,12 @@ void MainWindow::slotSetClipDuration(int id, int duration) { void MainWindow::slotConnectMonitors() { m_projectList->setRenderer(m_clipMonitor->render); - connect(m_projectList, SIGNAL(clipSelected(const QDomElement &)), m_clipMonitor, SLOT(slotSetXml(const QDomElement &))); connect(m_projectList, SIGNAL(receivedClipDuration(int, int)), this, SLOT(slotSetClipDuration(int, int))); connect(m_projectList, SIGNAL(showClipProperties(DocClipBase *)), this, SLOT(slotShowClipProperties(DocClipBase *))); connect(m_projectList, SIGNAL(getFileProperties(const QDomElement &, int)), m_clipMonitor->render, SLOT(getFileProperties(const QDomElement &, int))); connect(m_clipMonitor->render, SIGNAL(replyGetImage(int, int, const QPixmap &, int, int)), m_projectList, SLOT(slotReplyGetImage(int, int, const QPixmap &, int, int))); connect(m_clipMonitor->render, SIGNAL(replyGetFileProperties(int, const QMap < QString, QString > &, const QMap < QString, QString > &)), m_projectList, SLOT(slotReplyGetFileProperties(int, const QMap < QString, QString > &, const QMap < QString, QString > &))); + connect(m_clipMonitor, SIGNAL(refreshClipThumbnail(int)), m_projectList, SLOT(slotRefreshClipThumbnail(int))); } void MainWindow::setupActions() { @@ -354,7 +377,6 @@ void MainWindow::setupActions() { statusProgressBar->setMaximum(100); statusProgressBar->setMaximumWidth(150); statusProgressBar->setVisible(false); - statusLabel = new QLabel(this); QWidget *w = new QWidget; @@ -366,7 +388,7 @@ void MainWindow::setupActions() { m_toolGroup = new QActionGroup(this); - QString style1 = "QToolButton { background-color: rgba(230, 230, 230, 20); border-style: inset; border:1px solid #666666;border-radius: 3px;margin: 0px 3px} QToolButton:checked { background-color: rgba(224, 0, 0, 100); border-style: inset; border:1px solid #666666;border-radius: 3px;}"; + 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->setCheckable(true); @@ -379,6 +401,17 @@ void MainWindow::setupActions() { m_toolGroup->addAction(m_buttonSelectTool); m_toolGroup->addAction(m_buttonRazorTool); m_toolGroup->setExclusive(true); + toolbar->setToolButtonStyle(Qt::ToolButtonIconOnly); + + QWidget * actionWidget; + actionWidget = toolbar->widgetForAction(m_buttonSelectTool); + actionWidget->setMaximumWidth(24); + actionWidget->setMinimumHeight(17); + + actionWidget = toolbar->widgetForAction(m_buttonRazorTool); + actionWidget->setMaximumWidth(24); + actionWidget->setMinimumHeight(17); + toolbar->setStyleSheet(style1); connect(m_toolGroup, SIGNAL(triggered(QAction *)), this, SLOT(slotChangeTool(QAction *))); @@ -387,65 +420,106 @@ void MainWindow::setupActions() { m_buttonFitZoom->setCheckable(false); connect(m_buttonFitZoom, SIGNAL(triggered()), this, SLOT(slotFitZoom())); + actionWidget = toolbar->widgetForAction(m_buttonFitZoom); + actionWidget->setMaximumWidth(24); + actionWidget->setMinimumHeight(17); + m_zoomSlider = new QSlider(Qt::Horizontal, this); m_zoomSlider->setMaximum(13); m_zoomSlider->setMaximumWidth(150); m_zoomSlider->setMinimumWidth(100); - const int contentHeight = QFontMetrics(w->font()).height() + 3; - QString style = "QSlider::groove:horizontal { border: 1px solid #999999;height: 8px }"; - style.append("QSlider::handle:horizontal { background-color: white; border: 1px solid #999999;width: 8px;margin: -2px 0;border-radius: 3px; }"); + const int contentHeight = QFontMetrics(w->font()).height() + 8; + QString style = "QSlider::groove:horizontal { background-color: rgba(230, 230, 230, 220);border: 1px solid #999999;height: 8px;border-radius: 3px;margin-top:3px }"; + style.append("QSlider::handle:horizontal { background-color: white; border: 1px solid #999999;width: 9px;margin: -2px 0;border-radius: 3px; }"); m_zoomSlider->setStyleSheet(style); //m_zoomSlider->setMaximumHeight(contentHeight); //m_zoomSlider->height() + 5; - statusBar()->setMinimumHeight(contentHeight + 5); + statusBar()->setMinimumHeight(contentHeight); toolbar->addWidget(m_zoomSlider); - m_buttonVideoThumbs = toolbar->addAction(KIcon("video-mpeg"), i18n("Show videoo thumbnails")); + m_buttonVideoThumbs = toolbar->addAction(KIcon("kdenlive-show-videothumb"), i18n("Show video thumbnails")); m_buttonVideoThumbs->setCheckable(true); - m_buttonVideoThumbs->setChecked(KdenliveSettings::audiothumbnails()); + m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails()); connect(m_buttonVideoThumbs, SIGNAL(triggered()), this, SLOT(slotSwitchVideoThumbs())); - m_buttonAudioThumbs = toolbar->addAction(KIcon("audio-mpeg"), i18n("Show audio thumbnails")); + m_buttonAudioThumbs = toolbar->addAction(KIcon("kdenlive-show-audiothumb"), i18n("Show audio thumbnails")); m_buttonAudioThumbs->setCheckable(true); - m_buttonAudioThumbs->setChecked(KdenliveSettings::videothumbnails()); + m_buttonAudioThumbs->setChecked(KdenliveSettings::audiothumbnails()); connect(m_buttonAudioThumbs, SIGNAL(triggered()), this, SLOT(slotSwitchAudioThumbs())); - m_buttonShowMarkers = toolbar->addAction(KIcon("audio-mpeg"), i18n("Show markers comments")); + m_buttonShowMarkers = toolbar->addAction(KIcon("kdenlive-show-markers"), i18n("Show markers comments")); 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->setCheckable(true); + m_buttonSnap->setChecked(KdenliveSettings::snaptopoints()); + connect(m_buttonSnap, SIGNAL(triggered()), this, SLOT(slotSwitchSnap())); layout->addWidget(toolbar); - statusBar()->insertPermanentWidget(0, statusProgressBar, 1); - statusBar()->insertPermanentWidget(1, statusLabel, 1); + + actionWidget = toolbar->widgetForAction(m_buttonVideoThumbs); + actionWidget->setMaximumWidth(24); + actionWidget->setMinimumHeight(17); + + actionWidget = toolbar->widgetForAction(m_buttonAudioThumbs); + actionWidget->setMaximumWidth(24); + actionWidget->setMinimumHeight(17); + + actionWidget = toolbar->widgetForAction(m_buttonShowMarkers); + actionWidget->setMaximumWidth(24); + actionWidget->setMinimumHeight(17); + + actionWidget = toolbar->widgetForAction(m_buttonSnap); + actionWidget->setMaximumWidth(24); + actionWidget->setMinimumHeight(17); + + m_messageLabel = new StatusBarMessageLabel(this); + m_messageLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::MinimumExpanding); + + statusBar()->addWidget(m_messageLabel, 10); + statusBar()->addWidget(statusProgressBar, 0); statusBar()->insertPermanentWidget(ID_TIMELINE_BUTTONS, w); statusBar()->insertPermanentFixedItem("00:00:00:00", ID_TIMELINE_POS); statusBar()->insertPermanentWidget(ID_TIMELINE_FORMAT, m_timecodeFormat); statusBar()->setMaximumHeight(statusBar()->font().pointSize() * 4); + m_messageLabel->hide(); actionCollection()->addAction("select_tool", m_buttonSelectTool); actionCollection()->addAction("razor_tool", m_buttonRazorTool); - KAction* clearAction = new KAction(KIcon("document-new"), i18n("Clear"), this); - clearAction->setShortcut(Qt::CTRL + Qt::Key_W); - actionCollection()->addAction("clear", clearAction); - /*connect(clearAction, SIGNAL(triggered(bool)), - textArea, SLOT(clear()));*/ + actionCollection()->addAction("show_video_thumbs", m_buttonVideoThumbs); + actionCollection()->addAction("show_audio_thumbs", m_buttonAudioThumbs); + actionCollection()->addAction("show_markers", m_buttonShowMarkers); + actionCollection()->addAction("snap", m_buttonSnap); + actionCollection()->addAction("zoom_fit", m_buttonFitZoom); + + m_projectSearch = new KAction(KIcon("edit-find"), i18n("Find"), this); + actionCollection()->addAction("project_find", m_projectSearch); + connect(m_projectSearch, SIGNAL(triggered(bool)), this, SLOT(slotFind())); + m_projectSearch->setShortcut(Qt::Key_Slash); + + m_projectSearchNext = new KAction(KIcon("go-down-search"), i18n("Find Next"), this); + actionCollection()->addAction("project_find_next", m_projectSearchNext); + connect(m_projectSearchNext, SIGNAL(triggered(bool)), this, SLOT(slotFindNext())); + m_projectSearchNext->setShortcut(Qt::Key_F3); + m_projectSearchNext->setEnabled(false); KAction* profilesAction = new KAction(KIcon("document-new"), i18n("Manage Profiles"), this); actionCollection()->addAction("manage_profiles", profilesAction); connect(profilesAction, SIGNAL(triggered(bool)), this, SLOT(slotEditProfiles())); - KAction* projectAction = new KAction(KIcon("document-new"), i18n("Project Settings"), this); + KAction* projectAction = new KAction(KIcon("configure"), i18n("Project Settings"), this); actionCollection()->addAction("project_settings", projectAction); connect(projectAction, SIGNAL(triggered(bool)), this, SLOT(slotEditProjectSettings())); - KAction* projectRender = new KAction(KIcon("document-new"), i18n("Render Project"), this); + KAction* projectRender = new KAction(KIcon("media-record"), i18n("Render"), this); actionCollection()->addAction("project_render", projectRender); connect(projectRender, SIGNAL(triggered(bool)), this, SLOT(slotRenderProject())); @@ -474,6 +548,26 @@ void MainWindow::setupActions() { actionCollection()->addAction("monitor_seek_forward", monitorSeekForward); connect(monitorSeekForward, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotForward())); + KAction* clipStart = new KAction(KIcon("media-seek-backward"), i18n("Go to Clip Start"), this); + clipStart->setShortcut(Qt::Key_Home); + actionCollection()->addAction("seek_clip_start", clipStart); + connect(clipStart, SIGNAL(triggered(bool)), this, SLOT(slotClipStart())); + + KAction* clipEnd = new KAction(KIcon("media-seek-forward"), i18n("Go to Clip End"), this); + clipEnd->setShortcut(Qt::Key_End); + actionCollection()->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); + projectStart->setShortcut(Qt::CTRL + Qt::Key_Home); + actionCollection()->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); + projectEnd->setShortcut(Qt::CTRL + Qt::Key_End); + actionCollection()->addAction("seek_end", projectEnd); + connect(projectEnd, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotEnd())); + KAction* monitorSeekForwardOneFrame = new KAction(KIcon("media-skip-forward"), i18n("Forward 1 Frame"), this); monitorSeekForwardOneFrame->setShortcut(Qt::Key_Right); actionCollection()->addAction("monitor_seek_forward-one-frame", monitorSeekForwardOneFrame); @@ -494,10 +588,38 @@ void MainWindow::setupActions() { actionCollection()->addAction("cut_timeline_clip", cutTimelineClip); connect(cutTimelineClip, SIGNAL(triggered(bool)), this, SLOT(slotCutTimelineClip())); - KAction* addClipMarker = new KAction(KIcon("edit-delete"), i18n("Add Marker to Clip"), this); + KAction* addClipMarker = new KAction(KIcon("bookmark-new"), i18n("Add Marker to Clip"), this); actionCollection()->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); + actionCollection()->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); + actionCollection()->addAction("delete_all_clip_markers", deleteAllClipMarkers); + connect(deleteAllClipMarkers, SIGNAL(triggered(bool)), this, SLOT(slotDeleteAllClipMarkers())); + + KAction* editClipMarker = new KAction(KIcon("document-properties"), i18n("Edit Marker"), this); + actionCollection()->addAction("edit_clip_marker", editClipMarker); + connect(editClipMarker, SIGNAL(triggered(bool)), this, SLOT(slotEditClipMarker())); + + KAction *addGuide = new KAction(KIcon("document-new"), i18n("Add Guide"), this); + actionCollection()->addAction("add_guide", addGuide); + connect(addGuide, SIGNAL(triggered()), this, SLOT(slotAddGuide())); + + QAction *delGuide = new KAction(KIcon("edit-delete"), i18n("Delete Guide"), this); + actionCollection()->addAction("delete_guide", delGuide); + connect(delGuide, SIGNAL(triggered()), this, SLOT(slotDeleteGuide())); + + QAction *editGuide = new KAction(KIcon("document-properties"), i18n("Edit Guide"), this); + actionCollection()->addAction("edit_guide", editGuide); + connect(editGuide, SIGNAL(triggered()), this, SLOT(slotEditGuide())); + + QAction *delAllGuides = new KAction(KIcon("edit-delete"), i18n("Delete All Guides"), this); + actionCollection()->addAction("delete_all_guides", delAllGuides); + connect(delAllGuides, SIGNAL(triggered()), this, SLOT(slotDeleteAllGuides())); + KStandardAction::quit(this, SLOT(queryQuit()), actionCollection()); @@ -570,19 +692,23 @@ void MainWindow::newFile() { projectFolder = w->selectedFolder(); delete w; } - MltVideoProfile prof = ProfilesDialog::getVideoProfile(profileName); + MltVideoProfile prof; + if (!profileName.isEmpty()) prof = ProfilesDialog::getVideoProfile(profileName); + else prof = ProfilesDialog::getVideoProfile("dv_pal"); if (prof.width == 0) prof = ProfilesDialog::getVideoProfile("dv_pal"); - KdenliveDoc *doc = new KdenliveDoc(KUrl(), projectFolder, prof, m_commandStack); + KdenliveDoc *doc = new KdenliveDoc(KUrl(), projectFolder, prof, m_commandStack, this); TrackView *trackView = new TrackView(doc, this); m_timelineArea->addTab(trackView, KIcon("kdenlive"), i18n("Untitled") + " / " + prof.description); - if (m_timelineArea->count() == 1) + if (m_timelineArea->count() == 1) { + connectDocumentInfo(doc); connectDocument(trackView, doc); - else m_timelineArea->setTabBarHidden(false); + } else m_timelineArea->setTabBarHidden(false); } void MainWindow::activateDocument() { TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget(); KdenliveDoc *currentDoc = currentTab->document(); + connectDocumentInfo(currentDoc); connectDocument(currentTab, currentDoc); } @@ -601,7 +727,7 @@ void MainWindow::slotRemoveTab() { } void MainWindow::saveFileAs(const QString &outputFileName) { - m_projectMonitor->saveSceneList(outputFileName, m_activeDocument->documentInfoXml()); + m_projectMonitor->saveSceneList(outputFileName, m_activeDocument->documentInfoXml(m_activeTimeline->projectView()->xmlInfo())); m_activeDocument->setUrl(KUrl(outputFileName)); setCaption(m_activeDocument->description()); m_timelineArea->setTabText(m_timelineArea->currentIndex(), m_activeDocument->description()); @@ -610,7 +736,7 @@ void MainWindow::saveFileAs(const QString &outputFileName) { } void MainWindow::saveFileAs() { - QString outputFile = KFileDialog::getSaveFileName(); + QString outputFile = KFileDialog::getSaveFileName(KUrl(), "*.kdenlive|Kdenlive project files (*.kdenlive)"); if (QFile::exists(outputFile)) { if (KMessageBox::questionYesNo(this, i18n("File already exists.\nDo you want to overwrite it ?")) == KMessageBox::No) return; } @@ -627,7 +753,7 @@ void MainWindow::saveFile() { } void MainWindow::openFile() { //changed - KUrl url = KFileDialog::getOpenUrl(KUrl(), "application/vnd.kde.kdenlive;*.kdenlive"); + KUrl url = KFileDialog::getOpenUrl(KUrl(), "*.kdenlive|Kdenlive project files (*.kdenlive)\n*.westley|MLT project files (*.westley)"); if (url.isEmpty()) return; m_fileOpenRecent->addUrl(url); openFile(url); @@ -637,11 +763,13 @@ void MainWindow::openFile(const KUrl &url) { //new //TODO: get video profile from url before opening it MltVideoProfile prof = ProfilesDialog::getVideoProfile(KdenliveSettings::default_profile()); if (prof.width == 0) prof = ProfilesDialog::getVideoProfile("dv_pal"); - KdenliveDoc *doc = new KdenliveDoc(url, KUrl(), prof, m_commandStack); + KdenliveDoc *doc = new KdenliveDoc(url, KUrl(), prof, m_commandStack, this); + connectDocumentInfo(doc); TrackView *trackView = new TrackView(doc, this); m_timelineArea->setCurrentIndex(m_timelineArea->addTab(trackView, KIcon("kdenlive"), doc->description())); m_timelineArea->setTabToolTip(m_timelineArea->currentIndex(), doc->url().path()); if (m_timelineArea->count() > 1) m_timelineArea->setTabBarHidden(false); + slotGotProgressInfo(QString(), -1); //connectDocument(trackView, doc); } @@ -676,7 +804,7 @@ void MainWindow::parseProfiles() { getUrl->exec(); KUrl mltPath = getUrl->selectedUrl(); delete getUrl; - if (mltPath.isEmpty()) exit(1); + if (mltPath.isEmpty()) kapp->quit(); KdenliveSettings::setMltpath(mltPath.path()); QStringList profilesList = QDir(KdenliveSettings::mltpath()).entryList(profilesFilter, QDir::Files); } @@ -688,7 +816,7 @@ void MainWindow::parseProfiles() { getUrl->exec(); KUrl rendererPath = getUrl->selectedUrl(); delete getUrl; - if (rendererPath.isEmpty()) exit(1); + if (rendererPath.isEmpty()) kapp->quit(); KdenliveSettings::setRendererpath(rendererPath.path()); } @@ -752,7 +880,10 @@ void MainWindow::slotDoRender(const QString &dest, const QString &render, const args << "-erase"; if (zoneOnly) args << "in=" + QString::number(in) << "out=" + QString::number(out); QString videoPlayer = "-"; - if (playAfter) videoPlayer = "kmplayer"; + if (playAfter) { + videoPlayer = KdenliveSettings::defaultplayerapp(); + if (videoPlayer.isEmpty()) KMessageBox::sorry(this, i18n("Cannot play video after rendering because the default video player application is not set.\nPlease define it in Kdenlive settings dialog.")); + } args << "inigo" << m_activeDocument->profilePath() << render << videoPlayer << temp.fileName() << dest << avformat_args; QProcess::startDetached("kdenlive_render", args); } @@ -780,6 +911,14 @@ void MainWindow::slotUpdateDocumentState(bool modified) { } } +void MainWindow::connectDocumentInfo(KdenliveDoc *doc) { + if (m_activeDocument) { + if (m_activeDocument == doc) return; + disconnect(m_activeDocument, SIGNAL(progressInfo(const QString &, int)), this, SLOT(slotGotProgressInfo(const QString &, int))); + } + connect(doc, SIGNAL(progressInfo(const QString &, int)), this, SLOT(slotGotProgressInfo(const QString &, int))); +} + void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //changed //m_projectMonitor->stop(); kDebug() << "/////////////////// CONNECTING DOC TO PROJECT VIEW ////////////////"; @@ -795,28 +934,30 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha disconnect(m_activeDocument, SIGNAL(updateClipDisplay(int)), m_projectList, SLOT(slotUpdateClip(int))); disconnect(m_activeDocument, SIGNAL(refreshClipThumbnail(int)), m_projectList, SLOT(slotRefreshClipThumbnail(int))); disconnect(m_activeDocument, SIGNAL(deletTimelineClip(int)), m_activeTimeline, SLOT(slotDeleteClip(int))); - disconnect(m_activeDocument, SIGNAL(thumbsProgress(KUrl, int)), this, SLOT(slotGotProgressInfo(KUrl, int))); disconnect(m_activeTimeline, SIGNAL(clipItemSelected(ClipItem*)), effectStack, SLOT(slotClipItemSelected(ClipItem*))); - disconnect(trackView, SIGNAL(clipItemSelected(ClipItem*)), this, SLOT(slotActivateEffectStackView())); + disconnect(m_activeTimeline, SIGNAL(clipItemSelected(ClipItem*)), this, SLOT(slotActivateEffectStackView())); disconnect(m_activeTimeline, SIGNAL(transitionItemSelected(Transition*)), transitionConfig, SLOT(slotTransitionItemSelected(Transition*))); - disconnect(trackView, SIGNAL(transitionItemSelected(Transition*)), this, SLOT(slotActivateTransitionView())); + disconnect(m_activeTimeline, SIGNAL(transitionItemSelected(Transition*)), 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_activeDocument, SIGNAL(docModified(bool)), this, SLOT(slotUpdateDocumentState(bool))); - disconnect(effectStack, SIGNAL(updateClipEffect(ClipItem*, QDomElement, QDomElement)), m_activeTimeline->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, QDomElement, QDomElement))); + 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))); - disconnect(effectStack, SIGNAL(changeEffectState(ClipItem*, QDomElement, bool)), m_activeTimeline->projectView(), SLOT(slotChangeEffectState(ClipItem*, QDomElement, bool))); + disconnect(effectStack, SIGNAL(changeEffectState(ClipItem*, int, bool)), m_activeTimeline->projectView(), SLOT(slotChangeEffectState(ClipItem*, int, bool))); disconnect(effectStack, SIGNAL(changeEffectPosition(ClipItem*, int, int)), trackView->projectView(), SLOT(slotChangeEffectPosition(ClipItem*, int, int))); disconnect(effectStack, SIGNAL(refreshEffectStack(ClipItem*)), m_activeTimeline->projectView(), SLOT(slotRefreshEffects(ClipItem*))); disconnect(transitionConfig, SIGNAL(transitionUpdated(Transition *, QDomElement)), trackView->projectView() , SLOT(slotTransitionUpdated(Transition *, QDomElement))); disconnect(m_activeTimeline->projectView(), SIGNAL(activateDocumentMonitor()), m_projectMonitor, SLOT(activateMonitor())); } m_activeDocument->setRenderer(NULL); - disconnect(m_projectList, SIGNAL(clipSelected(const QDomElement &)), m_clipMonitor, SLOT(slotSetXml(const QDomElement &))); + disconnect(m_projectList, SIGNAL(clipSelected(DocClipBase *)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *))); m_clipMonitor->stop(); } m_monitorManager->resetProfiles(doc->profilePath()); m_projectList->setDocument(doc); - connect(m_projectList, SIGNAL(clipSelected(const QDomElement &)), m_clipMonitor, SLOT(slotSetXml(const QDomElement &))); + connect(m_projectList, SIGNAL(clipSelected(DocClipBase *)), m_clipMonitor, SLOT(slotSetXml(DocClipBase *))); connect(trackView, SIGNAL(cursorMoved()), m_projectMonitor, SLOT(activateMonitor())); connect(trackView, SIGNAL(mousePosition(int)), this, SLOT(slotUpdateMousePosition(int))); connect(m_projectMonitor, SIGNAL(renderPosition(int)), trackView, SLOT(moveCursorPos(int))); @@ -828,7 +969,6 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha connect(doc, SIGNAL(refreshClipThumbnail(int)), m_projectList, SLOT(slotRefreshClipThumbnail(int))); connect(doc, SIGNAL(deletTimelineClip(int)), trackView, SLOT(slotDeleteClip(int))); - connect(doc, SIGNAL(thumbsProgress(KUrl, int)), this, SLOT(slotGotProgressInfo(KUrl, int))); connect(doc, SIGNAL(docModified(bool)), this, SLOT(slotUpdateDocumentState(bool))); @@ -841,9 +981,14 @@ 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(effectStack, SIGNAL(updateClipEffect(ClipItem*, QDomElement, QDomElement)), trackView->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, QDomElement, QDomElement))); + 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))); + + + connect(effectStack, SIGNAL(updateClipEffect(ClipItem*, QDomElement, QDomElement, int)), trackView->projectView(), SLOT(slotUpdateClipEffect(ClipItem*, QDomElement, QDomElement, int))); connect(effectStack, SIGNAL(removeEffect(ClipItem*, QDomElement)), trackView->projectView(), SLOT(slotDeleteEffect(ClipItem*, QDomElement))); - connect(effectStack, SIGNAL(changeEffectState(ClipItem*, QDomElement, bool)), trackView->projectView(), SLOT(slotChangeEffectState(ClipItem*, QDomElement, bool))); + connect(effectStack, SIGNAL(changeEffectState(ClipItem*, int, bool)), trackView->projectView(), SLOT(slotChangeEffectState(ClipItem*, int, bool))); 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))); @@ -855,6 +1000,9 @@ void MainWindow::connectDocument(TrackView *trackView, KdenliveDoc *doc) { //cha m_monitorManager->setTimecode(doc->timecode()); doc->setRenderer(m_projectMonitor->render); m_commandStack->setActiveStack(doc->commandStack()); + + doc->updateAllProjectClips(); + if (m_commandStack->isClean()) kDebug() << "//////////// UNDO STACK IS CLEAN"; else kDebug() << "//////////// UNDO STACK IS NOT CLEAN*******************"; @@ -882,11 +1030,10 @@ void MainWindow::slotPreferences() { void MainWindow::updateConfiguration() { //TODO: we should apply settings to all projects, not only the current one - TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget(); - if (currentTab) { - currentTab->refresh(); - currentTab->projectView()->checkAutoScroll(); - currentTab->projectView()->checkTrackHeight(); + if (m_activeTimeline) { + m_activeTimeline->refresh(); + m_activeTimeline->projectView()->checkAutoScroll(); + m_activeTimeline->projectView()->checkTrackHeight(); if (m_activeDocument) m_activeDocument->clipManager()->checkAudioThumbs(); } m_buttonAudioThumbs->setChecked(KdenliveSettings::audiothumbnails()); @@ -897,19 +1044,17 @@ void MainWindow::updateConfiguration() { void MainWindow::slotSwitchVideoThumbs() { KdenliveSettings::setVideothumbnails(!KdenliveSettings::videothumbnails()); - TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget(); - if (currentTab) { - currentTab->refresh(); + if (m_activeTimeline) { + m_activeTimeline->refresh(); } m_buttonVideoThumbs->setChecked(KdenliveSettings::videothumbnails()); } void MainWindow::slotSwitchAudioThumbs() { KdenliveSettings::setAudiothumbnails(!KdenliveSettings::audiothumbnails()); - TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget(); - if (currentTab) { - currentTab->refresh(); - currentTab->projectView()->checkAutoScroll(); + if (m_activeTimeline) { + m_activeTimeline->refresh(); + m_activeTimeline->projectView()->checkAutoScroll(); if (m_activeDocument) m_activeDocument->clipManager()->checkAudioThumbs(); } m_buttonAudioThumbs->setChecked(KdenliveSettings::audiothumbnails()); @@ -917,34 +1062,71 @@ void MainWindow::slotSwitchAudioThumbs() { void MainWindow::slotSwitchMarkersComments() { KdenliveSettings::setShowmarkers(!KdenliveSettings::showmarkers()); - TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget(); - if (currentTab) { - currentTab->refresh(); + if (m_activeTimeline) { + m_activeTimeline->refresh(); } m_buttonShowMarkers->setChecked(KdenliveSettings::showmarkers()); } - +void MainWindow::slotSwitchSnap() { + KdenliveSettings::setSnaptopoints(!KdenliveSettings::snaptopoints()); + m_buttonShowMarkers->setChecked(KdenliveSettings::snaptopoints()); +} void MainWindow::slotDeleteTimelineClip() { - TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget(); - if (currentTab) { - currentTab->projectView()->deleteSelectedClips(); + if (m_activeTimeline) { + m_activeTimeline->projectView()->deleteSelectedClips(); } } void MainWindow::slotAddClipMarker() { - TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget(); - if (currentTab) { - currentTab->projectView()->slotAddClipMarker(); + if (m_activeTimeline) { + m_activeTimeline->projectView()->slotAddClipMarker(); + } +} + +void MainWindow::slotDeleteClipMarker() { + if (m_activeTimeline) { + m_activeTimeline->projectView()->slotDeleteClipMarker(); + } +} + +void MainWindow::slotDeleteAllClipMarkers() { + if (m_activeTimeline) { + m_activeTimeline->projectView()->slotDeleteAllClipMarkers(); } } +void MainWindow::slotEditClipMarker() { + if (m_activeTimeline) { + m_activeTimeline->projectView()->slotEditClipMarker(); + } +} + +void MainWindow::slotAddGuide() { + if (m_activeTimeline) + m_activeTimeline->projectView()->slotAddGuide(); +} + +void MainWindow::slotEditGuide() { + if (m_activeTimeline) + m_activeTimeline->projectView()->slotEditGuide(); +} + +void MainWindow::slotDeleteGuide() { + if (m_activeTimeline) + m_activeTimeline->projectView()->slotDeleteGuide(); +} + +void MainWindow::slotDeleteAllGuides() { + if (m_activeTimeline) + m_activeTimeline->projectView()->slotDeleteAllGuides(); +} + void MainWindow::slotCutTimelineClip() { - TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget(); - if (currentTab) { - currentTab->projectView()->cutSelectedClips(); + if (m_activeTimeline) { + m_activeTimeline->projectView()->cutSelectedClips(); } } @@ -953,6 +1135,14 @@ void MainWindow::slotAddProjectClip(KUrl url) { m_activeDocument->slotAddClipFile(url, QString()); } +void MainWindow::slotAddTransition(QAction *result) { + if (!result) return; + QDomElement effect = transitions.getEffectByName(result->data().toString()); + if (m_activeTimeline) { + m_activeTimeline->projectView()->slotAddTransitionToSelectedClips(effect); + } +} + void MainWindow::slotAddVideoEffect(QAction *result) { if (!result) return; QDomElement effect = videoEffects.getEffectByName(result->data().toString()); @@ -980,19 +1170,18 @@ void MainWindow::slotZoomOut() { } void MainWindow::slotFitZoom() { - TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget(); - if (currentTab) { - m_zoomSlider->setValue(currentTab->fitZoom()); + if (m_activeTimeline) { + m_zoomSlider->setValue(m_activeTimeline->fitZoom()); } } -void MainWindow::slotGotProgressInfo(KUrl url, int progress) { +void MainWindow::slotGotProgressInfo(const QString &message, int progress) { statusProgressBar->setValue(progress); - if (progress > 0) { - statusLabel->setText(tr("Creating Audio Thumbs")); + if (progress >= 0) { + if (!message.isEmpty()) m_messageLabel->setMessage(message, InformationMessage);//statusLabel->setText(message); statusProgressBar->setVisible(true); } else { - statusLabel->setText(""); + m_messageLabel->setMessage(QString(), DefaultMessage); statusProgressBar->setVisible(false); } } @@ -1003,12 +1192,12 @@ void MainWindow::slotShowClipProperties(DocClipBase *clip) { return; } ClipProperties dia(clip, m_activeDocument->timecode(), m_activeDocument->fps(), this); + connect(&dia, SIGNAL(addMarker(int, GenTime, QString)), m_activeTimeline->projectView(), SLOT(slotAddClipMarker(int, GenTime, QString))); if (dia.exec() == QDialog::Accepted) { m_projectList->slotUpdateClipProperties(dia.clipId(), dia.properties()); if (dia.needsTimelineRefresh()) { // update clip occurences in timeline - TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget(); - currentTab->projectView()->slotUpdateClip(dia.clipId()); + m_activeTimeline->projectView()->slotUpdateClip(dia.clipId()); } } } @@ -1029,15 +1218,29 @@ void MainWindow::slotActivateTransitionView() { void MainWindow::slotSnapRewind() { if (m_monitorManager->projectMonitorFocused()) { - TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget(); - currentTab->projectView()->slotSeekToPreviousSnap(); + if (m_activeTimeline) + m_activeTimeline->projectView()->slotSeekToPreviousSnap(); } } void MainWindow::slotSnapForward() { if (m_monitorManager->projectMonitorFocused()) { - TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget(); - currentTab->projectView()->slotSeekToNextSnap(); + if (m_activeTimeline) + m_activeTimeline->projectView()->slotSeekToNextSnap(); + } +} + +void MainWindow::slotClipStart() { + if (m_monitorManager->projectMonitorFocused()) { + if (m_activeTimeline) + m_activeTimeline->projectView()->clipStart(); + } +} + +void MainWindow::slotClipEnd() { + if (m_monitorManager->projectMonitorFocused()) { + if (m_activeTimeline) + m_activeTimeline->projectView()->clipEnd(); } } @@ -1047,10 +1250,93 @@ void MainWindow::slotChangeTool(QAction * action) { } void MainWindow::slotSetTool(PROJECTTOOL tool) { - if (m_activeDocument) { + if (m_activeDocument && m_activeTimeline) { //m_activeDocument->setTool(tool); - TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget(); - currentTab->projectView()->setTool(tool); + m_activeTimeline->projectView()->setTool(tool); + } +} + +void MainWindow::slotFind() { + m_projectSearch->setEnabled(false); + m_findActivated = true; + m_findString = QString(); + TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget(); + currentTab->projectView()->initSearchStrings(); + statusBar()->showMessage(i18n("Starting -- find text as you type")); + m_findTimer.start(5000); + qApp->installEventFilter(this); +} + +void MainWindow::slotFindNext() { + if (m_activeTimeline && m_activeTimeline->projectView()->findNextString(m_findString)) { + statusBar()->showMessage(i18n("Found : %1", m_findString)); + } else { + statusBar()->showMessage(i18n("Reached end of project")); + } + m_findTimer.start(4000); +} + +void MainWindow::findAhead() { + if (m_activeTimeline && m_activeTimeline->projectView()->findString(m_findString)) { + m_projectSearchNext->setEnabled(true); + statusBar()->showMessage(i18n("Found : %1", m_findString)); + } else { + m_projectSearchNext->setEnabled(false); + statusBar()->showMessage(i18n("Not found : %1", m_findString)); + } +} + +void MainWindow::findTimeout() { + m_projectSearchNext->setEnabled(false); + m_findActivated = false; + m_findString = QString(); + statusBar()->showMessage(i18n("Find stopped"), 3000); + if (m_activeTimeline) m_activeTimeline->projectView()->clearSearchStrings(); + m_projectSearch->setEnabled(true); + removeEventFilter(this); +} + +void MainWindow::keyPressEvent(QKeyEvent *ke) { + if (m_findActivated) { + if (ke->key() == Qt::Key_Backspace) { + m_findString = m_findString.left(m_findString.length() - 1); + + if (!m_findString.isEmpty()) { + findAhead(); + } else { + findTimeout(); + } + + m_findTimer.start(4000); + ke->accept(); + return; + } else if (ke->key() == Qt::Key_Escape) { + findTimeout(); + ke->accept(); + return; + } else if (ke->key() == Qt::Key_Space || !ke->text().trimmed().isEmpty()) { + m_findString += ke->text(); + + findAhead(); + + m_findTimer.start(4000); + ke->accept(); + return; + } + } else KXmlGuiWindow::keyPressEvent(ke); +} + +bool MainWindow::eventFilter(QObject *obj, QEvent *event) { + if (m_findActivated) { + if (event->type() == QEvent::ShortcutOverride) { + QKeyEvent* ke = (QKeyEvent*) event; + if (ke->text().trimmed().isEmpty()) return false; + ke->accept(); + return true; + } else return false; + } else { + // pass the event on to the parent class + return QMainWindow::eventFilter(obj, event); } }