Introducing template based title clips

svn path=/trunk/kdenlive/; revision=3586

diff --git a/src/clipmanager.cpp b/src/clipmanager.cpp
index afac6ef5c1d57000e0e1d78c2078bbc3ed5758d5..c44367777597311faa5d466cb02ef18f9fd1b6c2 100644 (file)
--- a/src/clipmanager.cpp
+++ b/src/clipmanager.cpp
@@ -351,6 +351,28 @@ void ClipManager::slotAddTextClipFile(const QString titleName, const QString ima
     m_doc->commandStack()->push(command);
 }
 
+void ClipManager::slotAddTextTemplateClip(QString titleName, const QString imagePath, const KUrl path, const QString group, const QString &groupId)
+{
+    QDomDocument doc;
+    QDomElement prod = doc.createElement("producer");
+    doc.appendChild(prod);
+    prod.setAttribute("resource", imagePath);
+    prod.setAttribute("name", titleName);
+    prod.setAttribute("xmltemplate", path.path());
+    uint id = m_clipIdCounter++;
+    prod.setAttribute("id", QString::number(id));
+    if (!group.isEmpty()) {
+        prod.setAttribute("groupname", group);
+        prod.setAttribute("groupid", groupId);
+    }
+    prod.setAttribute("type", (int) TEXT);
+    prod.setAttribute("transparency", "1");
+    prod.setAttribute("in", "0");
+    prod.setAttribute("out", m_doc->getFramePos(KdenliveSettings::image_duration()) - 1);
+    AddClipCommand *command = new AddClipCommand(m_doc, doc.documentElement(), QString::number(id), true);
+    m_doc->commandStack()->push(command);
+}
+
 int ClipManager::getFreeClipId()
 {
     return m_clipIdCounter++;

diff --git a/src/clipmanager.h b/src/clipmanager.h
index ee0e91dc9404ed6c4e8ee2f6963b8e85d411bb8e..272016ddc25835ffb20d9030610aa56fe1ab848e 100644 (file)
--- a/src/clipmanager.h
+++ b/src/clipmanager.h
@@ -57,6 +57,7 @@ Q_OBJECT public:
     void slotAddClipFile(const KUrl url, const QString group, const QString &groupId);
     void slotAddClipList(const KUrl::List urls, const QString group, const QString &groupId);
     void slotAddTextClipFile(const QString titleName, const QString imagePath, const QString xml, const QString group, const QString &groupId);
+    void slotAddTextTemplateClip(QString titleName, const QString imagePath, const KUrl path, const QString group, const QString &groupId);
     void slotAddColorClipFile(const QString name, const QString color, QString duration, const QString group, const QString &groupId);
     void slotAddSlideshowClipFile(const QString name, const QString path, int count, const QString duration, const bool loop, const bool fade, const QString &luma_duration, const QString &luma_file, const int softness, const QString group, const QString &groupId);
     DocClipBase *getClipById(QString clipId);

diff --git a/src/kdenlivedoc.cpp b/src/kdenlivedoc.cpp
index 34286682f9a0f86207658464ec8a8c411bd0ee47..549807b4155def56fa87b3f24b1d89cc4040088e 100644 (file)
--- a/src/kdenlivedoc.cpp
+++ b/src/kdenlivedoc.cpp
@@ -1046,7 +1046,7 @@ DocClipBase *KdenliveDoc::getBaseClip(const QString &clipId)
     return m_clipManager->getClipById(clipId);
 }
 
