titlewidget can export titles with embedded images

titledocument can read/save embedded imaged

inserting into project, will save embedded images to projectdir/titles

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

diff --git a/src/titledocument.cpp b/src/titledocument.cpp
index 7d6d269dc97ee5e114cf8cccd95eef81a011179c..98caaf3562affb72ce37e52e51095842ade2ca05 100644 (file)
--- a/src/titledocument.cpp
+++ b/src/titledocument.cpp
@@ -21,6 +21,7 @@
 #include <KTemporaryFile>
 #include <kio/netaccess.h>
 #include <KApplication>
+#include <KStandardDirs>
 #include <KLocale>
 #include <KMessageBox>
 
@@ -30,6 +31,8 @@
 #include <QGraphicsRectItem>
 #include <QGraphicsTextItem>
 #include <QGraphicsSvgItem>
+#include <QCryptographicHash>
+#include <QSvgRenderer>
 #include <QFontInfo>
 #include <QFile>
 #include <QTextCursor>
@@ -40,6 +43,19 @@
 #include <QGraphicsDropShadowEffect>
 #endif
 
+QByteArray fileToByteArray(const QString& filename)
+{
+    QByteArray ret;
+    QFile file(filename);
+    if (file.open(QIODevice::ReadOnly))
+    {
+        while (!file.atEnd()){
+            ret.append(file.readLine());
+        }
+    }
+    return ret;
+}
+
 TitleDocument::TitleDocument()
 {
     m_scene = NULL;
@@ -52,7 +68,48 @@ void TitleDocument::setScene(QGraphicsScene* _scene, int width, int height)
     m_height = height;
 }
 
