From 0053daab28e4b2010b9484cd42f2e9a0cb5bd2e8 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Wed, 8 Apr 2009 23:18:39 +0000 Subject: [PATCH] Missing file from previous commit + mark document as modified when dragging a clip to timeline svn path=/trunk/kdenlive/; revision=3265 --- src/clipmanager.cpp | 5 ++++- src/customtrackview.cpp | 1 + src/docclipbase.cpp | 8 ++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/clipmanager.cpp b/src/clipmanager.cpp index c43b583d..b591d8f0 100644 --- a/src/clipmanager.cpp +++ b/src/clipmanager.cpp @@ -185,8 +185,11 @@ DocClipBase *ClipManager::getClipById(QString clipId) DocClipBase *ClipManager::getClipByResource(QString resource) { + QString clipResource; for (int i = 0; i < m_clipList.count(); i++) { - if (m_clipList.at(i)->getProperty("resource") == resource) { + clipResource = m_clipList.at(i)->getProperty("resource"); + if (clipResource.isEmpty()) clipResource = m_clipList.at(i)->getProperty("colour"); + if (clipResource == resource) { return m_clipList.at(i); } } diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 7abfe7c2..2bdb7f51 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -1659,6 +1659,7 @@ void CustomTrackView::dropEvent(QDropEvent * event) m_document->renderer()->mltInsertClip(info, item->xml(), item->baseClip()->producer(item->track())); item->setSelected(true); } + m_document->setModified(true); m_changeSpeedAction->setEnabled(hasVideoClip); m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); groupSelectedItems(true); diff --git a/src/docclipbase.cpp b/src/docclipbase.cpp index be815389..b11ba095 100644 --- a/src/docclipbase.cpp +++ b/src/docclipbase.cpp @@ -33,7 +33,7 @@ #include -DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, const QString &id) : +DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, const QString &id, bool placeHolder) : QObject(), audioFrameChache(), m_description(), @@ -47,6 +47,7 @@ DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, const QStrin m_thumbProd(NULL), m_audioThumbCreated(false), m_id(id), + m_placeHolder(placeHolder), m_properties() { int type = xml.attribute("type").toInt(); @@ -758,5 +759,8 @@ bool DocClipBase::slotGetAudioThumbs() return true; } - +bool DocClipBase::isPlaceHolder() const +{ + return m_placeHolder; +} -- 2.39.2