-void KdenliveDoc::slotCreateTextClip(QString /*group*/, const QString &/*groupId*/)
+void KdenliveDoc::slotCreateTextClip(QString group, const QString &groupId)
 {
     QString titlesFolder = projectFolder().path() + "/titles/";
     KStandardDirs::makeDir(titlesFolder);
@@ -1056,12 +1056,28 @@ void KdenliveDoc::slotCreateTextClip(QString /*group*/, const QString &/*groupId
         QImage pix = dia_ui->renderedPixmap();
         pix.save(titleInfo.at(1));
         //dia_ui->saveTitle(path + ".kdenlivetitle");
-        m_clipManager->slotAddTextClipFile(titleInfo.at(0), titleInfo.at(1), dia_ui->xml().toString(), QString(), QString());
+        m_clipManager->slotAddTextClipFile(titleInfo.at(0), titleInfo.at(1), dia_ui->xml().toString(), group, groupId);
         setModified(true);
     }
     delete dia_ui;
 }
 
+void KdenliveDoc::slotCreateTextTemplateClip(QString group, const QString &groupId)
+{
+    KUrl titlesFolder = KUrl(projectFolder().path() + "/titles/");
+    KUrl path = KFileDialog::getOpenUrl(titlesFolder, "*.kdenlivetitle", kapp->activeWindow(), i18n("Enter Template Path"));
+    if (path.isEmpty()) return;
+
+    QStringList titleInfo = TitleWidget::getFreeTitleInfo(projectFolder());
+
+    TitleWidget *dia_ui = new TitleWidget(path, titlesFolder.path(), m_render, kapp->activeWindow());
+    QImage pix = dia_ui->renderedPixmap();
+    pix.save(titleInfo.at(1));
+    delete dia_ui;
+    m_clipManager->slotAddTextTemplateClip(titleInfo.at(0), titleInfo.at(1), path, group, groupId);
+    setModified(true);
+}
+
 int KdenliveDoc::tracksCount() const
 {
     return m_tracksList.count();

diff --git a/src/kdenlivedoc.h b/src/kdenlivedoc.h
index 197fc61493cf8df800cba9cdf2f2a85bfb1c0978..b1b353bc68a74e5a2005880b5a6258c4a5f29b8b 100644 (file)
--- a/src/kdenlivedoc.h
+++ b/src/kdenlivedoc.h
@@ -151,6 +151,7 @@ private:
 
 public slots:
     void slotCreateTextClip(QString group, const QString &groupId);
+    void slotCreateTextTemplateClip(QString group, const QString &groupId);
     /** Set to true if document needs saving, false otherwise */
     void setModified(bool mod = true);
     void checkProjectClips();

diff --git a/src/kdenliveui.rc b/src/kdenliveui.rc
index 55576391cd3c3a4a2524b7bf477e5b9c01dd35e6..e36ca100449aa002ffa07b56ba67a0e1a43af2f3 100644 (file)
--- a/src/kdenliveui.rc
+++ b/src/kdenliveui.rc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<gui name="kdenlive" version="44">
+<gui name="kdenlive" version="45">
   <ToolBar name="extraToolBar" >
     <text>Extra Toolbar</text>
        <Action name="project_render" />
@@ -23,6 +23,7 @@
       <Action name="add_color_clip" />
       <Action name="add_slide_clip" />
       <Action name="add_text_clip" />
+      <Action name="add_text_template_clip" />
       <Action name="add_folder" /> 
       <Menu name="transcoders" ><text>Transcode</text>
       </Menu>

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 7477b95d611c3bdd828e4a0415a010cdcb2aa025..fe9f0a89d44c0f73b4175ee2b36ee2ccdd5fda4a 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1101,6 +1101,10 @@ void MainWindow::setupActions()
     collection->addAction("add_text_clip", addTitleClip);
     connect(addTitleClip , SIGNAL(triggered()), m_projectList, SLOT(slotAddTitleClip()));
 
+    QAction *addTitleTemplateClip = new KAction(KIcon("kdenlive-add-text-clip"), i18n("Add Template Title"), this);
+    collection->addAction("add_text_template_clip", addTitleTemplateClip);
+    connect(addTitleTemplateClip , SIGNAL(triggered()), m_projectList, SLOT(slotAddTitleTemplateClip()));
+
     QAction *addFolderButton = new KAction(KIcon("folder-new"), i18n("Create Folder"), this);
     collection->addAction("add_folder", addFolderButton);
     connect(addFolderButton , SIGNAL(triggered()), m_projectList, SLOT(slotAddFolder()));
@@ -1134,6 +1138,7 @@ void MainWindow::setupActions()
     addClips->addAction(addColorClip);
     addClips->addAction(addSlideClip);
     addClips->addAction(addTitleClip);
+    addClips->addAction(addTitleTemplateClip);
     addClips->addAction(addFolderButton);
 
     addClips->addAction(reloadClip);
@@ -2319,6 +2324,15 @@ void MainWindow::slotShowClipProperties(DocClipBase *clip)
 {
     if (clip->clipType() == TEXT) {
         QString titlepath = m_activeDocument->projectFolder().path() + "/titles/";
+        if (!clip->getProperty("xmltemplate").isEmpty()) {
+            // template text clip
+            KUrl path = KUrlRequesterDialog::getUrl(clip->getProperty("xmltemplate"), this, i18n("Change template path"));
+            if (!path.isEmpty() && (path.path() != clip->getProperty("xmltemplate"))) {
+                // Clip template modified, update
+                m_projectList->regenerateTemplate(clip->getId());
+            }
+            return;
+        }
         QString path = clip->getProperty("resource");
         TitleWidget *dia_ui = new TitleWidget(KUrl(), titlepath, m_projectMonitor->render, this);
         QDomDocument doc;

diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index ccb1599af834305bbda924710927bfd9d11d6d47..d393a286e39fd80b953724e49c8606f9dc049066 100644 (file)
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -203,6 +203,8 @@ void ProjectList::slotOpenClip()
     }
 }
 
+
+
 void ProjectList::slotReloadClip()
 {
     ProjectItem *item = static_cast <ProjectItem*>(m_listView->currentItem());
@@ -298,6 +300,10 @@ void ProjectList::slotItemEdited(QTreeWidgetItem *item, int column)
             slotUpdateClipProperties(clip, newprops);
             EditClipCommand *command = new EditClipCommand(this, clip->clipId(), oldprops, newprops, false);
             m_commandStack->push(command);
+            if (!clip->referencedClip()->getProperty("xmltemplate").isEmpty()) {
+                // This is a text template clip, update the image
+                regenerateTemplate(clip);
+            }
         }
     } else if (column == 1) {
         if (clip->isGroup()) {
@@ -604,21 +610,10 @@ void ProjectList::slotAddClip(const QList <QUrl> givenList, QString group)
     }
     if (list.isEmpty()) return;
 
-    QString groupId;
     if (group.isEmpty()) {
-        ProjectItem *item = static_cast <ProjectItem*>(m_listView->currentItem());
-        if (item && !item->isGroup()) {
-            while (item->parent()) {
-                item = static_cast <ProjectItem*>(item->parent());
-                if (item->isGroup()) break;
-            }
-        }
-        if (item && item->isGroup()) {
-            group = item->groupName();
-            groupId = item->clipId();
-        }
-    }
-    m_doc->slotAddClipList(list, group, groupId);
+        QStringList groupInfo = getGroup();
+        m_doc->slotAddClipList(list, groupInfo.at(0), groupInfo.at(1));
+    } else m_doc->slotAddClipList(list, group, QString());
 }
 
 void ProjectList::slotRemoveInvalidClip(const QString &id, bool replace)
