First step of OpenSankore Document Mode integration

OpenBoard.pro

@@ -65,6 +65,11 @@ DEPENDPATH += src/pdf-merger
 INCLUDEPATH += src/pdf-merger
 include(src/pdf-merger/pdfMerger.pri)
 
+
+#plugins
+include(plugins/plugins.pri)
+INCLUDEPATH += plugins/cffadaptor/src
+
 #ThirdParty
 DEPENDPATH += $$THIRD_PARTY_PATH/quazip/
 INCLUDEPATH += $$THIRD_PARTY_PATH/quazip/
@@ -82,7 +87,8 @@ FORMS += resources/forms/mainWindow.ui \
    resources/forms/trapFlash.ui \
    resources/forms/youTubePublishingDialog.ui \
    resources/forms/capturePublishing.ui \
-   resources/forms/intranetPodcastPublishingDialog.ui
+   resources/forms/intranetPodcastPublishingDialog.ui \
+    resources/forms/webPublishing.ui
 
 UB_ETC.files = resources/etc
 UB_I18N.files = resources/i18n/*.qm

plugins/cffadaptor/UBCFFAdaptor.pro

+#-------------------------------------------------
+#
+# Project created by QtCreator 2012-02-14T13:30:14
+#
+#-------------------------------------------------
+
+TARGET = CFF_Adaptor
+TEMPLATE = lib
+
+win32: SUB_DIR = win32
+macx: SUB_DIR = macx
+linux-g++: SUB_DIR = linux
+linux-g++-32: SUB_DIR = linux
+linux-g++-64: SUB_DIR = linux
+
+THIRD_PARTY_PATH = ../../../Sankore-ThirdParty
+QUAZIP_DIR   = "$$PWD/../../../Sankore-ThirdParty/quazip/quazip-0.3"
+
+BUILD_DIR = build/$$SUB_DIR
+CONFIG(debug, debug|release):BUILD_DIR = $$BUILD_DIR/debug
+CONFIG(release, debug|release) {
+   BUILD_DIR = $$BUILD_DIR/release
+   CONFIG += warn_off
+}
+
+win32{
+    CONFIG += dll
+}
+
+OBJECTS_DIR = $$BUILD_DIR/objects
+MOC_DIR = $$BUILD_DIR/moc
+DESTDIR = $$BUILD_DIR/lib
+RCC_DIR = $$BUILD_DIR/rcc
+SANKORE_DIR = ../..
+win32:{
+    QMAKE_POST_LINK += copy $$replace(DESTDIR,/,\\)\\CFF_Adaptor.dll" $$replace(SANKORE_DIR,/,\\)\\CFF_Adaptor.dll /y"
+}
+macx:{
+    QMAKE_POST_LINK += bash postScript_mac.sh "$$DESTDIR" "$$SANKORE_DIR/$$BUILD_DIR/product/Open-Sankore.app/Contents/MacOS"
+}
+
+LIBS     += "-L$$THIRD_PARTY_PATH/quazip/lib/$$SUB_DIR" "-lquazip"
+
+QT       += xml xmlpatterns core
+QT       += gui
+QT       += svg
+
+
+DEFINES += UBCFFADAPTOR_LIBRARY
+DEFINES += NO_THIRD_PARTY_WARNINGS
+
+INCLUDEPATH += src
+
+DEPENDPATH  += $$THIRD_PARTY_PATH/quazip/
+INCLUDEPATH += $$THIRD_PARTY_PATH/quazip/
+include($$THIRD_PARTY_PATH/quazip/quazip.pri)
+
+
+SOURCES += \
+    src/UBCFFAdaptor.cpp
+
+HEADERS +=\
+    $$PWD/../../src/globals/UBGlobals.h \
+    src/UBCFFAdaptor.h \
+    src/UBCFFAdaptor_global.h \
+    src/UBCFFConstants.h
+
+RESOURCES += \
+    resources/resources.qrc
\ No newline at end of file

plugins/cffadaptor/postScript_mac.sh

+#!/bin/bash
+SOURCE=$1
+DESTINATION=$2
+mkdir -p $DESTINATION
+cp -R $SOURCE/ $DESTINATION
\ No newline at end of file

plugins/cffadaptor/resources/images/soundOn.svg

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+<svg version="1.2" baseProfile="tiny" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+	 x="0px" y="0px" width="26px" height="26px" viewBox="0 0 26 26" xml:space="preserve">
+<circle fill="#CCCCCC" cx="13" cy="13" r="13"/>
+<circle fill="#999999" cx="13" cy="13" r="11"/>
+<rect x="7" y="9" fill="#FFFFFF" width="6" height="8"/>
+<polygon fill="#FFFFFF" points="10,11 10,15 17,21 17,5 "/>
+</svg>

plugins/cffadaptor/resources/resources.qrc

+<RCC>
+    <qresource prefix="/">
+        <file>images/soundOn.svg</file>
+    </qresource>
+</RCC>

plugins/cffadaptor/src/UBCFFAdaptor.h

+/*
+ * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)
+ *
+ * This file is part of Open-Sankoré.
+ *
+ * Open-Sankoré is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License,
+ * with a specific linking exception for the OpenSSL project's
+ * "OpenSSL" library (or with modified versions of it that use the
+ * same license as the "OpenSSL" library).
+ *
+ * Open-Sankoré is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Open-Sankoré.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#ifndef UBCFFADAPTOR_H
+#define UBCFFADAPTOR_H
+
+#include "UBCFFAdaptor_global.h"
+
+#include <QtCore>
+
+class QTransform;
+class QDomDocument;
+class QDomElement;
+class QDomNode;
+class QuaZipFile;
+
+class UBCFFADAPTORSHARED_EXPORT UBCFFAdaptor {
+    class UBToCFFConverter;
+
+public:
+    UBCFFAdaptor();
+    ~UBCFFAdaptor();
+
+    bool convertUBZToIWB(const QString &from, const QString &to);
+    bool deleteDir(const QString& pDirPath) const;
+    QList<QString> getConversionMessages();
+
+private:
+    QString uncompressZip(const QString &zipFile);
+    bool compressZip(const QString &source, const QString &destination);
+    bool compressDir(const QString &dirName, const QString &parentDir, QuaZipFile *outZip);
+    bool compressFile(const QString &fileName, const QString &parentDir, QuaZipFile *outZip);
+
+    QString createNewTmpDir();
+    bool freeDir(const QString &dir);
+    void freeTmpDirs();
+
+private:
+    QStringList tmpDirs;
+    QList<QString> mConversionMessages;
+
+private:
+
+    class UBToCFFConverter {
+
+       static const int DEFAULT_LAYER = -100000;
+
+    public:
+        UBToCFFConverter(const QString &source, const QString &destination);
+        ~UBToCFFConverter();
+        bool isValid() const;
+        QString lastErrStr() const {return errorStr;}
+        bool parse();
+        QList<QString> getMessages() {return mExportErrorList;}
+
+    private:
+
+        void addLastExportError(QString error) {mExportErrorList.append(error);}
+
+        void fillNamespaces();
+
+        bool parseMetadata();
+        bool parseContent();
+        QDomElement parsePageset(const QStringList &pageFileNames);
+        QDomElement parsePage(const QString &pageFileName);
+        QDomElement parseSvgPageSection(const QDomElement &element);
+        void writeQDomElementToXML(const QDomNode &node);
+        bool writeExtendedIwbSection();
+        QDomElement parseGroupsPageSection(const QDomElement &groupRoot);
+
+        bool createBackground(const QDomElement &element, QMultiMap<int, QDomElement> &dstSvgList);
+        QString createBackgroundImage(const QDomElement &element, QSize size);
+        bool createPngFromSvg(QString &svgPath, QString &dstPath,  QTransform transformation, QSize size = QSize());
+
+        bool parseSVGGGroup(const QDomElement &element, QMultiMap<int, QDomElement> &dstSvgList);
+        bool parseUBZImage(const QDomElement &element, QMultiMap<int, QDomElement> &dstSvgList);
+        bool parseUBZVideo(const QDomElement &element, QMultiMap<int, QDomElement> &dstSvgList);
+        bool parseUBZAudio(const QDomElement &element, QMultiMap<int, QDomElement> &dstSvgList);
+        bool parseForeignObject(const QDomElement &element, QMultiMap<int, QDomElement> &dstSvgList);
+        bool parseUBZText(const QDomElement &element, QMultiMap<int, QDomElement> &dstSvgList);
+
+        bool parseUBZPolygon(const QDomElement &element, QMultiMap<int, QDomElement> &dstSvgList);
+        bool parseUBZPolyline(const QDomElement &element, QMultiMap<int, QDomElement> &dstSvgList);
+        bool parseUBZLine(const QDomElement &element, QMultiMap<int, QDomElement> &dstSvgList);       
+        void addSVGElementToResultModel(const QDomElement &element, QMultiMap<int, QDomElement> &dstList, int layer = DEFAULT_LAYER);
+        void addIWBElementToResultModel(const QDomElement &element);
+
+        qreal getAngleFromTransform(const QTransform &tr);
+        QString getDstContentFolderName(const QString &elementType);
+        QString getSrcContentFolderName(QString href);
+        QString getFileNameFromPath(QString sPath);
+        QString getExtentionFromFileName(const QString &filename);
+        QString convertExtention(const QString &ext);
+        QString getElementTypeFromUBZ(const QDomElement &element);
+
+        int getElementLayer(const QDomElement &element);
+
+        bool itIsSupportedFormat(const QString &format) const;
+        bool itIsFormatToConvert(const QString &format) const;
+        bool itIsSVGElementAttribute(const QString ItemType, const QString &AttrName);
+        bool itIsIWBAttribute(const QString &attribute) const;
+        bool itIsUBZAttributeToConvert(const QString &attribute) const;
+
+        bool ibwAddLine(int x1, int y1, int x2, int y2, QString color=QString(), int width=1, bool isBackground=false);
+
+        QTransform getTransformFromUBZ(const QDomElement &ubzElement);
+        void setGeometryFromUBZ(const QDomElement &ubzElement, QDomElement &iwbElement);
+        void setCoordinatesFromUBZ(const QDomElement &ubzElement, QDomElement &iwbElement);
+        bool setContentFromUBZ(const QDomElement &ubzElement, QDomElement &svgElement);
+        void setCFFTextFromUBZ(const QDomElement &ubzElement, QDomElement &iwbElement, QDomElement &svgElement);
+        void setCFFTextFromHTMLTextNode(const QDomElement htmlTextNode, QDomElement &iwbElement);
+        QString ubzAttrNameToCFFAttrName(QString cffAttrName);
+        QString ubzAttrValueToCFFAttrName(QString cffAttrValue);
+
+        bool setCFFAttribute(const QString &attributeName, const QString &attributeValue, const QDomElement &ubzElement, QDomElement &iwbElement,  QDomElement &svgElement);
+        bool setCommonAttributesFromUBZ(const QDomElement &ubzElement, QDomElement &iwbElement,  QDomElement &svgElement);
+        void setViewBox(QRect viewbox);
+
+        QDomNode findTextNode(const QDomNode &node);
+        QDomNode findNodeByTagName(const QDomNode &node, QString tagName);
+
+        QSize getSVGDimentions(const QString &element);
+
+        inline QRect getViewboxRect(const QString &element) const;
+        inline QString rectToIWBAttr(const QRect &rect) const;
+        inline QString digitFileFormat(int num) const;
+        inline bool strToBool(const QString &in) const {return in == "true";}
+        QString contentIWBFileName() const;
+
+    private:
+        QList<QString> mExportErrorList;
+        QMap<QString, QString> iwbSVGItemsAttributes;
+        QDomDocument *mDataModel; //model for reading indata
+        QXmlStreamWriter *mIWBContentWriter; //stream to write outdata
+        QSize mSVGSize; //svg page size
+        QRect mViewbox; //Main viewbox parameter for CFF
+        QString sourcePath; // dir with unpacked source data (ubz)
+        QString destinationPath; //dir with unpacked destination data (iwb)
+        QDomDocument *mDocumentToWrite; //document for saved QDomElements from mSvgElements and mExtendedElements
+        QMultiMap<int, QDomElement> mSvgElements; //Saving svg elements to have a sorted by z order list of elements to write;
+        QList<QDomElement> mExtendedElements; //Saving extended options of elements to be able to add them to the end of result iwb document;
+        mutable QString errorStr; // last error string message
+
+    public:
+        operator bool() const {return isValid();}
+    };
+
+    class UBToUBZConverter {
+    public:
+        UBToUBZConverter();
+    };
+
+
+};
+
+#endif // UBCFFADAPTOR_H

plugins/cffadaptor/src/UBCFFAdaptor_global.h

+/*
+ * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)
+ *
+ * This file is part of Open-Sankoré.
+ *
+ * Open-Sankoré is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License,
+ * with a specific linking exception for the OpenSSL project's
+ * "OpenSSL" library (or with modified versions of it that use the
+ * same license as the "OpenSSL" library).
+ *
+ * Open-Sankoré is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Open-Sankoré.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#ifndef UBCFFADAPTOR_GLOBAL_H
+#define UBCFFADAPTOR_GLOBAL_H
+
+#include <QtCore/qglobal.h>
+
+#if defined(UBCFFADAPTOR_LIBRARY)
+#  define UBCFFADAPTORSHARED_EXPORT Q_DECL_EXPORT
+#else
+#  define UBCFFADAPTORSHARED_EXPORT Q_DECL_IMPORT
+#endif
+
+#endif // UBCFFADAPTOR_GLOBAL_H

plugins/cffadaptor/src/UBCFFConstants.h

+/*
+ * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)
+ *
+ * This file is part of Open-Sankoré.
+ *
+ * Open-Sankoré is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License,
+ * with a specific linking exception for the OpenSSL project's
+ * "OpenSSL" library (or with modified versions of it that use the
+ * same license as the "OpenSSL" library).
+ *
+ * Open-Sankoré is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Open-Sankoré.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#ifndef UBCFFCONSTANTS_H
+#define UBCFFCONSTANTS_H
+
+#define PI 3.1415926535
+
+const int DEFAULT_BACKGROUND_LAYER = -20000002;
+const int DEFAULT_BACKGROUND_CROSS_LAYER = -20000001;
+
+// Constant names. Use only them instead const char* in each function
+
+// Constant fileNames;
+const QString fMetadata = "metadata.rdf";
+const QString fIWBContent = "content.xml";
+const QString fIWBBackground = "background.png";
+const QString sAudioElementImage = ":images/soundOn.svg";
+
+// Constant messages;
+const QString noErrorMsg = "NoError";
+
+// Tag names
+const QString tDescription = "Description";
+const QString tIWBRoot = "iwb";
+const QString tIWBMeta = "meta";
+const QString tUBZSize = "size";
+const QString tSvg = "svg";
+const QString tIWBPage = "page";
+const QString tIWBPageSet = "pageset";
+const QString tId = "id";
+const QString tElement = "element";
+const QString tUBZGroup = "group";
+const QString tUBZGroups = "groups";
+const QString tUBZG = "g";
+const QString tUBZPolygon = "polygon";
+const QString tUBZPolyline = "polyline";
+const QString tUBZLine = "line";
+const QString tUBZAudio = "audio";
+const QString tUBZVideo = "video";
+const QString tUBZImage = "image";
+const QString tUBZForeignObject = "foreignObject";
+const QString tUBZTextContent = "itemTextContent";
+
+const QString tIWBA = "a";
+const QString tIWBG = "g";
+const QString tIWBSwitch = "switch";
+const QString tIWBImage = "image";
+const QString tIWBVideo = "video";
+const QString tIWBAudio = "audio";
+const QString tIWBText = "text";
+const QString tIWBTextArea = "textarea";
+const QString tIWBPolyLine = "polyline";
+const QString tIWBPolygon = "polygon";
+const QString tIWBFlash = "video";
+const QString tIWBRect = "rect";
+const QString tIWBLine = "line";
+const QString tIWBTbreak = "tbreak";
+const QString tIWBTspan = "tspan";
+
+// Attributes names
+const QString aIWBVersion = "version";
+const QString aOwner  = "owner";
+const QString aDescription  = "description";
+const QString aCreator  = "creator";
+const QString aAbout  = "about";
+const QString aIWBViewBox = "viewbox";
+const QString aUBZViewBox = "viewBox";
+const QString aDarkBackground = "dark-background";
+const QString aBackground = "background";
+const QString aCrossedBackground = "crossed-background";
+const QString aUBZType = "type";
+const QString aUBZUuid = "uuid";
+const QString aUBZParent = "parent";
+const QString aFill = "fill"; // IWB attribute contans color to fill
+
+const QString aID = "id";   // ID of any svg element can be placed in to iwb section
+const QString aRef = "ref"; // as reference for applying additional attributes
+const QString aSVGHref = "xlink:href"; // reference to file
+const QString aIWBHref = "ref"; // reference to element ID
+const QString aUBZHref = "href";
+const QString aUBZSource = "source";
+const QString aSrc = "src";
+const QString aSVGRequiredExtension = "requiredExtensions";
+
+const QString aX = "x";
+const QString aY = "y";
+const QString aWidth = "width";
+const QString aHeight = "height";
+const QString aStroke = "stroke";
+const QString aStrokeWidth = "stroke-width";
+const QString aPoints = "points";
+const QString aZLayer = "z-value";
+const QString aLayer = "layer";
+const QString aTransform = "transform";
+const QString aLocked = "locked";
+const QString aIWBName = "name";
+const QString aIWBContent = "content";
+
+
+// Attribute values
+const QString avIWBVersionNo = "1.0"; 
+const QString avUBZText = "text";
+const QString avFalse = "false";
+const QString avTrue = "true";
+
+// Namespaces and prefixes
+const QString svgRequiredExtensionPrefix = "http://www.imsglobal.org/iwb/";
+const QString dcNS = "http://purl.org/dc/elements/1.1/";
+const QString ubNS = "http://uniboard.mnemis.com/document";
+const QString svgUBZNS = "http://www.imsglobal.org/xsd/iwb_v1p0";
+const QString svgIWBNS = "http://www.w3.org/2000/svg";
+const QString xlinkNS = "http://www.w3.org/1999/xlink";
+const QString iwbNS = "http://www.imsglobal.org/xsd/iwb_v1p0";
+const QString xsiNS = "http://www.w3.org/2001/XMLSchema-instance";
+const QString xsiShemaLocation = "\
+http://www.imsglobal.org/xsd/iwb_v1p0 \
+http://www.imsglobal.org/profile/iwb/iwbv1p0_v1p0.xsd \
+http://www.w3.org/2000/svg http://www.imsglobal.org/profile/iwb/svgsubsetv1p0_v1p0.xsd \
+http://www.w3.org/1999/xlink http://www.imsglobal.org/xsd/w3/1999/xlink.xsd";
+const QString dcNSPrefix = "dc";
+const QString ubNSPrefix = "ub";
+const QString svgIWBNSPrefix = "svg";
+const QString xlinkNSPrefix = "xlink";
+const QString iwbNsPrefix = "iwb";
+const QString xsiPrefix = "xsi";
+const QString xsiSchemaLocationPrefix = "schemaLocation";
+
+const QString avOwner = "";
+const QString avCreator = "";
+const QString avDescription = "";
+
+//constant symbols and words etc
+const QString dimensionsDelimiter1 = "x";
+const QString dimensionsDelimiter2 = " ";
+const QString pageAlias = "page";
+const QString pageFileExtentionUBZ = "svg";
+
+//content folder names
+const QString cfImages = "images";
+const QString cfVideos = "video";
+const QString cfAudios = "audio";
+const QString cfFlash = "flash";
+
+//known file extentions
+const QString feSvg = "svg";
+const QString feWgt = "wgt";
+const QString fePng = "png";
+
+const int iCrossSize = 32;
+const int iCrossWidth = 1;
+
+// Image formats supported by CFF exclude wgt. Wgt is Sankore widget, which is considered as a .png preview.
+const QString iwbElementImage(" \
+wgt, \
+jpeg, \
+jpg, \
+bmp, \
+gif, \
+wmf, \
+emf, \
+png, \
+tif, \
+tiff \
+");
+
+// Video formats supported by CFF
+const QString iwbElementVideo(" \
+mpg, \
+mpeg, \
+swf, \
+");
+
+// Audio formats supported by CFF
+const QString iwbElementAudio(" \
+mp3, \
+wav \
+");
+
+const QString cffSupportedFileFormats(iwbElementImage + iwbElementVideo + iwbElementAudio);
+const QString ubzFormatsToConvert("svg");
+
+
+const QString iwbSVGImageAttributes(" \
+id, \
+xlink:href, \
+x, \
+y, \
+height, \
+width, \
+fill-opacity, \
+requiredExtentions, \
+transform \
+");
+
+
+const QString iwbSVGAudioAttributes(" \
+id, \
+xlink:href, \
+x, \
+y, \
+height, \
+width, \
+fill-opacity, \
+requiredExtentions, \
+transform \
+");
+
+const QString iwbSVGVideoAttributes(" \
+id, \
+xlink:href, \
+x, \
+y, \
+height, \
+width, \
+fill-opacity, \
+requiredExtentions, \
+transform \
+");
+
+const QString iwbSVGRectAttributes(" \
+id, \
+x, \
+y, \
+height, \
+width, \
+fill, \
+fill-opacity, \
+stroke, \
+stroke-dasharray, \
+stroke-linecap, \
+stroke-linejoin, \
+stroke-opacity, \
+stroke-width, \
+transform \
+");
+
+
+
+const QString iwbSVGTextAttributes(" \
+id, \
+x, \
+y, \
+fill, \
+font-family, \
+font-size, \
+font-style, \
+font-weight, \
+font-stretch, \
+transform \
+");
+
+const QString iwbSVGTextAreaAttributes(" \
+id, \
+x, \
+y, \
+height, \
+width, \
+fill, \
+font-family, \
+font-size, \
+font-style, \
+font-weight, \
+font-stretch, \
+text-align, \
+transform \
+");
+
+const QString iwbSVGTspanAttributes(" \
+id, \
+fill, \
+font-family, \
+font-size, \
+font-style, \
+font-weight, \
+font-stretch, \
+text-align, \
+");
+
+const QString iwbSVGLineAttributes(" \
+id, \
+x1, \
+y1, \
+x2, \
+y2, \
+stroke, \
+stroke-dasharray, \
+stroke-width, \
+stroke-opacity, \
+stroke-linecap, \
+transform \
+");
+
+const QString iwbSVGPolyLineAttributes(" \
+id, \
+points, \
+stroke, \
+stroke-width, \
+stroke-dasharray, \
+stroke-opacity, \
+stroke-linecap, \
+transform \
+");
+
+const QString iwbSVGPolygonAttributes(" \
+id, \
+points, \
+fill, \
+fill-opacity, \
+stroke, \
+stroke-dasharray, \
+stroke-width, \
+stroke-linecap, \
+stroke-linejoin, \
+stroke-opacity, \
+stroke-width, \
+transform \
+");
+
+// 1 to 1 copy to SVG section
+const QString iwbElementAttributes(" \
+background, \
+background-fill, \
+background-posture, \
+flip, \
+freehand, \
+highlight, \
+highlight-fill, \
+list-style-type, \
+list-style-type-fill, \
+locked, \
+replicate, \
+revealer, \
+stroke-lineshape-start, \
+stroke-lineshape-end \
+");
+
+// cannot be copied 1 to 1 to SVG section
+const QString ubzElementAttributesToConvert(" \
+xlink:href, \
+src, \
+transform, \
+uuid \
+"
+);
+
+// additional attributes. Have references in SVG section.
+const QString svgElementAttributes(" \
+points, \
+fill, \
+fill-opacity, \
+stroke, \
+stroke-dasharray, \
+stroke-linecap, \
+stroke-opacity, \
+stroke-width, \
+stroke_linejoin, \
+requiredExtensions, \
+viewbox, \
+x, \
+y, \
+x1, \
+y1, \
+x2, \
+y2, \
+height, \
+width, \
+font-family, \
+font-size, \
+font-style, \
+font-weight, \
+font-stretch, \
+text-align \
+");
+
+const QString ubzContentFolders("audios,videos,images,widgets");
+
+struct UBItemLayerType
+{
+    enum Enum
+    {
+        FixedBackground = -2000, Object = -1000, Graphic = 0, Tool = 1000, Control = 2000
+    };
+};
+
+#endif // UBCFFCONSTANTS_H

plugins/cffadaptor/src/UBGlobals.h

+/*
+ * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)
+ *
+ * This file is part of Open-Sankoré.
+ *
+ * Open-Sankoré is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License,
+ * with a specific linking exception for the OpenSSL project's
+ * "OpenSSL" library (or with modified versions of it that use the
+ * same license as the "OpenSSL" library).
+ *
+ * Open-Sankoré is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Open-Sankoré.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#ifndef UBGLOBALS_H
+#define UBGLOBALS_H
+
+#define DELETEPTR(ptr) if(NULL != ptr){ \
+    delete ptr; \
+    ptr = NULL; \
+    }
+
+#ifdef Q_WS_WIN
+
+#define WARNINGS_DISABLE __pragma(warning(push, 0));
+#define WARNINGS_ENABLE __pragma(warning(pop));
+
+#ifdef NO_THIRD_PARTY_WARNINGS
+// disabling warning level to 0 and save old state
+#define THIRD_PARTY_WARNINGS_DISABLE WARNINGS_DISABLE
+#else
+// just save old state (needs for not empty define)
+#define THIRD_PARTY_WARNINGS_DISABLE __pragma(warning(push));
+#endif //#ifdef NO_THIRD_PARTY_WARNINGS
+// anyway on WIN
+#define THIRD_PARTY_WARNINGS_ENABLE WARNINGS_ENABLE
+
+#else //#ifdef Q_WS_WIN
+
+#define WARNINGS_DISABLE _Pragma("GCC diagnostic push"); \
+_Pragma("GCC diagnostic ignored \"-Wunused-parameter\""); \
+_Pragma("GCC diagnostic ignored \"-Wunused-variable\""); \
+_Pragma("GCC diagnostic ignored \"-Wsign-compare\"");
+
+#define WARNINGS_ENABLE _Pragma("GCC diagnostic pop"); 
+
+#ifdef NO_THIRD_PARTY_WARNINGS
+//disabling some warnings
+#define THIRD_PARTY_WARNINGS_DISABLE WARNINGS_DISABLE
+
+#define THIRD_PARTY_WARNINGS_ENABLE WARNINGS_ENABLE
+#else
+// just save old state (needs for not empty define)
+#define THIRD_PARTY_WARNINGS_ENABLE WARNINGS_ENABLE
+
+#endif //#ifdef NO_THIRD_PARTY_WARNINGS
+
+#endif //#ifdef Q_WS_WIN
+
+#endif // UBGLOBALS_H
+        

plugins/plugins.pri

+HEADERS +=  plugins/cffadaptor/src/UBCFFAdaptor_global.h \
+            plugins/cffadaptor/src/UBCFFAdaptor.h \
+            plugins/cffadaptor/src/UBCFFConstants.h \
+            plugins/cffadaptor/src/UBGlobals.h
+
+SOURCES +=  plugins/cffadaptor/src/UBCFFAdaptor.cpp

resources/OpenBoard.qrc

@@ -360,5 +360,7 @@
         <file>images/ungroupItems.svg</file>
         <file>images/setAsBackground.svg</file>
         <file>images/backgroundPalette/resetDefaultGridSize.svg</file>
+        <file>images/collapse-all.png</file>
+        <file>images/expand-all.png</file>
     </qresource>
 </RCC>

resources/forms/documents.ui

@@ -28,50 +28,142 @@
   <property name="styleSheet">
    <string notr="true"/>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QFrame" name="topFrame">
-     <property name="frameShape">
-      <enum>QFrame::NoFrame</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-     <property name="lineWidth">
-      <number>0</number>
-     </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QWidget" name="topWidget" native="true">
      <layout class="QHBoxLayout" name="horizontalLayout">
       <item>
-        <widget class="QFrame" name="topLeftFrame">
+       <widget class="QSplitter" name="splitter">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="opaqueResize">
+         <bool>true</bool>
+        </property>
+        <property name="handleWidth">
+         <number>6</number>
+        </property>
+        <widget class="QWidget" name="topLeftWidget" native="true">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
-         <property name="frameShape">
-          <enum>QFrame::Panel</enum>
-         </property>
-         <property name="frameShadow">
-          <enum>QFrame::Plain</enum>
-         </property>
          <layout class="QVBoxLayout" name="verticalLayout_2">
-          <property name="spacing">
-           <number>0</number>
-          </property>
-          <property name="margin">
-           <number>0</number>
-          </property>
           <item>
-           <widget class="UBDocumentTreeWidget" name="documentTreeWidget">
-            <property name="sizePolicy">
-            <sizepolicy hsizetype="Maximum" vsizetype="Expanding">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
+           <layout class="QHBoxLayout" name="horizontalLayout_3">
+            <item>
+             <widget class="QPushButton" name="collapseAll">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="toolTip">
+               <string>Collapse All</string>
+              </property>
+              <property name="text">
+               <string/>
+              </property>
+              <property name="icon">
+               <iconset resource="../OpenBoard.qrc">
+                <normaloff>:/images/collapse-all.png</normaloff>:/images/collapse-all.png</iconset>
+              </property>
+              <property name="flat">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QPushButton" name="expandAll">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="toolTip">
+               <string>Expand All</string>
+              </property>
+              <property name="text">
+               <string notr="true"/>
+              </property>
+              <property name="icon">
+               <iconset resource="../OpenBoard.qrc">
+                <normaloff>:/images/expand-all.png</normaloff>:/images/expand-all.png</iconset>
+              </property>
+              <property name="flat">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QComboBox" name="sortKind">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <horstretch>4</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <item>
+               <property name="text">
+                <string>Select a sort</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Creation date</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Update date</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Alphabetical order</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+            <item>
+             <widget class="QComboBox" name="sortOrder">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                <horstretch>2</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <item>
+               <property name="text">
+                <string>Ascending order</string>
+               </property>
+              </item>
+              <item>
+               <property name="text">
+                <string>Descending order</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item>
+           <widget class="UBDocumentTreeView" name="documentTreeView">
+            <property name="minimumSize">
+             <size>
+              <width>400</width>
+              <height>0</height>
+             </size>
             </property>
-            <property name="styleSheet">
-             <string notr="true"/>
+            <property name="maximumSize">
+             <size>
+              <width>16777215</width>
+              <height>16777215</height>
+             </size>
             </property>
             <property name="frameShape">
              <enum>QFrame::NoFrame</enum>
@@ -79,14 +171,23 @@
             <property name="frameShadow">
              <enum>QFrame::Plain</enum>
             </property>
-            <property name="lineWidth">
-             <number>1</number>
+            <property name="autoScroll">
+             <bool>true</bool>
+            </property>
+            <property name="autoScrollMargin">
+             <number>65</number>
             </property>
-            <property name="horizontalScrollMode">
-             <enum>QAbstractItemView::ScrollPerPixel</enum>
+            <property name="selectionMode">
+             <enum>QAbstractItemView::ExtendedSelection</enum>
             </property>
-            <property name="autoExpandDelay">
-             <number>2</number>
+            <property name="selectionBehavior">
+             <enum>QAbstractItemView::SelectRows</enum>
+            </property>
+            <property name="verticalScrollMode">
+             <enum>QAbstractItemView::ScrollPerItem</enum>
+            </property>
+            <property name="animated">
+             <bool>true</bool>
             </property>
             <property name="headerHidden">
              <bool>true</bool>
@@ -94,25 +195,15 @@
             <attribute name="headerVisible">
              <bool>false</bool>
             </attribute>
-            <column>
-             <property name="text">
-              <string notr="true">1</string>
-             </property>
-            </column>
            </widget>
           </item>
          </layout>
         </widget>
-      </item>
-      <item>
-        <widget class="QWidget" name="topRightFrame" native="true">
+        <widget class="QFrame" name="topRightFrame">
          <property name="styleSheet">
           <string notr="true"/>
          </property>
          <layout class="QVBoxLayout" name="verticalLayout_3">
-          <property name="margin">
-           <number>0</number>
-          </property>
           <item>
            <widget class="UBDocumentThumbnailWidget" name="thumbnailWidget">
             <property name="contextMenuPolicy">
@@ -147,7 +238,16 @@
              <property name="spacing">
               <number>0</number>
              </property>
-             <property name="margin">
+             <property name="leftMargin">
+              <number>0</number>
+             </property>
+             <property name="topMargin">
+              <number>0</number>
+             </property>
+             <property name="rightMargin">
+              <number>0</number>
+             </property>
+             <property name="bottomMargin">
               <number>0</number>
              </property>
              <item>
@@ -224,6 +324,7 @@
           </item>
          </layout>
         </widget>
+       </widget>
       </item>
      </layout>
     </widget>
@@ -238,9 +339,9 @@
    <header>gui/UBDocumentThumbnailWidget.h</header>
   </customwidget>
   <customwidget>
-   <class>UBDocumentTreeWidget</class>
-   <extends>QTreeWidget</extends>
-   <header>gui/UBDocumentTreeWidget.h</header>
+   <class>UBDocumentTreeView</class>
+   <extends>QTreeView</extends>
+   <header>document/UBDocumentController.h</header>
   </customwidget>
  </customwidgets>
  <resources>

resources/forms/webPublishing.ui

+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>documentPublishingDialog</class>
+ <widget class="QDialog" name="documentPublishingDialog">
+  <property name="windowModality">
+   <enum>Qt::WindowModal</enum>
+  </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>607</width>
+    <height>405</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <item>
+    <layout class="QFormLayout" name="formLayout">
+     <property name="fieldGrowthPolicy">
+      <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+     </property>
+     <item row="0" column="0">
+      <widget class="QLabel" name="titleLabel">
+       <property name="text">
+        <string>Title</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QLineEdit" name="title">
+       <property name="maxLength">
+        <number>60</number>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>E-mail</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QLineEdit" name="email"/>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Author</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QLineEdit" name="author"/>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="decriptionLabel">
+       <property name="text">
+        <string>Description</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QPlainTextEdit" name="description">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>168</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="1">
+      <spacer name="verticalSpacer">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>10</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="5" column="1">
+      <widget class="QCheckBox" name="attachPDF">
+       <property name="text">
+        <string>Attach Downloadable PDF Version</string>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="1">
+      <widget class="QCheckBox" name="attachUBZ">
+       <property name="text">
+        <string>Attach Downloadable Uniboard File (UBZ)</string>
+       </property>
+      </widget>
+     </item>
+     <item row="7" column="1">
+      <widget class="QLabel" name="videoWarning">
+       <property name="text">
+        <string>Warning: This documents contains video, which will not be displayed properly on the Web</string>
+       </property>
+       <property name="wordWrap">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="8" column="1">
+      <widget class="QDialogButtonBox" name="dialogButtons">
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

src/adaptors/UBCFFSubsetAdaptor.h

+/*
+ * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)
+ *
+ * This file is part of Open-Sankoré.
+ *
+ * Open-Sankoré is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3 of the License,
+ * with a specific linking exception for the OpenSSL project's
+ * "OpenSSL" library (or with modified versions of it that use the
+ * same license as the "OpenSSL" library).
+ *
+ * Open-Sankoré is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Open-Sankoré.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+
+#ifndef UBCFFSUBSETADAPTOR_H
+#define UBCFFSUBSETADAPTOR_H
+
+#include <QtXml>
+#include <QString>
+#include <QStack>
+#include <QDomDocument>
+#include <QHash>
+
+class UBDocumentProxy;
+class UBGraphicsScene;
+class QSvgGenerator;
+class UBGraphicsSvgItem;
+class UBGraphicsPixmapItem;
+class UBGraphicsItemDelegate;
+class QTransform;
+class QPainter;
+class UBGraphicsItem;
+class QGraphicsItem;
+class QTextBlockFormat;
+class QTextCharFormat;
+class QTextCursor;
+class UBGraphicsStrokesGroup;
+
+
+class UBCFFSubsetAdaptor
+{
+public:
+    UBCFFSubsetAdaptor();
+    static bool ConvertCFFFileToUbz(QString &cffSourceFile, UBDocumentProxy* pDocument);
+
+private:
+    class UBCFFSubsetReader
+    {
+    public:
+        UBCFFSubsetReader(UBDocumentProxy *proxy, QFile *content);
+        ~UBCFFSubsetReader();
+
+        UBDocumentProxy *mProxy;
+        QString pwdContent;
+
+        bool parse();
+
+    private:
+        QString mTempFilePath;
+        UBGraphicsScene *mCurrentScene;
+        QRectF mCurrentSceneRect;
+        QString mIndent;
+        QRectF mViewBox;
+        QRectF mViewPort;
+        qreal mVBTransFactor;
+        QPointF mViewBoxCenter;
+        QSize mSize;
+        QPointF mShiftVector;
+        bool mSvgGSectionIsOpened;
+        UBGraphicsGroupContainerItem *mGSectionContainer;
+
+    private:
+        QDomDocument mDOMdoc;
+        QDomNode mCurrentDOMElement;
+        QHash<QString, UBGraphicsItem*> persistedItems;
+        QMap<QString, QString> mRefToUuidMap;
+        QDir mTmpFlashDir;
+
+        void addItemToGSection(QGraphicsItem *item);
+        bool hashElements();
+        void addExtentionsToHash(QDomElement *parent, QDomElement *topGroup);
+
+        void hashSvg(QDomNode *parent, QString prefix = "");
+        void hashSiblingIwbElements(QDomElement *parent, QDomElement *topGroup = 0);
+
+        inline void parseSvgSectionAttr(const QDomElement &);
+        bool parseSvgPage(const QDomElement &parent);
+        bool parseSvgPageset(const QDomElement &parent);
+        bool parseSvgElement(const QDomElement &parent);
+        bool parseIwbMeta(const QDomElement &element);
+        bool parseSvg(const QDomElement &svgSection);
+
+        inline bool parseGSection(const QDomElement &element);
+        inline bool parseSvgSwitchSection(const QDomElement &element);
+        inline bool parseSvgRect(const QDomElement &element);
+        inline bool parseSvgEllipse(const QDomElement &element);
+        inline bool parseSvgPolygon(const QDomElement &element);
+        inline bool parseSvgPolyline(const QDomElement &element);
+        inline bool parseSvgText(const QDomElement &element);
+        inline bool parseSvgTextarea(const QDomElement &element);
+        inline bool parseSvgImage(const QDomElement &element);
+        inline bool parseSvgFlash(const QDomElement &element);
+        inline bool parseSvgAudio(const QDomElement &element);
+        inline bool parseSvgVideo(const QDomElement &element);
+        inline UBGraphicsGroupContainerItem *parseIwbGroup(QDomElement &parent);
+        inline bool parseIwbElement(QDomElement &element);
+        inline void parseTSpan(const QDomElement &parent, QPainter &painter
+                               , qreal &curX, qreal &curY, qreal &width, qreal &height, qreal &linespacing, QRectF &lastDrawnTextBoundingRect
+                               , qreal &fontSize, QColor &fontColor, QString &fontFamily, QString &fontStretch, bool &italic
+                               , int &fontWeight, int &textAlign, QTransform &fontTransform);
+        inline void parseTSpan(const QDomElement &element, QTextCursor &cursor
+                               , QTextBlockFormat &blockFormat, QTextCharFormat &charFormat);
+        inline void hashSceneItem(const QDomElement &element, UBGraphicsItem *item);
+
+        // to kill
+        inline void parseTextAttributes(const QDomElement &element, qreal &fontSize, QColor &fontColor,
+                                 QString &fontFamily, QString &fontStretch, bool &italic,
+                                 int &fontWeight, int &textAlign, QTransform &fontTransform);
+        inline void parseTextAttributes(const QDomElement &element, QFont &font, QColor);
+        inline void readTextBlockAttr(const QDomElement &element, QTextBlockFormat &format);
+        inline void readTextCharAttr(const QDomElement &element, QTextCharFormat &format);
+
+        //elements parsing methods
+        bool parseDoc();
+
+        bool createNewScene();
+        bool persistCurrentScene();
+        bool persistScenes();
+
+//        helper methods
+        void repositionSvgItem(QGraphicsItem *item, qreal width, qreal height,
+                               qreal x, qreal y,
+                               QTransform &transform);
+        QColor colorFromString(const QString& clrString);
+        QTransform transformFromString(const QString trString, QGraphicsItem *item = 0);
+        bool getViewBoxDimenstions(const QString& viewBox);
+        QSvgGenerator* createSvgGenerator(qreal width, qreal height);
+        bool getTempFileName();
+        inline bool strToBool(QString);
+        bool createTempFlashPath();
+    };
+};
+
+#endif // UBCFFSUBSETADAPTOR_H

src/adaptors/UBExportFullPDF.cpp

@@ -43,6 +43,7 @@
 #include "domain/UBGraphicsPDFItem.h"
 
 #include "document/UBDocumentProxy.h"
+#include "document/UBDocumentController.h"
 
 #include "pdf/GraphicsPDFItem.h"
 
@@ -265,6 +266,16 @@ bool UBExportFullPDF::persistsDocument(UBDocumentProxy* pDocumentProxy, const QS
     return true;
 }
 
+bool UBExportFullPDF::associatedActionactionAvailableFor(const QModelIndex &selectedIndex)
+{
+    const UBDocumentTreeModel *docModel = qobject_cast<const UBDocumentTreeModel*>(selectedIndex.model());
+    if (!selectedIndex.isValid() || docModel->isCatalog(selectedIndex)) {
+        return false;
+    }
+
+    return true;
+}
+
 
 QString UBExportFullPDF::exportExtention()
 {