UBBoardView conflicts merged

12 years ago · 0594cfe09f
parent 625c239e34 d3ca55c9a1
commit 0594cfe09f
481 changed files with 1551 additions and 3213 deletions
--- a/LICENSE.txt
+++ b/LICENSE.txt
@ -1,6 +1,6 @@
-Copyright (C) 2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)
+Copyright (C) 2013 Groupement d'Inter<EFBFBD>t Public pour l'Education NumŽrique en Afrique (GIP ENA)

-Open-Sankoré is free software: you can redistribute it and/or modify
+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
--- a/Open-Sankore.packproj
+++ b/Open-Sankore.packproj
@ -26,9 +26,9 @@
 					<key>International</key>
 					<dict>
 						<key>Mode</key>
-						<integer>0</integer>
+						<integer>1</integer>
 						<key>Path</key>
-						<string></string>
+						<string>LICENSE.txt</string>
 						<key>Path Type</key>
 						<integer>2</integer>
 					</dict>
--- a/Sankore_3.1.pro
+++ b/Sankore_3.1.pro
@ -10,8 +10,8 @@ CONFIG += debug_and_release \

 VERSION_MAJ = 2
 VERSION_MIN = 00
-VERSION_TYPE = r # a = alpha, b = beta, r = release, other => error
-VERSION_PATCH = 05
+VERSION_TYPE = b # a = alpha, b = beta, r = release, other => error
+VERSION_PATCH = 06

 VERSION = "$${VERSION_MAJ}.$${VERSION_MIN}.$${VERSION_TYPE}.$${VERSION_PATCH}"
 VERSION = $$replace(VERSION, "\\.r", "")
--- a/buildDebianPackage.sh
+++ b/buildDebianPackage.sh
@ -19,6 +19,15 @@
 #     functions
 #**********************

+checkUser()
+{
+  if [ `id -u` -ne 0 ]; then
+    echo "Please run the script as root, may be using fakeroot command as follow"
+    echo "fakeroot ./buildDebianPackage.sh [options]"
+    exit 1
+  fi
+}
+
 initializeVariables()
 {
  MAKE_TAG=true
@ -120,6 +129,7 @@ buildWithStandardQt(){
 #**********************
 #     script
 #**********************
+checkUser
 initializeVariables
 buildWithStandardQt

@ -375,12 +385,13 @@ chmod 755 "$BASE_WORKING_DIR/DEBIAN/postint"
 mkdir -p "install/linux"
 DEBIAN_PACKAGE_NAME="Open-Sankore_${VERSION}_$ARCHITECTURE.deb"

-fakeroot  chown -R root:root $BASE_WORKING_DIR 
+chown -R root:root $BASE_WORKING_DIR 
 dpkg -b "$BASE_WORKING_DIR" "install/linux/$DEBIAN_PACKAGE_NAME"
-notifyProgress "Open-Sankore" "Package built"

 #clean up mess
-fakeroot rm -rf $BASE_WORKING_DIR
+rm -rf $BASE_WORKING_DIR
+
+notifyProgress "Open-Sankore" "Package built"


 if [ $CREATE_DIENA_DISTRIBUTION_ZIP == true ]; then
@ -392,3 +403,4 @@ if [ $CREATE_DIENA_DISTRIBUTION_ZIP == true ]; then
    notifyProgress "Open-Sankore" "Build Diena zip file for distribution"
 fi

+exit 0
--- a/plugins/cffadaptor/src/UBCFFAdaptor.cpp
+++ b/plugins/cffadaptor/src/UBCFFAdaptor.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/plugins/cffadaptor/src/UBCFFAdaptor.h
+++ b/plugins/cffadaptor/src/UBCFFAdaptor.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
@ -100,7 +100,7 @@ private:

        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);       
+        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);

--- a/plugins/cffadaptor/src/UBCFFAdaptor_global.h
+++ b/plugins/cffadaptor/src/UBCFFAdaptor_global.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/plugins/cffadaptor/src/UBCFFConstants.h
+++ b/plugins/cffadaptor/src/UBCFFConstants.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/plugins/cffadaptor/src/UBGlobals.h
+++ b/plugins/cffadaptor/src/UBGlobals.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/resources/etc/SankoreEditor/editor_en/files/calepin.png
+++ b/resources/etc/SankoreEditor/editor_en/files/calepin.png
--- a/resources/etc/SankoreEditor/editor_en/files/logo.png
+++ b/resources/etc/SankoreEditor/editor_en/files/logo.png
--- a/resources/etc/SankoreEditor/editor_en/files/logoplanetesankore.png
+++ b/resources/etc/SankoreEditor/editor_en/files/logoplanetesankore.png
--- a/resources/etc/SankoreEditor/editor_en/files/mappe.png
+++ b/resources/etc/SankoreEditor/editor_en/files/mappe.png
--- a/resources/etc/SankoreEditor/editor_en/files/outils.png
+++ b/resources/etc/SankoreEditor/editor_en/files/outils.png
--- a/resources/etc/SankoreEditor/editor_en/index.html
+++ b/resources/etc/SankoreEditor/editor_en/index.html
@ -1,81 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Sankoré editor</title>
-<style type="text/css">
-<!--
-.white {	color: #FFF;
-}
-body {
-	background-color: #E5E3DB;
-}
-body,td,th {
-	font-family: Verdana, Geneva, sans-serif;
-	color: #666;
-	text-align: left;
-}
-.conteneur {
-	background-color: #5C5C5C;
-	text-align: center;
-}
-.c {
-	text-align: center;
-}
-.m {
-	font-size: medium;
-}
-a:link {
-	color: #666;
-}
-a:visited {
-	color: #666;
-}
-a:hover {
-	color: #000;
-}
-a:active {
-	color: #666;
-}
-->
-</style>
-</head>
-
-<body>
-<table width="843" border="0" align="center">
-  <tr>
-    <td class="conteneur"><p><img src="files/logo.png" width="196" height="22" alt="editeur" /></p>
-    <p><span class="white">Instructions on how to use Sankoré editor </span></p>
-    <p><span class="white">THE CURRENT VERSION IS ONLY AVAILABLE IN FRENCH</span></p></td>
-  </tr>
-  <tr>
-    <td><div align="center"><img src="files/outils.png" width="128" height="128" alt="outils" /> <img src="files/mappe.png" width="128" height="128" alt="mappe" /> <img src="files/calepin.png" width="128" height="128" alt="calepin" /></div></td>
-  </tr>
-  <tr>
-    <td><p>Sankoré Editor allows you to create rich interactivity scenarios. Create interactive content easily with basic activities that can be used in various subjects (attach images, sounds, order of words, phrases, create categories ...). This content can then be added to the software Open-Sankore. </p></td>
-  </tr>
-  <tr>
-    <td><p>Requirement to work with the editor :</p>
-      <ul>
-        <li>a Web access</li>
-        <li>an account on Planète Sankoré</li>
-    </ul></td>
-  </tr>
-  <tr>
-    <td><div align="center">
-      <p>&nbsp;</p>
-      <p><a href="http://editeur.sankore.org" title="Editeur" target="_self" class="c">Click here to connect to the Sankoré Editor</a></p>
-    </div></td>
-  </tr>
-  <tr>
-    <td><p>&nbsp;</p>
-    <p>&nbsp;</p>
-    <p>&nbsp;</p></td>
-  </tr>
-  <tr>
-    <td>Sankoré editor is hosted on <a href="http://planete.sankore.org/" target="_self">planete.sankore.org</a></td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-</body>
-</html>
--- a/resources/etc/SankoreEditor/editor_fr/files/calepin.png
+++ b/resources/etc/SankoreEditor/editor_fr/files/calepin.png
--- a/resources/etc/SankoreEditor/editor_fr/files/logo.png
+++ b/resources/etc/SankoreEditor/editor_fr/files/logo.png
--- a/resources/etc/SankoreEditor/editor_fr/files/logoplanetesankore.png
+++ b/resources/etc/SankoreEditor/editor_fr/files/logoplanetesankore.png
--- a/resources/etc/SankoreEditor/editor_fr/files/mappe.png
+++ b/resources/etc/SankoreEditor/editor_fr/files/mappe.png
--- a/resources/etc/SankoreEditor/editor_fr/files/outils.png
+++ b/resources/etc/SankoreEditor/editor_fr/files/outils.png
--- a/resources/etc/SankoreEditor/editor_fr/index.html
+++ b/resources/etc/SankoreEditor/editor_fr/index.html
@ -1,80 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Editeur Sankoré</title>
-<style type="text/css">
-<!--
-.white {	color: #FFF;
-}
-body {
-	background-color: #E5E3DB;
-}
-body,td,th {
-	font-family: Verdana, Geneva, sans-serif;
-	color: #666;
-	text-align: left;
-}
-.conteneur {
-	background-color: #5C5C5C;
-	text-align: center;
-}
-.c {
-	text-align: center;
-}
-.m {
-	font-size: medium;
-}
-a:link {
-	color: #666;
-}
-a:visited {
-	color: #666;
-}
-a:hover {
-	color: #000;
-}
-a:active {
-	color: #666;
-}
-->
-</style>
-</head>
-
-<body>
-<table width="843" border="0" align="center">
-  <tr>
-    <td class="conteneur"><p><img src="files/logo.png" width="196" height="22" alt="editeur" /></p>
-    <p><span class="white">Instructions pour l'utilisation de l'éditeur Sankoré</span></p></td>
-  </tr>
-  <tr>
-    <td><div align="center"><img src="files/outils.png" width="128" height="128" alt="outils" /> <img src="files/mappe.png" width="128" height="128" alt="mappe" /> <img src="files/calepin.png" width="128" height="128" alt="calepin" /></div></td>
-  </tr>
-  <tr>
-    <td>L'éditeur Sankoré vous permet de réaliser des scénarios d'interactivités riches. Il facilite la création de contenu interactif avec des activités de base qui peuvent être utilisées dans diverses disciplines (associer des images, des sons, ordonner des mots, des phrases,  créer des catégories...). Ce contenu peut ensuite être ajouté à votre cours sur le logiciel Open-Sankoré. L'éditeur repose sur votre compte utilisateur Planète Sankoré.</td>
-  </tr>
-  <tr>
-    <td><p>Éléments requis pour travailler avec l'éditeur :</p>
-      <ul>
-        <li>un accès Web</li>
-        <li>un compte Planète Sankoré</li>
-    </ul></td>
-  </tr>
-  <tr>
-    <td><div align="center">
-      <p>&nbsp;</p>
-      <p><a href="http://editeur.sankore.org" title="Editeur" target="_self" class="c">Accès à l'éditeur Sankoré</a></p>
-    </div></td>
-  </tr>
-  <tr>
-    <td><p>&nbsp;</p>
-    <p>&nbsp;</p>
-    <p>&nbsp;</p></td>
-  </tr>
-  <tr>
-    <td>L'éditeur Sankoré est hébergé sur <a href="http://planete.sankore.org/" target="_self">planete.sankore.org</a></td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-</body>
-</html>
--- a/resources/forms/mainWindow.ui
+++ b/resources/forms/mainWindow.ui
@ -1596,18 +1596,6 @@
    <string>Check Update</string>
   </property>
  </action>