@@ -651,22 +646,8 @@ void ProjectList::slotAddColorClip()
     if (dia->exec() == QDialog::Accepted) {
         QString color = dia_ui->clip_color->color().name();
         color = color.replace(0, 1, "0x") + "ff";
-
-        QString group;
-        QString groupId;
-        ProjectItem *item = static_cast <ProjectItem*>(m_listView->currentItem());
-        if (item && !item->isGroup()) {
-            while (item->parent()) {
-                item = static_cast <ProjectItem*>(item->parent());
-                if (item->isGroup()) break;
-            }
-        }
-        if (item && item->isGroup()) {
-            group = item->groupName();
-            groupId = item->clipId();
-        }
-
-        m_doc->clipManager()->slotAddColorClipFile(dia_ui->clip_name->text(), color, dia_ui->clip_duration->text(), group, groupId);
+        QStringList groupInfo = getGroup();
+        m_doc->clipManager()->slotAddColorClipFile(dia_ui->clip_name->text(), color, dia_ui->clip_duration->text(), groupInfo.at(0), groupInfo.at(1));
         m_doc->setModified(true);
     }
     delete dia_ui;
@@ -680,22 +661,8 @@ void ProjectList::slotAddSlideshowClip()
     SlideshowClip *dia = new SlideshowClip(m_timecode, this);
 
     if (dia->exec() == QDialog::Accepted) {
-
-        QString group;
-        QString groupId;
-        ProjectItem *item = static_cast <ProjectItem*>(m_listView->currentItem());
-        if (item && !item->isGroup()) {
-            while (item->parent()) {
-                item = static_cast <ProjectItem*>(item->parent());
-                if (item->isGroup()) break;
-            }
-        }
-        if (item && item->isGroup()) {
-            group = item->groupName();
-            groupId = item->clipId();
-        }
-
-        m_doc->clipManager()->slotAddSlideshowClipFile(dia->clipName(), dia->selectedPath(), dia->imageCount(), dia->clipDuration(), dia->loop(), dia->fade(), dia->lumaDuration(), dia->lumaFile(), dia->softness(), group, groupId);
+        QStringList groupInfo = getGroup();
+        m_doc->clipManager()->slotAddSlideshowClipFile(dia->clipName(), dia->selectedPath(), dia->imageCount(), dia->clipDuration(), dia->loop(), dia->fade(), dia->lumaDuration(), dia->lumaFile(), dia->softness(), groupInfo.at(0), groupInfo.at(1));
         m_doc->setModified(true);
     }
     delete dia;
