UBBoardView conflicts merged

0594cfe0 · Ilia Ryabokon · 625c239e · d3ca55c9 · 0594cfe0 · 0594cfe0
Commit 0594cfe0 authored Jun 04, 2013 by Ilia Ryabokon
481 changed files
--- a/LICENSE.txt
+++ b/LICENSE.txt
-Copyright (C) 2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)
+Copyright (C) 2013 Groupement d'Intert 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
 /*
- * 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
 /*
- * 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_global.h
+++ b/plugins/cffadaptor/src/UBCFFAdaptor_global.h
 /*
- * 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
 /*
- * 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
 /*
- * 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
-<!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
-<!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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
--- a/src/adaptors/UBSvgSubsetAdaptor.h
+++ b/src/adaptors/UBSvgSubsetAdaptor.h
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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,7 +38,7 @@ 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);
@@ -55,20 +55,19 @@ class UBBoardView : public QGraphicsView

    void setMultiselection(bool enable);
    bool isMultipleSelectionEnabled() { return mMultipleSelectionIsEnabled; }
-// work around for handling tablet events on MAC OS with Qt 4.8.0 and above
+    // 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);
 #endif
-    signals:
-
+signals:
    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.
@@ -101,7 +100,6 @@ class UBBoardView : public QGraphicsView
                           QGraphicsItem *items[],
                           const QStyleOptionGraphicsItem options[]);

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

@@ -109,10 +107,7 @@ class UBBoardView : public QGraphicsView

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

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

    void init();

@@ -174,11 +169,11 @@ class UBBoardView : public QGraphicsView

    static bool hasSelectedParents(QGraphicsItem * item);

-    private slots:
+private slots:

    void settingChanged(QVariant newValue);

-    public slots:
+public slots:

    void virtualKeyboardActivated(bool b);
    void longPressEvent();

--- a/src/board/UBDrawingController.cpp
+++ b/src/board/UBDrawingController.cpp
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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/UBApplication.cpp
+++ b/src/core/UBApplication.cpp
 /*
- * 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
 /*
- * 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
 /*
- * 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é.
 *
@@ -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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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
 /*
- * 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/UBPreferencesController.cpp
+++ b/src/core/UBPreferencesController.cpp
--- a/src/core/UBPreferencesController.h
+++ b/src/core/UBPreferencesController.h
--- a/src/core/UBSceneCache.cpp
+++ b/src/core/UBSceneCache.cpp
--- a/src/core/UBSceneCache.h
+++ b/src/core/UBSceneCache.h
--- a/src/core/UBSetting.cpp
+++ b/src/core/UBSetting.cpp
--- a/src/core/UBSetting.h
+++ b/src/core/UBSetting.h
--- a/src/core/UBSettings.cpp
+++ b/src/core/UBSettings.cpp
--- a/src/core/UBSettings.h
+++ b/src/core/UBSettings.h
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
--- a/src/core/memcheck.h
+++ b/src/core/memcheck.h
--- a/src/customWidgets/UBActionableWidget.cpp
+++ b/src/customWidgets/UBActionableWidget.cpp
--- a/src/customWidgets/UBActionableWidget.h
+++ b/src/customWidgets/UBActionableWidget.h
--- a/src/customWidgets/UBMediaWidget.cpp
+++ b/src/customWidgets/UBMediaWidget.cpp
--- a/src/customWidgets/UBMediaWidget.h
+++ b/src/customWidgets/UBMediaWidget.h
--- a/src/desktop/UBCustomCaptureWindow.cpp
+++ b/src/desktop/UBCustomCaptureWindow.cpp
--- a/src/desktop/UBCustomCaptureWindow.h
+++ b/src/desktop/UBCustomCaptureWindow.h
--- a/src/desktop/UBDesktopAnnotationController.cpp
+++ b/src/desktop/UBDesktopAnnotationController.cpp
--- a/src/desktop/UBDesktopAnnotationController.h
+++ b/src/desktop/UBDesktopAnnotationController.h
--- a/src/desktop/UBDesktopPalette.cpp
+++ b/src/desktop/UBDesktopPalette.cpp
--- a/src/desktop/UBDesktopPalette.h
+++ b/src/desktop/UBDesktopPalette.h
--- a/src/desktop/UBDesktopPropertyPalette.cpp
+++ b/src/desktop/UBDesktopPropertyPalette.cpp
--- a/src/desktop/UBDesktopPropertyPalette.h
+++ b/src/desktop/UBDesktopPropertyPalette.h
--- a/src/desktop/UBWindowCapture.h
+++ b/src/desktop/UBWindowCapture.h
--- a/src/desktop/UBWindowCaptureDelegate_win.cpp
+++ b/src/desktop/UBWindowCaptureDelegate_win.cpp
--- a/src/desktop/UBWindowCaptureDelegate_win.h
+++ b/src/desktop/UBWindowCaptureDelegate_win.h
--- a/src/desktop/UBWindowCapture_linux.cpp
+++ b/src/desktop/UBWindowCapture_linux.cpp
--- a/src/desktop/UBWindowCapture_mac.mm
+++ b/src/desktop/UBWindowCapture_mac.mm
--- a/src/desktop/UBWindowCapture_win.cpp
+++ b/src/desktop/UBWindowCapture_win.cpp
--- a/src/document/UBDocumentContainer.cpp
+++ b/src/document/UBDocumentContainer.cpp
--- a/src/document/UBDocumentContainer.h
+++ b/src/document/UBDocumentContainer.h
--- a/src/document/UBDocumentController.cpp
+++ b/src/document/UBDocumentController.cpp
--- a/src/document/UBDocumentController.h
+++ b/src/document/UBDocumentController.h
--- a/src/document/UBDocumentProxy.cpp
+++ b/src/document/UBDocumentProxy.cpp
--- a/src/document/UBDocumentProxy.h
+++ b/src/document/UBDocumentProxy.h
--- a/src/domain/UBAbstractUndoCommand.cpp
+++ b/src/domain/UBAbstractUndoCommand.cpp
--- a/src/domain/UBAbstractUndoCommand.h
+++ b/src/domain/UBAbstractUndoCommand.h
--- a/src/domain/UBDocumentUndoCommand.cpp
+++ b/src/domain/UBDocumentUndoCommand.cpp
--- a/src/domain/UBDocumentUndoCommand.h
+++ b/src/domain/UBDocumentUndoCommand.h
--- a/src/domain/UBGraphicsAudioItem.h
+++ b/src/domain/UBGraphicsAudioItem.h
--- a/src/domain/UBGraphicsDelegateFrame.cpp
+++ b/src/domain/UBGraphicsDelegateFrame.cpp
--- a/src/domain/UBGraphicsDelegateFrame.h
+++ b/src/domain/UBGraphicsDelegateFrame.h
--- a/src/domain/UBGraphicsGroupContainerItem.cpp
+++ b/src/domain/UBGraphicsGroupContainerItem.cpp
--- a/src/domain/UBGraphicsGroupContainerItem.h
+++ b/src/domain/UBGraphicsGroupContainerItem.h
--- a/src/domain/UBGraphicsGroupContainerItemDelegate.cpp
+++ b/src/domain/UBGraphicsGroupContainerItemDelegate.cpp
--- a/src/domain/UBGraphicsGroupContainerItemDelegate.h
+++ b/src/domain/UBGraphicsGroupContainerItemDelegate.h
--- a/src/domain/UBGraphicsItemDelegate.cpp
+++ b/src/domain/UBGraphicsItemDelegate.cpp
--- a/src/domain/UBGraphicsItemDelegate.h
+++ b/src/domain/UBGraphicsItemDelegate.h
--- a/src/domain/UBGraphicsItemGroupUndoCommand.cpp
+++ b/src/domain/UBGraphicsItemGroupUndoCommand.cpp
--- a/src/domain/UBGraphicsItemGroupUndoCommand.h
+++ b/src/domain/UBGraphicsItemGroupUndoCommand.h
--- a/src/domain/UBGraphicsItemTransformUndoCommand.cpp
+++ b/src/domain/UBGraphicsItemTransformUndoCommand.cpp
--- a/src/domain/UBGraphicsItemTransformUndoCommand.h
+++ b/src/domain/UBGraphicsItemTransformUndoCommand.h
--- a/src/domain/UBGraphicsItemUndoCommand.cpp
+++ b/src/domain/UBGraphicsItemUndoCommand.cpp
--- a/src/domain/UBGraphicsItemUndoCommand.h
+++ b/src/domain/UBGraphicsItemUndoCommand.h
--- a/src/domain/UBGraphicsMediaItem.cpp
+++ b/src/domain/UBGraphicsMediaItem.cpp
--- a/src/domain/UBGraphicsMediaItem.h
+++ b/src/domain/UBGraphicsMediaItem.h
--- a/src/domain/UBGraphicsMediaItemDelegate.cpp
+++ b/src/domain/UBGraphicsMediaItemDelegate.cpp
--- a/src/domain/UBGraphicsMediaItemDelegate.h
+++ b/src/domain/UBGraphicsMediaItemDelegate.h
--- a/src/domain/UBGraphicsPDFItem.cpp
+++ b/src/domain/UBGraphicsPDFItem.cpp
--- a/src/domain/UBGraphicsPDFItem.h
+++ b/src/domain/UBGraphicsPDFItem.h
--- a/src/domain/UBGraphicsPixmapItem.cpp
+++ b/src/domain/UBGraphicsPixmapItem.cpp
--- a/src/domain/UBGraphicsPixmapItem.h
+++ b/src/domain/UBGraphicsPixmapItem.h
--- a/src/domain/UBGraphicsPolygonItem.cpp
+++ b/src/domain/UBGraphicsPolygonItem.cpp
--- a/src/domain/UBGraphicsPolygonItem.h
+++ b/src/domain/UBGraphicsPolygonItem.h
--- a/src/domain/UBGraphicsProxyWidget.cpp
+++ b/src/domain/UBGraphicsProxyWidget.cpp
--- a/src/domain/UBGraphicsProxyWidget.h
+++ b/src/domain/UBGraphicsProxyWidget.h
--- a/src/domain/UBGraphicsScene.cpp
+++ b/src/domain/UBGraphicsScene.cpp
--- a/src/domain/UBGraphicsScene.h
+++ b/src/domain/UBGraphicsScene.h
--- a/src/domain/UBGraphicsStroke.cpp
+++ b/src/domain/UBGraphicsStroke.cpp
--- a/src/domain/UBGraphicsStroke.h
+++ b/src/domain/UBGraphicsStroke.h
--- a/src/domain/UBGraphicsStrokesGroup.cpp
+++ b/src/domain/UBGraphicsStrokesGroup.cpp
--- a/src/domain/UBGraphicsStrokesGroup.h
+++ b/src/domain/UBGraphicsStrokesGroup.h
--- a/src/domain/UBGraphicsSvgItem.cpp
+++ b/src/domain/UBGraphicsSvgItem.cpp
--- a/src/domain/UBGraphicsSvgItem.h
+++ b/src/domain/UBGraphicsSvgItem.h
--- a/src/domain/UBGraphicsTextItem.cpp
+++ b/src/domain/UBGraphicsTextItem.cpp
--- a/src/domain/UBGraphicsTextItem.h
+++ b/src/domain/UBGraphicsTextItem.h
--- a/src/domain/UBGraphicsTextItemDelegate.cpp
+++ b/src/domain/UBGraphicsTextItemDelegate.cpp
--- a/src/domain/UBGraphicsTextItemDelegate.h
+++ b/src/domain/UBGraphicsTextItemDelegate.h
--- a/src/domain/UBGraphicsTextItemUndoCommand.cpp
+++ b/src/domain/UBGraphicsTextItemUndoCommand.cpp
--- a/src/domain/UBGraphicsTextItemUndoCommand.h
+++ b/src/domain/UBGraphicsTextItemUndoCommand.h
--- a/src/domain/UBGraphicsVideoItem.cpp
+++ b/src/domain/UBGraphicsVideoItem.cpp
--- a/src/domain/UBGraphicsVideoItem.h
+++ b/src/domain/UBGraphicsVideoItem.h
--- a/src/domain/UBGraphicsVideoItemDelegate.cpp
+++ b/src/domain/UBGraphicsVideoItemDelegate.cpp
--- a/src/domain/UBGraphicsVideoItemDelegate.h
+++ b/src/domain/UBGraphicsVideoItemDelegate.h
--- a/src/domain/UBGraphicsWidgetItem.cpp
+++ b/src/domain/UBGraphicsWidgetItem.cpp
--- a/src/domain/UBGraphicsWidgetItem.h
+++ b/src/domain/UBGraphicsWidgetItem.h
--- a/src/domain/UBGraphicsWidgetItemDelegate.cpp
+++ b/src/domain/UBGraphicsWidgetItemDelegate.cpp
--- a/src/domain/UBGraphicsWidgetItemDelegate.h
+++ b/src/domain/UBGraphicsWidgetItemDelegate.h
--- a/src/domain/UBItem.cpp
+++ b/src/domain/UBItem.cpp
--- a/src/domain/UBItem.h
+++ b/src/domain/UBItem.h
--- a/src/domain/UBPageSizeUndoCommand.cpp
+++ b/src/domain/UBPageSizeUndoCommand.cpp
--- a/src/domain/UBPageSizeUndoCommand.h
+++ b/src/domain/UBPageSizeUndoCommand.h
--- a/src/domain/UBResizableGraphicsItem.cpp
+++ b/src/domain/UBResizableGraphicsItem.cpp
--- a/src/domain/UBResizableGraphicsItem.h
+++ b/src/domain/UBResizableGraphicsItem.h
--- a/src/domain/domain.pri
+++ b/src/domain/domain.pri
--- a/src/frameworks/MacUtils.h
+++ b/src/frameworks/MacUtils.h
--- a/src/frameworks/UBBase32.cpp
+++ b/src/frameworks/UBBase32.cpp
--- a/src/frameworks/UBBase32.h
+++ b/src/frameworks/UBBase32.h
--- a/src/frameworks/UBCoreGraphicsScene.cpp
+++ b/src/frameworks/UBCoreGraphicsScene.cpp
--- a/src/frameworks/UBCoreGraphicsScene.h
+++ b/src/frameworks/UBCoreGraphicsScene.h
--- a/src/frameworks/UBCryptoUtils.cpp
+++ b/src/frameworks/UBCryptoUtils.cpp
--- a/src/frameworks/UBCryptoUtils.h
+++ b/src/frameworks/UBCryptoUtils.h
--- a/src/frameworks/UBFileSystemUtils.cpp
+++ b/src/frameworks/UBFileSystemUtils.cpp
--- a/src/frameworks/UBFileSystemUtils.h
+++ b/src/frameworks/UBFileSystemUtils.h
--- a/src/frameworks/UBGeometryUtils.cpp
+++ b/src/frameworks/UBGeometryUtils.cpp
--- a/src/frameworks/UBGeometryUtils.h
+++ b/src/frameworks/UBGeometryUtils.h
--- a/src/frameworks/UBPlatformUtils.cpp
+++ b/src/frameworks/UBPlatformUtils.cpp
--- a/src/frameworks/UBPlatformUtils.h
+++ b/src/frameworks/UBPlatformUtils.h
--- a/src/frameworks/UBPlatformUtils_linux.cpp
+++ b/src/frameworks/UBPlatformUtils_linux.cpp
--- a/src/frameworks/UBPlatformUtils_mac.mm
+++ b/src/frameworks/UBPlatformUtils_mac.mm
--- a/src/frameworks/UBPlatformUtils_win.cpp
+++ b/src/frameworks/UBPlatformUtils_win.cpp
--- a/src/frameworks/UBStringUtils.cpp
+++ b/src/frameworks/UBStringUtils.cpp
--- a/src/frameworks/UBStringUtils.h
+++ b/src/frameworks/UBStringUtils.h
--- a/src/frameworks/UBVersion.cpp
+++ b/src/frameworks/UBVersion.cpp
--- a/src/frameworks/UBVersion.h
+++ b/src/frameworks/UBVersion.h
--- a/src/globals/UBGlobals.h
+++ b/src/globals/UBGlobals.h
--- a/src/gui/UBActionPalette.cpp
+++ b/src/gui/UBActionPalette.cpp
--- a/src/gui/UBActionPalette.h
+++ b/src/gui/UBActionPalette.h
--- a/src/gui/UBBlackoutWidget.cpp
+++ b/src/gui/UBBlackoutWidget.cpp
--- a/src/gui/UBBlackoutWidget.h
+++ b/src/gui/UBBlackoutWidget.h
--- a/src/gui/UBCachePropertiesWidget.cpp
+++ b/src/gui/UBCachePropertiesWidget.cpp
--- a/src/gui/UBCachePropertiesWidget.h
+++ b/src/gui/UBCachePropertiesWidget.h
--- a/src/gui/UBCircleFrame.cpp
+++ b/src/gui/UBCircleFrame.cpp
--- a/src/gui/UBCircleFrame.h
+++ b/src/gui/UBCircleFrame.h
--- a/src/gui/UBClockPalette.h
+++ b/src/gui/UBClockPalette.h
--- a/src/gui/UBColorPicker.cpp
+++ b/src/gui/UBColorPicker.cpp
--- a/src/gui/UBColorPicker.h
+++ b/src/gui/UBColorPicker.h
--- a/src/gui/UBDockDownloadWidget.cpp
+++ b/src/gui/UBDockDownloadWidget.cpp
--- a/src/gui/UBDockDownloadWidget.h
+++ b/src/gui/UBDockDownloadWidget.h
--- a/src/gui/UBDockPalette.cpp
+++ b/src/gui/UBDockPalette.cpp
--- a/src/gui/UBDockPalette.h
+++ b/src/gui/UBDockPalette.h
--- a/src/gui/UBDockPaletteWidget.cpp
+++ b/src/gui/UBDockPaletteWidget.cpp
--- a/src/gui/UBDockPaletteWidget.h
+++ b/src/gui/UBDockPaletteWidget.h
--- a/src/gui/UBDockTeacherGuideWidget.cpp
+++ b/src/gui/UBDockTeacherGuideWidget.cpp
--- a/src/gui/UBDockTeacherGuideWidget.h
+++ b/src/gui/UBDockTeacherGuideWidget.h
--- a/src/gui/UBDocumentNavigator.cpp
+++ b/src/gui/UBDocumentNavigator.cpp
--- a/src/gui/UBDocumentNavigator.h
+++ b/src/gui/UBDocumentNavigator.h
--- a/src/gui/UBDocumentThumbnailWidget.cpp
+++ b/src/gui/UBDocumentThumbnailWidget.cpp
--- a/src/gui/UBDocumentThumbnailWidget.h
+++ b/src/gui/UBDocumentThumbnailWidget.h
--- a/src/gui/UBDocumentToolsPalette.cpp
+++ b/src/gui/UBDocumentToolsPalette.cpp
--- a/src/gui/UBDocumentToolsPalette.h
+++ b/src/gui/UBDocumentToolsPalette.h
--- a/src/gui/UBDocumentTreeWidget.cpp
+++ b/src/gui/UBDocumentTreeWidget.cpp
--- a/src/gui/UBDocumentTreeWidget.h
+++ b/src/gui/UBDocumentTreeWidget.h
--- a/src/gui/UBDownloadWidget.cpp
+++ b/src/gui/UBDownloadWidget.cpp
--- a/src/gui/UBDownloadWidget.h
+++ b/src/gui/UBDownloadWidget.h
--- a/src/gui/UBFavoriteToolPalette.cpp
+++ b/src/gui/UBFavoriteToolPalette.cpp
--- a/src/gui/UBFavoriteToolPalette.h
+++ b/src/gui/UBFavoriteToolPalette.h
--- a/src/gui/UBFeaturesActionBar.cpp
+++ b/src/gui/UBFeaturesActionBar.cpp
--- a/src/gui/UBFeaturesActionBar.h
+++ b/src/gui/UBFeaturesActionBar.h
--- a/src/gui/UBFeaturesWidget.cpp
+++ b/src/gui/UBFeaturesWidget.cpp
--- a/src/gui/UBFeaturesWidget.h
+++ b/src/gui/UBFeaturesWidget.h
--- a/src/gui/UBFloatingPalette.cpp
+++ b/src/gui/UBFloatingPalette.cpp
--- a/src/gui/UBFloatingPalette.h
+++ b/src/gui/UBFloatingPalette.h
--- a/src/gui/UBIconButton.cpp
+++ b/src/gui/UBIconButton.cpp
--- a/src/gui/UBIconButton.h
+++ b/src/gui/UBIconButton.h
--- a/src/gui/UBKeyboardPalette.cpp
+++ b/src/gui/UBKeyboardPalette.cpp
--- a/src/gui/UBKeyboardPalette.h
+++ b/src/gui/UBKeyboardPalette.h
--- a/src/gui/UBKeyboardPalette_linux.cpp
+++ b/src/gui/UBKeyboardPalette_linux.cpp
--- a/src/gui/UBKeyboardPalette_mac.cpp
+++ b/src/gui/UBKeyboardPalette_mac.cpp
--- a/src/gui/UBKeyboardPalette_win.cpp
+++ b/src/gui/UBKeyboardPalette_win.cpp
--- a/src/gui/UBLeftPalette.cpp
+++ b/src/gui/UBLeftPalette.cpp
--- a/src/gui/UBLeftPalette.h
+++ b/src/gui/UBLeftPalette.h
--- a/src/gui/UBMagnifer.cpp
+++ b/src/gui/UBMagnifer.cpp
--- a/src/gui/UBMagnifer.h
+++ b/src/gui/UBMagnifer.h
--- a/src/gui/UBMainWindow.cpp
+++ b/src/gui/UBMainWindow.cpp
--- a/src/gui/UBMainWindow.h
+++ b/src/gui/UBMainWindow.h
--- a/src/gui/UBMessageWindow.cpp
+++ b/src/gui/UBMessageWindow.cpp
--- a/src/gui/UBMessageWindow.h
+++ b/src/gui/UBMessageWindow.h
--- a/src/gui/UBMessagesDialog.cpp
+++ b/src/gui/UBMessagesDialog.cpp
--- a/src/gui/UBMessagesDialog.h
+++ b/src/gui/UBMessagesDialog.h
--- a/src/gui/UBMousePressFilter.cpp
+++ b/src/gui/UBMousePressFilter.cpp
--- a/src/gui/UBMousePressFilter.h
+++ b/src/gui/UBMousePressFilter.h
--- a/src/gui/UBNavigatorPalette.cpp
+++ b/src/gui/UBNavigatorPalette.cpp
--- a/src/gui/UBNavigatorPalette.h
+++ b/src/gui/UBNavigatorPalette.h
--- a/src/gui/UBPageNavigationWidget.cpp
+++ b/src/gui/UBPageNavigationWidget.cpp
--- a/src/gui/UBPageNavigationWidget.h
+++ b/src/gui/UBPageNavigationWidget.h
--- a/src/gui/UBPropertyPalette.cpp
+++ b/src/gui/UBPropertyPalette.cpp
--- a/src/gui/UBPropertyPalette.h
+++ b/src/gui/UBPropertyPalette.h
--- a/src/gui/UBResources.cpp
+++ b/src/gui/UBResources.cpp
--- a/src/gui/UBResources.h
+++ b/src/gui/UBResources.h
--- a/src/gui/UBRightPalette.cpp
+++ b/src/gui/UBRightPalette.cpp
--- a/src/gui/UBRightPalette.h
+++ b/src/gui/UBRightPalette.h
--- a/src/gui/UBRubberBand.cpp
+++ b/src/gui/UBRubberBand.cpp
--- a/src/gui/UBRubberBand.h
+++ b/src/gui/UBRubberBand.h
--- a/src/gui/UBScreenMirror.cpp
+++ b/src/gui/UBScreenMirror.cpp
--- a/src/gui/UBScreenMirror.h
+++ b/src/gui/UBScreenMirror.h
--- a/src/gui/UBSpinningWheel.cpp
+++ b/src/gui/UBSpinningWheel.cpp
--- a/src/gui/UBSpinningWheel.h
+++ b/src/gui/UBSpinningWheel.h
--- a/src/gui/UBStylusPalette.cpp
+++ b/src/gui/UBStylusPalette.cpp
--- a/src/gui/UBStylusPalette.h
+++ b/src/gui/UBStylusPalette.h
--- a/src/gui/UBTeacherGuideWidget.cpp
+++ b/src/gui/UBTeacherGuideWidget.cpp
--- a/src/gui/UBTeacherGuideWidget.h
+++ b/src/gui/UBTeacherGuideWidget.h
--- a/src/gui/UBTeacherGuideWidgetsTools.cpp
+++ b/src/gui/UBTeacherGuideWidgetsTools.cpp
--- a/src/gui/UBTeacherGuideWidgetsTools.h
+++ b/src/gui/UBTeacherGuideWidgetsTools.h
--- a/src/gui/UBThumbnailView.cpp
+++ b/src/gui/UBThumbnailView.cpp
--- a/src/gui/UBThumbnailView.h
+++ b/src/gui/UBThumbnailView.h
--- a/src/gui/UBThumbnailWidget.cpp
+++ b/src/gui/UBThumbnailWidget.cpp
--- a/src/gui/UBThumbnailWidget.h
+++ b/src/gui/UBThumbnailWidget.h
--- a/src/gui/UBToolWidget.cpp
+++ b/src/gui/UBToolWidget.cpp
--- a/src/gui/UBToolWidget.h
+++ b/src/gui/UBToolWidget.h
--- a/src/gui/UBToolbarButtonGroup.cpp
+++ b/src/gui/UBToolbarButtonGroup.cpp
--- a/src/gui/UBToolbarButtonGroup.h
+++ b/src/gui/UBToolbarButtonGroup.h
--- a/src/gui/UBUpdateDlg.cpp
+++ b/src/gui/UBUpdateDlg.cpp
--- a/src/gui/UBUpdateDlg.h
+++ b/src/gui/UBUpdateDlg.h
--- a/src/gui/UBVideoPlayer.cpp
+++ b/src/gui/UBVideoPlayer.cpp
--- a/src/gui/UBVideoPlayer.h
+++ b/src/gui/UBVideoPlayer.h
--- a/src/gui/UBWebToolsPalette.cpp
+++ b/src/gui/UBWebToolsPalette.cpp
--- a/src/gui/UBWebToolsPalette.h
+++ b/src/gui/UBWebToolsPalette.h
--- a/src/gui/UBWidgetMirror.cpp
+++ b/src/gui/UBWidgetMirror.cpp
--- a/src/gui/UBWidgetMirror.h
+++ b/src/gui/UBWidgetMirror.h
--- a/src/gui/UBZoomPalette.cpp
+++ b/src/gui/UBZoomPalette.cpp
--- a/src/gui/UBZoomPalette.h
+++ b/src/gui/UBZoomPalette.h
--- a/src/interfaces/IDataStorage.h
+++ b/src/interfaces/IDataStorage.h
--- a/src/network/UBAutoSaver.cpp
+++ b/src/network/UBAutoSaver.cpp
--- a/src/network/UBAutoSaver.h
+++ b/src/network/UBAutoSaver.h
--- a/src/network/UBCookieJar.cpp
+++ b/src/network/UBCookieJar.cpp
--- a/src/network/UBCookieJar.h
+++ b/src/network/UBCookieJar.h
--- a/src/network/UBHttpFileDownloader.cpp
+++ b/src/network/UBHttpFileDownloader.cpp
--- a/src/network/UBHttpFileDownloader.h
+++ b/src/network/UBHttpFileDownloader.h
--- a/src/network/UBHttpGet.cpp
+++ b/src/network/UBHttpGet.cpp
--- a/src/network/UBHttpGet.h
+++ b/src/network/UBHttpGet.h
--- a/src/network/UBNetworkAccessManager.cpp
+++ b/src/network/UBNetworkAccessManager.cpp
--- a/src/network/UBNetworkAccessManager.h
+++ b/src/network/UBNetworkAccessManager.h
--- a/src/network/UBServerXMLHttpRequest.cpp
+++ b/src/network/UBServerXMLHttpRequest.cpp
--- a/src/network/UBServerXMLHttpRequest.h
+++ b/src/network/UBServerXMLHttpRequest.h
--- a/src/pdf-merger/ASCII85Decode.cpp
+++ b/src/pdf-merger/ASCII85Decode.cpp
--- a/src/pdf-merger/ASCII85Decode.h
+++ b/src/pdf-merger/ASCII85Decode.h
--- a/src/pdf-merger/ASCIIHexDecode.cpp
+++ b/src/pdf-merger/ASCIIHexDecode.cpp
--- a/src/pdf-merger/ASCIIHexDecode.h
+++ b/src/pdf-merger/ASCIIHexDecode.h
--- a/src/pdf-merger/AbstractBoxElementHandler.h
+++ b/src/pdf-merger/AbstractBoxElementHandler.h
--- a/src/pdf-merger/AnnotsHandler.cpp
+++ b/src/pdf-merger/AnnotsHandler.cpp
--- a/src/pdf-merger/AnnotsHandler.h
+++ b/src/pdf-merger/AnnotsHandler.h
--- a/src/pdf-merger/CCITTFaxDecode.cpp
+++ b/src/pdf-merger/CCITTFaxDecode.cpp
--- a/src/pdf-merger/CCITTFaxDecode.h
+++ b/src/pdf-merger/CCITTFaxDecode.h
--- a/src/pdf-merger/Config.h
+++ b/src/pdf-merger/Config.h
--- a/src/pdf-merger/ContentHandler.cpp
+++ b/src/pdf-merger/ContentHandler.cpp
--- a/src/pdf-merger/ContentHandler.h
+++ b/src/pdf-merger/ContentHandler.h
--- a/src/pdf-merger/CropBoxElementHandler.h
+++ b/src/pdf-merger/CropBoxElementHandler.h
--- a/src/pdf-merger/DCTDecode.cpp
+++ b/src/pdf-merger/DCTDecode.cpp
--- a/src/pdf-merger/DCTDecode.h
+++ b/src/pdf-merger/DCTDecode.h
--- a/src/pdf-merger/Decoder.h
+++ b/src/pdf-merger/Decoder.h
--- a/src/pdf-merger/Document.cpp
+++ b/src/pdf-merger/Document.cpp
--- a/src/pdf-merger/Document.h
+++ b/src/pdf-merger/Document.h
--- a/src/pdf-merger/Exception.h
+++ b/src/pdf-merger/Exception.h
--- a/src/pdf-merger/FileIsAbsentException.h
+++ b/src/pdf-merger/FileIsAbsentException.h
--- a/src/pdf-merger/Filter.cpp
+++ b/src/pdf-merger/Filter.cpp
--- a/src/pdf-merger/Filter.h
+++ b/src/pdf-merger/Filter.h
--- a/src/pdf-merger/FilterPredictor.cpp
+++ b/src/pdf-merger/FilterPredictor.cpp
--- a/src/pdf-merger/FilterPredictor.h
+++ b/src/pdf-merger/FilterPredictor.h
--- a/src/pdf-merger/FlateDecode.cpp
+++ b/src/pdf-merger/FlateDecode.cpp
--- a/src/pdf-merger/FlateDecode.h
+++ b/src/pdf-merger/FlateDecode.h
--- a/src/pdf-merger/JBIG2Decode.cpp
+++ b/src/pdf-merger/JBIG2Decode.cpp
--- a/src/pdf-merger/JBIG2Decode.h
+++ b/src/pdf-merger/JBIG2Decode.h
--- a/src/pdf-merger/LZWDecode.cpp
+++ b/src/pdf-merger/LZWDecode.cpp
--- a/src/pdf-merger/LZWDecode.h
+++ b/src/pdf-merger/LZWDecode.h
--- a/src/pdf-merger/MediaBoxElementHandler.h
+++ b/src/pdf-merger/MediaBoxElementHandler.h
--- a/src/pdf-merger/MergePageDescription.h
+++ b/src/pdf-merger/MergePageDescription.h
--- a/src/pdf-merger/Merger.cpp
+++ b/src/pdf-merger/Merger.cpp
--- a/src/pdf-merger/Merger.h
+++ b/src/pdf-merger/Merger.h
--- a/src/pdf-merger/Object.cpp
+++ b/src/pdf-merger/Object.cpp
--- a/src/pdf-merger/Object.h
+++ b/src/pdf-merger/Object.h
--- a/src/pdf-merger/OverlayDocumentParser.cpp
+++ b/src/pdf-merger/OverlayDocumentParser.cpp
--- a/src/pdf-merger/OverlayDocumentParser.h
+++ b/src/pdf-merger/OverlayDocumentParser.h
--- a/src/pdf-merger/Page.cpp
+++ b/src/pdf-merger/Page.cpp
--- a/src/pdf-merger/Page.h
+++ b/src/pdf-merger/Page.h
--- a/src/pdf-merger/PageElementHandler.cpp
+++ b/src/pdf-merger/PageElementHandler.cpp
--- a/src/pdf-merger/PageElementHandler.h
+++ b/src/pdf-merger/PageElementHandler.h
--- a/src/pdf-merger/PageParser.h
+++ b/src/pdf-merger/PageParser.h
--- a/src/pdf-merger/Parser.cpp
+++ b/src/pdf-merger/Parser.cpp
--- a/src/pdf-merger/Parser.h
+++ b/src/pdf-merger/Parser.h
--- a/src/pdf-merger/Rectangle.cpp
+++ b/src/pdf-merger/Rectangle.cpp
--- a/src/pdf-merger/Rectangle.h
+++ b/src/pdf-merger/Rectangle.h
--- a/src/pdf-merger/RemoveHimSelfHandler.h
+++ b/src/pdf-merger/RemoveHimSelfHandler.h
--- a/src/pdf-merger/RemoveHimselfHandler.cpp
+++ b/src/pdf-merger/RemoveHimselfHandler.cpp
--- a/src/pdf-merger/RotationHandler.h
+++ b/src/pdf-merger/RotationHandler.h
--- a/src/pdf-merger/RunLengthDecode.cpp
+++ b/src/pdf-merger/RunLengthDecode.cpp
--- a/src/pdf-merger/RunLengthDecode.h
+++ b/src/pdf-merger/RunLengthDecode.h
--- a/src/pdf-merger/Transformation.h
+++ b/src/pdf-merger/Transformation.h
--- a/src/pdf-merger/TypeElementHandler.h
+++ b/src/pdf-merger/TypeElementHandler.h
--- a/src/pdf-merger/Utils.cpp
+++ b/src/pdf-merger/Utils.cpp
--- a/src/pdf-merger/Utils.h
+++ b/src/pdf-merger/Utils.h
--- a/src/pdf/GraphicsPDFItem.cpp
+++ b/src/pdf/GraphicsPDFItem.cpp
--- a/src/pdf/GraphicsPDFItem.h
+++ b/src/pdf/GraphicsPDFItem.h
--- a/src/pdf/PDFRenderer.cpp
+++ b/src/pdf/PDFRenderer.cpp
--- a/src/pdf/PDFRenderer.h
+++ b/src/pdf/PDFRenderer.h
--- a/src/pdf/UBWebPluginPDFWidget.cpp
+++ b/src/pdf/UBWebPluginPDFWidget.cpp
--- a/src/pdf/UBWebPluginPDFWidget.h
+++ b/src/pdf/UBWebPluginPDFWidget.h
--- a/src/pdf/XPDFRenderer.cpp
+++ b/src/pdf/XPDFRenderer.cpp
--- a/src/pdf/XPDFRenderer.h
+++ b/src/pdf/XPDFRenderer.h
--- a/src/podcast/UBAbstractVideoEncoder.cpp
+++ b/src/podcast/UBAbstractVideoEncoder.cpp
--- a/src/podcast/UBAbstractVideoEncoder.h
+++ b/src/podcast/UBAbstractVideoEncoder.h
--- a/src/podcast/UBPodcastController.cpp
+++ b/src/podcast/UBPodcastController.cpp
--- a/src/podcast/UBPodcastController.h
+++ b/src/podcast/UBPodcastController.h
--- a/src/podcast/UBPodcastRecordingPalette.cpp
+++ b/src/podcast/UBPodcastRecordingPalette.cpp
--- a/src/podcast/UBPodcastRecordingPalette.h
+++ b/src/podcast/UBPodcastRecordingPalette.h
--- a/src/podcast/intranet/UBIntranetPodcastPublisher.cpp
+++ b/src/podcast/intranet/UBIntranetPodcastPublisher.cpp
--- a/src/podcast/intranet/UBIntranetPodcastPublisher.h
+++ b/src/podcast/intranet/UBIntranetPodcastPublisher.h
--- a/src/podcast/quicktime/UBAudioQueueRecorder.cpp
+++ b/src/podcast/quicktime/UBAudioQueueRecorder.cpp
--- a/src/podcast/quicktime/UBAudioQueueRecorder.h
+++ b/src/podcast/quicktime/UBAudioQueueRecorder.h
--- a/src/podcast/quicktime/UBQuickTimeFile.cpp
+++ b/src/podcast/quicktime/UBQuickTimeFile.cpp
--- a/src/podcast/quicktime/UBQuickTimeFile.h
+++ b/src/podcast/quicktime/UBQuickTimeFile.h
--- a/src/podcast/quicktime/UBQuickTimeVideoEncoder.cpp
+++ b/src/podcast/quicktime/UBQuickTimeVideoEncoder.cpp
--- a/src/podcast/quicktime/UBQuickTimeVideoEncoder.h
+++ b/src/podcast/quicktime/UBQuickTimeVideoEncoder.h
--- a/src/podcast/windowsmedia/UBWaveRecorder.cpp
+++ b/src/podcast/windowsmedia/UBWaveRecorder.cpp
--- a/src/podcast/windowsmedia/UBWaveRecorder.h
+++ b/src/podcast/windowsmedia/UBWaveRecorder.h
--- a/src/podcast/windowsmedia/UBWindowsMediaFile.cpp
+++ b/src/podcast/windowsmedia/UBWindowsMediaFile.cpp
--- a/src/podcast/windowsmedia/UBWindowsMediaFile.h
+++ b/src/podcast/windowsmedia/UBWindowsMediaFile.h
--- a/src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.cpp
+++ b/src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.cpp
--- a/src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.h
+++ b/src/podcast/windowsmedia/UBWindowsMediaVideoEncoder.h
--- a/src/podcast/youtube/UBYouTubePublisher.cpp
+++ b/src/podcast/youtube/UBYouTubePublisher.cpp
--- a/src/podcast/youtube/UBYouTubePublisher.h
+++ b/src/podcast/youtube/UBYouTubePublisher.h
--- a/src/tools/UBAbstractDrawRuler.cpp
+++ b/src/tools/UBAbstractDrawRuler.cpp
--- a/src/tools/UBAbstractDrawRuler.h
+++ b/src/tools/UBAbstractDrawRuler.h
--- a/src/tools/UBGraphicsCache.cpp
+++ b/src/tools/UBGraphicsCache.cpp
--- a/src/tools/UBGraphicsCache.h
+++ b/src/tools/UBGraphicsCache.h
--- a/src/tools/UBGraphicsCompass.cpp
+++ b/src/tools/UBGraphicsCompass.cpp
--- a/src/tools/UBGraphicsCompass.h
+++ b/src/tools/UBGraphicsCompass.h
--- a/src/tools/UBGraphicsCurtainItem.cpp
+++ b/src/tools/UBGraphicsCurtainItem.cpp
--- a/src/tools/UBGraphicsCurtainItem.h
+++ b/src/tools/UBGraphicsCurtainItem.h
--- a/src/tools/UBGraphicsCurtainItemDelegate.cpp
+++ b/src/tools/UBGraphicsCurtainItemDelegate.cpp
--- a/src/tools/UBGraphicsCurtainItemDelegate.h
+++ b/src/tools/UBGraphicsCurtainItemDelegate.h
--- a/src/tools/UBGraphicsProtractor.cpp
+++ b/src/tools/UBGraphicsProtractor.cpp
--- a/src/tools/UBGraphicsProtractor.h
+++ b/src/tools/UBGraphicsProtractor.h
--- a/src/tools/UBGraphicsRuler.cpp
+++ b/src/tools/UBGraphicsRuler.cpp
--- a/src/tools/UBGraphicsRuler.h
+++ b/src/tools/UBGraphicsRuler.h
--- a/src/tools/UBGraphicsTriangle.cpp
+++ b/src/tools/UBGraphicsTriangle.cpp
--- a/src/tools/UBGraphicsTriangle.h
+++ b/src/tools/UBGraphicsTriangle.h
--- a/src/tools/UBToolsManager.cpp
+++ b/src/tools/UBToolsManager.cpp
--- a/src/tools/UBToolsManager.h
+++ b/src/tools/UBToolsManager.h
--- a/src/web/UBOEmbedParser.cpp
+++ b/src/web/UBOEmbedParser.cpp
--- a/src/web/UBOEmbedParser.h
+++ b/src/web/UBOEmbedParser.h
--- a/src/web/UBTrapFlashController.cpp
+++ b/src/web/UBTrapFlashController.cpp
--- a/src/web/UBTrapFlashController.h
+++ b/src/web/UBTrapFlashController.h
--- a/src/web/UBWebController.cpp
+++ b/src/web/UBWebController.cpp
--- a/src/web/UBWebController.h
+++ b/src/web/UBWebController.h
--- a/src/web/UBWebKitUtils.cpp
+++ b/src/web/UBWebKitUtils.cpp
--- a/src/web/UBWebKitUtils.h
+++ b/src/web/UBWebKitUtils.h
--- a/src/web/UBWebPage.cpp
+++ b/src/web/UBWebPage.cpp
--- a/src/web/UBWebPage.h
+++ b/src/web/UBWebPage.h
--- a/src/web/UBWebPluginWidget.cpp
+++ b/src/web/UBWebPluginWidget.cpp
--- a/src/web/UBWebPluginWidget.h
+++ b/src/web/UBWebPluginWidget.h
--- a/src/web/browser/WBBrowserWindow.cpp
+++ b/src/web/browser/WBBrowserWindow.cpp
--- a/src/web/browser/WBBrowserWindow.h
+++ b/src/web/browser/WBBrowserWindow.h
--- a/src/web/browser/WBChaseWidget.cpp
+++ b/src/web/browser/WBChaseWidget.cpp
--- a/src/web/browser/WBChaseWidget.h
+++ b/src/web/browser/WBChaseWidget.h
--- a/src/web/browser/WBDownloadManager.cpp
+++ b/src/web/browser/WBDownloadManager.cpp
--- a/src/web/browser/WBDownloadManager.h
+++ b/src/web/browser/WBDownloadManager.h
--- a/src/web/browser/WBEditTableView.cpp
+++ b/src/web/browser/WBEditTableView.cpp
--- a/src/web/browser/WBEditTableView.h
+++ b/src/web/browser/WBEditTableView.h
--- a/src/web/browser/WBHistory.cpp
+++ b/src/web/browser/WBHistory.cpp
--- a/src/web/browser/WBHistory.h
+++ b/src/web/browser/WBHistory.h
--- a/src/web/browser/WBModelMenu.cpp
+++ b/src/web/browser/WBModelMenu.cpp
--- a/src/web/browser/WBModelMenu.h
+++ b/src/web/browser/WBModelMenu.h
--- a/src/web/browser/WBSearchLineEdit.cpp
+++ b/src/web/browser/WBSearchLineEdit.cpp
--- a/src/web/browser/WBSearchLineEdit.h
+++ b/src/web/browser/WBSearchLineEdit.h
--- a/src/web/browser/WBSqueezeLabel.cpp
+++ b/src/web/browser/WBSqueezeLabel.cpp
--- a/src/web/browser/WBSqueezeLabel.h
+++ b/src/web/browser/WBSqueezeLabel.h
--- a/src/web/browser/WBTabWidget.cpp
+++ b/src/web/browser/WBTabWidget.cpp
--- a/src/web/browser/WBTabWidget.h
+++ b/src/web/browser/WBTabWidget.h
--- a/src/web/browser/WBToolBarSearch.cpp
+++ b/src/web/browser/WBToolBarSearch.cpp
--- a/src/web/browser/WBToolBarSearch.h
+++ b/src/web/browser/WBToolBarSearch.h
--- a/src/web/browser/WBUrlLineEdit.cpp
+++ b/src/web/browser/WBUrlLineEdit.cpp
--- a/src/web/browser/WBUrlLineEdit.h
+++ b/src/web/browser/WBUrlLineEdit.h
--- a/src/web/browser/WBWebTrapWebView.cpp
+++ b/src/web/browser/WBWebTrapWebView.cpp
--- a/src/web/browser/WBWebTrapWebView.h
+++ b/src/web/browser/WBWebTrapWebView.h
--- a/src/web/browser/WBWebView.cpp
+++ b/src/web/browser/WBWebView.cpp
--- a/src/web/browser/WBWebView.h
+++ b/src/web/browser/WBWebView.h
--- a/tools/CrashReportViewer/Bug.icns
+++ b/tools/CrashReportViewer/Bug.icns
--- a/tools/CrashReportViewer/CrashReportViewer.pro
+++ b/tools/CrashReportViewer/CrashReportViewer.pro
--- a/tools/CrashReportViewer/CrashReportViewer.ui
+++ b/tools/CrashReportViewer/CrashReportViewer.ui
--- a/tools/CrashReportViewer/CrashReporterSymbolSupplier.cpp
+++ b/tools/CrashReportViewer/CrashReporterSymbolSupplier.cpp
--- a/tools/CrashReportViewer/CrashReporterSymbolSupplier.h
+++ b/tools/CrashReportViewer/CrashReporterSymbolSupplier.h
--- a/tools/CrashReportViewer/CrashWindow.cpp
+++ b/tools/CrashReportViewer/CrashWindow.cpp
--- a/tools/CrashReportViewer/CrashWindow.h
+++ b/tools/CrashReportViewer/CrashWindow.h
--- a/tools/CrashReportViewer/Info.plist
+++ b/tools/CrashReportViewer/Info.plist
--- a/tools/CrashReportViewer/main.cpp
+++ b/tools/CrashReportViewer/main.cpp
--- a/tools/CrashReportViewer/release.macx.sh
+++ b/tools/CrashReportViewer/release.macx.sh
--- a/tools/pdf2image/core/UBPlatformUtils.cpp
+++ b/tools/pdf2image/core/UBPlatformUtils.cpp
--- a/tools/pdf2image/core/UBPlatformUtils.h
+++ b/tools/pdf2image/core/UBPlatformUtils.h
--- a/tools/pdf2image/pdf2image.cpp
+++ b/tools/pdf2image/pdf2image.cpp
--- a/tools/pdf2image/pdf2image.pro
+++ b/tools/pdf2image/pdf2image.pro
--- a/tools/pdf2image/resources/pdf2image
+++ b/tools/pdf2image/resources/pdf2image