-  <action name="actionSankoreEditor">
-   <property name="icon">
-    <iconset resource="../sankore.qrc">
-     <normaloff>:/images/toolbar/paraschool.png</normaloff>:/images/toolbar/paraschool.png</iconset>
-   </property>
-   <property name="text">
-    <string>Open-Sankoré Editor</string>
-   </property>
-   <property name="toolTip">
-    <string>Show Open-Sankoré Widgets Editor</string>
-   </property>
-  </action>
  <action name="actionHideApplication">
   <property name="icon">
    <iconset resource="../sankore.qrc">
--- a/resources/images/toolbar/paraschool.png
+++ b/resources/images/toolbar/paraschool.png
--- a/resources/sankore.qrc
+++ b/resources/sankore.qrc
@ -295,7 +295,6 @@
        <file>images/toolbar/updates.png</file>
        <file>images/paletteLibrary.png</file>
        <file>images/paletteNavigator.png</file>
-        <file>images/toolbar/paraschool.png</file>
        <file>images/toolbar/display.png</file>
        <file>images/toolbar/hide.png</file>
        <file>images/toolbar/record.png</file>
--- a/src/adaptors/UBCFFSubsetAdaptor.cpp
+++ b/src/adaptors/UBCFFSubsetAdaptor.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/UBCFFSubsetAdaptor.h
+++ b/src/adaptors/UBCFFSubsetAdaptor.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/UBExportAdaptor.cpp
+++ b/src/adaptors/UBExportAdaptor.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/UBExportAdaptor.h
+++ b/src/adaptors/UBExportAdaptor.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/UBExportCFF.cpp
+++ b/src/adaptors/UBExportCFF.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/UBExportCFF.h
+++ b/src/adaptors/UBExportCFF.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/UBExportDocument.cpp
+++ b/src/adaptors/UBExportDocument.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/UBExportDocument.h
+++ b/src/adaptors/UBExportDocument.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/UBExportFullPDF.cpp
+++ b/src/adaptors/UBExportFullPDF.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/UBExportFullPDF.h
+++ b/src/adaptors/UBExportFullPDF.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/UBExportPDF.cpp
+++ b/src/adaptors/UBExportPDF.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/UBExportPDF.h
+++ b/src/adaptors/UBExportPDF.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/UBExportWeb.cpp
+++ b/src/adaptors/UBExportWeb.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/UBExportWeb.h
+++ b/src/adaptors/UBExportWeb.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/UBImportAdaptor.cpp
+++ b/src/adaptors/UBImportAdaptor.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/UBImportAdaptor.h
+++ b/src/adaptors/UBImportAdaptor.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/UBImportCFF.cpp
+++ b/src/adaptors/UBImportCFF.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/UBImportCFF.h
+++ b/src/adaptors/UBImportCFF.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/UBImportDocument.cpp
+++ b/src/adaptors/UBImportDocument.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/UBImportDocument.h
+++ b/src/adaptors/UBImportDocument.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/UBImportImage.cpp
+++ b/src/adaptors/UBImportImage.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/UBImportImage.h
+++ b/src/adaptors/UBImportImage.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/UBImportPDF.cpp
+++ b/src/adaptors/UBImportPDF.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/UBImportPDF.h
+++ b/src/adaptors/UBImportPDF.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/UBImportVirtualPrinter.cpp
+++ b/src/adaptors/UBImportVirtualPrinter.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/UBIniFileParser.cpp
+++ b/src/adaptors/UBIniFileParser.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/UBIniFileParser.h
+++ b/src/adaptors/UBIniFileParser.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/UBMetadataDcSubsetAdaptor.cpp
+++ b/src/adaptors/UBMetadataDcSubsetAdaptor.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/UBMetadataDcSubsetAdaptor.h
+++ b/src/adaptors/UBMetadataDcSubsetAdaptor.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/UBSvgSubsetAdaptor.cpp
+++ b/src/adaptors/UBSvgSubsetAdaptor.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
@ -97,12 +97,12 @@ QMap<QString,IDataStorage*> UBSvgSubsetAdaptor::additionalElementToStore;
 QString UBSvgSubsetAdaptor::toSvgTransform(const QMatrix& matrix)
 {
    return QString("matrix(%1, %2, %3, %4, %5, %6)")
-           .arg(matrix.m11(), 0 , 'g')
-           .arg(matrix.m12(), 0 , 'g')
-           .arg(matrix.m21(), 0 , 'g')
-           .arg(matrix.m22(), 0 , 'g')
-           .arg(matrix.dx(), 0 , 'g')
-           .arg(matrix.dy(), 0 , 'g');
+            .arg(matrix.m11(), 0 , 'g')
+            .arg(matrix.m12(), 0 , 'g')
+            .arg(matrix.m21(), 0 , 'g')
+            .arg(matrix.m22(), 0 , 'g')
+            .arg(matrix.dx(), 0 , 'g')
+            .arg(matrix.dy(), 0 , 'g');
 }


@ -117,12 +117,12 @@ QMatrix UBSvgSubsetAdaptor::fromSvgTransform(const QString& transform)
    if (sl.size() >= 6)
    {
        matrix.setMatrix(
-            sl.at(0).toFloat(),
-            sl.at(1).toFloat(),
-            sl.at(2).toFloat(),
-            sl.at(3).toFloat(),
-            sl.at(4).toFloat(),
-            sl.at(5).toFloat());
+                    sl.at(0).toFloat(),
+                    sl.at(1).toFloat(),
+                    sl.at(2).toFloat(),
+                    sl.at(3).toFloat(),
+                    sl.at(4).toFloat(),
+                    sl.at(5).toFloat());
    }

    return matrix;
