adjustSize();
}
+int ClipProperties::clipId() {
+ return m_clip->getId();
+}
+
+QMap <QString, QString> ClipProperties::properties() {
+ QMap <QString, QString> props;
+ props["description"] = m_view.clip_description->text();
+ return props;
+}
+
#include "clipproperties.moc"
public:
ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidget * parent = 0);
-
+ QMap <QString, QString> properties();
+ int clipId();
private slots:
#include "clipmanager.h"
DocClipBase::DocClipBase(ClipManager *clipManager, QDomElement xml, uint id):
- m_xml(xml), m_id(id), m_description(""), m_refcount(0), m_projectThumbFrame(0), m_audioThumbCreated(false), m_duration(GenTime()), m_thumbProd(NULL), m_audioTimer(NULL) {
+ m_id(id), m_description(QString()), m_refcount(0), m_projectThumbFrame(0), m_audioThumbCreated(false), m_duration(GenTime()), m_thumbProd(NULL), m_audioTimer(NULL) {
int type = xml.attribute("type").toInt();
m_clipType = (CLIPTYPE) type;
m_name = xml.attribute("name");
- m_xml.setAttribute("id", QString::number(id));
+ m_id = id;
+
+ QDomNamedNodeMap attributes = xml.attributes();
+ for (unsigned int i = 0; i < attributes.count(); i++) {
+ m_properties.insert(attributes.item(i).nodeName(), attributes.item(i).nodeValue());
+ }
+
KUrl url = KUrl(xml.attribute("resource"));
int out = xml.attribute("out").toInt();
- if (out != 0) setDuration(GenTime(out, 25));
+ if (out != 0) {
+ setDuration(GenTime(out, 25));
+ //m_properties.insert("out", QString::number(out));
+ }
if (m_name.isEmpty()) m_name = url.fileName();
if (!url.isEmpty()) {
DocClipBase::DocClipBase(const DocClipBase& clip) {
- m_xml = clip.toXML();
m_id = clip.getId();
m_clipType = clip.clipType();
m_name = clip.name();
m_duration = clip.duration();
m_audioThumbCreated = clip.audioThumbCreated();
+ m_properties = clip.properties();
}
DocClipBase & DocClipBase::operator=(const DocClipBase & clip) {
DocClipBase::operator=(clip);
- m_xml = clip.toXML();
m_id = clip.getId();
m_clipType = clip.clipType();
m_name = clip.name();
m_duration = clip.duration();
m_audioThumbCreated = clip.audioThumbCreated();
+ m_properties = clip.properties();
return *this;
}
m_audioThumbCreated = false;
}
-void DocClipBase::setGroup(const QString name, const QString id) {
- m_xml.setAttribute("groupname", name);
- m_xml.setAttribute("groupid", id);
-}
-
KThumb *DocClipBase::thumbProducer() {
return m_thumbProd;
}
}
KUrl DocClipBase::fileURL() const {
- QString res = m_xml.attribute("resource");
+ QString res = m_properties.value("resource");
if (m_clipType != COLOR && !res.isEmpty()) return KUrl(res);
return KUrl();
}
return m_projectThumbFrame;
}
-void DocClipBase::setDescription(const QString & description) {
- m_description = description;
-}
-
-const QString & DocClipBase::description() const {
- return m_description;
+const QString DocClipBase::description() const {
+ return m_properties.value("description");
}
void DocClipBase::setDuration(GenTime dur) {
// virtual
QDomElement DocClipBase::toXML() const {
- /*
- QDomDocument doc;
+ QDomDocument doc;
+
+ QDomElement clip = doc.createElement("producer");
- QDomElement clip = doc.createElement("kdenliveclip");
- QDomText text = doc.createTextNode(description());
- clip.appendChild(text);
- doc.appendChild(clip);
- */
- return m_xml;
+ QMapIterator<QString, QString> i(m_properties);
+ while (i.hasNext()) {
+ i.next();
+ if (!i.value().isEmpty()) clip.setAttribute(i.key(), i.value());
+ }
+ //doc.appendChild(clip);
+ //kDebug()<<"/// CLIP XML: "<<doc.toString();
+ return clip;
}
DocClipBase *DocClipBase::
endl;
} else {
// setup DocClipBase specifics of the clip.
- clip->setDescription(description);
+ QMap <QString, QString> props;
+ props.insert("description", description);
+ clip->setProperties(props);
clip->setAudioThumbCreated(false);
}
return clip;
}
void DocClipBase::setProperties(QMap <QString, QString> properties) {
- m_properties = properties;
+ QMapIterator<QString, QString> i(properties);
+ while (i.hasNext()) {
+ i.next();
+ m_properties.insert(i.key(), i.value());
+ }
}
-QMap <QString, QString> DocClipBase::properties() {
+QMap <QString, QString> DocClipBase::properties() const {
return m_properties;
}
/** returns the name of this clip. */
const QString & name() const;
- /** Sets the description for this clip. */
- void setDescription(const QString & descripton);
-
/** Returns the description of this clip. */
- const QString & description() const;
+ const QString description() const;
/** Returns the internal unique id of the clip. */
uint getId() const;
void slotRequestAudioThumbs();
/** Free cache data */
void slotClearAudioCache();
- /** puts the clip in a group (used for folder grouping) */
- void setGroup(const QString name, const QString id);
-
private: // Private attributes
/** The name of this clip */
/** A list of snap markers; these markers are added to a clips snap-to points, and are displayed as necessary. */
QList < CommentedTime > m_snapMarkers;
- QDomElement m_xml;
/** A thumbnail for this clip */
QPixmap m_thumbnail;
void setProjectThumbFrame(const uint &ix);
uint getProjectThumbFrame() const;
void setProperties(QMap <QString, QString> properties);
- QMap <QString, QString> properties();
+ QMap <QString, QString> properties() const;
signals:
void getAudioThumbs();
void MainWindow::slotShowClipProperties(DocClipBase *clip) {
ClipProperties dia(clip, m_activeDocument->timecode(), m_activeDocument->fps(), this);
- dia.exec();
+ if (dia.exec() == QDialog::Accepted) {
+ m_projectList->slotUpdateClipProperties(dia.clipId(), dia.properties());
+ }
}
void MainWindow::customEvent(QEvent* e) {
m_groupName = name;
}
-void ProjectItem::setGroup(const QString name, const QString id) {
- if (m_clip) m_clip->setGroup(name, id);
-}
-
QStringList ProjectItem::names() const {
QStringList result;
result.append(text(0));
m_clip->setDuration(m_duration);
}
-void ProjectItem::setDescription(const QString &desc) {
- m_clip->setDescription(desc);
+void ProjectItem::setProperties(QMap <QString, QString> props) {
+ m_clip->setProperties(props);
}
DocClipBase *ProjectItem::referencedClip() {
const KUrl clipUrl() const;
int clipMaxDuration() const;
CLIPTYPE clipType() const;
- void setGroup(const QString name, const QString id);
void changeDuration(int frames);
DocClipBase *referencedClip();
- void setDescription(const QString &desc);
+ void setProperties(QMap <QString, QString> props);
private:
QDomElement m_element;
connect(listView, SIGNAL(requestMenu(const QPoint &, QTreeWidgetItem *)), this, SLOT(slotContextMenu(const QPoint &, QTreeWidgetItem *)));
connect(listView, SIGNAL(addClip()), this, SLOT(slotAddClip()));
connect(listView, SIGNAL(addClip(QUrl, const QString &)), this, SLOT(slotAddClip(QUrl, const QString &)));
- connect(listView, SIGNAL(itemChanged(QTreeWidgetItem *, int)), this, SLOT(slotUpdateItemDescription(QTreeWidgetItem *, int)));
+ connect(listView, SIGNAL(itemChanged(QTreeWidgetItem *, int)), this, SLOT(slotItemEdited(QTreeWidgetItem *, int)));
connect(listView, SIGNAL(showProperties(DocClipBase *)), this, SIGNAL(showClipProperties(DocClipBase *)));
m_listViewDelegate = new ItemDelegate(listView);
if (item && !item->isGroup()) emit clipSelected(item->toXml());
}
-void ProjectList::slotUpdateItemDescription(QTreeWidgetItem *item, int column) {
- ProjectItem *clip = static_cast <ProjectItem*>(item);
- CLIPTYPE type = clip->clipType();
- if (column == 2) {
+void ProjectList::slotUpdateClipProperties(int id, QMap <QString, QString> properties) {
+ ProjectItem *item = getItemById(id);
+ if (item) slotUpdateClipProperties(item, properties);
+}
+
+void ProjectList::slotUpdateClipProperties(ProjectItem *clip, QMap <QString, QString> properties) {
+ if (!clip) return;
+ clip->setProperties(properties);
+ if (properties.contains("description")) {
+ CLIPTYPE type = clip->clipType();
+ clip->setText(2, properties.value("description"));
if (type == AUDIO || type == VIDEO || type == AV || type == IMAGE || type == PLAYLIST) {
// Use Nepomuk system to store clip description
Nepomuk::Resource f(clip->clipUrl().path());
- if (f.isValid()) f.setDescription(item->text(2));
- clip->setDescription(item->text(2));
- kDebug() << "NEPOMUK, SETTING CLIP: " << clip->clipUrl().path() << ", TO TEXT: " << item->text(2);
+ if (f.isValid()) f.setDescription(properties.value("description"));
}
- } else if (column == 1 && type == FOLDER) {
+ }
+}
+
+void ProjectList::slotItemEdited(QTreeWidgetItem *item, int column) {
+ ProjectItem *clip = static_cast <ProjectItem*>(item);
+ if (column == 2) {
+ QMap <QString, QString> props;
+ props["description"] = item->text(2);
+ slotUpdateClipProperties(clip, props);
+ } else if (column == 1 && clip->clipType() == FOLDER) {
m_doc->slotEditFolder(item->text(1), clip->groupName(), clip->clipId());
}
}
void setRenderer(Render *projectRender);
void addClip(const QStringList &name, const QDomElement &elem, const int clipId, const KUrl &url = KUrl(), const QString &group = QString::null, int parentId = -1);
+ void slotUpdateClipProperties(int id, QMap <QString, QString> properties);
public slots:
void setDocument(KdenliveDoc *doc);
void slotAddFolder();
void slotAddFolder(const QString foldername, int clipId, bool remove, bool edit);
/** This is triggered when a clip description has been modified */
- void slotUpdateItemDescription(QTreeWidgetItem *item, int column);
+ void slotItemEdited(QTreeWidgetItem *item, int column);
+ void slotUpdateClipProperties(ProjectItem *item, QMap <QString, QString> properties);
//void slotShowMenu(const QPoint &pos);
else clone = (ProjectItem*) takeTopLevelItem(indexOfTopLevelItem(it));
if (clone) {
item->addChild(clone);
- clone->setGroup(item->groupName(), QString::number(parentId));
+ QMap <QString, QString> props;
+ props.insert("groupname", item->groupName());
+ props.insert("groupid", QString::number(parentId));
+ clone->setProperties(props);
}
}
}