@@ -703,8 +670,19 @@ void ProjectList::slotAddSlideshowClip()
 
 void ProjectList::slotAddTitleClip()
 {
-    QString group;
-    QString groupId;
+    QStringList groupInfo = getGroup();
+    m_doc->slotCreateTextClip(groupInfo.at(0), groupInfo.at(1));
+}
+
+void ProjectList::slotAddTitleTemplateClip()
+{
+    QStringList groupInfo = getGroup();
+    m_doc->slotCreateTextTemplateClip(groupInfo.at(0), groupInfo.at(1));
+}
+
+QStringList ProjectList::getGroup() const
+{
+    QStringList result;
     ProjectItem *item = static_cast <ProjectItem*>(m_listView->currentItem());
     if (item && !item->isGroup()) {
         while (item->parent()) {
@@ -713,11 +691,10 @@ void ProjectList::slotAddTitleClip()
         }
     }
     if (item && item->isGroup()) {
-        group = item->groupName();
-        groupId = item->clipId();
-    }
-
-    m_doc->slotCreateTextClip(group, groupId);
+        result << item->groupName();
+        result << item->clipId();
+    } else result << QString() << QString();
+    return result;
 }
 
 void ProjectList::setDocument(KdenliveDoc *doc)
@@ -914,4 +891,38 @@ QString ProjectList::currentClipUrl() const
     return item->clipUrl().path();
 }
 
+void ProjectList::regenerateTemplate(const QString &id)
+{
+    ProjectItem *clip = getItemById(ix);
+    if (clip) regenerateTemplate(clip);
+}
+
+void ProjectList::regenerateTemplate(ProjectItem *clip)
+{
+    // Generate image for template clip
+    const QString comment = clip->referencedClip()->getProperty("description");
+    const QString path = clip->referencedClip()->getProperty("xmltemplate");
+    QDomDocument doc;
+    QFile file(path);
+    if (!file.open(QIODevice::ReadOnly))
+        return;
+    if (!doc.setContent(&file)) {
+        file.close();
+        return;
+    }
+    file.close();
+    QDomNodeList texts = doc.elementsByTagName("content");
+    for (int i = 0; i < texts.count(); i++) {
+        QString data = texts.item(i).firstChild().nodeValue();
+        data.replace("%s", comment);
+        texts.item(i).firstChild().setNodeValue(data);
+    }
+    TitleWidget *dia_ui = new TitleWidget(KUrl(), QString(), m_render, this);
+    dia_ui->setXml(doc);
+    QImage pix = dia_ui->renderedPixmap();
+    pix.save(clip->clipUrl().path());
+    delete dia_ui;
+    clip->referencedClip()->producer()->set("force_reload", 1);
+}
+
 #include "projectlist.moc"

diff --git a/src/projectlist.h b/src/projectlist.h
index 1352cd7172acffcda7e10b84aa78c6c9acaebb4a..fedfaf21cc741c9c6da2731e43a8cf571c8a39f9 100644 (file)
--- a/src/projectlist.h
+++ b/src/projectlist.h
@@ -150,6 +150,7 @@ public slots:
     void slotEditClip();
     void slotReloadClip();
     void slotAddColorClip();
+    void regenerateTemplate(const QString &id);
 
 private:
     ProjectListView *m_listView;
@@ -176,11 +177,14 @@ private:
     void requestClipThumbnail(const QString &id);
     void deleteProjectFolder(QMap <QString, QString> map);
     void editFolder(const QString folderName, const QString oldfolderName, const QString &clipId);
+    QStringList getGroup() const;
+    void regenerateTemplate(ProjectItem *clip);
 
 private slots:
     void slotClipSelected();
     void slotAddSlideshowClip();
     void slotAddTitleClip();
+    void slotAddTitleTemplateClip();
     void slotContextMenu(const QPoint &pos, QTreeWidgetItem *);
     void slotAddFolder();
     /** This is triggered when a clip description has been modified */