@ -340,7 +340,7 @@ QString UBSvgSubsetAdaptor::readTeacherGuideNode(int sceneIndex)
        mXmlReader.readNext();
        if (mXmlReader.isStartElement())
        {
-             if (mXmlReader.name() == "teacherBar" || mXmlReader.name() == "teacherGuide"){
+            if (mXmlReader.name() == "teacherBar" || mXmlReader.name() == "teacherGuide"){
                result.clear();
                result += "<teacherGuide version=\"" + mXmlReader.attributes().value("version").toString() + "\">";
                result += "\n";
@ -372,10 +372,10 @@ QString UBSvgSubsetAdaptor::readTeacherGuideNode(int sceneIndex)


 UBSvgSubsetAdaptor::UBSvgSubsetReader::UBSvgSubsetReader(UBDocumentProxy* pProxy, const QByteArray& pXmlData)
-        : mXmlReader(pXmlData)
-        , mProxy(pProxy)
-        , mDocumentPath(pProxy->persistencePath())
-        , mGroupHasInfo(false)
+    : mXmlReader(pXmlData)
+    , mProxy(pProxy)
+    , mDocumentPath(pProxy->persistencePath())
+    , mGroupHasInfo(false)
 {
    // NOOP
 }
@ -399,10 +399,6 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
        mXmlReader.readNext();
        if (mXmlReader.isStartElement())
        {
-            qreal zFromSvg = getZValueFromSvg();
-            QUuid uuidFromSvg = getUuidFromSvg();
-
-
            if (mXmlReader.name() == "svg")
            {
                if (!mScene)
@ -443,9 +439,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
                QStringRef svgSceneUuid = mXmlReader.attributes().value(mNamespaceUri, "uuid");

                if (!svgSceneUuid.isNull())
-                {
                    mScene->setUuid(QUuid(svgSceneUuid.toString()));
-                }

                // introduced in UB 4.0

@ -475,9 +469,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
                QStringRef pageDpi = mXmlReader.attributes().value("pageDpi");

                if (!pageDpi.isNull())
-                {
                    UBSettings::settings()->pageDpi->set(pageDpi.toString());
-                }

                bool darkBackground = false;
                bool crossedBackground = false;
@ -560,9 +552,6 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()

                if (polygonItem)
                {
-                    polygonItem->setUuid(uuidFromSvg);
-
-
                    polygonItem->setData(UBGraphicsItemData::ItemLayerType, QVariant(UBItemLayerType::Graphic));

                    UBGraphicsStrokesGroup* group;
@ -570,24 +559,26 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
                        group = new UBGraphicsStrokesGroup();
                        mStrokesList.insert(parentId,group);
                        currentStroke = new UBGraphicsStroke();
+                        group->setTransform(polygonItem->transform());
+                        UBGraphicsItem::assignZValue(group, polygonItem->zValue());
                    }
                    else
                        group = mStrokesList.value(parentId);

-                    polygonItem->setTransform(group->transform());
+                    if(polygonItem->transform().isIdentity())
+                        polygonItem->setTransform(group->transform());
+
                    group->addToGroup(polygonItem);
                    polygonItem->setStrokesGroup(group);
                    polygonItem->setStroke(currentStroke);

                    polygonItem->show();
                    group->addToGroup(polygonItem);
-
                }
            }
            else if (mXmlReader.name() == "polyline")
            {
-                QList<UBGraphicsPolygonItem*> polygonItems
-                = polygonItemsFromPolylineSvg(mScene->isDarkBackground() ? Qt::white : Qt::black);
+                QList<UBGraphicsPolygonItem*> polygonItems = polygonItemsFromPolylineSvg(mScene->isDarkBackground() ? Qt::white : Qt::black);

                QString parentId = QUuid::createUuid().toString();

@ -600,11 +591,15 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
                        group = new UBGraphicsStrokesGroup();
                        mStrokesList.insert(parentId,group);
                        currentStroke = new UBGraphicsStroke();
+                        group->setTransform(polygonItem->transform());
+                        UBGraphicsItem::assignZValue(group, polygonItem->zValue());
                    }
                    else
                        group = mStrokesList.value(parentId);

-                    polygonItem->setTransform(group->transform());
+                    if(polygonItem->transform().isIdentity())
+                        polygonItem->setTransform(group->transform());
+
                    group->addToGroup(polygonItem);
                    polygonItem->setStrokesGroup(group);
                    polygonItem->setStroke(currentStroke);
@ -612,6 +607,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
                    polygonItem->show();
                    group->addToGroup(polygonItem);
                }
+
            }
            else if (mXmlReader.name() == "image")
            {
@ -636,12 +632,6 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()

                            mScene->addItem(pixmapItem);

-                            if (zFromSvg != UBZLayerController::errorNum())
-                                UBGraphicsItem::assignZValue(pixmapItem, zFromSvg);
-
-                            if (!uuidFromSvg.isNull())
-                                pixmapItem->setUuid(uuidFromSvg);
-
                            if (isBackground)
                                mScene->setAsBackgroundObject(pixmapItem);

@ -651,7 +641,6 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
                    else if (href.contains("svg"))
                    {
                        UBGraphicsSvgItem* svgItem = svgItemFromSvg();
-
                        if (svgItem)
                        {
                            svgItem->setFlag(QGraphicsItem::ItemIsMovable, true);
@ -659,9 +648,6 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()

                            mScene->addItem(svgItem);

-                            if (zFromSvg != UBZLayerController::errorNum())
-                                UBGraphicsItem::assignZValue(svgItem, zFromSvg);
-
                            if (isBackground)
                                mScene->setAsBackgroundObject(svgItem);

@ -677,7 +663,6 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
            else if (mXmlReader.name() == "audio")
            {
                UBGraphicsMediaItem* audioItem = audioItemFromSvg();
-
                if (audioItem)
                {
                    audioItem->setFlag(QGraphicsItem::ItemIsMovable, true);
@ -685,12 +670,6 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()

                    mScene->addItem(audioItem);

-                    if (zFromSvg != UBZLayerController::errorNum())
-                        UBGraphicsItem::assignZValue(audioItem, zFromSvg);
-
-                    if (!uuidFromSvg.isNull())
-                        audioItem->setUuid(uuidFromSvg);
-
                    audioItem->show();

                    //force start to load the video and display the first frame
@ -701,20 +680,14 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
            else if (mXmlReader.name() == "video")
            {
                UBGraphicsMediaItem* videoItem = videoItemFromSvg();
-
                if (videoItem)
                {
+
                    videoItem->setFlag(QGraphicsItem::ItemIsMovable, true);
                    videoItem->setFlag(QGraphicsItem::ItemIsSelectable, true);

                    mScene->addItem(videoItem);

-                    if (zFromSvg != UBZLayerController::errorNum())
-                        UBGraphicsItem::assignZValue(videoItem, zFromSvg);
-
-                    if (!uuidFromSvg.isNull())
-                        videoItem->setUuid(uuidFromSvg);
-
                    videoItem->show();

                    //force start to load the video and display the first frame
@ -725,7 +698,6 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
            else if (mXmlReader.name() == "text")//This is for backward compatibility with proto text field prior to version 4.3
            {
                UBGraphicsTextItem* textItem = textItemFromSvg();
-
                if (textItem)
                {
                    textItem->setFlag(QGraphicsItem::ItemIsMovable, true);
@ -733,85 +705,54 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()

                    mScene->addItem(textItem);

-                    if (zFromSvg != UBZLayerController::errorNum())
-                        UBGraphicsItem::assignZValue(textItem, zFromSvg);
-
-                    if (!uuidFromSvg.isNull())
-                        textItem->setUuid(uuidFromSvg);
-
                    textItem->show();
                }
            }
            else if (mXmlReader.name() == "curtain")
            {
                UBGraphicsCurtainItem* mask = curtainItemFromSvg();
-
                if (mask)
                {
                    mScene->addItem(mask);
                    mScene->registerTool(mask);
-
-                    if (zFromSvg != UBZLayerController::errorNum())
-                        UBGraphicsItem::assignZValue(mask, zFromSvg);
-
-                    if (!uuidFromSvg.isNull())
-                        mask->setUuid(uuidFromSvg);
                }
            }
            else if (mXmlReader.name() == "ruler")
            {

-                QString ubZValue = mXmlReader.attributes().value(mNamespaceUri, "z-value").toString();
                UBGraphicsRuler *ruler = rulerFromSvg();
-
-                ubZValue = mXmlReader.attributes().value(mNamespaceUri, "z-value").toString();
                if (ruler)
                {
                    mScene->addItem(ruler);
                    mScene->registerTool(ruler);
-
-                    if (zFromSvg != UBZLayerController::errorNum())
-                        UBGraphicsItem::assignZValue(ruler, zFromSvg);
                }

            }
            else if (mXmlReader.name() == "compass")
            {
                UBGraphicsCompass *compass = compassFromSvg();
-
                if (compass)
                {
                    mScene->addItem(compass);
                    mScene->registerTool(compass);
-
-                    if (zFromSvg != UBZLayerController::errorNum())
-                        UBGraphicsItem::assignZValue(compass, zFromSvg);
                }
            }
            else if (mXmlReader.name() == "protractor")
            {
                UBGraphicsProtractor *protractor = protractorFromSvg();
-
                if (protractor)
                {
                    mScene->addItem(protractor);
                    mScene->registerTool(protractor);
-
-                    if (zFromSvg != UBZLayerController::errorNum())
-                        UBGraphicsItem::assignZValue(protractor, zFromSvg);
                }
            }
            else if (mXmlReader.name() == "triangle")
            {
                UBGraphicsTriangle *triangle = triangleFromSvg();
-
                if (triangle)
                {
                    mScene->addItem(triangle);
                    mScene->registerTool(triangle);
-
-                    if (zFromSvg != UBZLayerController::errorNum())
-                        UBGraphicsItem::assignZValue(triangle, zFromSvg);
                }
            }
            else if (mXmlReader.name() == "cache")
@ -822,9 +763,6 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
                    mScene->addItem(cache);
                    mScene->registerTool(cache);
                    UBApplication::boardController->notifyCache(true);
-
-                    if (zFromSvg != UBZLayerController::errorNum())
-                        UBGraphicsItem::assignZValue(cache, zFromSvg);
                }
            }
            else if (mXmlReader.name() == "foreignObject")
@ -851,9 +789,6 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()

                        mScene->addItem(pdfItem);

-                        if (zFromSvg != UBZLayerController::errorNum())
-                            UBGraphicsItem::assignZValue(pdfItem, zFromSvg);
-
                        if (isBackground)
                            mScene->setAsBackgroundObject(pdfItem);

@ -873,12 +808,6 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()

                        mScene->addItem(appleWidgetItem);

-                        if (zFromSvg != UBZLayerController::errorNum())
-                            UBGraphicsItem::assignZValue(appleWidgetItem, zFromSvg);
-
-                        if (!uuidFromSvg.isNull())
-                            appleWidgetItem->setUuid(uuidFromSvg);
-
                        appleWidgetItem->show();

                        currentWidget = appleWidgetItem;
@ -887,7 +816,6 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
                else if (src.contains(".wgt"))
                {
                    UBGraphicsW3CWidgetItem* w3cWidgetItem = graphicsW3CWidgetFromSvg();
-
                    if (w3cWidgetItem)
                    {
                        w3cWidgetItem->setFlag(QGraphicsItem::ItemIsSelectable, true);
@ -896,12 +824,6 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()

                        mScene->addItem(w3cWidgetItem);

-                        if (zFromSvg != UBZLayerController::errorNum())
-                            UBGraphicsItem::assignZValue(w3cWidgetItem, zFromSvg);
-
-                        if (!uuidFromSvg.isNull())
-                            w3cWidgetItem->setUuid(uuidFromSvg);
-
                        w3cWidgetItem->show();

                        currentWidget = w3cWidgetItem;
@ -910,7 +832,6 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
                else if (type == "text")
                {
                    UBGraphicsTextItem* textItem = textItemFromSvg();
-
                    UBGraphicsTextItemDelegate *textDelegate = 0;

                    if (textItem)
@ -931,12 +852,6 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()

                        mScene->addItem(textItem);

-                        if (zFromSvg != UBZLayerController::errorNum())
-                            UBGraphicsItem::assignZValue(textItem, zFromSvg);
-
-                        if (!uuidFromSvg.isNull())
-                            textItem->setUuid(uuidFromSvg);
-
                        textItem->show();
                    }
                }
@ -991,9 +906,8 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
        mScene->addItem(iterator.value());
    }

-    if (mScene) {
+    if (mScene)
        mScene->setModified(false);
-    }

    mScene->enableUndoRedoStack();
    qDebug() << "loadScene() : created scene and read file";
@ -1108,9 +1022,9 @@ void UBSvgSubsetAdaptor::persistScene(UBDocumentProxy* proxy, UBGraphicsScene* p


 UBSvgSubsetAdaptor::UBSvgSubsetWriter::UBSvgSubsetWriter(UBDocumentProxy* proxy, UBGraphicsScene* pScene, const int pageIndex)
-        : mScene(pScene)
-        , mDocumentPath(proxy->persistencePath())
-        , mPageIndex(pageIndex)
+    : mScene(pScene)
+    , mDocumentPath(proxy->persistencePath())
+    , mPageIndex(pageIndex)

 {
    // NOOP
@ -1213,24 +1127,25 @@ bool UBSvgSubsetAdaptor::UBSvgSubsetWriter::persistScene(int pageIndex)

                foreach(QGraphicsItem* item, strokesGroupItem->childItems()) {
                    UBGraphicsPolygonItem* poly = qgraphicsitem_cast<UBGraphicsPolygonItem*>(item);
-                    if (!poly) {
+                    if (!poly)
                        continue;
-                    } else if (!resultPoly) {
+                    if (!resultPoly) {
                        resultPoly = poly;
                        continue;
                    }
-                    QPolygonF newPolygon = poly->sceneTransform().map(poly->polygon());
-                    QPainterPath strokePainterPath;
-                    strokePainterPath.addPolygon(resultPoly->sceneTransform().map(resultPoly->polygon()));
-                    QPolygonF oldPolygons = strokePainterPath.simplified().toFillPolygon(resultPoly->sceneTransform().inverted());
-                    newPolygon = oldPolygons.united(newPolygon);
-                    resultPoly->setPolygon(newPolygon);
-
-                    //
+
+                    QPolygonF unitedPolygon = resultPoly->polygon().united(poly->polygon());
+                    resultPoly->setPolygon(unitedPolygon);
                    items.removeOne(poly);
                }
                if (resultPoly) {
-                    polygonItemToSvgPolygon(resultPoly, true);
+                    resultPoly->setZValue(strokesGroupItem->zValue());
+                    //Claudio: the painter path simplification remove all the polygons overlap
+                    QPainterPath painterPath;
+                    painterPath.addPolygon(resultPoly->polygon());
+                    painterPath = painterPath.simplified();
+                    resultPoly->setPolygon(painterPath.toFillPolygon());
+                    polygonItemToSvgPolygon(resultPoly, false);
                    items.removeOne(resultPoly);
                }
            }
@ -1239,9 +1154,7 @@ bool UBSvgSubsetAdaptor::UBSvgSubsetWriter::persistScene(int pageIndex)
            UBGraphicsPolygonItem *polygonItem = qgraphicsitem_cast<UBGraphicsPolygonItem*> (item);
            if (polygonItem && polygonItem->isVisible())
            {
-
                UBGraphicsStroke* currentStroke = polygonItem->stroke();
-
                if (openStroke && (currentStroke != openStroke))
                {
                    mXmlWriter.writeEndElement(); //g
@ -1514,15 +1427,14 @@ void UBSvgSubsetAdaptor::UBSvgSubsetWriter::persistGroupToDom(QGraphicsItem *gro
        foreach (QGraphicsItem *item, groupItem->childItems()) {
            QUuid tmpUuid = UBGraphicsScene::getPersonalUuid(item);
            if (!tmpUuid.isNull()) {
-                if (item->type() == UBGraphicsGroupContainerItem::Type && item->childItems().count()) {
+                if (item->type() == UBGraphicsGroupContainerItem::Type && item->childItems().count())
                    persistGroupToDom(item, curParent, groupDomDocument);
-                }
-                else {
-                    QDomElement curSubElement = groupDomDocument->createElement(tElement);
+            }
+            else {
+                QDomElement curSubElement = groupDomDocument->createElement(tElement);

-                    curSubElement.setAttribute(aId, tmpUuid);
-                    curGroupElement.appendChild(curSubElement);
-                }
+                curSubElement.setAttribute(aId, tmpUuid);
+                curGroupElement.appendChild(curSubElement);
            }
        }
    }
@ -1694,26 +1606,15 @@ UBGraphicsPolygonItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::polygonItemFromPol
 {
    UBGraphicsPolygonItem* polygonItem = new UBGraphicsPolygonItem();

+    graphicsItemFromSvg(polygonItem);
+
    QStringRef svgPoints = mXmlReader.attributes().value("points");

    QPolygonF polygon;

    if (!svgPoints.isNull())
    {
-//        int lenght = strlen(svgPoints.toUtf8().constData()) + 1;
-//        char pippo[lenght];
-//        memcpy(pippo,svgPoints.toUtf8().constData(),lenght);
-//        char* localPosition = (char*) &pippo[0];
-//        do{
-//            float x = atof(localPosition);
-//            localPosition = strchr(localPosition,',') + 1;
-//            float y = atof(localPosition);
-//            localPosition = strchrnul(localPosition,' ');
-//            polygon << QPointF(x,y);
-//        }while(localPosition - pippo > lenght - 5);
-
-        QStringList ts = svgPoints.toString().split(QLatin1Char(' '),
-                         QString::SkipEmptyParts);
+        QStringList ts = svgPoints.toString().split(QLatin1Char(' '), QString::SkipEmptyParts);

        foreach(const QString sPoint, ts)
        {
@ -1748,26 +1649,13 @@ UBGraphicsPolygonItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::polygonItemFromPol

    polygonItem->setPolygon(polygon);

-    QStringRef svgTransform = mXmlReader.attributes().value("transform");
-
-    QMatrix itemMatrix;
-
-    if (!svgTransform.isNull())
-    {
-        itemMatrix = fromSvgTransform(svgTransform.toString());
-        polygonItem->setMatrix(itemMatrix);
-    }
-
    QStringRef svgFill = mXmlReader.attributes().value("fill");

    QColor brushColor = pDefaultColor;

    if (!svgFill.isNull())
-    {
        brushColor.setNamedColor(svgFill.toString());

-    }
-
    QStringRef svgFillOpacity = mXmlReader.attributes().value("fill-opacity");
    qreal opacity = 1.0;

@ -1779,17 +1667,6 @@ UBGraphicsPolygonItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::polygonItemFromPol

    polygonItem->setColor(brushColor);

-    QStringRef ubZValue = mXmlReader.attributes().value(mNamespaceUri, "z-value");
-
-    if (!ubZValue.isNull())
-    {
-        UBGraphicsItem::assignZValue(polygonItem, ubZValue.toString().toFloat());
-    }
-    else
-    {
-        UBGraphicsItem::assignZValue(polygonItem, mGroupZIndex);
-    }
-
    QStringRef ubFillOnDarkBackground = mXmlReader.attributes().value(mNamespaceUri, "fill-on-dark-background");

    if (!ubFillOnDarkBackground.isNull())
@ -1864,6 +1741,7 @@ UBGraphicsPolygonItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::polygonItemFromLin
    }

    UBGraphicsPolygonItem* polygonItem = new UBGraphicsPolygonItem(line, lineWidth);
+    graphicsItemFromSvg(polygonItem);

    QStringRef svgStroke = mXmlReader.attributes().value("stroke");

@ -1886,18 +1764,6 @@ UBGraphicsPolygonItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::polygonItemFromLin

    polygonItem->setColor(brushColor);

-    QStringRef ubZValue = mXmlReader.attributes().value(mNamespaceUri, "z-value");
-
-    if (!ubZValue.isNull())
-    {
-        UBGraphicsItem::assignZValue(polygonItem, ubZValue.toString().toFloat());
-    }
-    else
-    {
-        UBGraphicsItem::assignZValue(polygonItem, mGroupZIndex);
-    }
-
-
    QStringRef ubFillOnDarkBackground = mXmlReader.attributes().value(mNamespaceUri, "fill-on-dark-background");

    if (!ubFillOnDarkBackground.isNull())
@ -2008,7 +1874,7 @@ QList<UBGraphicsPolygonItem*> UBSvgSubsetAdaptor::UBSvgSubsetReader::polygonItem
    if (!svgPoints.isNull())
    {
        QStringList ts = svgPoints.toString().split(QLatin1Char(' '),
-                         QString::SkipEmptyParts);
+                                                    QString::SkipEmptyParts);

        QList<QPointF> points;

@ -2288,24 +2154,21 @@ UBGraphicsMediaItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::audioItemFromSvg()

    //Claudio this is necessary to fix the absolute path added on Sankore 3.1 1.00.00
    //The absoult path doesn't work when you want to share Sankore documents.
-    if(!href.startsWith("audios/")){
+    if(!audioHref.startsWith("audios/")){
        int indexOfAudioDirectory = href.lastIndexOf("audios");
        href = mDocumentPath + "/" + href.right(href.length() - indexOfAudioDirectory);
    }

    UBGraphicsMediaItem* audioItem = new UBGraphicsMediaItem(QUrl::fromLocalFile(href));
-    if(audioItem){
+    if(audioItem)
        audioItem->connect(UBApplication::boardController, SIGNAL(activeSceneChanged()), audioItem, SLOT(activeSceneChanged()));
-    }

    graphicsItemFromSvg(audioItem);
    QStringRef ubPos = mXmlReader.attributes().value(mNamespaceUri, "position");

    qint64 p = 0;
    if (!ubPos.isNull())
-    {
        p = ubPos.toString().toLongLong();
-    }

    audioItem->setInitialPos(p);
    return audioItem;
@ -2326,7 +2189,7 @@ UBGraphicsMediaItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::videoItemFromSvg()

    //Claudio this is necessary to fix the absolute path added on Sankore 3.1 1.00.00
    //The absoult path doesn't work when you want to share Sankore documents.
-    if(!href.startsWith("videos/")){
+    if(!videoHref.startsWith("videos/")){
        int indexOfAudioDirectory = href.lastIndexOf("videos");
        href = mDocumentPath + "/" + href.right(href.length() - indexOfAudioDirectory);
    }
@ -2380,9 +2243,9 @@ void UBSvgSubsetAdaptor::UBSvgSubsetReader::graphicsItemFromSvg(QGraphicsItem* g
    {
        if (!svgX.isNull() && !svgY.isNull())
        {
-            #ifdef Q_WS_WIN
-                gItem->setPos(svgX.toString().toFloat(), svgY.toString().toFloat());
-            #endif
+#ifdef Q_WS_WIN
+            gItem->setPos(svgX.toString().toFloat(), svgY.toString().toFloat());
+#endif
        }
    }

@ -2402,9 +2265,7 @@ void UBSvgSubsetAdaptor::UBSvgSubsetReader::graphicsItemFromSvg(QGraphicsItem* g
    QStringRef ubZValue = mXmlReader.attributes().value(mNamespaceUri, "z-value");

    if (!ubZValue.isNull())
-    {
        UBGraphicsItem::assignZValue(gItem, ubZValue.toString().toFloat());
-    }

    UBItem* ubItem = dynamic_cast<UBItem*>(gItem);

@ -2413,16 +2274,14 @@ void UBSvgSubsetAdaptor::UBSvgSubsetReader::graphicsItemFromSvg(QGraphicsItem* g
        QStringRef ubUuid = mXmlReader.attributes().value(mNamespaceUri, "uuid");

        if (!ubUuid.isNull())
-        {
            ubItem->setUuid(QUuid(ubUuid.toString()));
-        }
+        else
+            ubItem->setUuid(QUuid::createUuid());

        QStringRef ubSource = mXmlReader.attributes().value(mNamespaceUri, "source");

        if (!ubSource.isNull())
-        {
            ubItem->setSourceUrl(QUrl(ubSource.toString()));
-        }
    }

    QStringRef ubLocked = mXmlReader.attributes().value(mNamespaceUri, "locked");
@ -2449,35 +2308,10 @@ void UBSvgSubsetAdaptor::UBSvgSubsetReader::graphicsItemFromSvg(QGraphicsItem* g
        int layerAsInt = ubLayer.toString().toInt(&ok);

        if (ok)
-        {
            gItem->setData(UBGraphicsItemData::ItemLayerType, QVariant(layerAsInt));
-        }
-    }
-}
-
-qreal UBSvgSubsetAdaptor::UBSvgSubsetReader::getZValueFromSvg()
-{
-    qreal result = UBZLayerController::errorNum();
-
-    QStringRef ubZValue = mXmlReader.attributes().value(mNamespaceUri, "z-value");
-    if (!ubZValue.isNull()) {
-        result  = ubZValue.toString().toFloat();
    }
-
-    return result;
-}
-
-QUuid UBSvgSubsetAdaptor::UBSvgSubsetReader::getUuidFromSvg()
-{
-    QString strUuid = mXmlReader.attributes().value(mNamespaceUri, "uuid").toString();
-    QUuid uuid = QUuid(strUuid);
-    if (!uuid.isNull())
-        return uuid;
-
-    return QUuid::createUuid();
 }

-
 void UBSvgSubsetAdaptor::UBSvgSubsetWriter::graphicsItemToSvg(QGraphicsItem* item)
 {
    mXmlWriter.writeAttribute("x", "0");
@ -2759,7 +2593,7 @@ UBGraphicsTextItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::textItemFromSvg()
        color.setNamedColor(ubFillOnLightBackground.toString());
        if (!color.isValid())
            color = Qt::black;
-            textItem->setColorOnLightBackground(color);
+        textItem->setColorOnLightBackground(color);
    }

    QString text;
@ -2769,6 +2603,7 @@ UBGraphicsTextItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::textItemFromSvg()
        if (mXmlReader.hasError())
        {
            delete textItem;
+            textItem = 0;
            return 0;
        }

@ -2788,7 +2623,7 @@ UBGraphicsTextItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::textItemFromSvg()
                    return textItem;
                }

-            //tracking for backward capability with older versions
+                //tracking for backward capability with older versions
            } else if (mXmlReader.name() == "font")  {
                QFont font = textItem->font();

@ -2803,18 +2638,18 @@ UBGraphicsTextItem* UBSvgSubsetAdaptor::UBSvgSubsetReader::textItemFromSvg()
                        styleToken = styleToken.trimmed();
                        if (styleToken.startsWith(sFontSizePrefix) && styleToken.endsWith(sPixelUnit)) {
                            int fontSize = styleToken.mid(
-                                               sFontSizePrefix.length(),
-                                               styleToken.length() - sFontSizePrefix.length() - sPixelUnit.length()).toInt();
+                                        sFontSizePrefix.length(),
+                                        styleToken.length() - sFontSizePrefix.length() - sPixelUnit.length()).toInt();
                            font.setPixelSize(fontSize);
                        } else if (styleToken.startsWith(sFontWeightPrefix)) {
                            QString fontWeight = styleToken.mid(
-                                                     sFontWeightPrefix.length(),
-                                                     styleToken.length() - sFontWeightPrefix.length());
+                                        sFontWeightPrefix.length(),
+                                        styleToken.length() - sFontWeightPrefix.length());
                            font.setBold(fontWeight.contains("bold"));
                        } else if (styleToken.startsWith(sFontStylePrefix)) {
                            QString fontStyle = styleToken.mid(
-                                                    sFontStylePrefix.length(),
-                                                    styleToken.length() - sFontStylePrefix.length());
+                                        sFontStylePrefix.length(),
+                                        styleToken.length() - sFontStylePrefix.length());
                            font.setItalic(fontStyle.contains("italic"));
                        }
                    }
@ -3168,7 +3003,7 @@ UBGraphicsTriangle* UBSvgSubsetAdaptor::UBSvgSubsetReader::triangleFromSvg()
    UBGraphicsTriangle::UBGraphicsTriangleOrientation orientation = UBGraphicsTriangle::orientationFromStr(orientationStringRef);
    triangle->setOrientation(orientation);

-        if (!svgX.isNull() && !svgY.isNull() && !svgWidth.isNull() && !svgHeight.isNull())
+    if (!svgX.isNull() && !svgY.isNull() && !svgWidth.isNull() && !svgHeight.isNull())
    {
        triangle->setRect(svgX.toString().toFloat(), svgY.toString().toFloat(), svgWidth.toString().toFloat(), svgHeight.toString().toFloat(), orientation);
    }
@ -3299,9 +3134,3 @@ void UBSvgSubsetAdaptor::convertSvgImagesToImages(UBDocumentProxy* proxy)
        }
    }
 }
-
-
-
-
-
-
--- a/src/adaptors/UBSvgSubsetAdaptor.h
+++ b/src/adaptors/UBSvgSubsetAdaptor.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
@ -158,9 +158,6 @@ class UBSvgSubsetAdaptor

                void graphicsItemFromSvg(QGraphicsItem* gItem);

-                qreal getZValueFromSvg();
-                QUuid getUuidFromSvg();
-
                QXmlStreamReader mXmlReader;
                int mFileVersion;
                UBDocumentProxy *mProxy;
--- a/src/adaptors/UBThumbnailAdaptor.cpp
+++ b/src/adaptors/UBThumbnailAdaptor.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/UBThumbnailAdaptor.h
+++ b/src/adaptors/UBThumbnailAdaptor.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/UBWebPublisher.cpp
+++ b/src/adaptors/UBWebPublisher.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/UBWebPublisher.h
+++ b/src/adaptors/UBWebPublisher.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/publishing/UBDocumentPublisher.cpp
+++ b/src/adaptors/publishing/UBDocumentPublisher.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/publishing/UBDocumentPublisher.h
+++ b/src/adaptors/publishing/UBDocumentPublisher.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/publishing/UBSvgSubsetRasterizer.cpp
+++ b/src/adaptors/publishing/UBSvgSubsetRasterizer.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/adaptors/publishing/UBSvgSubsetRasterizer.h
+++ b/src/adaptors/publishing/UBSvgSubsetRasterizer.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/api/UBLibraryAPI.cpp
+++ b/src/api/UBLibraryAPI.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/api/UBLibraryAPI.h
+++ b/src/api/UBLibraryAPI.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/api/UBW3CWidgetAPI.cpp
+++ b/src/api/UBW3CWidgetAPI.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/api/UBW3CWidgetAPI.h
+++ b/src/api/UBW3CWidgetAPI.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/api/UBWidgetMessageAPI.cpp
+++ b/src/api/UBWidgetMessageAPI.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/api/UBWidgetMessageAPI.h
+++ b/src/api/UBWidgetMessageAPI.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/api/UBWidgetUniboardAPI.cpp
+++ b/src/api/UBWidgetUniboardAPI.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/api/UBWidgetUniboardAPI.h
+++ b/src/api/UBWidgetUniboardAPI.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/board/UBBoardController.cpp
+++ b/src/board/UBBoardController.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
@ -358,9 +358,7 @@ void UBBoardController::setupToolbar()
 void UBBoardController::setToolCursor(int tool)
 {
    if (mActiveScene)
-    {
        mActiveScene->setToolCursor(tool);
-    }

    mControlView->setToolCursor(tool);
 }
@ -1893,10 +1891,7 @@ void UBBoardController::updateSystemScaleFactor()
    }

    if (mSystemScaleFactor != newScaleFactor)
-    {
        mSystemScaleFactor = newScaleFactor;
-        emit systemScaleFactorChanged(newScaleFactor);
-    }

    UBGraphicsScene::SceneViewState viewState = mActiveScene->viewState();

@ -1961,13 +1956,8 @@ void UBBoardController::setPageSize(QSize newSize)
 void UBBoardController::notifyCache(bool visible)
 {
    if(visible)
-    {
        emit cacheEnabled();
-    }
-    else
-    {
-        emit cacheDisabled();
-    }
+    
    mCacheWidgetIsEnabled = visible;
 }

--- a/src/board/UBBoardController.h
+++ b/src/board/UBBoardController.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
@ -149,7 +149,7 @@ class UBBoardController : public UBDocumentContainer
        void setBoxing(QRect displayRect);
        void setToolbarTexts();
        static QUrl expandWidgetToTempDir(const QByteArray& pZipedData, const QString& pExtension = QString("wgt"));
-//        static QRect freeRectInGlobalPos() const {return ;}
+        
        void setPageSize(QSize newSize);
        UBBoardPaletteManager *paletteManager()
        {
@ -239,12 +239,10 @@ class UBBoardController : public UBDocumentContainer
        void newPageAdded();
        void activeSceneChanged();
        void zoomChanged(qreal pZoomFactor);
-        void systemScaleFactorChanged(qreal pSystemScaleFactor);
        void penColorChanged();
        void controlViewportChanged();
        void backgroundChanged();
        void cacheEnabled();
-        void cacheDisabled();
        void documentReorganized(int index);
        void displayMetadata(QMap<QString, QString> metadata);
        void pageSelectionChanged(int index);
--- a/src/board/UBBoardPaletteManager.cpp
+++ b/src/board/UBBoardPaletteManager.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
@ -175,7 +175,7 @@ void UBBoardPaletteManager::setupDockPaletteWidgets()

 void UBBoardPaletteManager::slot_changeMainMode(UBApplicationController::MainMode mainMode)
 {
-//    Board = 0, Internet, Document, Tutorial, ParaschoolEditor, WebDocument
+//    Board = 0, Internet, Document, Tutorial, WebDocument

    switch( mainMode )
    {
@ -821,8 +821,6 @@ void UBBoardPaletteManager::changeMode(eUBDockPaletteWidgetMode newMode, bool is

    if( !isInit )
        UBApplication::boardController->notifyPageChanged();
-
-    emit signal_changeMode(newMode);
 }

 void UBBoardPaletteManager::addItem(const QPixmap& pPixmap, const QPointF& pos,  qreal scaleFactor, const QUrl& sourceUrl)
@ -970,11 +968,6 @@ void UBBoardPaletteManager::changeStylusPaletteOrientation(QVariant var)
 }


-void UBBoardPaletteManager::connectToDocumentController()
-{
-    emit connectToDocController();
-}
-
 void UBBoardPaletteManager::refreshPalettes()
 {
    mRightPalette->update();
--- a/src/board/UBBoardPaletteManager.h
+++ b/src/board/UBBoardPaletteManager.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
@ -64,7 +64,6 @@ class UBBoardPaletteManager : public QObject
        UBActionPalette *addItemPalette() {return mAddItemPalette;}
        void showVirtualKeyboard(bool show = true);
        void initPalettesPosAtStartup();
-        void connectToDocumentController();
        void refreshPalettes();

        UBKeyboardPalette *mKeyboardPalette;
@ -79,10 +78,6 @@ class UBBoardPaletteManager : public QObject
        void startDownloads();
        void stopDownloads();

-    signals:
-        void connectToDocController();
-        void signal_changeMode(eUBDockPaletteWidgetMode newMode);
-
    public slots:

        void activeSceneChanged();
--- a/src/board/UBBoardView.cpp
+++ b/src/board/UBBoardView.cpp
--- a/src/board/UBBoardView.h
+++ b/src/board/UBBoardView.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
@ -38,150 +38,145 @@ class UBBoardView : public QGraphicsView
 {
    Q_OBJECT

-    public:
+public:

-        UBBoardView(UBBoardController* pController, QWidget* pParent = 0, bool isControl = false, bool isDesktop = false);
-        UBBoardView(UBBoardController* pController, int pStartLayer, int pEndLayer, QWidget* pParent = 0, bool isControl = false, bool isDesktop = false);
-        virtual ~UBBoardView();
+    UBBoardView(UBBoardController* pController, QWidget* pParent = 0, bool isControl = false, bool isDesktop = false);
+    UBBoardView(UBBoardController* pController, int pStartLayer, int pEndLayer, QWidget* pParent = 0, bool isControl = false, bool isDesktop = false);
+    virtual ~UBBoardView();

-        UBGraphicsScene* scene();
+    UBGraphicsScene* scene();

-        void forcedTabletRelease();
+    void forcedTabletRelease();

-        void setToolCursor(int tool);
+    void setToolCursor(int tool);

-        void rubberItems();
-        void moveRubberedItems(QPointF movingVector);
+    void rubberItems();
+    void moveRubberedItems(QPointF movingVector);

-        void setMultiselection(bool enable);
-        bool isMultipleSelectionEnabled() { return mMultipleSelectionIsEnabled; }
-// work around for handling tablet events on MAC OS with Qt 4.8.0 and above
+    void setMultiselection(bool enable);
+    bool isMultipleSelectionEnabled() { return mMultipleSelectionIsEnabled; }
+    // work around for handling tablet events on MAC OS with Qt 4.8.0 and above
 #if defined(Q_WS_MACX)
-        bool directTabletEvent(QEvent *event);
-        QWidget *widgetForTabletEvent(QWidget *w, const QPoint &pos);
+    bool directTabletEvent(QEvent *event);
+    QWidget *widgetForTabletEvent(QWidget *w, const QPoint &pos);
 #endif
-    signals:
+signals:
+    void resized(QResizeEvent* event);
+    void shown();
+    void clickOnBoard();
+    void mouseReleased();

-        void resized(QResizeEvent* event);
-        void hidden();
-        void shown();
-        void clickOnBoard();
-        void mouseReleased();

-    protected:
+protected:

-        bool itemIsLocked(QGraphicsItem *item);
-        bool isUBItem(QGraphicsItem *item); // we should to determine items who is not UB and use general scene behavior for them.
-        bool isCppTool(QGraphicsItem *item);
-        void handleItemsSelection(QGraphicsItem *item);
-        bool itemShouldReceiveMousePressEvent(QGraphicsItem *item);
-        bool itemShouldReceiveSuspendedMousePressEvent(QGraphicsItem *item);
-        bool itemHaveParentWithType(QGraphicsItem *item, int type);
-        bool itemShouldBeMoved(QGraphicsItem *item);
-        QGraphicsItem* determineItemToPress(QGraphicsItem *item);
-        QGraphicsItem* determineItemToMove(QGraphicsItem *item);
-        void handleItemMousePress(QMouseEvent *event);
-        void handleItemMouseMove(QMouseEvent *event);
+    bool itemIsLocked(QGraphicsItem *item);
+    bool isUBItem(QGraphicsItem *item); // we should to determine items who is not UB and use general scene behavior for them.
+    bool isCppTool(QGraphicsItem *item);
+    void handleItemsSelection(QGraphicsItem *item);
+    bool itemShouldReceiveMousePressEvent(QGraphicsItem *item);
+    bool itemShouldReceiveSuspendedMousePressEvent(QGraphicsItem *item);
+    bool itemHaveParentWithType(QGraphicsItem *item, int type);
+    bool itemShouldBeMoved(QGraphicsItem *item);
+    QGraphicsItem* determineItemToPress(QGraphicsItem *item);
+    QGraphicsItem* determineItemToMove(QGraphicsItem *item);
+    void handleItemMousePress(QMouseEvent *event);
+    void handleItemMouseMove(QMouseEvent *event);

-        virtual bool event (QEvent * e);
+    virtual bool event (QEvent * e);

-        virtual void keyPressEvent(QKeyEvent *event);
-        virtual void keyReleaseEvent(QKeyEvent *event);
-        virtual void tabletEvent(QTabletEvent * event);
-        virtual void mouseDoubleClickEvent(QMouseEvent *event);
-        virtual void mousePressEvent(QMouseEvent *event);
-        virtual void mouseMoveEvent(QMouseEvent *event);
-        virtual void mouseReleaseEvent(QMouseEvent *event);
-        virtual void wheelEvent(QWheelEvent *event);
-        virtual void leaveEvent ( QEvent * event);
+    virtual void keyPressEvent(QKeyEvent *event);
+    virtual void keyReleaseEvent(QKeyEvent *event);
+    virtual void tabletEvent(QTabletEvent * event);
+    virtual void mouseDoubleClickEvent(QMouseEvent *event);
+    virtual void mousePressEvent(QMouseEvent *event);
+    virtual void mouseMoveEvent(QMouseEvent *event);
+    virtual void mouseReleaseEvent(QMouseEvent *event);
+    virtual void wheelEvent(QWheelEvent *event);
+    virtual void leaveEvent ( QEvent * event);

-        virtual void focusOutEvent ( QFocusEvent * event );
+    virtual void focusOutEvent ( QFocusEvent * event );

-        virtual void drawItems(QPainter *painter, int numItems,
-                                    QGraphicsItem *items[],
-                                    const QStyleOptionGraphicsItem options[]);
+    virtual void drawItems(QPainter *painter, int numItems,
+                           QGraphicsItem *items[],
+                           const QStyleOptionGraphicsItem options[]);

-//        virtual void dragEnterEvent(QDragEnterEvent * event);
-        virtual void dropEvent(QDropEvent *event);
-        virtual void dragMoveEvent(QDragMoveEvent *event);
+    virtual void dropEvent(QDropEvent *event);
+    virtual void dragMoveEvent(QDragMoveEvent *event);

-        virtual void resizeEvent(QResizeEvent * event);
+    virtual void resizeEvent(QResizeEvent * event);

-        virtual void drawBackground(QPainter *painter, const QRectF &rect);
+    virtual void drawBackground(QPainter *painter, const QRectF &rect);

-        virtual void showEvent(QShowEvent * event);
-        virtual void hideEvent(QHideEvent * event);
+private:

-    private:
+    void init();

-        void init();
+    inline bool shouldDisplayItem(QGraphicsItem *item)
+    {
+        bool ok;
+        int itemLayerType = item->data(UBGraphicsItemData::ItemLayerType).toInt(&ok);
+        return (ok && (itemLayerType >= mStartLayer && itemLayerType <= mEndLayer));
+    }

-        inline bool shouldDisplayItem(QGraphicsItem *item)
-        {
-            bool ok;
-            int itemLayerType = item->data(UBGraphicsItemData::ItemLayerType).toInt(&ok);
-            return (ok && (itemLayerType >= mStartLayer && itemLayerType <= mEndLayer));
-        }
+    QList<QUrl> processMimeData(const QMimeData* pMimeData);

-        QList<QUrl> processMimeData(const QMimeData* pMimeData);
+    UBBoardController* mController;

-        UBBoardController* mController;
+    int mStartLayer, mEndLayer;
+    bool mFilterZIndex;

-        int mStartLayer, mEndLayer;
-        bool mFilterZIndex;
+    bool mTabletStylusIsPressed;
+    bool mUsingTabletEraser;

-        bool mTabletStylusIsPressed;
-        bool mUsingTabletEraser;
+    bool mPendingStylusReleaseEvent;

-        bool mPendingStylusReleaseEvent;
+    bool mMouseButtonIsPressed;
+    QPointF mPreviousPoint;
+    QPoint mMouseDownPos;

-        bool mMouseButtonIsPressed;
-        QPointF mPreviousPoint;
-        QPoint mMouseDownPos;
+    bool mPenPressureSensitive;
+    bool mMarkerPressureSensitive;
+    bool mUseHighResTabletEvent;

-        bool mPenPressureSensitive;
-        bool mMarkerPressureSensitive;
-        bool mUseHighResTabletEvent;
+    QRubberBand *mRubberBand;
+    bool mIsCreatingTextZone;
+    bool mIsCreatingSceneGrabZone;

-        QRubberBand *mRubberBand;
-        bool mIsCreatingTextZone;
-        bool mIsCreatingSceneGrabZone;
+    bool isAbsurdPoint(QPoint point);

-        bool isAbsurdPoint(QPoint point);
+    bool mVirtualKeyboardActive;
+    bool mOkOnWidget;

-        bool mVirtualKeyboardActive;
-        bool mOkOnWidget;
+    bool mWidgetMoved;
+    QPointF mLastPressedMousePos;
+    QGraphicsItem *movingItem;
+    QMouseEvent *suspendedMousePressEvent;

-        bool mWidgetMoved;
-        QPointF mLastPressedMousePos;
-        QGraphicsItem *movingItem;
-        QMouseEvent *suspendedMousePressEvent;
+    bool moveRubberBand;
+    UBRubberBand *mUBRubberBand;

-        bool moveRubberBand;
-        UBRubberBand *mUBRubberBand;
+    QList<QGraphicsItem *> mRubberedItems;
+    QSet<QGraphicsItem*> mJustSelectedItems;

-        QList<QGraphicsItem *> mRubberedItems;
-        QSet<QGraphicsItem*> mJustSelectedItems;
+    int mLongPressInterval;
+    QTimer mLongPressTimer;

-        int mLongPressInterval;
-        QTimer mLongPressTimer;
+    bool mIsDragInProgress;
+    bool mMultipleSelectionIsEnabled;
+    bool bIsControl;
+    bool bIsDesktop;
+    bool mRubberBandInPlayMode;

-        bool mIsDragInProgress;
-        bool mMultipleSelectionIsEnabled;
-        bool bIsControl;
-        bool bIsDesktop;
-        bool mRubberBandInPlayMode;
+    static bool hasSelectedParents(QGraphicsItem * item);

-        static bool hasSelectedParents(QGraphicsItem * item);
+private slots:

-    private slots:
+    void settingChanged(QVariant newValue);

-        void settingChanged(QVariant newValue);
+public slots:

-    public slots:
-
-        void virtualKeyboardActivated(bool b);
-        void longPressEvent();
+    void virtualKeyboardActivated(bool b);
+    void longPressEvent();

 };

--- a/src/board/UBDrawingController.cpp
+++ b/src/board/UBDrawingController.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
@ -159,35 +159,23 @@ bool UBDrawingController::isDrawingTool()
 int UBDrawingController::currentToolWidthIndex()
 {
    if (stylusTool() == UBStylusTool::Pen || stylusTool() == UBStylusTool::Line)
-    {
        return UBSettings::settings()->penWidthIndex();
-    }
    else if (stylusTool() == UBStylusTool::Marker)
-    {
        return UBSettings::settings()->markerWidthIndex();
-    }
    else
-    {
        return -1;
-    }
 }


 qreal UBDrawingController::currentToolWidth()
 {
    if (stylusTool() == UBStylusTool::Pen || stylusTool() == UBStylusTool::Line)
-    {
        return UBSettings::settings()->currentPenWidth();
-    }
    else if (stylusTool() == UBStylusTool::Marker)
-    {
        return UBSettings::settings()->currentMarkerWidth();
-    }
    else
-    {
        //failsafe
        return UBSettings::settings()->currentPenWidth();
-    }
 }


--- a/src/board/UBDrawingController.h
+++ b/src/board/UBDrawingController.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/board/UBFeaturesController.cpp
+++ b/src/board/UBFeaturesController.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
@ -37,7 +37,6 @@
 #include "domain/UBGraphicsScene.h"
 #include "domain/UBGraphicsSvgItem.h"
 #include "domain/UBGraphicsPixmapItem.h"
-#include "domain/UBGraphicsVideoItem.h"
 #include "domain/UBGraphicsWidgetItem.h"

 #include "gui/UBFeaturesWidget.h"
--- a/src/board/UBFeaturesController.h
+++ b/src/board/UBFeaturesController.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/core/UB.h
+++ b/src/core/UB.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
@ -50,17 +50,17 @@ struct UBStylusTool
 {
    enum Enum
    {
-        Pen = 0, 
-        Eraser, 
-         Marker, 
-        Selector, 
+        Pen = 0,
+        Eraser,
+        Marker,
+        Selector,
        Play,
-        Hand, 
-        ZoomIn, 
-        ZoomOut, 
-        Pointer, 
-        Line, 
-        Text, 
+        Hand,
+        ZoomIn,
+        ZoomOut,
+        Pointer,
+        Line,
+        Text,
        Capture
    };
 };
@ -138,17 +138,17 @@ struct UBGraphicsItemType
 {
    enum Enum
    {
-        PolygonItemType = QGraphicsItem::UserType + 1, 
+        PolygonItemType = QGraphicsItem::UserType + 1,
        PixmapItemType,
-        SvgItemType, 
+        SvgItemType,
        DelegateButtonType,
-        MediaItemType, 
-        PDFItemType, 
+        MediaItemType,
+        PDFItemType,
        TextItemType,
        CurtainItemType,
-        RulerItemType, 
-        CompassItemType, 
-        ProtractorItemType, 
+        RulerItemType,
+        CompassItemType,
+        ProtractorItemType,
        StrokeItemType,
        TriangleItemType,
        MagnifierItemType,
--- a/src/core/UBApplication.cpp
+++ b/src/core/UBApplication.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
@ -317,8 +317,6 @@ int UBApplication::exec(const QString& pFileToImport)
    webController = new UBWebController(mainWindow);
    documentController = new UBDocumentController(mainWindow);

-    boardController->paletteManager()->connectToDocumentController();
-
    UBDrawingController::drawingController()->setStylusTool((int)UBStylusTool::Pen);

    applicationController = new UBApplicationController(boardController->controlView(),
@ -349,7 +347,6 @@ int UBApplication::exec(const QString& pFileToImport)
    connect(mainWindow->actionPreferences, SIGNAL(triggered()), mPreferencesController, SLOT(show()));
    connect(mainWindow->actionTutorial, SIGNAL(triggered()), applicationController, SLOT(showTutorial()));
    connect(mainWindow->actionTutorial, SIGNAL(triggered()), this, SLOT(stopScript()));
-    connect(mainWindow->actionSankoreEditor, SIGNAL(triggered()), applicationController, SLOT(showSankoreEditor()));
    connect(mainWindow->actionCheckUpdate, SIGNAL(triggered()), applicationController, SLOT(checkUpdateRequest()));


@ -543,7 +540,6 @@ void UBApplication::decorateActionMenu(QAction* action)

            menu->addSeparator();
            menu->addAction(mainWindow->actionTutorial);
-            menu->addAction(mainWindow->actionSankoreEditor);

 #ifndef Q_WS_X11 // No Podcast on Linux yet
            menu->addAction(mainWindow->actionPodcast);
@ -651,12 +647,10 @@ void UBApplication::cleanup()
    if (webController) delete webController;
    if (documentController) delete documentController;

-
    applicationController = NULL;
    boardController = NULL;
    webController = NULL;
    documentController = NULL;
-
 }

 void UBStyle::drawItemText(QPainter *painter, const QRect &rect, int alignment, const QPalette &pal,
--- a/src/core/UBApplication.h
+++ b/src/core/UBApplication.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/core/UBApplicationController.cpp
+++ b/src/core/UBApplicationController.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
@ -68,9 +68,9 @@

 #include "core/memcheck.h"

-UBApplicationController::UBApplicationController(UBBoardView *pControlView, 
+UBApplicationController::UBApplicationController(UBBoardView *pControlView,
                                                 UBBoardView *pDisplayView,
-                                                 UBMainWindow* pMainWindow, 
+                                                 UBMainWindow* pMainWindow,
                                                 QObject* parent,
                                                 UBRightPalette* rightPalette)
    : QObject(parent)
@ -371,7 +371,7 @@ void UBApplicationController::showBoard()
    UBPlatformUtils::setDesktopMode(false);

    mUninoteController->hideWindow();
-    
+
    mMainWindow->show();

    emit mainModeChanged(Board);
@ -513,42 +513,14 @@ void UBApplicationController::showTutorial()
 }


-void UBApplicationController::showSankoreEditor()
-{
-
-    if (UBApplication::boardController)
-    {
-        UBApplication::boardController->persistCurrentScene();
-        UBApplication::boardController->hide();
-    }
-
-// it's needed not to duplicate webbrowser search in web mode. If I've breaked smbd's code let Ivan know
-        UBApplication::webController->show(UBWebController::Paraschool);
-
-    mMainWindow->webToolBar->hide();
-    mMainWindow->boardToolBar->hide();
-    mMainWindow->documentToolBar->hide();
-    mMainWindow->tutorialToolBar->show();
-
-
-    mMainMode = ParaschoolEditor;
-
-    adaptToolBar();
-
-    mUninoteController->hideWindow();
-
-    mirroringEnabled(false);
-    emit mainModeChanged(mMainMode);
-}
-
 void UBApplicationController::checkUpdate()
 {
-    if(mHttp)
-        delete mHttp;
-    QUrl url("http://ftp.open-sankore.org/update.json");
-    mHttp = new QHttp(url.host());
-    connect(mHttp, SIGNAL(requestFinished(int,bool)), this, SLOT(updateRequestFinished(int,bool)));
-    mHttp->get(url.path());
+//    if(mHttp)
+//        delete mHttp;
+//    QUrl url("http://ftp.open-sankore.org/update.json");
+//    mHttp = new QHttp(url.host());
+//    connect(mHttp, SIGNAL(requestFinished(int,bool)), this, SLOT(updateRequestFinished(int,bool)));
+//    mHttp->get(url.path());
 }

 void UBApplicationController::updateRequestFinished(int id, bool error)
@ -622,10 +594,6 @@ void UBApplicationController::hideDesktop()
    {
        showTutorial();
    }
-    else if (mMainMode == ParaschoolEditor)
-    {
-        showSankoreEditor();
-    }

    mIsShowingDesktop = false;

--- a/src/core/UBApplicationController.h
+++ b/src/core/UBApplicationController.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
@ -92,7 +92,7 @@ class UBApplicationController : public QObject

        enum MainMode
        {
-            Board = 0, Internet, Document, Tutorial, ParaschoolEditor, WebDocument
+            Board = 0, Internet, Document, Tutorial, WebDocument
        };

        MainMode displayMode()
@ -137,7 +137,6 @@ class UBApplicationController : public QObject
        void actionPaste();

        void showTutorial();
-        void showSankoreEditor();

        void checkUpdateRequest();
        void checkUpdateAtLaunch();
--- a/src/core/UBDisplayManager.cpp
+++ b/src/core/UBDisplayManager.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
@ -19,6 +19,7 @@
 * along with Open-Sankoré.  If not, see <http://www.gnu.org/licenses/>.
 */

+
 #include "UBDisplayManager.h"

 #include "frameworks/UBPlatformUtils.h"
--- a/src/core/UBDisplayManager.h
+++ b/src/core/UBDisplayManager.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/core/UBDocumentManager.cpp
+++ b/src/core/UBDocumentManager.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/core/UBDocumentManager.h
+++ b/src/core/UBDocumentManager.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/core/UBDownloadManager.cpp
+++ b/src/core/UBDownloadManager.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/core/UBDownloadManager.h
+++ b/src/core/UBDownloadManager.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/core/UBDownloadThread.cpp
+++ b/src/core/UBDownloadThread.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/core/UBDownloadThread.h
+++ b/src/core/UBDownloadThread.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/core/UBIdleTimer.cpp
+++ b/src/core/UBIdleTimer.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/core/UBIdleTimer.h
+++ b/src/core/UBIdleTimer.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/core/UBMimeData.cpp
+++ b/src/core/UBMimeData.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/core/UBMimeData.h
+++ b/src/core/UBMimeData.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/core/UBPersistenceManager.cpp
+++ b/src/core/UBPersistenceManager.cpp
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/src/core/UBPersistenceManager.h
+++ b/src/core/UBPersistenceManager.h
@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Webdoc SA
+ * 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é.
 *
--- a/Show More
+++ b/Show More