-QDomDocument TitleDocument::xml(QGraphicsRectItem* startv, QGraphicsRectItem* endv)
+int TitleDocument::base64ToUrl(QGraphicsItem* item, QDomElement& content, bool embed)
+{
+            if (embed)
+            {
+                if (!item->data(Qt::UserRole+1).toString().isEmpty())
+                {
+                     content.setAttribute("base64",item->data(Qt::UserRole+1).toString());
+                } else if (!item->data(Qt::UserRole).toString().isEmpty() ) 
+                {
+                    content.setAttribute("base64",fileToByteArray( item->data(Qt::UserRole).toString() ).toBase64().data());
+                }
+                content.removeAttribute("url");
+            }else{
+                // save for project files to disk
+                QString base64=item->data(Qt::UserRole+1).toString();
+                if (!base64.isEmpty()){
+                    QString titlePath;
+                    if (!m_projectPath.isEmpty())
+                    {
+                        titlePath=m_projectPath;
+                    }else{
+                        titlePath="/tmp/titles";
+                    } 
+                    qDebug() << titlePath;
+                    QString filename=titlePath+QString( QCryptographicHash::hash(base64.toAscii(), QCryptographicHash::Md5).toHex().append(".titlepart"));
+                    KStandardDirs::makeDir(titlePath);
+                    QFile f(filename);
+                    if (f.open(QIODevice::WriteOnly)){
+                        f.write(QByteArray::fromBase64(base64.toAscii()) ) ;
+                        f.close();
+                        content.setAttribute("url",filename);
+                        content.removeAttribute("base64");
+                    }
+
+                } else {
+                    return 1;
+                }
+            }
+               return 0;
+} 
+
+QDomDocument TitleDocument::xml(QGraphicsRectItem* startv, QGraphicsRectItem* endv, bool embed)
 {
     QDomDocument doc;
 
@@ -71,10 +128,12 @@ QDomDocument TitleDocument::xml(QGraphicsRectItem* startv, QGraphicsRectItem* en
         case 7:
             e.setAttribute("type", "QGraphicsPixmapItem");
             content.setAttribute("url", item->data(Qt::UserRole).toString());
+            base64ToUrl (item, content, embed );
             break;
         case 13:
             e.setAttribute("type", "QGraphicsSvgItem");
             content.setAttribute("url", item->data(Qt::UserRole).toString());
+            base64ToUrl (item, content, embed );
             break;
         case 3:
             e.setAttribute("type", "QGraphicsRectItem");
@@ -209,12 +268,12 @@ QColor TitleDocument::getBackgroundColor()
 }
 
 
-bool TitleDocument::saveDocument(const KUrl& url, QGraphicsRectItem* startv, QGraphicsRectItem* endv, int out)
+bool TitleDocument::saveDocument(const KUrl& url, QGraphicsRectItem* startv, QGraphicsRectItem* endv, int out, bool embed)
 {
     if (!m_scene)
         return false;
 
-    QDomDocument doc = xml(startv, endv);
+    QDomDocument doc = xml(startv, endv, embed);
     doc.documentElement().setAttribute("out", out);
     KTemporaryFile tmpfile;
     if (!tmpfile.open()) {
@@ -232,8 +291,9 @@ bool TitleDocument::saveDocument(const KUrl& url, QGraphicsRectItem* startv, QGr
     return KIO::NetAccess::upload(tmpfile.fileName(), url, 0);
 }
 
-int TitleDocument::loadFromXml(QDomDocument doc, QGraphicsRectItem* startv, QGraphicsRectItem* endv, int *out)
+int TitleDocument::loadFromXml(QDomDocument doc, QGraphicsRectItem* startv, QGraphicsRectItem* endv, int *out, const QString& projectpath)
 {
+    m_projectPath=projectpath;
     QDomNodeList titles = doc.elementsByTagName("kdenlivetitle");
     //TODO: Check if the opened title size is equal to project size, otherwise warn user and rescale
     if (doc.documentElement().hasAttribute("width") && doc.documentElement().hasAttribute("height")) {
@@ -347,16 +407,40 @@ int TitleDocument::loadFromXml(QDomDocument doc, QGraphicsRectItem* startv, QGra
                     gitem = rec;
                 } else if (items.item(i).attributes().namedItem("type").nodeValue() == "QGraphicsPixmapItem") {
                     QString url = items.item(i).namedItem("content").attributes().namedItem("url").nodeValue();
-                    QPixmap pix(url);
+                    QString base64 = items.item(i).namedItem("content").attributes().namedItem("base64").nodeValue();
+                    QPixmap pix;
+                    if (base64.isEmpty()){
+                        pix.load(url);
+                    }else{
+                        pix.loadFromData(QByteArray::fromBase64(base64.toAscii()));
+                    }
                     QGraphicsPixmapItem *rec = m_scene->addPixmap(pix);
                     rec->setData(Qt::UserRole, url);
+                    if (!base64.isEmpty()){
+                        rec->setData(Qt::UserRole+1, base64);
+                    }
                     gitem = rec;
                 } else if (items.item(i).attributes().namedItem("type").nodeValue() == "QGraphicsSvgItem") {
                     QString url = items.item(i).namedItem("content").attributes().namedItem("url").nodeValue();
-                    QGraphicsSvgItem *rec = new QGraphicsSvgItem(url);
-                    m_scene->addItem(rec);
-                    rec->setData(Qt::UserRole, url);
-                    gitem = rec;
+                    QString base64 = items.item(i).namedItem("content").attributes().namedItem("base64").nodeValue();
+                    QGraphicsSvgItem *rec = NULL;
+                    if (base64.isEmpty()){
+                        rec = new QGraphicsSvgItem(url);
+                    }else{
+                        rec = new QGraphicsSvgItem();
+                        QSvgRenderer *renderer= new QSvgRenderer(QByteArray::fromBase64(base64.toAscii()), rec );
+                        rec->setSharedRenderer(renderer);
+                        //QString elem=rec->elementId();
+                        //QRectF bounds = renderer->boundsOnElement(elem);
+                    }
+                    if (rec){
+                        m_scene->addItem(rec);
+                        rec->setData(Qt::UserRole, url);
+                        if (!base64.isEmpty()){
+                            rec->setData(Qt::UserRole+1, base64);
+                        }
+                        gitem = rec;
+                    }
                 }
             }
             //pos and transform

diff --git a/src/titledocument.h b/src/titledocument.h
index f85e0679cf84428785df38205a22a9fec84b646d..ca5e92bc7fc14885d3e4fa93ed5d6d00106ca09f 100644 (file)
--- a/src/titledocument.h
+++ b/src/titledocument.h
@@ -23,6 +23,7 @@
 
 class QGraphicsScene;
 class QGraphicsRectItem;
+class QGraphicsItem;
 
 const int ROTATEFACTOR = 103;
 const int ZOOMFACTOR = 104;
@@ -33,9 +34,9 @@ class TitleDocument
 public:
     TitleDocument();
     void setScene(QGraphicsScene* scene, int width, int height);
-    bool saveDocument(const KUrl& url, QGraphicsRectItem* startv, QGraphicsRectItem* endv, int out);
-    QDomDocument xml(QGraphicsRectItem* startv, QGraphicsRectItem* endv);
-    int loadFromXml(QDomDocument doc, QGraphicsRectItem* startv, QGraphicsRectItem* endv, int *out);
+    bool saveDocument(const KUrl& url, QGraphicsRectItem* startv, QGraphicsRectItem* endv, int out, bool embed_images = false );
+    QDomDocument xml(QGraphicsRectItem* startv, QGraphicsRectItem* endv, bool embed_images = false );
+    int loadFromXml(QDomDocument doc, QGraphicsRectItem* startv, QGraphicsRectItem* endv, int *out,const QString& projectpath="");
     /** \brief Get the background color (incl. alpha) from the document, if possibly
      * \returns The background color of the document, inclusive alpha. If none found, returns (0,0,0,0) */
     QColor getBackgroundColor();
@@ -47,6 +48,7 @@ public:
 
 private:
     QGraphicsScene* m_scene;
+    QString m_projectPath;
     int m_width;
     int m_height;
     QString colorToString(const QColor&);
@@ -55,6 +57,7 @@ private:
     QColor stringToColor(const QString &);
     QTransform stringToTransform(const QString &);
     QList<QVariant> stringToList(const QString &);
+    int base64ToUrl(QGraphicsItem* item, QDomElement& content, bool embed);
 };
 
 #endif

diff --git a/src/titlewidget.cpp b/src/titlewidget.cpp
index d0de78736fca0584f801fd13562363c285ddbea5..b6f2ef84789a2850d58b13e46d85a14efea31681 100644 (file)
--- a/src/titlewidget.cpp
+++ b/src/titlewidget.cpp
@@ -1787,6 +1787,11 @@ void TitleWidget::saveTitle(KUrl url)
 {
     if (anim_start->isChecked()) slotAnimStart(false);
     if (anim_end->isChecked()) slotAnimEnd(false);
+    bool embed_image=false;
+    if (KMessageBox::questionYesNo(this, i18n("Do you want to embed Images into this TitleDocument?\nThis is most needed for sharing Titles.")) != KMessageBox::No)
+    {
+        embed_image=true;      
+    }
     if (url.isEmpty()) {
         KFileDialog *fs = new KFileDialog(KUrl(m_projectTitlePath), "application/x-kdenlivetitle", this);
         fs->setOperationMode(KFileDialog::Saving);
@@ -1800,7 +1805,7 @@ void TitleWidget::saveTitle(KUrl url)
         delete fs;
     }
     if (!url.isEmpty()) {
-        if (m_titledocument.saveDocument(url, m_startViewport, m_endViewport, m_tc.getFrameCount(title_duration->text()) - 1) == false)
+        if (m_titledocument.saveDocument(url, m_startViewport, m_endViewport, m_tc.getFrameCount(title_duration->text()) - 1, embed_image) == false)
             KMessageBox::error(this, i18n("Cannot write to file %1", url.path()));
     }
 }
@@ -1820,7 +1825,7 @@ int TitleWidget::outPoint() const
 void TitleWidget::setXml(QDomDocument doc)
 {
     int out;
-    m_count = m_titledocument.loadFromXml(doc, m_startViewport, m_endViewport, &out);
+    m_count = m_titledocument.loadFromXml(doc, m_startViewport, m_endViewport, &out, m_projectTitlePath);
     adjustFrameSize();
     title_duration->setText(m_tc.getTimecode(GenTime(out + 1, m_render->fps())));
     /*if (doc.documentElement().hasAttribute("out")) {